更新

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

@@ -0,0 +1,19 @@
+package org.jeecg.common.dto.basedata;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("项目档案—商务收款计划请求参数")
+@Data
+public class ArchivesBusinessListReqDTO {
+    @ApiModelProperty("项目档案id")
+    private String id;
+    @ApiModelProperty("计划类型 1.收款计划 2.回款情况 3.付款计划 4.付款情况")
+    private String planType;
+    @ApiModelProperty("组织")
+    private String pkOrg;
+
+    public ArchivesBusinessListReqDTO() {
+    }
+}

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.NotDuplicate;
 import org.jeecg.common.dto.archives.ExpensePriceReqDTO;
@@ -15,17 +16,18 @@ import org.jeecg.common.dto.archives.ProArchivesAddReqDTO;
 import org.jeecg.common.dto.archives.ProArchivesAddRespDTO;
 import org.jeecg.common.dto.archives.ProPlanListReqDTO;
 import org.jeecg.common.dto.archives.ProPlanListRespDTO;
-import org.jeecg.common.dto.basedata.ArchivesMilestoneListRespDTO;
+import org.jeecg.common.dto.basedata.ArchivesBusinessListReqDTO;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.archives.entity.ProjectManageArchives;
 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.archives.entity.ProjectManageArchivesAndBusiness;
 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.basedata.entity.BaseArchivesMilestone;
 import org.jeecg.modules.payment.service.ManagerPaymentAndReceiptSlipService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
@@ -55,6 +57,8 @@ public class ProjectManageArchivesController {
 	private ManagerPaymentAndReceiptSlipService managerPaymentAndReceiptSlipService;
 	@Autowired
 	private ProjectManageBusinessOtherService projectManageBusinessOtherService;
+	@Autowired
+	private ProjectManageArchivesAndBusinessService projectManageArchivesAndBusinessService;
 
 
 	@ApiOperation(value = "项目档案分页查询接口", notes = "项目档案分页查询")
@@ -332,6 +336,45 @@ public class ProjectManageArchivesController {
 		return result;
 	}
 
+	@ApiOperation(value = "项目档案—商务收款计划", notes = "根据主表id查询项目档案计划列表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name="id", value="项目档案id",required=true, dataType="String"),
+			@ApiImplicitParam(name="planType", value="计划类型",required=true, dataType="String"),
+			@ApiImplicitParam(name="pkOrg", value="组织",required=true, dataType="String")
+	})
+	@GetMapping(value = "/getBusinessList")
+	public Result<List<ProjectManageArchivesAndBusiness>> getBusinessList(@Valid ArchivesBusinessListReqDTO reqDTO, BindingResult bindingResult) {
+		Result<List<ProjectManageArchivesAndBusiness>> result = new Result<List<ProjectManageArchivesAndBusiness>>();
+		try {
+			StringBuilder sb = new StringBuilder();
+			if(bindingResult.hasErrors()) {
+				//记录错误信息
+				bindingResult.getAllErrors().stream().forEach(error -> sb.append(error.getDefaultMessage() + "<br/>"));
+				result.error500(sb.toString());
+				return result;
+			}
+			QueryWrapper<ProjectManageArchivesAndBusiness> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("del_flag", "0")
+					.eq("pro_archives_id", reqDTO.getId());
+			if(StringUtils.isNotBlank(reqDTO.getPlanType())){
+				queryWrapper.eq("plan_type", reqDTO.getPlanType());
+			}
+			if(StringUtils.isNotBlank(reqDTO.getPkOrg())){
+				queryWrapper.eq("pkOrg", reqDTO.getPkOrg());
+			}
+			    queryWrapper.orderByAsc("sort");
+			    List<ProjectManageArchivesAndBusiness> list = projectManageArchivesAndBusinessService.list(queryWrapper);
+				result.setResult(list);
+				result.setSuccess(true);
+		}
+		catch (Exception e) {
+				e.printStackTrace();
+				log.info(e.getMessage());
+				result.error500("操作失败");
+			}
+		return result;
+	}
+
 
 
 	/**