更新

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

@@ -7,10 +7,10 @@ import lombok.Data;
 @ApiModel("项目档案—商务收款计划请求参数")
 @Data
 public class ArchivesBusinessListReqDTO {
-    @ApiModelProperty("项目档案--里程碑信息表id")
+    @ApiModelProperty("项目档案--子表id（里程碑信息表）")
     private String businessId;
-    @ApiModelProperty("项目档案--生产条线id")
-    private String  ArchivesLineId;
+    @ApiModelProperty("里程碑档案id")
+    private String  archivesMileId;
 
     public ArchivesBusinessListReqDTO() {
     }

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

@@ -31,7 +31,6 @@ import org.jeecg.modules.archives.entity.ProjectManageBusinessOther;
 import org.jeecg.modules.archives.service.ProjectManageArchivesAndBusinessService;
 import org.jeecg.modules.archives.service.ProjectManageArchivesService;
 import org.jeecg.modules.archives.service.ProjectManageBusinessOtherService;
-import org.jeecg.modules.invoice.entity.InvoiceManagePurchase;
 import org.jeecg.modules.invoice.entity.InvoiceManagePurchaseDetail;
 import org.jeecg.modules.invoice.service.InvoiceManagePurchaseDetailService;
 import org.jeecg.modules.payment.service.ManagerPaymentAndReceiptSlipService;
@@ -388,7 +387,8 @@ public class ProjectManageArchivesController {
 
 	@ApiOperation(value = "根据id商务里程碑信息", notes = "根据主表id查询项目档案商务收款计划里程碑相关数据")
 	@ApiImplicitParams({
-			@ApiImplicitParam(name="businessId", value="项目档案里程碑信息表id",required=true, dataType="String"),
+			@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) {
@@ -409,8 +409,8 @@ public class ProjectManageArchivesController {
 
 			QueryWrapper<InvoiceManagePurchaseDetail> detailQueryWrapper = new QueryWrapper<>();
 			detailQueryWrapper.eq("del_flag", "0")
-					.eq("co_archives_id", reqDTO.getArchivesLineId())
-					.eq("pro_business_id", reqDTO.getBusinessId());
+					.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)){

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

@@ -20,7 +20,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 @ApiModel("采购,销售发票详情表")
 @Data
 @TableName("invoice_manage_pirchase_detail")
-public class InvoiceManagePurchaseDetail implements Serializable {
+public class  InvoiceManagePurchaseDetail implements Serializable {
 	private static final long serialVersionUID = -6372683069405898456L;
 	@ApiModelProperty("id")
 	@TableId(type = IdType.UUID)