Merge remote-tracking branch 'origin/master'

src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xdap.self_development.service.impl;
 
+import com.alibaba.fastjson2.JSON;
 import com.definesys.mpaas.query.MpaasQueryFactory;
 import com.xdap.api.moudle.user.pojo.XdapUsers;
 import com.xdap.self_development.controller.request.ApprovalByPlatformRequest;
@@ -180,6 +181,7 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
             todoTaskPojo.setDocumentNo(approvalId);
             todoTaskPojo.setProcessTitle(processTitle);
             todoTaskPojo.setCurrentNode(ApprovalOrderEnum.PROOFREAD.getDesc());
+            todoTaskPojo.setCurrentProcessor(JSON.toJSONString(firstNode.getAssignees()));
             todoTaskPojo.setModelId(engineModelId);
             todoTaskPojo.setVersionNumber(modelPojoOld.getVersionNumber());
             todoTaskPojo.setOwnerId(assigneeId);
@@ -353,7 +355,7 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
                             .update("is_delete", isd)
                             .update("current_node", approvalConfigPojos.get(0).getNodeName())
                             .update("last_update_date", new Date())
-                            .update("current_processor", Arrays.asList(approvalConfigPojos.get(0).getAssignees().split(",")))
+                            .update("current_processor", JSON.toJSONString(Arrays.asList(approvalConfigPojos.get(0).getAssignees().split(","))))
                             .eq("document_no", approvalId)
                             .eq("owner_id", assID)
                             .doUpdate(TodoTaskPojo.class);
@@ -382,7 +384,7 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
                     sw.buildFromDatasource("xdap_app_223770822127386625")
                             .update("last_update_date", new Date())
                             .update("current_node", approvalConfigPojo1.getNodeName())
-                            .update("current_processor", Arrays.asList(approvalConfigPojo1.getAssignees().split(",")))
+                            .update("current_processor", JSON.toJSONString(Arrays.asList(approvalConfigPojo1.getAssignees().split(","))))
                             .eq("document_no", approvalId)
 //                                .eq("is_delete", 0)
 //                            .eq("owner_id", nextAssId)

src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java

@@ -4,6 +4,7 @@ package com.xdap.self_development.service.impl;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.fastjson.JSON;
 import com.definesys.mpaas.query.MpaasQueryFactory;
 import com.xdap.api.moudle.user.pojo.XdapUsers;
 import com.xdap.runtime.service.RuntimeAppContextService;
@@ -445,7 +446,7 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
                     .update("is_delete", 1)
                     .update("last_update_date", new Date())
                     .eq("owner_id", currentUserId)
-                    .eq("process_title", "数据维护")
+                    .eq("data_type", "数据维护")
                     .doUpdate(TodoTaskPojo.class);
         }
         //应该不会有新增参数 要不然还要给参数绑定部门，责任人，填写人
@@ -527,15 +528,16 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
             TodoTaskPojo todoTaskPojo = new TodoTaskPojo();
             todoTaskPojo.setCreatedById(userID);
             todoTaskPojo.setDocumentNo(UUID.randomUUID().toString());
-            todoTaskPojo.setProcessTitle(CurrentNodeEnum.REPAIR.getDesc());
+            todoTaskPojo.setProcessTitle("分发填写人");
             todoTaskPojo.setCurrentNode("待维护");
             todoTaskPojo.setStatusCode(null);
             todoTaskPojo.setModelName(modelPojo.getModelName());
             todoTaskPojo.setModelId(modelPojo.getId());
             todoTaskPojo.setCreationDate(new Date());
-            todoTaskPojo.setDataType(modelPojo.getYcOrOth());
+            todoTaskPojo.setDataType(CurrentNodeEnum.REPAIR.getDesc());
             todoTaskPojo.setVersionNumber(modelPojo.getVersionNumber());
             todoTaskPojo.setOwnerId(filledBy);
+            todoTaskPojo.setCurrentProcessor(JSON.toJSONString(filledBy));
             todoTaskPojo.setIsDelete(0);
             todoTaskPojo.setCreatedBy(ObjectUtils.isNotEmpty(XdapUsers) ? XdapUsers.getUsername() : "");
             todoTaskPojos.add(todoTaskPojo);
@@ -551,7 +553,7 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
             sw.buildFromDatasource("xdap_app_223770822127386625")
                     .eq("owner_id", userID)
                     .eq("model_id", engineModelId)
-                    .eq("process_title", "任务分解")
+                    .eq("data_type", "任务分解")
                     .update("is_delete", 1)
                     .update("last_update_date", new Date())
                     .doUpdate(TodoTaskPojo.class);

src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java

@@ -1,6 +1,7 @@
 package com.xdap.self_development.service.impl;
 
 
+import com.alibaba.fastjson2.JSON;
 import com.definesys.mpaas.query.MpaasQueryFactory;
 import com.definesys.mpaas.query.db.PageQueryResult;
 import com.xdap.api.moudle.user.pojo.XdapUsers;
@@ -17,6 +18,7 @@ import com.xdap.self_development.service.TodoTaskService;
 import com.xdap.self_development.service.XdapDeptUsersService;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.poi.ss.formula.functions.T;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -71,12 +73,31 @@ public class TodoTaskServiceImpl implements TodoTaskService {
         if (ObjectUtils.isEmpty(todoTaskRequest.getCreatedById())) {
             throw new RuntimeException("请传入申请人");
         }
+        List<TodoTaskPojo> tods = new ArrayList<>();
         PageResultDTO<TodoTaskPojo> todoTaskPojoPageResultDTO = new PageResultDTO<>();
         PageQueryResult<TodoTaskPojo> queryResult = sw.buildFromDatasource("xdap_app_223770822127386625")
                 .eq("created_by_id", todoTaskRequest.getCreatedById())
                 .orderBy("creation_date", "desc")
                 .doPageQuery(todoTaskRequest.getPage(), todoTaskRequest.getSize(), TodoTaskPojo.class);
-        todoTaskPojoPageResultDTO.setList(queryResult.getResult());
+
+        for (TodoTaskPojo todoTaskPojo : queryResult.getResult()) {
+            TodoTaskPojo todoTaskPojo1 = new TodoTaskPojo();
+            String currentProcessor = todoTaskPojo.getCurrentProcessor();
+            BeanUtils.copyProperties(todoTaskPojo, todoTaskPojo1);
+
+            List<String> strings = JSON.parseArray(currentProcessor).toList(String.class).stream()
+                    .map(x -> {
+                        XdapUsers xdapUsers = xdapDeptUsersService.selectUserByID(x);
+                        if (ObjectUtils.isNotEmpty(xdapUsers)) {
+                            return xdapUsers.getUsername();
+                        } else {
+                            return "未知用户名:" + x;
+                        }
+                    }).collect(Collectors.toList());
+            todoTaskPojo1.setCurrentProcessor(String.join(",", strings));
+            tods.add(todoTaskPojo1);
+        }
+        todoTaskPojoPageResultDTO.setList(tods);
         todoTaskPojoPageResultDTO.setTotalCount(queryResult.getCount());
         return todoTaskPojoPageResultDTO;
     }
@@ -124,8 +145,26 @@ public class TodoTaskServiceImpl implements TodoTaskService {
                 .eq("is_delete", dOrYTask)
                 .orderBy("creation_date", "desc")
                 .doPageQuery(todoTaskRequest.getPage(), todoTaskRequest.getSize(), TodoTaskPojo.class);
-        List<TodoTaskPojo> todoTaskPojos = queryResult.getResult();
+
-        pageResultDTO.setList(todoTaskPojos);
+        List<TodoTaskPojo> tods = new ArrayList<>();
+        for (TodoTaskPojo todoTaskPojo : queryResult.getResult()) {
+            TodoTaskPojo todoTaskPojo1 = new TodoTaskPojo();
+            String currentProcessor = todoTaskPojo.getCurrentProcessor();
+            BeanUtils.copyProperties(todoTaskPojo, todoTaskPojo1);
+
+            List<String> strings = JSON.parseArray(currentProcessor).toList(String.class).stream()
+                    .map(x -> {
+                        XdapUsers xdapUsers = xdapDeptUsersService.selectUserByID(x);
+                        if (ObjectUtils.isNotEmpty(xdapUsers)) {
+                            return xdapUsers.getUsername();
+                        } else {
+                            return "未知用户名:" + x;
+                        }
+                    }).collect(Collectors.toList());
+            todoTaskPojo1.setCurrentProcessor(String.join(",", strings));
+            tods.add(todoTaskPojo1);
+        }
+        pageResultDTO.setList(tods);
         pageResultDTO.setTotalCount(queryResult.getCount());
         return pageResultDTO;
     }
@@ -164,13 +203,14 @@ public class TodoTaskServiceImpl implements TodoTaskService {
             TodoTaskPojo todoTaskPojo = new TodoTaskPojo();
             todoTaskPojo.setCreatedById(userID);
             todoTaskPojo.setDocumentNo(UUID.randomUUID().toString());
-            todoTaskPojo.setProcessTitle(CurrentNodeEnum.JOBSPLIT.getDesc());
+            todoTaskPojo.setProcessTitle("分发责任人");
             todoTaskPojo.setCurrentNode("待分解");
+            todoTaskPojo.setCurrentProcessor(JSON.toJSONString(engineParamDetailDTO.getResPersonId()));
             todoTaskPojo.setStatusCode(null/*String.valueOf(ParamValueVersionEnum.DRAFT.getCode())*/);
             todoTaskPojo.setModelName(ObjectUtils.isNotEmpty(modelPojo) ? modelPojo.getModelName() : "");
             todoTaskPojo.setModelId(modelId);
             todoTaskPojo.setCreationDate(new Date());
-            todoTaskPojo.setDataType(modelPojo.getYcOrOth());
+            todoTaskPojo.setDataType(CurrentNodeEnum.JOBSPLIT.getDesc());
             todoTaskPojo.setVersionNumber(ObjectUtils.isNotEmpty(modelPojo) ? modelPojo.getVersionNumber() : 0);
             todoTaskPojo.setIsDelete(0);
             todoTaskPojo.setOwnerId(engineParamDetailDTO.getResPersonId());