报告归档调整

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

@@ -91,5 +91,16 @@ public class CwProjectReportArchive extends BaseEntity {
     @Query(tableColumn = "cw_pa.file_number",type = QueryType.LIKE)
     private String fileNumber;
 
+    /**
+     * 报告文号
+     */
+    @Query(tableColumn = "cw_pa.report_no",type = QueryType.LIKE)
+    private String reportNo;
+
+    /**
+     * 审计意见
+     */
+    private String reportRemarks;
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -31,9 +31,14 @@
             <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="reportNo" column="report_no" jdbcType="VARCHAR"/>
+            <result property="reportRemarks" column="report_remarks" jdbcType="VARCHAR"/>
+            <result property="reportDate" column="report_date" jdbcType="TIMESTAMP"/>
+            <result property="reportCreateName" column="report_create_name" jdbcType="VARCHAR"/>
+            <result property="signatureAnnotator1Name" column="signature_annotator1_name" jdbcType="VARCHAR"/>
+            <result property="signatureAnnotator2Name" column="signature_annotator2_name" jdbcType="VARCHAR"/>
         <association property="cwProjectRecordsDTO" column="project_id" select="getProject" javaType="com.jeeplus.test.cw.projectRecords.service.dto.CwProjectRecordsDTO"></association>
         <collection property="workAttachmentDtoList" ofType="com.jeeplus.test.workContract.service.dto.WorkAttachmentDto" column="id" select="getFileList"></collection>
-        <collection property="cwProjectReportArchiveReportDTOList" ofType="com.jeeplus.test.cw.projectReportArchive.service.dto.CwProjectReportArchiveReportDTO" column="id" select="getReportList"></collection>
     </resultMap>
     <resultMap id="AttachmentMap" type="com.jeeplus.test.cw.projectReportArchive.service.dto.WorkAttachmentArchiveDto">
         <id property="id" column="id" jdbcType="VARCHAR"/>
@@ -99,7 +104,9 @@
         cw_pa.proc_ins_id,
         cw_pa.process_definition_id,
         cw_pa.status,
-        cw_pa.file_number
+        cw_pa.file_number,
+        cw_pa.report_no,
+        cw_pa.report_remarks
     </sql>
     <sql id="Archive_File_Column_List">
         cw_paf.id,
@@ -226,14 +233,38 @@
         ${ew.customSqlSegment}
     </select>
 
+    <sql id="prnl_column">
+        cw_prnl.report_no,
+        cw_prnl.report_date,
+        cw_pr.signature_annotator1,
+        cw_pr.signature_annotator2,
+        cw_prnl.create_by,
+        su.name as report_create_name,
+        su1.name as signature_annotator1_name,
+        su2.name as signature_annotator2_name
+    </sql>
     <select id="queryById" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"></include>,
         cw_wcb.name as audited_units_name,
-        su.name as user_name
+        su.name as user_name,
+        b.report_date,
+        b.report_create_name,
+        b.signature_annotator1_name,
+        b.signature_annotator2_name
         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(
+            select
+                <include refid="prnl_column"></include>
+            from cw_project_report_new_line cw_prnl
+            left join cw_project_report cw_pr on cw_pr.id = cw_prnl.report_id and cw_pr.del_flag = '0'
+            left join sys_user su on su.id = cw_prnl.create_by and su.del_flag = '0'
+            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
         where cw_pa.del_flag = '0' and cw_pa.id = ${id}
     </select>
 

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

@@ -127,22 +127,6 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
                         }
                     }
                 }
-                // 报告文号
-                if (StringUtils.isNotBlank(cwProjectReportArchiveDTO.getReportNo())){
-                    List<CwProjectInfoData> cwProjectInfoData = cwProjectInfoMapper.selectList(new QueryWrapper<CwProjectInfoData>().lambda().like(CwProjectInfoData::getReportNo, cwProjectReportArchiveDTO.getReportNo()));
-                    List<String> ids = cwProjectInfoData.stream().distinct().map(CwProjectInfoData::getId).collect(Collectors.toList());
-                    if (CollectionUtil.isNotEmpty(ids)){
-                        List<CwProjectReportArchiveReport> cwProjectReportArchiveReports = cwProjectReportArchiveReportMapper.selectList(new QueryWrapper<CwProjectReportArchiveReport>().lambda().in(CwProjectReportArchiveReport::getReportId, ids));
-                        List<String> collect = cwProjectReportArchiveReports.stream().distinct().map(CwProjectReportArchiveReport::getArchiveId).collect(Collectors.toList());
-                        if (CollectionUtil.isNotEmpty(collect)) {
-                            queryWrapper.in("cw_pa.id",collect);
-                        }else {
-                            return new Page<>();
-                        }
-                    }else{
-                        return new Page<>();
-                    }
-                }
             }
         }
         return cwProjectReportArchiveMapper.findList(page, queryWrapper);
@@ -216,36 +200,6 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
                 cwProjectReportArchiveFile.setFileType(item.getFileType());
                 cwProjectReportArchiveFileMapper.insert(cwProjectReportArchiveFile);
             });
-            // 审计报告
-            if(CollectionUtil.isNotEmpty(cwProjectReportArchiveDTO.getCwProjectReportArchiveReportDTOList())){
-                List<String> ids = cwProjectReportArchiveDTO.getCwProjectReportArchiveReportDTOList().stream().filter(item -> {
-                    if (StringUtils.isNotBlank(item.getId())) {
-                        return true;
-                    }
-                    return false;
-                }).distinct().map(CwProjectReportArchiveReportDTO::getId).collect(Collectors.toList());
-                if (CollectionUtil.isNotEmpty(ids)) {
-                    cwProjectReportArchiveReportMapper.delete(new QueryWrapper<CwProjectReportArchiveReport>().lambda()
-                            .eq(CwProjectReportArchiveReport::getArchiveId, cwProjectReportArchive.getId())
-                            .notIn(CwProjectReportArchiveReport::getId, ids)
-                    );
-                } else {
-                    cwProjectReportArchiveReportMapper.delete(new QueryWrapper<CwProjectReportArchiveReport>().lambda().eq(CwProjectReportArchiveReport::getArchiveId, cwProjectReportArchive.getId()));
-                }
-                cwProjectReportArchiveDTO.getCwProjectReportArchiveReportDTOList().stream().forEach(item->{
-                    if (StringUtils.isNotBlank(item.getId())) {
-                        CwProjectReportArchiveReport cwProjectReportArchiveReport = CwProjectReportArchiveReportWrapper.INSTANCE.toEntity(item);
-                        cwProjectReportArchiveReport.setArchiveId(cwProjectReportArchive.getId());
-                        cwProjectReportArchiveReportMapper.updateById(cwProjectReportArchiveReport);
-                    } else {
-                        CwProjectReportArchiveReport cwProjectReportArchiveReport = CwProjectReportArchiveReportWrapper.INSTANCE.toEntity(item);
-                        cwProjectReportArchiveReport.setArchiveId(cwProjectReportArchive.getId());
-                        cwProjectReportArchiveReportMapper.insert(cwProjectReportArchiveReport);
-                    }
-                });
-            } else {
-                cwProjectReportArchiveReportMapper.delete(new QueryWrapper<CwProjectReportArchiveReport>().lambda().eq(CwProjectReportArchiveReport::getArchiveId, cwProjectReportArchive.getId()));
-            }
         }
         return cwProjectReportArchive.getId();
     }

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

@@ -69,7 +69,7 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     /**
      * 归档时间
      */
-    @Excel(name = "归档时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "9")
+    @Excel(name = "归档时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "10")
     private Date auditDate;
 
     /**
@@ -121,6 +121,7 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     /**
      * 报告文号
      */
+    @Excel(name = "报告文号",width = 25,orderNum = "9")
     private String reportNo;
 
     /**
@@ -144,14 +145,41 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     /**
      * 创建人姓名
      */
-    @Excel(name = "创建人",width = 25,orderNum = "10")
+    @Excel(name = "创建人",width = 25,orderNum = "11")
     private String createName;
 
     /**
      * 创建时间
      */
-    @Excel(name = "创建时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "11")
+    @Excel(name = "创建时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "12")
     private String createDateT;
 
+    /**
+     * 审计意见
+     */
+    private String reportRemarks;
+
+    /**
+     * 报告日期
+     */
+    private Date reportDate;
+
+    /**
+     * 报告主办人
+     */
+    private String reportCreateName;
+
+    /**
+     * 签字注师1
+     */
+    private String signatureAnnotator1Name;
+
+    /**
+     * 签字注师2
+     */
+    private String signatureAnnotator2Name;
+
+
+
     private static final long serialVersionUID = 1L;
 }