更新

src/main/java/org/jeecg/common/dto/basedata/ArchivesBusinessListReqDTO.java

@@ -9,8 +9,6 @@ import lombok.Data;
 public class ArchivesBusinessListReqDTO {
     @ApiModelProperty("项目档案--子表id（里程碑信息表）")
     private String businessId;
-    @ApiModelProperty("里程碑档案id")
-    private String  archivesMileId;
 
     public ArchivesBusinessListReqDTO() {
     }

src/main/java/org/jeecg/common/dto/basedata/ArchivesBusinessListRespDTO.java

@@ -16,17 +16,14 @@ public class ArchivesBusinessListRespDTO {
     private String mileName;
     @ApiModelProperty("金额")
     private BigDecimal price;
-    @ApiModelProperty("未收款条线")
-    private BigDecimal uncoPrice;
 
     public ArchivesBusinessListRespDTO() {
     }
 
-    public ArchivesBusinessListRespDTO(String id, String mileId, String mileName, BigDecimal price, BigDecimal uncoPrice) {
+    public ArchivesBusinessListRespDTO(String id, String mileId, String mileName, BigDecimal price) {
         this.id = id;
         this.mileId = mileId;
         this.mileName = mileName;
         this.price = price;
-        this.uncoPrice = uncoPrice;
     }
 }

src/main/java/org/jeecg/common/dto/invoice/PurchaseDetailReqDTO.java

@@ -0,0 +1,17 @@
+package org.jeecg.common.dto.invoice;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("采购发票子表参数请求")
+@Data
+public class PurchaseDetailReqDTO {
+    @ApiModelProperty("项目档案--子表id（里程碑信息表）")
+    private String coArchivesId;
+    @ApiModelProperty("里程碑档案id")
+    private String proBusinessId;
+
+    public PurchaseDetailReqDTO() {
+    }
+}

src/main/java/org/jeecg/common/dto/invoice/PurchaseDetailRespDTO.java

@@ -0,0 +1,16 @@
+package org.jeecg.common.dto.invoice;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@ApiModel("采购发票子表响应参数")
+@Data
+public class PurchaseDetailRespDTO {
+    @ApiModelProperty("未收票金额")
+    private java.math.BigDecimal uncoPrice;
+
+    public PurchaseDetailRespDTO() {
+    }
+}

src/main/java/org/jeecg/modules/archives/controller/ProjectManageArchivesController.java

@@ -388,7 +388,6 @@ public class ProjectManageArchivesController {
 	@ApiOperation(value = "根据id商务里程碑信息", notes = "根据主表id查询项目档案商务收款计划里程碑相关数据")
 	@ApiImplicitParams({
 			@ApiImplicitParam(name="businessId", value="项目档案里程碑子表id",required=true, dataType="String"),
-			@ApiImplicitParam(name="archivesMileId", value="项目档案里程碑信息表id",required=true, dataType="String"),
 	})
 	@GetMapping(value = "/getMileNameById")
 	public Result<List<ArchivesBusinessListRespDTO>> getBusinessList(@Valid ArchivesBusinessListReqDTO reqDTO, BindingResult bindingResult) {
@@ -407,37 +406,23 @@ public class ProjectManageArchivesController {
 			    ProjectManageArchivesAndBusiness business = projectManageArchivesAndBusinessService.getOne(queryWrapper);
 
 
-			QueryWrapper<InvoiceManagePurchaseDetail> detailQueryWrapper = new QueryWrapper<>();
-			detailQueryWrapper.eq("del_flag", "0")
-					.eq("co_archives_id", reqDTO.getBusinessId())
-					.eq("pro_business_id", reqDTO.getArchivesMileId());
-			List<InvoiceManagePurchaseDetail> details = invoiceManagePurchaseDetailService.list(detailQueryWrapper);
-		    BigDecimal uncoPrice = null;
-			if(!CollectionUtils.isEmpty(details)){
-				uncoPrice = details.get(0).getUncoPrice();
-			}
 			    List<ArchivesBusinessListRespDTO> respDTOS = Lists.newArrayList();
                 if(business != null){
 					if(StringUtils.isNotBlank(business.getMileId1())){
-						respDTOS.add(new ArchivesBusinessListRespDTO(business.getId(), business.getMileId1(), business.getMilestone1(), business.getPrice1(),
-								uncoPrice == null ? business.getPrice1() : uncoPrice));
+						respDTOS.add(new ArchivesBusinessListRespDTO(business.getId(), business.getMileId1(), business.getMilestone1(), business.getPrice1()));
 					}
 					if(StringUtils.isNotBlank(business.getMileId2())){
-						respDTOS.add(new ArchivesBusinessListRespDTO(business.getId(), business.getMileId2(), business.getMilestone2(), business.getPrice2(),
-								uncoPrice == null ? business.getPrice1() : uncoPrice));
+						respDTOS.add(new ArchivesBusinessListRespDTO(business.getId(), business.getMileId2(), business.getMilestone2(), business.getPrice2()));
 					}
 					if(StringUtils.isNotBlank(business.getMileId3())){
-						respDTOS.add(new ArchivesBusinessListRespDTO(business.getId(), business.getMileId3(), business.getMilestone3(), business.getPrice3(),
-								uncoPrice == null ? business.getPrice1() : uncoPrice));
+						respDTOS.add(new ArchivesBusinessListRespDTO(business.getId(), business.getMileId3(), business.getMilestone3(), business.getPrice3()));
 					}
 					if(StringUtils.isNotBlank(business.getMileId4())){
-						respDTOS.add(new ArchivesBusinessListRespDTO(business.getId(), business.getMileId4(), business.getMilestone4(), business.getPrice4(),
-								uncoPrice == null ? business.getPrice1() : uncoPrice));
+						respDTOS.add(new ArchivesBusinessListRespDTO(business.getId(), business.getMileId4(), business.getMilestone4(), business.getPrice4()));
 
 					}
 					if(StringUtils.isNotBlank(business.getMileId5())){
-						respDTOS.add(new ArchivesBusinessListRespDTO(business.getId(), business.getMileId5(), business.getMilestone5(), business.getPrice5(),
-								uncoPrice == null ? business.getPrice1() : uncoPrice));
+						respDTOS.add(new ArchivesBusinessListRespDTO(business.getId(), business.getMileId5(), business.getMilestone5(), business.getPrice5()));
 					}
 				}
 				result.setResult(respDTOS);

src/main/java/org/jeecg/modules/invoice/controller/InvoiceManagePurchaseController.java

@@ -9,6 +9,8 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.dto.invoice.PurchaseAddReqDTO;
+import org.jeecg.common.dto.invoice.PurchaseDetailReqDTO;
+import org.jeecg.common.dto.invoice.PurchaseDetailRespDTO;
 import org.jeecg.common.dto.invoice.PurchaseReqDTO;
 import org.jeecg.common.dto.invoice.PurchaseRespDTO;
 import org.jeecg.common.system.query.QueryGenerator;
@@ -17,9 +19,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.invoice.entity.InvoiceManagePurchaseDetail;
+import org.jeecg.modules.invoice.service.InvoiceManagePurchaseDetailService;
 import org.jeecg.modules.invoice.service.InvoiceManagePurchaseService;
 import org.jeecg.modules.system.service.ISysSerialPatternService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -30,6 +35,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
    * @Author jihaosen
    * @date 2021/2/26
@@ -43,7 +50,8 @@ public class InvoiceManagePurchaseController {
 	private InvoiceManagePurchaseService invoiceManagePurchaseService;
 	@Autowired
 	private ISysSerialPatternService sysSerialPatternService;
-
+   @Autowired
+   private InvoiceManagePurchaseDetailService invoiceManagePurchaseDetailService;
 	
 	@GetMapping(value = "/list")
 	@ApiOperation(value = "分页查询接口", notes = "采购发票和销售发票分页查询")
@@ -176,4 +184,31 @@ public class InvoiceManagePurchaseController {
 		}
 		return result;
 	}
+
+
+	@ApiOperation(value = "查询未收票金额", notes = "查询未收票金额")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "id", value = "组织", required = true, dataType = "String")
+	})
+	@GetMapping(value = "/getChildrenList")
+	public Result<PurchaseDetailRespDTO> getChildrenList(PurchaseDetailReqDTO reqDTO) {
+		Result<PurchaseDetailRespDTO> result = new Result<PurchaseDetailRespDTO>();
+		QueryWrapper<InvoiceManagePurchaseDetail> queryWrapper = new QueryWrapper();
+		queryWrapper.eq("del_flag", "0");
+		queryWrapper.lambda().eq(InvoiceManagePurchaseDetail :: getCoArchivesId, reqDTO.getCoArchivesId());
+		queryWrapper.lambda().eq(InvoiceManagePurchaseDetail::getProBusinessId,  reqDTO.getProBusinessId());
+		List<InvoiceManagePurchaseDetail> details =  invoiceManagePurchaseDetailService.list(queryWrapper);
+		PurchaseDetailRespDTO respDTO = new PurchaseDetailRespDTO();
+		if(!CollectionUtils.isEmpty(details)){
+			respDTO.setUncoPrice(details.get(0).getUncoPrice());
+		}
+
+		if(respDTO==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(respDTO);
+			result.setSuccess(true);
+		}
+		return result;
+	}
 }

src/main/java/org/jeecg/modules/invoice/entity/InvoiceManagePurchaseDetail.java

@@ -27,11 +27,11 @@ public class  InvoiceManagePurchaseDetail implements Serializable {
 	private String id;
 	 @ApiModelProperty("采购，销售发票id")
 	private String purchaseId;
-	@ApiModelProperty("收款条线档案id")
+	@ApiModelProperty("项目档案--子表id（里程碑信息表）")
 	private String coArchivesId;
 	@ApiModelProperty("收付款条线")
 	private String coArchivesName;
-	@ApiModelProperty("项目档案里程碑表id")
+	@ApiModelProperty("里程碑档案id")
 	private String proBusinessId;
 	@ApiModelProperty("项目档案里程碑（项目档案—商务，页签中的收款计划）")
 	private String proArchivesMilestone;