报告归档修改、禁止报告重复归档

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/controller/CwProjectReportArchiveController.java

@@ -14,6 +14,7 @@ import com.jeeplus.test.cw.projectRecords.service.dto.CwProjectRecordsDTO;
 import com.jeeplus.test.cw.projectReportArchive.service.CwProjectReportArchiveService;
 import com.jeeplus.test.cw.projectReportArchive.service.dto.CwProjectReportArchiveDTO;
 import com.jeeplus.test.cw.projectReportArchive.service.dto.ReportDTO;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.ResponseEntity;
@@ -53,6 +54,13 @@ public class CwProjectReportArchiveController {
         return ResponseEntity.ok (result);
     }
 
+    /**
+     * 查询审计报告信息列表
+     * @param reportDTO
+     * @param page
+     * @return
+     * @throws Exception
+     */
     @GetMapping("reportList")
     public ResponseEntity<IPage<ReportDTO>> findReportList(ReportDTO reportDTO, Page<ReportDTO> page) throws Exception {
         IPage<ReportDTO> result = new Page<ReportDTO>();
@@ -61,6 +69,16 @@ public class CwProjectReportArchiveController {
     }
 
     /**
+     * 查询报告是否已归档
+     * @param reportNo
+     * @return
+     */
+    @GetMapping("findReportUse")
+    public ResponseEntity<Boolean> findReportUse(String reportNo) {
+        return ResponseEntity.ok (cwProjectReportArchiveService.findReportUse (reportNo));
+    }
+
+    /**
      * 查询财务项目报告归档详情
      * @param id
      * @return

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/domain/CwProjectReportArchive.java

@@ -92,10 +92,9 @@ public class CwProjectReportArchive extends BaseEntity {
     private String fileNumber;
 
     /**
-     * 报告文号
+     * 报告id
      */
-    @Query(tableColumn = "cw_pa.report_no",type = QueryType.LIKE)
-    private String reportNo;
+    private String reportId;
 
     /**
      * 审计意见

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/mapper/xml/CwProjectReportArchiveMapper.xml

@@ -31,6 +31,7 @@
             <result property="projectName" column="project_name" jdbcType="VARCHAR"/>
             <result property="createName" column="user_name" jdbcType="VARCHAR"/>
             <result property="createDateT" column="create_date" jdbcType="VARCHAR"/>
+            <result property="reportId" column="report_id" jdbcType="VARCHAR"/>
             <result property="reportNo" column="report_no" jdbcType="VARCHAR"/>
             <result property="reportRemarks" column="report_remarks" jdbcType="VARCHAR"/>
             <result property="reportDate" column="report_date" jdbcType="TIMESTAMP"/>
@@ -105,7 +106,7 @@
         cw_pa.process_definition_id,
         cw_pa.status,
         cw_pa.file_number,
-        cw_pa.report_no,
+        cw_pa.report_id,
         cw_pa.report_remarks
     </sql>
     <sql id="Archive_File_Column_List">
@@ -224,16 +225,19 @@
         cw_wcb.name as audited_units_name,
         su.name as user_name,
         su1.name as project_master_name,
-        cw_pr.project_name as project_name
+        cw_pr.project_name as project_name,
+        cw_prnl.report_no
         from cw_project_report_archive cw_pa
         left join cw_work_client_base cw_wcb on cw_pa.audited_units = cw_wcb.id and cw_wcb.del_flag = '0'
         left join sys_user su on su.id = cw_pa.create_by and su.del_flag = '0'
         left join cw_project_records cw_pr on cw_pr.id = cw_pa.project_id and cw_pr.del_flag = '0'
         left join sys_user su1 on cw_pr.project_master_id = su1.id and su1.del_flag = '0'
+        left join cw_project_report_new_line cw_prnl on cw_prnl.report_id = cw_pa.report_id and cw_prnl.del_flag = '0'
         ${ew.customSqlSegment}
     </select>
 
     <sql id="prnl_column">
+        cw_pr.id as report_id,
         cw_prnl.report_no,
         cw_prnl.report_date,
         cw_pr.signature_annotator1,
@@ -251,7 +255,8 @@
         b.report_date,
         b.report_create_name,
         b.signature_annotator1_name,
-        b.signature_annotator2_name
+        b.signature_annotator2_name,
+        b.report_no
         from cw_project_report_archive cw_pa
         left join cw_work_client_base cw_wcb on cw_pa.audited_units = cw_wcb.id and cw_wcb.del_flag = '0'
         left join sys_user su on su.id = cw_pa.create_by and su.del_flag = '0'
@@ -264,7 +269,7 @@
             left join sys_user su1 on su1.id = cw_pr.signature_annotator1 and su1.del_flag = '0'
             left join sys_user su2 on su2.id = cw_pr.signature_annotator2 and su2.del_flag = '0'
             where cw_prnl.del_flag = '0'
-        ) b on b.report_no = cw_pa.report_no
+        ) b on b.report_id = cw_pa.report_id
         where cw_pa.del_flag = '0' and cw_pa.id = ${id}
     </select>
 
@@ -278,7 +283,8 @@
             cw_prnl.report_no,
             cw_prnl.id as new_line_id,
             su3.name as create_name,
-            cw_pr.create_by
+            cw_pr.create_by,
+            cw_pr.id as report_id
         from cw_project_report cw_pr
         inner join cw_project_report_new_line cw_prnl on cw_prnl.report_id = cw_pr.id and cw_prnl.del_flag = '0'
         left join sys_user su1 on su1.id = cw_pr.signature_annotator1 and su1.del_flag = '0'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/service/CwProjectReportArchiveService.java

@@ -3,6 +3,7 @@ package com.jeeplus.test.cw.projectReportArchive.service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -127,6 +128,11 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
                         }
                     }
                 }
+                // 报告文号
+                if (StringUtils.isNotBlank(cwProjectReportArchiveDTO.getReportNo())) {
+                    queryWrapper.like("cw_prnl.report_no",cwProjectReportArchiveDTO.getReportNo());
+                }
+
             }
         }
         return cwProjectReportArchiveMapper.findList(page, queryWrapper);
@@ -156,6 +162,22 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
     }
 
     /**
+     * 查询报告是否已归档
+     * @param reportId
+     * @return
+     */
+    public boolean findReportUse(String reportId) {
+        LambdaQueryWrapper<CwProjectReportArchive> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(CwProjectReportArchive::getReportId,reportId);
+        queryWrapper.eq(CwProjectReportArchive::getDelFlag,"0");
+        List<CwProjectReportArchive> list = this.list(queryWrapper);
+        if (CollectionUtil.isEmpty(list)) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
      * 根据id查询项目详情
      * @param id
      * @return

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/service/dto/CwProjectReportArchiveDTO.java

@@ -155,6 +155,11 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     private String createDateT;
 
     /**
+     * 报告id
+     */
+    private String reportId;
+
+    /**
      * 审计意见
      */
     private String reportRemarks;