合同、客户删除时添加是否被引用判断，报告管理添加筛选条件

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/controller/ContractInfoController.java

@@ -89,7 +89,7 @@ public class ContractInfoController {
      */
     @ApiOperation(value = "合同登记删除")
     @GetMapping(value = "remove")
-    public String remove(@RequestParam String id) {
+    public ResponseEntity remove(@RequestParam String id) {
         return service.removeById(id);
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/mapper/ContractInfoMapper.java

@@ -75,4 +75,10 @@ public interface ContractInfoMapper extends BaseMapper<ContractInfo> {
                          @Param("actualContractAmount") Double actualContractAmount,
                          @Param("contractApprovalType") String contractApprovalType,
                          @Param("filedPaperType") String filedPaperType);
+
+    String isUseByProject(@Param("id") String id);
+
+    String isUseByReim(@Param("id") String id);
+
+    String isUseByInvoice(@Param("id") String id);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/mapper/xml/ContractInfoMapper.xml

@@ -240,4 +240,30 @@
         from cw_work_contract_participant cw_wcp
         where cw_wcp.del_flag = '0' and cw_wcp.customer_no = #{no}
     </select>
+
+    <select id="isUseByProject" resultType="string">
+        select
+            cw_wci.contract_name
+        from cw_project_records cw_pr
+        left join cw_work_contract_info cw_wci on cw_wci.id = cw_pr.contract_id and cw_wci.del_flag = '0'
+        where cw_pr.del_flag = '0' and cw_pr.contract_id = #{id}
+    </select>
+
+    <select id="isUseByReim" resultType="string">
+        select
+            cw_wci.contract_name
+        from cw_reimbursement_detail_info_contract cw_rdic
+        inner join cw_reimbursement_info cw_ri on cw_ri.id = cw_rdic.info_id and cw_ri.del_flag = '0'
+        left join cw_work_contract_info cw_wci on cw_wci.id = cw_rdic.contract_id and cw_wci.del_flag = '0'
+        where cw_rdic.del_flag = '0' and cw_rdic.contract_id = #{id}
+    </select>
+
+    <select id="isUseByInvoice" resultType="string">
+        select
+            cw_wci.contract_name
+        from cw_finance_invoice_base cw_fib
+        inner join cw_finance_invoice cw_fi on cw_fi.id = cw_fib.invoice_id and cw_fi.del_flag = '0'
+        left join cw_work_contract_info cw_wci on cw_wci.id = cw_fib.contract_id and cw_wci.del_flag = '0'
+        where cw_fib.del_flag = '0' and cw_fib.contract_id = #{id}
+    </select>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/service/ContractInfoService.java

@@ -35,11 +35,13 @@ import org.flowable.editor.language.json.converter.util.CollectionUtils;
 import org.flowable.ui.modeler.service.mapper.InfoMapper;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author: 王强
@@ -440,10 +442,27 @@ public class ContractInfoService {
     /**
      * 合同登记删除
      */
-    public String removeById(String id) {
+    public ResponseEntity removeById(String id) {
+        // 查询合同是否被引用 （项目、报销、发票）
+        // 查询合同是否被引用（项目）
+        String useByProject = mapper.isUseByProject(id);
+        String aa = mapper.isUseByReim(id);
+        String bb = mapper.isUseByInvoice(id);
+        if (StringUtils.isNotBlank(useByProject)) {
+            return ResponseEntity.ok ("合同: "+useByProject+" 被引用，不可删除");
+        }
+        // 查询合同是否被引用（报销）
+        String useByReim = mapper.isUseByReim(id);
+        if (StringUtils.isNotBlank(useByReim)) {
+            return ResponseEntity.ok ("合同: "+useByReim+" 被引用，不可删除");
+        }
+        // 查询合同是否被引用（发票）
+        String useByInvoice = mapper.isUseByInvoice(id);
+        if (StringUtils.isNotBlank(useByInvoice)) {
+            return ResponseEntity.ok ("合同: "+useByInvoice+" 被引用，不可删除");
+        }
         mapper.deleteById(id);
-        // 附件删除
-        return "删除完成!";
+        return ResponseEntity.ok ("删除成功");
     }
 
     /**

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/controller/CwProjectReportController.java

@@ -37,6 +37,7 @@ import org.flowable.engine.TaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -288,13 +289,24 @@ public class CwProjectReportController {
      */
     @ApiLog(value = "签章流程送审", type = LogTypeEnum.SAVE)
     @PostMapping("saveData")
+    @Transactional(rollbackFor = Exception.class)
     public ResponseEntity<String> saveData(@Valid @RequestBody CwProjectReportData cwProjectReportData) {
-        if (StringUtils.isNotBlank(cwProjectReportData.getSignatureAnnotator1()) && StringUtils.isNotBlank(cwProjectReportData.getSignatureAnnotator2())) {
-            // 修改报告表的 “签字注师1” 和 “签字注师2”
+        // 修改报告表的 “签字注师1” 和 “签字注师2”
+        if (ObjectUtil.isNotEmpty(cwProjectReportData)) {
             CwProjectReport cwProjectReport = new CwProjectReport();
-            cwProjectReport.setSignatureAnnotator1(cwProjectReportData.getSignatureAnnotator1());
-            cwProjectReport.setSignatureAnnotator2(cwProjectReportData.getSignatureAnnotator2());
             cwProjectReport.setId(cwProjectReportData.getId());
+            if (StringUtils.isNotBlank(cwProjectReportData.getSignatureAnnotator1())) {
+                cwProjectReport.setSignatureAnnotator1(cwProjectReportData.getSignatureAnnotator1());
+            }
+            if (StringUtils.isNotBlank(cwProjectReportData.getSignatureAnnotator2())) {
+                cwProjectReport.setSignatureAnnotator2(cwProjectReportData.getSignatureAnnotator2());
+            }
+            if (StringUtils.isNotBlank(cwProjectReportData.getIndustry())) {
+                cwProjectReport.setIndustry(cwProjectReportData.getIndustry());
+            }
+            if (StringUtils.isNotBlank(cwProjectReportData.getBusinessObjects())) {
+                cwProjectReport.setBusinessObjects(cwProjectReportData.getBusinessObjects());
+            }
             projectReportService.updateAnnotatorById(cwProjectReport);
         }
         if ("3".equals(cwProjectReportData.getSignatureType())) {

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/domain/CwProjectReport.java

@@ -232,4 +232,14 @@ public class CwProjectReport extends BaseEntity {
      */
     @TableField(exist = false)
     private String signatureAnnotator2Name;
+
+    /**
+     * 所属行业
+     */
+    private String industry;
+
+    /**
+     * 业务对象
+     */
+    private String businessObjects;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/domain/CwProjectReportData.java

@@ -464,4 +464,19 @@ public class CwProjectReportData extends BaseDTO {
      * 数据审核人  签章-实体章
      */
     private List<String> auditUserIdsSign3;
+
+    /**
+     * 所属行业
+     */
+    private String industry;
+
+    /**
+     * 业务对象
+     */
+    private String businessObjects;
+
+    /**
+     * 报备类型
+     */
+    private String filingType;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/CwProjectReportMapper.java

@@ -172,7 +172,7 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
     int checkIsSign(@Param("id")String id);
 
     /**
-     * 根据报告id修改签字注师1、2的值
+     * 根据报告id修改签字注师1、2,所属行业以及业务对象的值
      * @param cwProjectReport
      */
     void updateAnnotatorById(@Param("report")CwProjectReport cwProjectReport);

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -86,7 +86,9 @@
         art.ID_ as rev_task_id,
         art1.ID_ as sign_task_id1,
         art2.ID_ as sign_task_id2,
-        art3.ID_ as sign_task_id3
+        art3.ID_ as sign_task_id3,
+        a.industry,
+        a.business_objects
         FROM cw_project_report a
         left join cw_project_records b on a.project_id = b.id
         LEFT JOIN sys_office c on a.office_id = c.id
@@ -166,7 +168,9 @@
         cw_re.proc_ins_id as procInsId3,
         suser.name as real_header_name,
         b.project_master_id as project_master_id1,
-        b.real_header as project_master_id2
+        b.real_header as project_master_id2,
+        a.industry,
+        a.business_objects
         FROM cw_project_report a
         left join cw_project_records b on a.project_id = b.id
         LEFT JOIN sys_office c on a.office_id = c.id
@@ -511,7 +515,10 @@
 
     <update id="updateAnnotatorById" parameterType="com.jeeplus.test.cw.projectReport.domain.CwProjectReport">
         update cw_project_report
-        set signature_annotator1 = #{report.signatureAnnotator1},signature_annotator2 = #{report.signatureAnnotator2}
+        set signature_annotator1 = #{report.signatureAnnotator1},
+            signature_annotator2 = #{report.signatureAnnotator2},
+            industry = #{report.industry},
+            business_objects = #{report.businessObjects}
         where id = #{report.id}
     </update>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/service/CwProjectReportReviewService.java

@@ -311,6 +311,12 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
             if (StringUtils.isNotBlank(reportData.getSecurityBusiness())){
                 report.setSecurityBusiness(reportData.getSecurityBusiness());
             }
+            if (StringUtils.isNotBlank(reportData.getIndustry())){
+                report.setIndustry(reportData.getIndustry());
+            }
+            if (StringUtils.isNotBlank(reportData.getBusinessObjects())){
+                report.setBusinessObjects(reportData.getBusinessObjects());
+            }
             if (ObjectUtil.isNotEmpty(report)) {
                 cwProjectReportService.update(report, new QueryWrapper<CwProjectReport>().lambda().eq(CwProjectReport::getId,reportData.getId()));
             }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/service/CwProjectReportService.java

@@ -24,6 +24,8 @@ import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.test.cw.common.CommonUtils;
 import com.jeeplus.test.cw.common.flowable.dto.CommitParamDTO;
+import com.jeeplus.test.cw.projectRecords.domain.CwProjectRecords;
+import com.jeeplus.test.cw.projectRecords.service.CwProjectRecordsService;
 import com.jeeplus.test.cw.projectReport.domain.*;
 import com.jeeplus.test.cw.projectReport.mapper.*;
 import com.jeeplus.test.cw.projectReport.service.dto.CwProjectReportDTO;
@@ -65,6 +67,7 @@ import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 
 /**
  * @author: 王强
@@ -136,6 +139,9 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
     @Resource
     private CwProjectReportArchiveMapper cwProjectReportArchiveMapper;
 
+    @Resource
+    private CwProjectRecordsService cwProjectRecordsService;
+
     /**
      * 保存项目以及其他相关信息
      * @param reportData
@@ -477,6 +483,15 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         if (StringUtils.isNotEmpty(projectReportData.getStatus1())) {
             queryWrapper.eq("cw_prs1.status", projectReportData.getStatus1());
         }
+        if (StringUtils.isNotBlank(projectReportData.getFilingType())) {
+            List<CwProjectRecords> projectList = cwProjectRecordsService.list(new LambdaQueryWrapper<CwProjectRecords>().eq(CwProjectRecords::getReportType, projectReportData.getFilingType()));
+            List<String> projectIdList = projectList.stream().map(CwProjectRecords::getId).collect(Collectors.toList());
+            if (CollectionUtil.isNotEmpty(projectIdList)) {
+                queryWrapper.in("b.id", projectIdList);
+            } else {
+                return new Page<>();
+            }
+        }
         String isBmzr = "0";
         StringBuilder officeIds = new StringBuilder();
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
@@ -2692,13 +2707,15 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             reportMapper.deleteIsSign(item.getId());  // 物理删除
         });
         // 4. 删除已盖章的附件(附件表 work_attachment)
-        ossServiceMapper.deleteBatchIds(delIds);  // 逻辑删除
+        if (CollectionUtil.isNotEmpty(delIds)) {
+            ossServiceMapper.deleteBatchIds(delIds);  // 逻辑删除
+        }
         // 5. 根据报告id删除报告归档信息  // 逻辑删除
         cwProjectReportArchiveMapper.delete(new LambdaQueryWrapper<CwProjectReportArchive>().eq(CwProjectReportArchive::getReportId, reportId));
     }
 
     /**
-     * 根据报告id修改签字注师1、2的值
+     * 根据报告id修改签字注师1、2,所属行业以及业务对象的值
      * @param cwProjectReport
      */
     public void updateAnnotatorById(CwProjectReport cwProjectReport) {

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/workClientInfo/mapper/CwWorkClientBaseMapper.java

@@ -36,6 +36,23 @@ public interface CwWorkClientBaseMapper extends BaseMapper<CwWorkClientBase> {
      */
     public IPage<CwWorkClientContactDTO> getContractClientList(Page<CwWorkClientContactDTO> page, @Param("cwWorkClientContactDTO")CwWorkClientContactDTO cwWorkClientContactDTO);
 
+    // 查询客户是否被引用（合同-委托方）
+    List<String> isUseByClientContacts(String[] idArray);
+
+    // 查询客户是否被引用（合同-参与签约方）
+    List<String> isUseByContactParty(List<String> noList);
+
+    // 查询客户是否被引用（项目-被服务单位）
+    List<String> isUseByProject(String[] idArray);
+
+    // 查询客户是否被引用（报告-被服务单位）
+    List<String> isUseByReport(String[] idArray);
+
+    // 查询客户是否被引用（发票-实际开票单位）
+    List<String> isUseByInvoice(String[] idArray);
+
+    // 根据客户的id数组查询客户的no(编号)集合
+    List<String> getNoByIdArray(String[] idArray);
 }
 
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/workClientInfo/mapper/xml/CwWorkClientBaseMapper.xml

@@ -317,4 +317,71 @@
         temp.source_data,
         temp.status
     </sql>
+
+    <select id="getNoByIdArray" resultType="string">
+        select distinct cw_wcb.no
+        from cw_work_client_base cw_wcb
+        where cw_wcb.del_flag = '0' and cw_wcb.id in
+        <foreach collection="idArray" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
+    </select>
+
+    <select id="isUseByClientContacts" resultType="string">
+        select
+            distinct cw_wcb.name
+        from cw_work_contract_info cw_wci
+        left join cw_work_client_base cw_wcb on cw_wcb.id = cw_wci.client_contacts and cw_wcb.del_flag = '0'
+        where cw_wci.del_flag = '0' and cw_wci.client_contacts in
+        <foreach collection="idArray" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
+    </select>
+
+    <select id="isUseByContactParty" resultType="string">
+        select
+            distinct cw_wcb.name
+        from cw_work_contract_participant cw_wcp
+        inner join cw_work_contract_info cw_wci on cw_wci.id = cw_wcp.contract_info_id and cw_wci.del_flag = '0'
+        left join cw_work_client_base cw_wcb on cw_wcb.no = cw_wcp.customer_no and cw_wcb.del_flag = '0'
+        where cw_wcp.del_flag = '0' and cw_wcp.customer_no in
+        <foreach collection="noList" open="(" close=")" separator="," item="no">
+            #{no}
+        </foreach>
+    </select>
+
+    <select id="isUseByProject" resultType="string">
+        select
+            distinct cw_wcb.name
+        from cw_project_client_info cw_pci
+        inner join cw_project_records cw_pr on cw_pr.id = cw_pci.project_id and cw_pr.del_flag = '0'
+        left join cw_work_client_base cw_wcb on cw_wcb.id = cw_pci.client_id and cw_wcb.del_flag = '0'
+        where cw_pci.client_id in
+        <foreach collection="idArray" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
+    </select>
+
+    <select id="isUseByReport" resultType="string">
+        select
+            distinct cw_wcb.name
+        from cw_project_report_new_line cw_prnl
+        inner join cw_project_report cw_pr on cw_pr.id = cw_prnl.report_id and cw_pr.del_flag = '0'
+        left join cw_work_client_base cw_wcb on cw_wcb.id = cw_prnl.served_unit_id and cw_wcb.del_flag = '0'
+        where cw_prnl.del_flag = '0' and cw_prnl.served_unit_id in
+        <foreach collection="idArray" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
+    </select>
+
+    <select id="isUseByInvoice" resultType="string">
+        select
+            distinct cw_wcb.name
+        from cw_finance_invoice cw_fi
+        left join cw_work_client_base cw_wcb on cw_wcb.id = cw_fi.billing_workplace_real_id and cw_wcb.del_flag = '0'
+        where cw_fi.del_flag = '0' and cw_fi.billing_workplace_real_id in
+        <foreach collection="idArray" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
+    </select>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/workClientInfo/service/CwWorkClientService.java

@@ -287,7 +287,59 @@ public class CwWorkClientService extends ServiceImpl<CwWorkClientBaseMapper, CwW
     }
 
     public ResponseEntity deleteByIds(String ids) {
+        // 查询客户是否被引用  （合同-委托方、合同-参与签约方、项目-被服务单位、报告-被服务单位、发票-实际开票单位）
         String idArray[] =ids.split(",");
+        // 根据客户的id数组查询客户的no(编号)
+        List<String> noList = cwWorkClientBaseMapper.getNoByIdArray(idArray);
+
+        List<String> useClient = new ArrayList<>();
+
+        // 查询客户是否被引用（合同-委托方）
+        List<String> useByClientContacts = cwWorkClientBaseMapper.isUseByClientContacts(idArray);
+        if (CollectionUtil.isNotEmpty(useByClientContacts)) {
+            useByClientContacts.stream().forEach(item -> {
+                useClient.add(item);
+            });
+        }
+        // 查询客户是否被引用（合同-参与签约方）
+        List<String> useByContactParty = cwWorkClientBaseMapper.isUseByContactParty(noList);
+        if (CollectionUtil.isNotEmpty(useByContactParty)) {
+            useByContactParty.stream().forEach(item -> {
+                useClient.add(item);
+            });
+        }
+        // 查询客户是否被引用（项目-被服务单位）
+        List<String> useByProject = cwWorkClientBaseMapper.isUseByProject(idArray);
+        if (CollectionUtil.isNotEmpty(useByProject)) {
+            useByProject.stream().forEach(item -> {
+                useClient.add(item);
+            });
+        }
+        // 查询客户是否被引用（报告-被服务单位）
+        List<String> useByReport = cwWorkClientBaseMapper.isUseByReport(idArray);
+        if (CollectionUtil.isNotEmpty(useByReport)) {
+            useByReport.stream().forEach(item -> {
+                useClient.add(item);
+            });
+        }
+        // 查询客户是否被引用（发票-实际开票单位）
+        List<String> useByInvoice = cwWorkClientBaseMapper.isUseByInvoice(idArray);
+        if (CollectionUtil.isNotEmpty(useByInvoice)) {
+            useByInvoice.stream().forEach(item -> {
+                useClient.add(item);
+            });
+        }
+
+        if (CollectionUtil.isNotEmpty(useClient)) {
+            List<String> collect = useClient.stream().distinct().filter(item -> {
+                if (StringUtils.isNotBlank(item)) {
+                    return true;
+                }
+                return false;
+            }).collect(Collectors.toList());
+            String join = StringUtils.join(collect, ",");
+            return ResponseEntity.ok ("客户: "+join+" 被引用，不可删除");
+        }
         this.removeByIds (Lists.newArrayList (idArray));
         return ResponseEntity.ok ("删除成功");
     }