流程调整、评估项目组成员bug修复

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

@@ -38,6 +38,7 @@
             <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"/>
+            <result property="taskId" column="task_id" 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>
     </resultMap>
@@ -234,6 +235,7 @@
         cw_pr.project_name as project_name,
         cw_prnl.report_no,
         date_format(cw_prnl.report_date,'%Y-%m-%d') as report_date,
+        art.ID_ as task_id,
         (case when cw_pa.audit_date is null then timestampdiff(day,cw_prnl.report_date,now()) when cw_pa.audit_date is not null then timestampdiff(day,cw_prnl.report_date,cw_pa.audit_date) end) as archiveDay
         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'
@@ -246,6 +248,8 @@
         left join sys_user sub on cpm.user_id = sub.id
         left join sys_user_manage_office sumo on sumo.office_id = sub.office_id
 
+        left join act_ru_task art ON cw_pa.proc_ins_id = art.PROC_INST_ID_
+
         ${ew.customSqlSegment}
         and cw_prnl.report_number is not null and cw_prnl.report_date is not null
         <if test="sta == '超期未归档'">

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.jeeplus.core.query.QueryWrapperGenerator;
+import com.jeeplus.flowable.service.FlowTaskService;
 import com.jeeplus.sys.domain.User;
 import com.jeeplus.sys.mapper.UserMapper;
 import com.jeeplus.sys.service.dto.UserDTO;
@@ -33,6 +34,7 @@ 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.workContract.service.dto.WorkAttachmentDto;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -65,6 +67,8 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
     private CwProjectInfoMapper cwProjectInfoMapper;
     @Resource
     private SerialnumTplService serialnumTplService;
+    @Resource
+    private FlowTaskService flowTaskService;
 
     /**
      * 项目归档列表信息
@@ -193,6 +197,12 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
                         info.setFineMoney("0");
                     }
                 }
+                // 报告归档
+                if (StringUtils.isNotBlank(info.getTaskId()) && StringUtils.isNotBlank(info.getStatus())) {
+                    if ("2".equals(info.getStatus())) { // “审核中”的数据要获取数据审核人
+                        info.setAuditUserIds(flowTaskService.getTaskAuditUsers(info.getTaskId()));  // 获取数据审核人
+                    }
+                }
             }
         }
         return list;

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

@@ -219,6 +219,11 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     @Excel(name = "超期天数",width = 25,orderNum = "12")
     private String overdueDay;
 
+    /**
+     * 数据审核人
+     */
+    private List<String> auditUserIds;
+
 
     private static final long serialVersionUID = 1L;
 
@@ -525,4 +530,12 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
+
+    public void setAuditUserIds(List<String> auditUserIds) {
+        this.auditUserIds = auditUserIds;
+    }
+
+    public List<String> getAuditUserIds() {
+        return auditUserIds;
+    }
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApply/mapper/xml/ReportCancellApplyMapper.xml

@@ -77,7 +77,8 @@
 				cw_ar.proc_ins_id as cwProcInsId,
 				cw_ar.process_definition_id as cwProDefId,
 				d.real_header as projectMaster2Id,
-                k.name as projectMaster2Name
+                k.name as projectMaster2Name,
+                art.ID_ as task_id
 
 				FROM cw_project_report_cancell_apply a
 				LEFT JOIN cw_project_report_new_line b
@@ -98,6 +99,7 @@
         on c.create_by = h.id
         left join cw_project_report_cancell_apply_archived cw_ar
         on a.id = cw_ar.archive_id
+        left join act_ru_task art ON a.proc_ins_id = art.PROC_INST_ID_
         ${ew.customSqlSegment}
         order by a.create_date desc
     </select>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApply/service/ReportCancellApplyService.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.jeeplus.core.query.QueryWrapperGenerator;
+import com.jeeplus.flowable.service.FlowTaskService;
 import com.jeeplus.sys.domain.User;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.StringUtils;
@@ -32,6 +33,7 @@ import com.jeeplus.test.oss.domain.WorkAttachment;
 import liquibase.pro.packaged.A;
 import org.apache.commons.collections4.CollectionUtils;
 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;
@@ -64,6 +66,9 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
     @Resource
     private CwProjectReportMapper reportMapper;
 
+    @Autowired
+    private FlowTaskService flowTaskService;
+
     /**
      * 差选项目列表信息
      * @param page
@@ -102,6 +107,14 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
         List<String> manageOfficeIdList= Lists.newArrayList();
         IPage<ReportInfoDto> list = applyMapper.getList(page, queryWrapper,officeIds.toString());
+        list.getRecords().stream().forEach(i -> {
+            // 复核
+            if (StringUtils.isNotBlank(i.getTaskId()) && StringUtils.isNotBlank(i.getStatus())) {
+                if ("2".equals(i.getStatus())) { // “审核中”的数据要获取数据审核人
+                    i.setAuditUserIds(flowTaskService.getTaskAuditUsers(i.getTaskId()));  // 获取数据审核人
+                }
+            }
+        });
         return list;
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApply/service/dto/ReportInfoDto.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.jeeplus.core.service.dto.BaseDTO;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 报告申请信息
  * @author: 王强
@@ -123,4 +125,9 @@ public class ReportInfoDto extends BaseDTO {
      */
     @TableField(exist = false)
     private String projectMaster2Name;
+
+    /**
+     * 数据审核人  纸质归档
+     */
+    private List<String> auditUserIds;
 }

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

@@ -404,11 +404,12 @@ public class ProjectListService {
             });
         }
         // 主要项目组成员去重后添加到项目组成员集合中
+        ProgramProjectListInfo byId1 = projectListMapper.selectById(dto.getId());
         ProgramMembers p = new ProgramMembers();
         p.setIsImportant("1");  // 主要成员
         p.setProjectId(dto.getId());
         p.setStatus("0");
-        p.setUserId(info.getCreateBy());  //  项目创建人
+        p.setUserId(byId1.getCreateBy());  //  项目创建人
         programMembers.add(p);
         if (StringUtils.isNotBlank(info.getProjectManager())) {
             ProgramProjectListInfo byId = projectListMapper.getById(dto.getId());