物资管理流程修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/collect/mapper/xml/CollectBasicMapper.xml

@@ -36,12 +36,14 @@
 			a.collect_date,
 			b.goods_name,
 			so.name as handledByOfficeName,
-			su.name as handledByName
+			su.name as handledByName,
+			art.ID_ as task_id
 		FROM
 			material_management_collect_basics a
 			left join sys_user su on a.handled_by = su.id
 			left join sys_office so on a.handled_by_office = so.id
 			left join material_management_collect_detailed b on a.id = b.basic_id and b.del_flag = '0'
+			left join act_ru_task art ON a.proc_ins_id = art.PROC_INST_ID_
 			${ew.customSqlSegment}
 		ORDER BY a.update_date DESC
 	</select>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/collect/service/CollectService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jeeplus.core.query.QueryWrapperGenerator;
+import com.jeeplus.flowable.service.FlowTaskService;
 import com.jeeplus.flowable.service.MyNoticeService;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.Exceptions;
@@ -76,6 +77,9 @@ public class CollectService {
     @Resource
     private WareHouseBasicMapper wareHouseBasicMapper;
 
+    @Resource
+    private FlowTaskService flowTaskService;
+
     public void updateStatusById(CollectDto dto) {
         basicMapper.updateStatusById(dto.getId(), dto.getStatus());
     }
@@ -364,8 +368,16 @@ public class CollectService {
 
             queryWrapper.between("a.collect_date", contractDates[0], contractDates[1]);
         }
-
-        return basicMapper.findList(page, queryWrapper);
+        IPage<CollectDto> list = basicMapper.findList(page, queryWrapper);
+        list.getRecords().stream().forEach(item -> {
+            // 领用申请
+            if (StringUtils.isNotBlank(item.getTaskId()) && StringUtils.isNotBlank(item.getStatus())) {
+                if ("2".equals(item.getStatus())) { // “审核中”的数据要获取数据审核人
+                    item.setAuditUserIds(flowTaskService.getTaskAuditUsers(item.getTaskId()));  // 获取数据审核人
+                }
+            }
+        });
+        return list;
     }
 
     /**

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/collect/service/dto/CollectDto.java

@@ -102,4 +102,14 @@ public class CollectDto {
 
     //新增信息
     List<CollectDetailed> detailInfos;
+
+    /**
+     * 领用申请  taskId
+     */
+    private String taskId;
+
+    /**
+     * 数据审核人  领用申请
+     */
+    private List<String> auditUserIds;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/purchase/mapper/xml/MaterialBasicMapper.xml

@@ -27,13 +27,15 @@
 			a.process_definition_id,
 			b.trade_total_price,
 			so.name as handledByOfficeName,
-			su.name as handledByName
+			su.name as handledByName,
+			art.ID_ as task_id
 		FROM
 			material_management_pruchase_request_basics a
 			left join sys_user su on a.handled_by = su.id
 			left join sys_office so on a.handled_by_office = so.id
 			left join material_management_pruchase_request_detailed b
 			on a.id = b.basic_id and b.del_flag = '0'
+			left join act_ru_task art ON a.proc_ins_id = art.PROC_INST_ID_
 			${ew.customSqlSegment}
 		ORDER BY a.update_date DESC
     </select>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/purchase/service/MaterialService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -50,6 +51,9 @@ public class MaterialService {
     @Resource
     private OssServiceMapper ossServiceMapper;
 
+    @Resource
+    private FlowTaskService flowTaskService;
+
     /**
      * 列表查询
      */
@@ -100,8 +104,16 @@ public class MaterialService {
 
             queryWrapper.between("a.create_date", contractDates[0], contractDates[1]);
         }
-
-        return basicMapper.findList(page, queryWrapper);
+        IPage<MaterialInfoDto> list = basicMapper.findList(page, queryWrapper);
+        list.getRecords().stream().forEach(item -> {
+            // 采购申请
+            if (StringUtils.isNotBlank(item.getTaskId()) && StringUtils.isNotBlank(item.getStatus())) {
+                if ("2".equals(item.getStatus())) { // “审核中”的数据要获取数据审核人
+                    item.setAuditUserIds(flowTaskService.getTaskAuditUsers(item.getTaskId()));  // 获取数据审核人
+                }
+            }
+        });
+        return list;
     }
 
     public String save(MaterialInfoDto dto) throws Exception{

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/purchase/service/dto/MaterialInfoDto.java

@@ -129,4 +129,14 @@ public class MaterialInfoDto {
     private String processDefinitionId;
 
     private List<WorkAttachmentDto> files;
+
+    /**
+     * 采购申请  taskId
+     */
+    private String taskId;
+
+    /**
+     * 数据审核人  采购申请
+     */
+    private List<String> auditUserIds;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/mapper/xml/WareHouseBasicMapper.xml

@@ -16,12 +16,14 @@
 			sy.name as handleByName,
 			a.proc_ins_id,
 			a.process_definition_id,
-			ifnull(a.status,'0') as status
+			ifnull(a.status,'0') as status,
+			art.ID_ as task_id
 		FROM
 			material_management_warehouse_basics a
 			left join material_management_pruchase_request_basics b on a.purchase_no = b.purchase_no and b.del_flag = 0
 			left join sys_office so on a.handled_by_office = so.id
 			left join sys_user sy on sy.id = a.handled_by
+			left join act_ru_task art ON a.proc_ins_id = art.PROC_INST_ID_
 			${ew.customSqlSegment}
 		ORDER BY a.update_date DESC
     </select>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/service/WareHouseBasicService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 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;
@@ -68,6 +69,10 @@ public class WareHouseBasicService {
     @Resource
     private ContractInfoService infoService;
 
+    @Resource
+    private FlowTaskService flowTaskService;
+
+
     /**
      * 列表查询
      */
@@ -468,8 +473,16 @@ public class WareHouseBasicService {
                         .eq("a.`status`",dto.getStatusTwo()[1]);
             });
         }
-
-        return basicMapper.findList(page, queryWrapper);
+        IPage<WareHouseDto> list = basicMapper.findList(page, queryWrapper);
+        list.getRecords().forEach(item -> {
+            // 入库 修改申请
+            if (StringUtils.isNotBlank(item.getTaskId()) && StringUtils.isNotBlank(item.getStatus())) {
+                if ("2".equals(item.getStatus())) { // “审核中”的数据要获取数据审核人
+                    item.setAuditUserIds(flowTaskService.getTaskAuditUsers(item.getTaskId()));  // 获取数据审核人
+                }
+            }
+        });
+        return list;
     }
 
     /**

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/service/dto/WareHouseDto.java

@@ -261,4 +261,14 @@ public class WareHouseDto {
      * 合同编号
      */
     private String contractNo;
+
+    /**
+     * 入库 修改申请  taskId
+     */
+    private String taskId;
+
+    /**
+     * 数据审核人  入库 修改申请
+     */
+    private List<String> auditUserIds;
 }