部分代码提交

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/mapper/ProjectListMapper.java

@@ -21,9 +21,12 @@ public interface ProjectListMapper extends BaseMapper<ProgramProjectListInfo> {
 
     IPage<ProgramProjectListInfo> findPageList(Page<ProgramProjectListInfo> page, @Param(Constants.WRAPPER) QueryWrapper<ProgramProjectListInfo> wrapper);
 
+
     List<ExportFileDto> findList(@Param(Constants.WRAPPER) QueryWrapper<ProgramProjectListInfo> wrapper);
 
     IPage<ProgramProjectListInfo> findPage(Page<ProgramProjectListInfo> page, @Param(Constants.WRAPPER) QueryWrapper<ProgramProjectListInfo> wrapper);
 
     String selectInvoiceFlag(@Param("id") String id);
+
+    ProgramProjectListInfo getById(@Param("id")String id);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/mapper/xml/ProjectListMapper.xml

@@ -146,6 +146,94 @@
             ORDER BY a.update_date DESC
     </select>
 
+    <select id="getById" resultType="com.jeeplus.test.program.configuration.projectList.domain.ProgramProjectListInfo">
+        SELECT
+           a.id,
+           b.name AS create_by,
+           a.create_date,
+           a.update_by,
+           a.update_date,
+           a.del_flag,
+           a.contract_id,
+           a.contract_name,
+           a.client,
+           a.client_name,
+           a.amount,
+           a.contract_type,
+           a.name,
+           a.no,
+           a.project_type,
+           a.approval_no,
+           a.company,
+           a.project_mould,
+           a.property_holder,
+           a.property_holder_name,
+           a.location,
+           a.is_first,
+           a.year_num,
+           a.check_year,
+           a.project_manager,
+           c.name AS project_manager_name,
+           a.report_type,
+           a.industry,
+           a.enterprise_type,
+           a.risk_level,
+           a.project_source,
+           a.estimate,
+           a.plan_end_time,
+           a.use_num,
+           a.appointment,
+           a.work_hours,
+           a.remarks,
+           a.assessment_enterprise,
+           a.assessment_enterprise_name,
+           a.link_num,
+           a.relationship,
+           a.assessment_way,
+           a.assessment_objective,
+           a.assessment_date,
+           a.num,
+           a.project_development,
+           a.delegate_project_type,
+           a.assessment_object,
+           a.work_begin_date,
+           a.work_end_date,
+           a.reporting_date,
+           a.is_have,
+           a.is_influence,
+           a.mode,
+           a.status,
+           a.proc_ins_id,
+           a.process_definition_id,
+           prn.report_no,
+           pa1.status as status1,
+           pa1.id as auditId1,
+           pa1.proc_ins_id as procInsId1,
+           pa2.status as status2,
+           pa2.id as auditId2,
+           pa2.proc_ins_id as procInsId2,
+           pa3.status as status3,
+           pa3.id as auditId3,
+           pa3.proc_ins_id as procInsId3,
+           pa.status as archive_status,
+           pa.id as archive_id,
+           pa.proc_ins_id as procInsIdArchive,
+           d.id AS issued_id,
+           d.proc_ins_id AS procInsId4,
+           d.status AS issued_status
+        FROM
+            program_project_list_info a
+            LEFT JOIN sys_user b ON a.create_by = b.id
+            LEFT JOIN sys_user c ON a.project_manager = c.id
+            LEFT JOIN program_report_no prn ON prn.program_id = a.id
+            LEFT JOIN program_audit pa1 ON pa1.program_id = a.id and pa1.audit_level = '1' and pa1.del_flag = '0'
+            LEFT JOIN program_audit pa2 ON pa2.program_id = a.id and pa2.audit_level = '2' and pa2.del_flag = '0'
+            LEFT JOIN program_audit pa3 ON pa3.program_id = a.id and pa3.audit_level = '3' and pa3.del_flag = '0'
+            LEFT JOIN program_archive pa ON pa.program_id = a.id and pa.del_flag = '0'
+            LEFT JOIN proofread_issued d ON a.id = d.project_id
+        where a.id = #{id}
+    </select>
+
     <select id="findList" resultType="com.jeeplus.test.program.configuration.projectList.service.dto.ExportFileDto">
         SELECT
            (DATE_FORMAT(a.create_date,'%Y-%m-%d')) AS create_date,

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/service/ProjectListService.java

@@ -639,19 +639,25 @@ public class ProjectListService {
         }else{
             data.put("projectMaster",UserUtils.get(projectDto.getProjectManager()).getName());
         }
+        //查询项目详情
+        ProgramProjectListInfo programProjectListInfo = projectListMapper.getById(projectDto.getId());
 
         //项目审核人
-        data.put("projectauditor","");
+        data.put("projectauditor",UserUtils.get(projectDto.getAgreeUserId()).getName());
         //项目审核时间
-        data.put("projectAuditDate","");
+        Date agreeTime=projectDto.getAgreeTime();
+        if(null == agreeTime){
+            data.put("projectAuditDate","");
+            data.put("auditDate","");
+        }else{
+            String str = sdf.format(agreeTime);
+            data.put("projectAuditDate",str);
+            data.put("auditDate",str);
+        }
         //审核人员签字
-        data.put("auditPersonnel","");
-        //项目审核时间
-        data.put("auditDate","");
+        data.put("auditPersonnel",UserUtils.get(projectDto.getAgreeUserId()).getName());
         //改正人员签字
         data.put("correctPersonnel",UserUtils.get(proofreadInfoDto.getUpdateBy()).getName());
-        //项目审核时间
-        data.put("correctDate","");
         //保留意见
         data.put("qualifiedOpinion",proofreadInfoDto.getReservations());
         //未修改意见
@@ -659,11 +665,14 @@ public class ProjectListService {
         //执行人
         data.put("executor",UserUtils.get(proofreadInfoDto.getUpdateBy()).getName());
         //执行时间
+        //改正人员签字时间
         Date executorDate=proofreadInfoDto.getUpdateDate();
         if(null == executorDate){
+            data.put("correctDate","");
             data.put("executorDate","");
         }else{
             String str = sdf.format(executorDate);
+            data.put("correctDate",str);
             data.put("executorDate",str);
         }
 
@@ -747,17 +756,22 @@ public class ProjectListService {
         }
 
         //项目审核人
-        data.put("projectauditor","");
+        data.put("projectauditor",UserUtils.get(projectDto.getAgreeUserId()).getName());
         //项目审核时间
-        data.put("projectAuditDate","");
+        Date agreeTime=projectDto.getAgreeTime();
+        if(null == agreeTime){
+            data.put("projectAuditDate","");
+            data.put("auditDate","");
+        }else{
+            String str = sdf.format(agreeTime);
+            data.put("projectAuditDate",str);
+            data.put("auditDate",str);
+        }
+
         //审核人员签字
-        data.put("auditPersonnel","");
-        //项目审核时间
-        data.put("auditDate","");
+        data.put("auditPersonnel",UserUtils.get(projectDto.getAgreeUserId()).getName());
         //改正人员签字
         data.put("correctPersonnel",UserUtils.get(proofreadInfoDto.getUpdateBy()).getName());
-        //项目审核时间
-        data.put("correctDate","");
         //保留意见
         data.put("qualifiedOpinion",proofreadInfoDto.getReservations());
         //未修改意见
@@ -765,11 +779,14 @@ public class ProjectListService {
         //执行人
         data.put("executor",UserUtils.get(proofreadInfoDto.getUpdateBy()).getName());
         //执行时间
+        //改正人员签字时间
         Date executorDate=proofreadInfoDto.getUpdateDate();
         if(null == executorDate){
+            data.put("correctDate","");
             data.put("executorDate","");
         }else{
             String str = sdf.format(executorDate);
+            data.put("correctDate",str);
             data.put("executorDate",str);
         }