Merge remote-tracking branch 'origin/master'

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

@@ -85,5 +85,11 @@ public class CwProjectReportArchive extends BaseEntity {
     @Query(tableColumn = "cw_pa.status",type = QueryType.EQ)
     private String status;
 
+    /**
+     * 档案号
+     */
+    @Query(tableColumn = "cw_pa.file_number",type = QueryType.LIKE)
+    private String fileNumber;
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -26,6 +26,7 @@
             <result property="status" column="status" jdbcType="VARCHAR"/>
             <result property="auditedUnitsName" column="audited_units_name" jdbcType="VARCHAR"/>
             <result property="createBy.name" column="user_name" jdbcType="VARCHAR"/>
+            <result property="fileNumber" column="file_number" 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>
@@ -93,7 +94,8 @@
         cw_pa.audit_date,
         cw_pa.proc_ins_id,
         cw_pa.process_definition_id,
-        cw_pa.status
+        cw_pa.status,
+        cw_pa.file_number
     </sql>
     <sql id="Archive_File_Column_List">
         cw_paf.id,
@@ -183,12 +185,14 @@
         su1.name as signature_annotator1_name,
         su2.name as signature_annotator2_name,
         cw_prnl.report_date,
-        cw_prnl.report_no
+        cw_prnl.report_no,
+        su3.name as report_create_name
         from cw_project_report_archive_report cw_par
         left join cw_project_report_new_line cw_prnl on cw_par.report_id = cw_prnl.id and cw_prnl.del_flag = '0'
         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 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'
+        left join sys_user su3 on su3.id = cw_prnl.create_by and su3.del_flag = '0'
         where cw_par.del_flag = '0' and cw_par.archive_id = #{id}
     </select>
     <select id="getFileList" resultMap="AttachmentMap">
@@ -233,11 +237,14 @@
             su2.name as signature_annotator2_name,
             cw_prnl.report_date,
             cw_prnl.report_no,
-            cw_prnl.id as new_line_id
+            cw_prnl.id as new_line_id,
+            su3.name as create_name,
+            cw_pr.create_by
         from cw_project_report cw_pr
         left 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'
         left join sys_user su2 on su2.id = cw_pr.signature_annotator2 and su2.del_flag = '0'
+        left join sys_user su3 on su3.id = cw_pr.create_by and su3.del_flag = '0'
         ${ew.customSqlSegment}
     </select>
 </mapper>

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

@@ -29,9 +29,11 @@ import com.jeeplus.test.cw.projectReportArchive.service.dto.CwProjectReportArchi
 import com.jeeplus.test.cw.projectReportArchive.service.dto.ReportDTO;
 import com.jeeplus.test.cw.projectReportArchive.service.mapstruct.CwProjectReportArchiveReportWrapper;
 import com.jeeplus.test.cw.projectReportArchive.service.mapstruct.CwProjectReportArchiveWrapper;
+import com.jeeplus.test.mould.service.SerialnumTplService;
 import com.jeeplus.test.oss.domain.WorkAttachment;
 import com.jeeplus.test.oss.mapper.OssServiceMapper;
 import com.jeeplus.test.oss.service.OssService;
+import com.jeeplus.test.program.configuration.projectList.service.dto.ProjectListDto;
 import com.jeeplus.test.workContract.service.dto.WorkAttachmentDto;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -63,6 +65,8 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
     private UserMapper userMapper;
     @Resource
     private CwProjectInfoMapper cwProjectInfoMapper;
+    @Resource
+    private SerialnumTplService serialnumTplService;
 
     /**
      * 项目归档列表信息
@@ -189,6 +193,10 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
             if (StringUtils.isBlank(cwProjectReportArchive.getCreateBy())) {
                 cwProjectReportArchive.setCreateBy(UserUtils.getCurrentUserDTO().getId());
             }
+            if (StringUtils.isBlank(cwProjectReportArchive.getId())){
+                String fileNumber = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), CwProjectReportArchiveDTO.BIZ_CODE);
+                cwProjectReportArchive.setFileNumber(fileNumber);
+            }
         }
         this.saveOrUpdate(cwProjectReportArchive);
         if (ObjectUtil.isNotEmpty(cwProjectReportArchiveDTO)) {

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

@@ -13,6 +13,8 @@ import java.util.List;
 @Data
 public class CwProjectReportArchiveDTO extends BaseDTO {
 
+    public static final String BIZ_CODE = "15";
+
     /**
      * 备注信息
      */
@@ -113,5 +115,10 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
      */
     private String reportNo;
 
+    /**
+     * 档案号
+     */
+    private String fileNumber;
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -35,6 +35,7 @@ public class CwProjectReportArchiveReportDTO extends BaseDTO {
     private Date reportDate;// 报告日期
     private String reportNo;// 报告文号
     private String projectId;// 项目id
+    private String reportCreateName;// 报告主办人
 
 
     private static final long serialVersionUID = 1L;

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

@@ -14,4 +14,6 @@ public class ReportDTO {
     private String reportNo;// 报告文号
     private String projectId;// 项目id
     private String newLineId;// 报告文号数据的id
+    private String createName;// 创建人姓名
+    private String createBy;// 创建人id
 }