报告作废归档流程修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApplyArchived/mapper/xml/ReportCancellApplyArchivedMapper.xml

@@ -78,7 +78,8 @@
 				d.real_header as projectMaster2Id,
                 k.name as projectMaster2Name,
 				cw_ar.proc_ins_id as cwProcInsId,
-				cw_ar.process_definition_id as cwProDefId
+				cw_ar.process_definition_id as cwProDefId,
+                art.ID_ as archived_task_id
 
 				FROM cw_project_report_cancell_apply a
 				LEFT JOIN cw_project_report_new_line b
@@ -98,6 +99,8 @@
         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 cw_ar.proc_ins_id = art.PROC_INST_ID_
+
         ${ew.customSqlSegment}
         <if test="officeIds !=null and officeIds != ''">
             and c.office_id in (${officeIds})

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApplyArchived/service/ReportCancellApplyArchivedService.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.jeeplus.core.query.QueryWrapperGenerator;
+import com.jeeplus.flowable.service.FlowTaskService;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.UserUtils;
@@ -34,6 +35,7 @@ import com.jeeplus.test.workContract.service.dto.WorkAttachmentDto;
 import liquibase.pro.packaged.A;
 import org.flowable.editor.language.json.converter.util.CollectionUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -70,6 +72,9 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
     @Resource
     private OssService ossService;
 
+    @Resource
+    private FlowTaskService flowTaskService;
+
     /**
      * 差选项目列表信息
      *
@@ -110,6 +115,14 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
         List<String> manageOfficeIdList= Lists.newArrayList();
         IPage<ArchivedReportInfoDto> list = applyMapper.getList(page, queryWrapper,officeIds.toString());
+        list.getRecords().stream().forEach(i -> {
+            // 报告作废归档
+            if (StringUtils.isNotBlank(i.getArchivedTaskId()) && StringUtils.isNotBlank(i.getApplyFileType())) {
+                if ("2".equals(i.getApplyFileType())) { // “审核中”的数据要获取数据审核人
+                    i.setAuditUserIdsArchived(flowTaskService.getTaskAuditUsers(i.getArchivedTaskId()));  // 获取数据审核人
+                }
+            }
+        });
         return list;
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApplyArchived/service/dto/ArchivedReportInfoDto.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: 王强
@@ -127,4 +129,12 @@ public class ArchivedReportInfoDto extends BaseDTO {
     @TableField(exist = false)
     private String projectMaster2Name;
 
+    @TableField(exist = false)
+    private String archivedTaskId;
+
+    /**
+     * 数据审核人  报告作废归档
+     */
+    private List<String> auditUserIdsArchived;
+
 }