Merge remote-tracking branch 'origin/master'

src/main/java/com/xdap/self_development/common/UserPermissionGetter.java

@@ -79,6 +79,7 @@ public class UserPermissionGetter {
             }
         } catch (Exception e) {
             log.error(e.getMessage());
+            return new ArrayList<>();
         }
         return new ArrayList<>(result);
     }

src/main/java/com/xdap/self_development/controller/form/StartApprovalRequest.java

@@ -11,6 +11,8 @@ public class StartApprovalRequest {
     @NotBlank(message = "用户不能为空")
     private String userId;
 
+    @NotBlank(message = "流程标题不能为空")
+    private String processTitle;
     @NotBlank(message = "请选择审核内容")
     private String templateRowId;
     @NotEmpty(message = "校对人员不能为空")

src/main/java/com/xdap/self_development/pojo/ApprovalParameterChangeDetails.java

@@ -1,18 +0,0 @@
-package com.xdap.self_development.pojo;
-
-import com.definesys.mpaas.query.annotation.RowID;
-import com.definesys.mpaas.query.annotation.RowIDType;
-import com.definesys.mpaas.query.annotation.Table;
-import com.definesys.mpaas.query.model.MpaasBasePojo;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@Table("approval_parameter_change_details")
-public class ApprovalParameterChangeDetails extends MpaasBasePojo {
-    @RowID(sequence = "pp_s", type = RowIDType.UUID)
-    private String id;
-    private String documentId;
-    private String parameterName;
-}

src/main/java/com/xdap/self_development/pojo/ApprovalPerson.java

@@ -1,24 +0,0 @@
-package com.xdap.self_development.pojo;
-
-import com.definesys.mpaas.query.annotation.RowID;
-import com.definesys.mpaas.query.annotation.RowIDType;
-import com.definesys.mpaas.query.annotation.Table;
-import com.definesys.mpaas.query.model.MpaasBasePojo;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@Table("approval_persons")
-public class ApprovalPerson extends MpaasBasePojo {
-    @RowID(sequence = "ap_s", type = RowIDType.UUID)
-    private String id;
-    private List<String> jd;
-    private List<String> sh;
-    private List<String> hq;
-    private List<String> pz;
-    private String documentId;
-    ApprovalParameterChangeDetails details = new ApprovalParameterChangeDetails();
-}

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

@@ -103,16 +103,17 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
             todoTask.setCreatedById(request.getUserId());
             todoTask.setCreatedBy(xdapDeptUsersService.selectUserByID(request.getUserId()).getUsername());
             todoTask.setCurrentNode(getNodeName(flow.getCurrentNode()));
-            todoTask.setDataType("-");
+            todoTask.setDataType("模板审核");
             todoTask.setDocumentNo(flow.getId());
             todoTask.setCreationDate(Timestamp.valueOf(LocalDateTime.now()));
             todoTask.setIsDelete(0);
             todoTask.setModelId(template.getId());
             todoTask.setModelName(template.getTemplateName());
-            todoTask.setProcessTitle("模板审核");
+            todoTask.setProcessTitle(request.getProcessTitle());
             todoTask.setStatusCode(flow.getFlowStatus());
             todoTask.setVersionNumber(template.getVersion());
             todoTask.setOwnerId(person);
+            todoTask.setCurrentProcessor(JSON.toJSONString(getNodeUsers(flow, flow.getCurrentNode())));
             list.add(todoTask);
         }
         bd.getBusinessDatabase().doBatchInsert(list);
@@ -129,9 +130,6 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
     @Override
     @Transactional
     public PageQueryResult<TodoAndTemplateView> getApprovalList(ApprovalListForm form) {
-//        List<TodoAndTemplateView> approvalList = new ArrayList<>();
-//        Set<String> flowIds = new HashSet<>(Objects.requireNonNull(redisTemplate.opsForSet().members(TODO_PREFIX + form.getUserId())));
-//        List<String> ids = new ArrayList<>(flowIds);
         PageQueryResult<TodoAndTemplateView> result = bd.getBusinessDatabase()
                 .viewQueryMode(true)
                 .view("getAllApproval")
@@ -140,16 +138,6 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
                 .setVar("createdTime", form.getCreateDate() == null ? "" : form.getCreateDate())
                 .setVar("username", form.getUsername())
                 .doPageQuery(form.getPageNumber(), form.getPageSize(), TodoAndTemplateView.class);
-//        List<TodoAndTemplateView> todoList =bd.getBusinessDatabase()
-//                .viewQueryMode(true)
-//                .view("getTodoAndTemplate")
-//                .setVar("ids", ids)
-//                .setVar("createBy", form.getUserId())
-//                .setVar("templateName", form.getTemplateName())
-//                .setVar("status", form.getStatus())
-//                .setVar("createdTime", form.getCreateDate() == null ? "" : form.getCreateDate())
-//                .setVar("username",form.getUsername())
-//                .doQuery(TodoAndTemplateView.class);
         setCurrentApprovers(result);
         return result;
     }
@@ -230,7 +218,7 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
         record.setApprovalTime(Timestamp.valueOf(LocalDateTime.now()));
         bd.getBusinessDatabase().doInsert(record);
 
-        // 删除当前节点的已处理待办
+        // 完成当前节点的已处理待办
         if (!"COUNTERSIGN".equals(flow.getCurrentNode())) {
             bd.getBusinessDatabase()
                 .eq("document_no", flow.getId())
@@ -575,7 +563,7 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
                 .update("return_num", template.getReturnNum() + 1)
                 .doUpdate(Template.class);
         // 清除所有待办
-        clearAllTodo(flow, userId);
+        clearAllTodo(flow);
     }
 
     private boolean hasPermission(ApprovalFlow flow, String node, String userId) {
@@ -595,29 +583,42 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
 
     private void addNodeTodo(ApprovalFlow flow, String node, Template template, String createBy) {
         List<String> users = getNodeUsers(flow, node);
+        String processTitle = bd.getBusinessDatabase()
+                .eq("document_no", flow.getId())
+                .doQueryFirst(TodoTaskPojo.class).getProcessTitle();
         // 新增待办
         List<TodoTaskPojo> list = new ArrayList<>();
         for (String person : users) {
-            TodoTaskPojo todoTask = new TodoTaskPojo();
+            TodoTaskPojo todoTaskPojo = bd.getBusinessDatabase()
-            todoTask.setCreatedById(createBy);
+                    .eq("document_no", flow.getId())
-            todoTask.setCreatedBy(xdapDeptUsersService.selectUserByID(createBy).getUsername());
+                    .eq("owner_id", person).doQueryFirst(TodoTaskPojo.class);
-            todoTask.setCurrentNode(getNodeName(flow.getCurrentNode()));
+            if (todoTaskPojo != null) {
-            todoTask.setDataType("-");
+                todoTaskPojo.setCurrentNode(getNodeName(node));
-            todoTask.setDocumentNo(flow.getId());
+                todoTaskPojo.setCurrentProcessor(JSON.toJSONString(getNodeUsers(flow, node)));
-            todoTask.setCreationDate(Timestamp.valueOf(LocalDateTime.now()));
+                bd.getBusinessDatabase().doUpdate(todoTaskPojo);
-            todoTask.setIsDelete(0);
+            } else {
-            todoTask.setModelId(template.getId());
+                TodoTaskPojo todoTask = new TodoTaskPojo();
-            todoTask.setModelName(template.getTemplateName());
+                todoTask.setCreatedById(createBy);
-            todoTask.setProcessTitle("模板审核");
+                todoTask.setCreatedBy(xdapDeptUsersService.selectUserByID(createBy).getUsername());
-            todoTask.setStatusCode(flow.getFlowStatus());
+                todoTask.setCurrentNode(getNodeName(node));
-            todoTask.setVersionNumber(template.getVersion());
+                todoTask.setDataType("模板审核");
-            todoTask.setOwnerId(person);
+                todoTask.setDocumentNo(flow.getId());
-            list.add(todoTask);
+                todoTask.setCreationDate(Timestamp.valueOf(LocalDateTime.now()));
+                todoTask.setIsDelete(0);
+                todoTask.setModelId(template.getId());
+                todoTask.setModelName(template.getTemplateName());
+                todoTask.setProcessTitle(processTitle);
+                todoTask.setStatusCode(flow.getFlowStatus());
+                todoTask.setVersionNumber(template.getVersion());
+                todoTask.setOwnerId(person);
+                todoTask.setCurrentProcessor(JSON.toJSONString(getNodeUsers(flow, flow.getCurrentNode())));
+                list.add(todoTask);
+            }
         }
         bd.getBusinessDatabase().doBatchInsert(list);
     }
 
-    private void clearAllTodo(ApprovalFlow flow, String userId) {
+    private void clearAllTodo(ApprovalFlow flow) {
         // 清除已有待办
         bd.getBusinessDatabase()
                 .eq("document_no", flow.getId())

src/main/resources/application.properties

@@ -65,8 +65,8 @@ mpaas.datasource[0].username=root
 mpaas.datasource[0].password=qwer12
 mpaas.datasource[0].minPoolSize=50
 mpaas.datasource[0].maxPoolSize=1000
-
+mpaas.datasource[1].name=yc_lrs_test_relsult
-mpaas.datasource[1].url=jdbc:mysql://127.0.0.1:3306/test_demo?serverTimezone=GMT%2B8&characterEncoding=utf-8
+mpaas.datasource[1].url=jdbc:mysql://127.0.0.1:3306/yc_lrs_test_relsult?serverTimezone=GMT%2B8&characterEncoding=utf-8
 mpaas.datasource[1].username=root
 mpaas.datasource[1].password=qwer12
 mpaas.datasource[1].type=mysql