Merge remote-tracking branch 'origin/master'

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/ContractReturnedInfo.java

@@ -23,6 +23,9 @@ import java.time.LocalDate;
 @ApiModel(value = "合同回款信息表", description = "合同回款信息表")
 public class ContractReturnedInfo extends BaseEntity {
 
+    @ApiModelProperty(value = "项目id")
+    private Long projectId;
+
     @ApiModelProperty(value = "合同id")
     private Long contractId;
 

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/ProjectCostBudgetVO2.java

@@ -19,4 +19,7 @@ public class ProjectCostBudgetVO2 extends ProjectCostBudget {
     @ApiModelProperty(value = "子计划")
     private List<ProjectCostBudget> childrenList;
 
+    @ApiModelProperty(value = "回款条件")
+    private String returnedValue;
+
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -57,7 +57,7 @@
 
     <select id="approvalFile" resultType="org.springblade.archive.vo.ArchivesAutoVO$ApprovalFile">
         <if test="archiveId!=null">
-            select * from u_archive_file where archive_id = #{archiveId}
+            select * from u_archive_file where archive_id = #{archiveId} and is_element = 0
         </if>
     </select>
 
@@ -504,7 +504,7 @@
             and uaa.contract_id = #{vo.contractId}
         </if>
         <if test="vo.searchType == 1 and vo.queryValue != null and vo.queryValue != ''">
-            and uaa.name like concat('%',#{vo.queryValue},'%')
+            and uaa.name like concat('%',#{vo.queryValue},'%') or uaa.file_number like concat('%',#{vo.queryValue},'%')
         </if>
         <if test="vo.searchType == 2 and vo.queryValue != null and vo.queryValue != ''">
             and uaf.file_name like concat('%',#{vo.queryValue},'%')

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchiveAutoPdfServiceImpl.java

@@ -282,6 +282,10 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
         ArchiveProjectConfig config = archiveProjectConfigService.getByProjectIdOrNew(projectId);
         //是否打页码
         if (!config.isPage()) {
+            //不需要打页码的，把字段pdf_page_url设为null
+            for(ArchiveFile file:waitArchiveFiles){
+                file.setPdfPageUrl("");
+            }
             return;
         }
 

blade-service/blade-control/src/main/java/org/springblade/control/controller/ContractReturnedInfoController.java

@@ -39,12 +39,22 @@ public class ContractReturnedInfoController {
     }
 
     /**
-     * 获取合同回款列表
+     * 根据合同ID获取合同回款列表
      */
-    @GetMapping("/getContractReturnList")
+    @GetMapping("/getListByContractId")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "根据合同ID获取合同回款列表")
-    public R getContractReturnList(Long contractId){
-        return R.data(contractReturnedInfoService.getContractReturnList(contractId));
+    public R getListByContractId(Long contractId){
+        return R.data(contractReturnedInfoService.getListByContractId(contractId));
+    }
+
+    /**
+     * 根据项目ID获取合同回款列表
+     */
+    @GetMapping("/getListByProjectId")
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "根据项目ID获取合同回款列表")
+    public R getListByProjectId(Long projectId){
+        return R.data(contractReturnedInfoService.getListByProjectId(projectId));
     }
 }

blade-service/blade-control/src/main/java/org/springblade/control/controller/ProjectCostBudgetController.java

@@ -68,4 +68,5 @@ public class ProjectCostBudgetController {
         return R.success("保存成功");
     }
 
+
 }

blade-service/blade-control/src/main/java/org/springblade/control/mapper/ContractReturnedInfoMapper.java

@@ -20,5 +20,7 @@ public interface ContractReturnedInfoMapper extends BaseMapper<ContractReturnedI
 
     void deleteOldInfo(@Param("contractId") Long contractId);
 
-    List<ContractReturnedInfoVO> getContractReturnList(@Param("contractId") Long contractId);
+    List<ContractReturnedInfoVO> getListByContractId(@Param("contractId") Long contractId);
+
+    List<ContractReturnedInfoVO> getListByProjectId(@Param("projectId") Long projectId);
 }

blade-service/blade-control/src/main/java/org/springblade/control/mapper/ContractReturnedInfoMapper.xml

@@ -7,10 +7,17 @@
         delete from c_contract_returned_info
         where contract_id = #{contractId} and  practical_returned_time is null and practical_returned_money is null
     </delete>
-    <select id="getContractReturnList" resultType="org.springblade.control.vo.ContractReturnedInfoVO">
+    <select id="getListByContractId" resultType="org.springblade.control.vo.ContractReturnedInfoVO">
         select
             ri.*,
             (select name from blade_user WHERE id = ri.reminder_user) as reminderUserName
         from c_contract_returned_info ri where ri.contract_id = #{contractId}
     </select>
+
+    <select id="getListByProjectId" resultType="org.springblade.control.vo.ContractReturnedInfoVO">
+        select
+            ri.*,
+            (select name from blade_user WHERE id = ri.reminder_user) as reminderUserName
+        from c_contract_returned_info ri where ri.project_id = #{projectId}
+    </select>
 </mapper>

blade-service/blade-control/src/main/java/org/springblade/control/mapper/ProjectCostBudgetMapper.java

@@ -35,4 +35,6 @@ public interface ProjectCostBudgetMapper extends BaseMapper<ProjectCostBudget> {
     List<ProjectCostBudgetVO2> getApprovePlan(@Param("id") Long id);
 
     List<ProjectCostBudget> getAllChildrenPlan(@Param("id") Long id);
+
+    void removeChildrenPlan(@Param("projectId") Long projectId);
 }

blade-service/blade-control/src/main/java/org/springblade/control/mapper/ProjectCostBudgetMapper.xml

@@ -5,7 +5,11 @@
 
     <delete id="removeOldBudget">
         delete from c_project_cost_budget
-        where project_id = #{projectId} and approve = 0
+        where project_id = #{projectId} and approve = 0 and parent_id is null
+    </delete>
+    <delete id="removeChildrenPlan">
+        delete from c_project_cost_budget
+        where project_id = #{projectId} and parent_id is not null
     </delete>
 
     <select id="budgetList" resultType="org.springblade.control.vo.ProjectCostBudgetVO">
@@ -53,10 +57,13 @@
 
     </select>
     <select id="getApprovePlan" resultType="org.springblade.control.vo.ProjectCostBudgetVO2">
-        SELECT * FROM c_project_cost_budget  WHERE project_id = #{id} AND  approve = 1
+        SELECT
+            pcb.*,
+            (select cri.returned_condition from c_contract_returned_info cri where cri.id = pcb.contract_returned_id) as returnedValue
+        FROM c_project_cost_budget pcb WHERE pcb.project_id = #{id} AND pcb.approve = 1
     </select>
     <select id="getAllChildrenPlan" resultType="org.springblade.control.entity.ProjectCostBudget">
-        SELECT * FROM c_project_cost_budget  WHERE project_id = #{id} AND parentId is not null
+        SELECT * FROM c_project_cost_budget  WHERE project_id = #{id} AND parent_id is not null
     </select>
 
 

blade-service/blade-control/src/main/java/org/springblade/control/service/IContractReturnedInfoService.java

@@ -26,5 +26,7 @@ public interface IContractReturnedInfoService extends BaseService<ContractReturn
      */
     BigDecimal getContractReturnedMoney(Long contractId);
 
-    List<ContractReturnedInfoVO> getContractReturnList(Long contractId);
+    List<ContractReturnedInfoVO> getListByContractId(Long contractId);
+
+    List<ContractReturnedInfoVO> getListByProjectId(Long projectId);
 }

blade-service/blade-control/src/main/java/org/springblade/control/service/IProjectCostBudgetService.java

@@ -30,11 +30,10 @@ public interface IProjectCostBudgetService extends BaseService<ProjectCostBudget
     List<ProjectCostBudget> budgetListByProjectId(Long projectId);
 
     void deleteByProjectId(Long projectId);
-
     //分页获取列表
     ControlProjectInfoVO page(ControlProjectInfoDTO dto, Query query);
-
+    //根据id获取项目计划
     ProjectCostBudgetVO getPlanByProjectId(Long id);
-
+    //修改项目计划
     void updatePlan(ProjectCostBudgetVO vo);
 }

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/ContractReturnedInfoServiceImpl.java

@@ -38,7 +38,11 @@ public class ContractReturnedInfoServiceImpl extends BaseServiceImpl<ContractRet
     @Transactional
     public void saveOrUpdateBatchReturned(ContractReturnedInfoDTO dto) {
         baseMapper.deleteOldInfo(dto.getContractId());
-        this.saveOrUpdateBatch(dto.getList());
+        List<ContractReturnedInfo> list = dto.getList();
+        if (list != null && list.size() >0) {
+            list.stream().forEach(l->l.setProjectId(dto.getProjectId()));
+            this.saveOrUpdateBatch(list);
+        }
     }
 
     /**
@@ -66,7 +70,12 @@ public class ContractReturnedInfoServiceImpl extends BaseServiceImpl<ContractRet
      * @return
      */
     @Override
-    public List<ContractReturnedInfoVO> getContractReturnList(Long contractId) {
-        return baseMapper.getContractReturnList(contractId);
+    public List<ContractReturnedInfoVO> getListByContractId(Long contractId) {
+        return baseMapper.getListByContractId(contractId);
+    }
+
+    @Override
+    public List<ContractReturnedInfoVO> getListByProjectId(Long projectId) {
+        return baseMapper.getListByProjectId(projectId);
     }
 }

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/ProjectCostBudgetServiceImpl.java

@@ -133,6 +133,7 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
         ControlProjectInfo projectInfo = projectInfoService.getById(id);
         ProjectCostBudgetVO vo = new ProjectCostBudgetVO();
         vo.setProjectName(projectInfo.getName());
+        vo.setProjectId(id);
         //获取项目下所有已审批的计划
         List<ProjectCostBudgetVO2> list = baseMapper.getApprovePlan(id);
         //获取项目下所有的子计划
@@ -173,8 +174,48 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
      * 编辑项目计划
      */
     @Override
+    @Transactional
     public void updatePlan(ProjectCostBudgetVO vo) {
-
+        //把3个单位合成一个
+        List<ProjectCostBudgetVO2> list = new ArrayList<>();
+        Map<Integer, List<ProjectCostBudgetVO2>> buildUnit = vo.getBuildUnit();
+        Map<Integer, List<ProjectCostBudgetVO2>> supervisorUnit = vo.getSupervisorUnit();
+        Map<Integer, List<ProjectCostBudgetVO2>> constructUnit = vo.getConstructUnit();
+        for (int i = 1; i <= 6; i++) {
+            if (buildUnit != null && buildUnit.get(i) != null) {
+                list.addAll(buildUnit.get(i));
+            }
+            if (supervisorUnit != null && supervisorUnit.get(i) != null) {
+                list.addAll(supervisorUnit.get(i));
+            }
+            if (constructUnit != null && constructUnit.get(i) != null) {
+                list.addAll(constructUnit.get(i));
+            }
+        }
+        List<ProjectCostBudget> childrenList = new ArrayList<>();
+        List<ProjectCostBudget> parentList = new ArrayList<>();
+        //把所有子计划分离出来，并且设置父类id
+        for (ProjectCostBudgetVO2 vo2 : list) {
+            List<ProjectCostBudget> vo2ChildrenList = vo2.getChildrenList();
+            if (vo2ChildrenList != null && vo2ChildrenList.size() > 0){
+                //有子计划
+                for (ProjectCostBudget budget : vo2ChildrenList) {
+                    budget.setProjectId(vo.getProjectId());
+                    budget.setParentId(vo2.getId());
+                }
+                childrenList.addAll(vo2ChildrenList);
+            }
+                //无子计划
+                ProjectCostBudget budget = new ProjectCostBudget();
+                BeanUtils.copyProperties(vo2,budget);
+                parentList.add(budget);
+        }
+        //删除没有指定任务人的子计划,    暂时全部删除
+        baseMapper.removeChildrenPlan(vo.getProjectId());
+        //新增或修改子计划
+        this.saveOrUpdateBatch(childrenList);
+        //修改项目计划
+        this.updateBatchById(parentList);
     }
 
     /**