QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: scc流程所有审批

Browse Source
This commit is contained in:
mzaxd
2024-07-15 09:40:13 +08:00
parent 1e0818793c
commit c039f5f416
2 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java
+21
View File
@@ -155,6 +155,27 @@ public class ProcessStandardComplianceCheck implements Serializable {
@TableField(exist = false)
private String distributeFlag;
/**
* 会签人员
*/
@ApiModelProperty(value = "会签人员")
@TableField(exist = false)
private String countersignUser;
/**
* 设计工程师科室经理
*/
@ApiModelProperty(value = "设计工程师科室经理")
@TableField(exist = false)
private String manager;
/**
* 高级经理
*/
@ApiModelProperty(value = "高级经理")
@TableField(exist = false)
private String seniorManager;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}
laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+15 -15
View File
@@ -50,10 +50,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
import static com.jero.modules.activiti.common.ActivitiCommon.DISTRIBUTE;
@@ -195,20 +192,16 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
String curUserId = UserUtils.getUserId();
Map<String, Object> userInfoMap = processInfoVO.getUserInfoMap();
switch (xmlNodeId) {
case MAIN_CHECK_USER_DISTRIBUTE:
case MAIN_CHECK_USER_REDISTRIBUTE:
runtimeService.setVariable(processInstanceId, DISTRIBUTE, true);
break;
case MAIN_CHECK_USER_COLLECT:
break;
case COUNTERSIGN:
break;
case MANAGER_APPROVAL:
break;
case SENIOR_MANAGER_APPROVAL:
break;
case DESIGNER_ENGINEER_EVALUATION:
runtimeService.setVariable(processInstanceId, PASS, false);
break;
case MAIN_CHECK_USER_APPROVAL:
case COUNTERSIGN:
case MANAGER_APPROVAL:
case SENIOR_MANAGER_APPROVAL:
runtimeService.setVariable(processInstanceId, PASS, pass);
break;
}
// TODO 转办修改流程变量逻辑
@@ -216,7 +209,6 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
}
runtimeService.setVariable(processInstanceId, PASS, pass);
// 审批节点
actFlowCommonService.completeTask(taskId, curUserId);
}
@@ -259,7 +251,15 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
// 去重找到所有设计师
List<String> designEngineerList = detailInfoList.stream().map(ProcessStandardComplianceCheckDetail::getDesignEngineer).distinct().collect(Collectors.toList());
runtimeService.setVariable(processInstanceId, DESIGNER_LIST, designEngineerList);
} else {
// 不分发直接设置后续审批节点的人员变量
List<String> counterSignUserList = Arrays.asList(standardInfo.getCountersignUser().split(","));
runtimeService.setVariable(processInstanceId, COUNTERSIGN_USER_LIST, counterSignUserList);
runtimeService.setVariable(processInstanceId, MANAGER, standardInfo.getManager());
runtimeService.setVariable(processInstanceId, SENIOR_MANAGER, standardInfo.getSeniorManager());
}
// 保存数据
sccDetailService.updateBatchById(detailInfoList);
runtimeService.setVariable(processInstanceId, DISTRIBUTE, distributeFlag);
runtimeService.setVariable(processInstanceId, UNALLOCATED_QUANTITY, unallocatedQuantity);
break;