db/430É豸¹ÜÀíÊý¾Ý¿âÉè¼Æ.pdma.json

@@ -2,9 +2,9 @@
  "name": "430设备管理数据库设计",
  "describe": "描述设备管理数据库设计文档",
  "avatar": "",
  "version": "4.9.2",
  "version": "4.9.4",
  "createdTime": "2025-3-10 16:38:19",
  "updatedTime": "2025-7-14 11:25:39",
  "updatedTime": "2025-7-15 10:15:51",
  "dbConns": [],
  "profile": {
    "default": {
@@ -1610,6 +1610,24 @@
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "id": "AD503E36-C231-4D72-8643-AE270605278C"
        },
        {
          "defKey": "true_heat_treatment",
          "defName": "真空热处理炉",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "id": "50146CF4-21BF-4B90-A7EA-C4DB721CBBFC"
        }
      ],
      "correlations": [],

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationOrderChangeStatusEnum.java

@@ -6,6 +6,7 @@
    DEPART_MANAGER_SIGNING, //部门领导签字中
    PRODUCTION_SUPPORT_SIGNING, //保障部领导签字中
    ABOLISH, //已作废
    REJECTED, //已驳回
    COMPLETED, //已完成
    ;


 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java

@@ -322,16 +322,24 @@
    private String equipmentSpecification;

    /**
     * çœŸç©ºçƒ­å¤„理炉
     */
    @Excel(name = "真空热处理炉", width = 15, orderNum = "35")
    @ApiModelProperty(value = "真空热处理炉")
    @Dict(dicCode = "yn")
    private String trueHeatTreatment;

    /**
     * æ€»åŠŸçŽ‡(KW)
     */
    @Excel(name = "总功率(KW)", width = 15, orderNum = "35")
    @Excel(name = "总功率(KW)", width = 15, orderNum = "36")
    @ApiModelProperty(value = "总功率")
    private String equipmentPower;

    /**
     * è´¨ä¿å¼€å§‹æ—¥æœŸ
     */
    @Excel(name = "质保开始日期",  width = 25, format = "yyyy/MM/dd",  orderNum = "36")
    @Excel(name = "质保开始日期",  width = 25, format = "yyyy/MM/dd",  orderNum = "37")
    @ApiModelProperty(value = "质保开始日期")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -340,7 +348,7 @@
    /**
     * è´¨ä¿ç»“束日期
     */
    @Excel(name = "质保结束日期", width = 15, format = "yyyy/MM/dd", orderNum = "37")
    @Excel(name = "质保结束日期", width = 15, format = "yyyy/MM/dd", orderNum = "38")
    @ApiModelProperty(value = "质保结束日期")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -349,14 +357,14 @@
    /**
     * èµ„产状态
     */
    @Excel(name = "资产状态", width = 15, orderNum = "38",dicCode = "asset_status")
    @Excel(name = "资产状态", width = 15, orderNum = "39",dicCode = "asset_status")
    @ApiModelProperty(value = "资产状态")
    @Dict(dicCode = "asset_status")
    private String assetStatus;

    /**最新二保日期*/
    @TableField(exist = false)
    @Excel(name = "最新二保日期", width = 15, format = "yyyy/MM/dd", orderNum = "39")
    @Excel(name = "最新二保日期", width = 15, format = "yyyy/MM/dd", orderNum = "40")
    @ApiModelProperty(value = "最新二保日期")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -364,7 +372,7 @@

    /**下次二保日期*/
    @TableField(exist = false)
    @Excel(name = "下次二保日期", width = 15, format = "yyyy/MM/dd", orderNum = "40")
    @Excel(name = "下次二保日期", width = 15, format = "yyyy/MM/dd", orderNum = "41")
    @ApiModelProperty(value = "下次二保日期")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -373,7 +381,7 @@

    /**本次三保日期*/
    @TableField(exist = false)
    @Excel(name = "本次三保日期", width = 15,  format = "yyyy/MM/dd",orderNum = "41")
    @Excel(name = "本次三保日期", width = 15,  format = "yyyy/MM/dd",orderNum = "42")
    @ApiModelProperty(value = "本次三保日期")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -381,7 +389,7 @@

    /**下次三保日期*/
    @TableField(exist = false)
    @Excel(name = "下次三保日期", width = 15, format = "yyyy/MM/dd", orderNum = "42")
    @Excel(name = "下次三保日期", width = 15, format = "yyyy/MM/dd", orderNum = "43")
    @ApiModelProperty(value = "下次三保日期")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -389,34 +397,34 @@

    /**三保周期(å¹´)*/
    @TableField(exist = false)
    @Excel(name = "三保周期(å¹´)", width = 15, orderNum = "43")
    @Excel(name = "三保周期(å¹´)", width = 15, orderNum = "44")
    @ApiModelProperty(value = "三保周期(å¹´)")
    private Integer thirdMaintenancePeriod;

    /**最新技术状态鉴定日期*/
    @TableField(exist = false)
    @Excel(name = "最新技术状态鉴定日期", width = 15, format = "yyyy/MM/dd", orderNum = "44")
    @Excel(name = "最新技术状态鉴定日期", width = 15, format = "yyyy/MM/dd", orderNum = "45")
    @ApiModelProperty(value = "最新技术状态鉴定日期")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private java.util.Date latestTechnologyCheck;
    /**技术状态下次鉴定日期*/
    @TableField(exist = false)
    @Excel(name = "技术状态下次鉴定日期", width = 15, format = "yyyy/MM/dd", orderNum = "45")
    @Excel(name = "技术状态下次鉴定日期", width = 15, format = "yyyy/MM/dd", orderNum = "46")
    @ApiModelProperty(value = "技术状态下次鉴定日期")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private java.util.Date nextTechnologyCheck;
    /**技术鉴定周期(å¹´)*/
    @TableField(exist = false)
    @Excel(name = "技术鉴定周期(å¹´)", width = 15, orderNum = "46")
    @Excel(name = "技术鉴定周期(å¹´)", width = 15, orderNum = "47")
    @ApiModelProperty(value = "技术鉴定周期(å¹´)")
    private Integer technologyCheckPeriod;

    /**
     * æ˜¯å¦ä¸»è®¾å¤‡
     */
    @Excel(name = "是否主设备", width = 15, dicCode = "yn", orderNum = "47")
    @Excel(name = "是否主设备", width = 15, dicCode = "yn", orderNum = "48")
    @ApiModelProperty(value = "是否主设备")
    @Dict(dicCode = "yn")
    private String masterFlag;
@@ -425,14 +433,14 @@
    /**
     * æ˜¯å¦æœ‰å·¥è‰ºå‚æ•°
     */
    @Excel(name = "有无工艺参数", width = 15, dicCode = "yn", orderNum = "48")
    @Excel(name = "有无工艺参数", width = 15, dicCode = "yn", orderNum = "49")
    @ApiModelProperty(value = "是否有工艺参数")
    @Dict(dicCode = "yn")
    private String processParametersFlag;
    /**
     * æ˜¯å¦æœ‰ç²¾åº¦å‚æ•°
     */
    @Excel(name = "有无精度参数", width = 15, dicCode = "yn", orderNum = "49")
    @Excel(name = "有无精度参数", width = 15, dicCode = "yn", orderNum = "50")
    @ApiModelProperty(value = "是否有精度参数")
    @Dict(dicCode = "yn")
    private String precisionParametersFlag;
@@ -441,7 +449,7 @@
    /**
     * å¤‡æ³¨
     */
    @Excel(name = "备注", width = 50, orderNum = "50")
    @Excel(name = "备注", width = 50, orderNum = "51")
    @ApiModelProperty(value = "备注")
    private String remark;


 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java

@@ -130,6 +130,12 @@
    @ApiModelProperty(value = "管理员确认")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String manageUser;
    /**
     * ç®¡ç†å‘˜ç¡®è®¤ç»“æžœ
     */
    @ApiModelProperty(value = "管理员确认结果")
    @Dict(dicCode = "approve_reject")
    private String manageUserResult;
    /** é—®é¢˜æè¿°;默认 æ—  */
    @ApiModelProperty(name = "问题描述",notes = "默认 æ— ")
    private String problemDescription ;
@@ -140,11 +146,17 @@
    @ApiModelProperty(name = "管理员确认时间",notes = "")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date confirmTime ;
    private Date confirmTime;
    /** æ£€æŸ¥äººç¡®è®¤ */
    @ApiModelProperty(name = "检查人确认",notes = "")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String inspector;
    /**
     * æ£€æŸ¥äººç¡®è®¤ç»“æžœ
     */
    @ApiModelProperty(name = "检查人确认结果",notes = "")
    @Dict(dicCode = "approve_reject")
    private String inspectorResult;
    /** æ£€æŸ¥äººæ„è§ */
    @ApiModelProperty(name = "检查人意见",notes = "")
    private String inspectConfirmComment;

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderChangeController.java

@@ -79,14 +79,20 @@
    /**
     * ç¼–辑
     *
     * @param eamTechnicalStatusEvaluationOrderChange
     * @param request
     * @return
     */
    @AutoLog(value = "技术状态鉴定工单变更-编辑")
    @ApiOperation(value="技术状态鉴定工单变更-编辑", notes="技术状态鉴定工单变更-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<?> edit(@RequestBody EamTechnicalStatusEvaluationOrderChange eamTechnicalStatusEvaluationOrderChange) {
        eamTechnicalStatusEvaluationOrderChangeService.updateById(eamTechnicalStatusEvaluationOrderChange);
    public Result<?> edit(@RequestBody EamTechnicalStatusEvaluationOrderChange request) {
        if (request == null) {
            return Result.error("编辑的对象不能为空！");
        }
        boolean b = eamTechnicalStatusEvaluationOrderChangeService.editTechnicalStatusEvaluationOrderChange(request);
        if (!b) {
            return Result.error("编辑失败！");
        }
        return Result.OK("编辑成功!");
    }
    

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java

@@ -2,14 +2,19 @@

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderQuery;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderRequest;
@@ -30,6 +35,10 @@
public class EamTechnicalStatusEvaluationOrderController extends JeecgController<EamTechnicalStatusEvaluationOrder, IEamTechnicalStatusEvaluationOrderService> {
    @Autowired
    private IEamTechnicalStatusEvaluationOrderService eamTechnicalStatusEvaluationOrderService;
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private TranslateDictTextUtils translateDictTextUtils;

    /**
     * åˆ†é¡µåˆ—表查询
@@ -101,9 +110,6 @@
        if (request == null) {
            return Result.error("审批的对象不能为空！");
        }
        if(CollectionUtil.isEmpty(request.getTableDetailList())) {
            return Result.error("检查明细信息为空！");
        }
        // æ£€æŸ¥è¯·æ±‚参数
        if (StrUtil.isBlank(request.getTaskId()) || StrUtil.isBlank(request.getDataId()) || StrUtil.isBlank(request.getInstanceId())) {
            return Result.error("审批任务错误或不存在！");
@@ -126,6 +132,16 @@
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
        EamTechnicalStatusEvaluationOrder eamTechnicalStatusEvaluationOrder = eamTechnicalStatusEvaluationOrderService.getById(id);
        return Result.OK(eamTechnicalStatusEvaluationOrder);
        if (eamTechnicalStatusEvaluationOrder == null) {
            return Result.error("未找到对应数据");
        }
        try {
            String json = objectMapper.writeValueAsString(eamTechnicalStatusEvaluationOrder);
            JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
            translateDictTextUtils.translateField("evaluator", eamTechnicalStatusEvaluationOrder.getEvaluator(), item, "sys_user,realname,username");
            return Result.OK(item);
        } catch (JsonProcessingException e) {
            return Result.error("数据转译失败！");
        }
    }
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java

@@ -83,7 +83,7 @@
    private Date actualEndTime;
    /**领取人*/
    @ApiModelProperty(value = "领取人")
    @Dict(dicCode = "sys_user, realname, username")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String evaluator;
    /**鉴定状态;待鉴定、鉴定中、维修室主任签字、工艺人员签字、使用单位技术主管签字、设备检验员签字、已完成、已锁定、变更中、已过期*/
    @ApiModelProperty(value = "鉴定状态;待鉴定、鉴定中、维修室主任签字、工艺人员签字、使用单位技术主管签字、设备检验员签字、已完成、已锁定、变更中、已过期")
@@ -104,7 +104,7 @@
    private String otherCheckCompleted;
    /**安全装置检查确认人*/
    @ApiModelProperty(value = "安全装置检查确认人")
    @Dict(dicCode = "sys_user, realname, username")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String safetyCheckConfirm;
    /**安全装置检查确认时间*/
    @ApiModelProperty(value = "安全装置检查确认时间")
@@ -120,7 +120,7 @@
    private String safetyCheckConfirmComment;
    /**设备精度检查确认人*/
    @ApiModelProperty(value = "设备精度检查确认人")
    @Dict(dicCode = "sys_user, realname, username")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String precisionCheckConfirm;
    /**设备精度检查确认时间*/
    @ApiModelProperty(value = "设备精度检查确认时间")
@@ -136,7 +136,7 @@
    private String precisionCheckConfirmComment;
    /**其他检查确认人*/
    @ApiModelProperty(value = "其他检查确认人")
    @Dict(dicCode = "sys_user, realname, username")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String otherCheckConfirm;
    /**其他检查确认时间*/
    @ApiModelProperty(value = "其他检查确认时间")
@@ -168,7 +168,7 @@
    private String otherCheckResult;
    /**维修人签字*/
    @ApiModelProperty(value = "维修人签字")
    @Dict(dicCode = "sys_user, realname, username")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String repairerSignature;
    /**维修人签字时间*/
    @ApiModelProperty(value = "维修人签字时间")
@@ -177,7 +177,7 @@
    private Date repairerSignatureTime;
    /**维修室主任签字*/
    @ApiModelProperty(value = "维修室主任签字")
    @Dict(dicCode = "sys_user, realname, username")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String repairManagerSignature;
    /**维修室主任签字时间*/
    @ApiModelProperty(value = "维修室主任签字时间")
@@ -196,7 +196,7 @@
    private String sampleCheckResult;
    /**工艺员签字*/
    @ApiModelProperty(value = "工艺员签字")
    @Dict(dicCode = "sys_user, realname, username")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String processTechnicianSignature;
    /**工艺员签字时间*/
    @ApiModelProperty(value = "工艺员签字时间")
@@ -208,7 +208,7 @@
    private String processTechnicianComment;
    /**使用单位技术主管签字*/
    @ApiModelProperty(value = "使用单位技术主管签字")
    @Dict(dicCode = "sys_user, realname, username")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String departTechnicalLeaderSignature;
    /**使用单位技术主管签字时间*/
    @ApiModelProperty(value = "使用单位技术主管签字时间")
@@ -232,7 +232,7 @@
    private String evaluationReason;
    /**设备检查人签字*/
    @ApiModelProperty(value = "设备检查人签字")
    @Dict(dicCode = "sys_user, realname, username")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String inspectorSignature;
    /**设备检查人签字时间*/
    @ApiModelProperty(value = "设备检查人签字时间")

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSecondMaintenanceRequest.java

@@ -8,7 +8,9 @@
import lombok.experimental.Accessors;
import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
import org.jeecg.modules.eam.entity.EamSecondMaintenanceOrderDetail;
import org.jeecg.modules.eam.entity.EamWeekInspectionDetail;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -93,6 +95,12 @@
    @ApiModelProperty(value = "管理员确认")
    @Dict(dicCode = "sys_user, realname, username")
    private String manageUser;
    /**
     * ç®¡ç†å‘˜ç¡®è®¤ç»“æžœ
     */
    @ApiModelProperty(value = "管理员确认结果")
    @Dict(dicCode = "approve_reject")
    private String manageUserResult;
    /** é—®é¢˜æè¿°;默认 æ—  */
    @ApiModelProperty(name = "问题描述",notes = "默认 æ— ")
    private String problemDescription ;
@@ -107,6 +115,12 @@
    /** æ£€æŸ¥äººç¡®è®¤ */
    @ApiModelProperty(name = "检查人确认",notes = "")
    private String inspector;
    /**
     * æ£€æŸ¥äººç¡®è®¤ç»“æžœ
     */
    @ApiModelProperty(name = "检查人确认结果",notes = "")
    @Dict(dicCode = "approve_reject")
    private String inspectorResult;
    /** æ£€æŸ¥äººæ„è§ */
    @ApiModelProperty(name = "检查人意见",notes = "")
    private String inspectConfirmComment;
@@ -122,4 +136,12 @@
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;

    /**列表 ç»´ä¿®å·¥æ˜Žç»†*/
    @ApiModelProperty(value = "列表 ç»´ä¿®å·¥æ˜Žç»†")
    private List<EamSecondMaintenanceOrderDetail> repairmanDetailList;;

    /**列表 æ“ä½œå·¥æ˜Žç»†*/
    @ApiModelProperty(value = "列表 ç»´ä¿®å·¥æ˜Žç»†")
    private List<EamSecondMaintenanceOrderDetail> operatorDetailList;;
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderChangeService.java

@@ -28,4 +28,11 @@
     * @return
     */
    boolean addTechnicalStatusEvaluationOrderChange(EamTechnicalStatusEvaluationOrderChange request);

    /**
     * ç¼–辑
     * @param request
     * @return
     */
    boolean editTechnicalStatusEvaluationOrderChange(EamTechnicalStatusEvaluationOrderChange request);
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java

@@ -594,9 +594,11 @@

            // è§¦å‘保养流程
            SysParams sysParams = sysParamsService.getSysPramBySettingKey("maintenance_import_type");
            if (sysParams != null && sysParams.getSettingValue().equals("1")) {
                eamMaintenanceStandard.setStandardStatus(MaintenanceStandardStatusEnum.WAIT_SUBMIT.name());
                eamMaintenanceStandardMapper.updateById(eamMaintenanceStandard);
            if (sysParams != null) {
                if (sysParams.getSettingValue().equals("1")){
                    eamMaintenanceStandard.setStandardStatus(MaintenanceStandardStatusEnum.WAIT_SUBMIT.name());
                    eamMaintenanceStandardMapper.updateById(eamMaintenanceStandard);
                }
            } else {
                return Result.error("未找到保养流程导入相关配置,请联系管理员");
            }

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java

@@ -259,13 +259,16 @@
                throw new JeecgBootException("不是操作工，无法领取此工单！");
            }
        }
        List<String> usernames = new ArrayList<>();
        if (sysUser != null) {
            entity.setOperator(sysUser.getUsername());
        }
        if (BusinessCodeConst.PCR0001.equals(sysUser.getPost())) {
            entity.setOperator(sysUser.getUsername());
        }else if (BusinessCodeConst.PCR0002.equals(sysUser.getPost())) {
            entity.setRepairman(sysUser.getUsername());
            if (BusinessCodeConst.PCR0001.equals(sysUser.getPost())) {
                entity.setOperator(sysUser.getUsername());
                usernames.add(entity.getOperator());
            }
            if (BusinessCodeConst.PCR0002.equals(sysUser.getPost())) {
                entity.setRepairman(sysUser.getUsername());
                usernames.add(entity.getRepairman());
            }
        }
        entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
        entity.setActualStartTime(new Date());
@@ -283,8 +286,6 @@
            variables.put("comment", entity.getRemark());
        }
        variables.put("proofreading", true);
        List<String> usernames = new ArrayList<>();
        usernames.add(entity.getOperator());
        if (sysUser != null) {
            if (BusinessCodeConst.PCR0001.equals(sysUser.getPost())) {
                variables.put("operator_task", usernames);
@@ -371,14 +372,48 @@
                }
                if (BusinessCodeConst.PCR0001.equals(user.getPost())) {
                    entity.setOperator(user.getUsername());
                    values.put("organization", "二保操作工执行结束");
                    values.put("comment", "二保操作工执行结束");
                    //处理对应详情
                    if (CollectionUtils.isNotEmpty(request.getOperatorDetailList())){
                        //删除原有数据
                        List<EamSecondMaintenanceOrderDetail> addList = new ArrayList<>();
                        //先删除原有
                        LambdaQueryWrapper<EamSecondMaintenanceOrderDetail> queryWrapper = new LambdaQueryWrapper<>();
                        queryWrapper.eq(EamSecondMaintenanceOrderDetail::getOrderId, entity.getId());
                        queryWrapper.eq(EamSecondMaintenanceOrderDetail::getItemCategory,EamMaintenanceStandardDetailCategory.OPERATOR_MAINTENANCE.name());
                        secondMaintenanceOrderDetailService.remove(queryWrapper);
                        request.getOperatorDetailList().forEach(tableDetail -> {
                            EamSecondMaintenanceOrderDetail eamMaintenanceStandardDetail=new EamSecondMaintenanceOrderDetail();
                            BeanUtils.copyProperties(tableDetail, eamMaintenanceStandardDetail);
                            eamMaintenanceStandardDetail.setOrderId(entity.getId());
                            addList.add(eamMaintenanceStandardDetail);
                        });
                        secondMaintenanceOrderDetailService.saveBatch(addList);
                    }
                }else if (BusinessCodeConst.PCR0002.equals(user.getPost())) {
                    entity.setRepairman(user.getUsername());
                    values.put("organization", "二保维修工执行结束");
                    values.put("comment", "二保维修工执行结束");
                    //处理对应详情
                    if (CollectionUtils.isNotEmpty(request.getRepairmanDetailList())){
                        //删除原有数据
                        List<EamSecondMaintenanceOrderDetail> addList = new ArrayList<>();
                        //先删除原有
                        LambdaQueryWrapper<EamSecondMaintenanceOrderDetail> queryWrapper = new LambdaQueryWrapper<>();
                        queryWrapper.eq(EamSecondMaintenanceOrderDetail::getOrderId, entity.getId());
                        queryWrapper.eq(EamSecondMaintenanceOrderDetail::getItemCategory,EamMaintenanceStandardDetailCategory.REPAIRER_MAINTENANCE.name());
                        secondMaintenanceOrderDetailService.remove(queryWrapper);
                        request.getRepairmanDetailList().forEach(tableDetail -> {
                            EamSecondMaintenanceOrderDetail eamMaintenanceStandardDetail=new EamSecondMaintenanceOrderDetail();
                            BeanUtils.copyProperties(tableDetail, eamMaintenanceStandardDetail);
                            eamMaintenanceStandardDetail.setOrderId(entity.getId());
                            addList.add(eamMaintenanceStandardDetail);
                        });
                        secondMaintenanceOrderDetailService.saveBatch(addList);
                    }
                }
                values.put("dataId", entity.getId());
                values.put("organization", "三保执行结束");
                values.put("comment", "三保执行结束");
                break;
            case WAIT_ADMIN_CONFIRM:
                //管理员确认
@@ -391,9 +426,11 @@
                    values.put("dataId", entity.getId());
                    values.put("organization",request.getComment());
                    values.put("comment", request.getComment());
                    values.put("manageUserResult",request.getManageUserResult());
                    entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.WAIT_INSPECTOR_CONFIRM.name());
                    entity.setManageUser(user.getUsername());
                    entity.setProblemDescription(request.getProblemDescription());
                    entity.setManageUserResult(request.getManageUserResult());
                    entity.setDealDescription(request.getComment());
                    entity.setConfirmTime(new Date());
                }
@@ -403,8 +440,10 @@
                values.put("dataId", entity.getId());
                values.put("organization",request.getComment());
                values.put("comment", request.getComment());
                values.put("inspectorResult",request.getInspectorResult());
                entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.COMPLETE.name());
                entity.setInspector(user.getUsername());
                entity.setInspectorResult(request.getInspectorResult());
                entity.setInspectConfirmComment(request.getInspectConfirmComment());
                entity.setInspectConfirmTime(new Date());
                break;

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java

@@ -165,6 +165,22 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean editTechnicalStatusEvaluationOrderChange(EamTechnicalStatusEvaluationOrderChange request) {
        EamTechnicalStatusEvaluationOrderChange entity = this.getBaseMapper().selectById(request.getId());
        if(entity == null) {
            throw new JeecgBootException("编辑的数据已删除，请刷新重试！");
        }
        if(!TechnicalStatusEvaluationOrderChangeStatusEnum.WAIT_SUBMIT.name().equals(entity.getChangeStatus())) {
            throw new JeecgBootException("只有待提交状态才可编辑！");
        }
        entity.setApplyReason(request.getApplyReason());
        entity.setDeferredEvaluationDate(request.getDeferredEvaluationDate());
        this.getBaseMapper().updateById(entity);
        return true;
    }

    @Override
    public void afterFlowHandle(FlowMyBusiness business) {
        business.getTaskNameId();//接下来审批的节点
        business.getValues();//前端传进来的参数

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java

@@ -331,6 +331,9 @@
        List<UserSelector> userSelectors;
        switch (status) {
            case UNDER_EVALUATION:
                if(CollectionUtil.isEmpty(request.getTableDetailList())) {
                    throw new JeecgBootException("检查明细信息为空！");
                }
                boolean parallelCompletion = flowTaskService.checkParallelCompletion(flowMyBusiness.getTaskId());
                //执行完成
                userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0008);
@@ -343,7 +346,10 @@
                values.put("comment", "技术状态鉴定执行结束");
                request.setComment("技术状态鉴定执行结束");
                //设置entity
                if (parallelCompletion) {
                if (CommonConstant.STATUS_1.equals(entity.getSafetyCheckCompleted())
                        && CommonConstant.STATUS_1.equals(entity.getPrecisionCheckCompleted())
                        && CommonConstant.STATUS_1.equals(entity.getOtherCheckCompleted())
                        && parallelCompletion) {
                    //多个任务都已完成且维修室主任都已审批通过,会签完成，进行维修工签字
                    userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0002);
                    userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
@@ -353,100 +359,93 @@
                }
                if ("safety_equipment_check".equals(flowMyBusiness.getTaskNameId())) {
                    //执行安全检查
                    if (CommonConstant.STATUS_1.equals(entity.getSafetyCheckCompleted())) {
                        values.put("safetyEquipmentCheckFlag", request.getSafetyCheckConfirmResult());
                        entity.setSafetyCheckConfirmResult(request.getSafetyCheckConfirmResult());
                        entity.setSafetyCheckConfirm(user.getUsername());
                        entity.setSafetyCheckConfirmTime(new Date());
                        entity.setSafetyCheckConfirmComment(request.getSafetyCheckConfirmComment());
                        //维修室主任审批
                        if (!CommonConstant.STATUS_1.equals(request.getSafetyCheckConfirmResult())) {
                            //驳回 ç»™ç›‘察人
                            userApprovalList = Collections.singletonList(request.getTableDetailList().get(0).getRepairmanSignature());
                            values.put("NextAssignee", userApprovalList);
                            entity.setSafetyCheckCompleted(CommonConstant.STATUS_0);
                        }
                    } else {
                        //安全装置检查结果填报
                        List<EamTechnicalStatusEvaluationOrderDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList());
                        if(CollectionUtil.isEmpty(collect)) {
                            throw new JeecgBootException("安全装置检查项明细为空！");
                        }
                        //结果项检查
                        checkDetailResult(request.getTableDetailList(), TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK);
                        //添加操作人信息
                        for (EamTechnicalStatusEvaluationOrderDetail detail : collect) {
                            detail.setRepairmanSignature(user.getUsername());
                            detail.setRepairmanSignatureTime(new Date());
                        }
                        orderDetailService.updateBatchById(collect);
                    //安全装置检查结果填报
                    List<EamTechnicalStatusEvaluationOrderDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList());
                    if (CollectionUtil.isEmpty(collect)) {
                        throw new JeecgBootException("安全装置检查项明细为空！");
                    }
                    //结果项检查
                    checkDetailResult(request.getTableDetailList(), TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK);
                    //添加操作人信息
                    for (EamTechnicalStatusEvaluationOrderDetail detail : collect) {
                        detail.setRepairmanSignature(user.getUsername());
                        detail.setRepairmanSignatureTime(new Date());
                    }
                    orderDetailService.updateBatchById(collect);
                    values.put("NextAssignee", userApprovalList);
                    entity.setSafetyCheckCompleted(CommonConstant.STATUS_1);
                } else if ("safety_equipment_check_confirm".equals(flowMyBusiness.getTaskNameId()) && CommonConstant.STATUS_1.equals(entity.getSafetyCheckCompleted())) {
                    values.put("safetyEquipmentCheckFlag", request.getSafetyCheckConfirmResult());
                    entity.setSafetyCheckConfirmResult(request.getSafetyCheckConfirmResult());
                    entity.setSafetyCheckConfirm(user.getUsername());
                    entity.setSafetyCheckConfirmTime(new Date());
                    entity.setSafetyCheckConfirmComment(request.getSafetyCheckConfirmComment());
                    //维修室主任审批
                    if (!CommonConstant.STATUS_1.equals(request.getSafetyCheckConfirmResult())) {
                        //驳回 ç»™ç›‘察人
                        userApprovalList = Collections.singletonList(request.getTableDetailList().get(0).getRepairmanSignature());
                        values.put("NextAssignee", userApprovalList);
                        entity.setSafetyCheckCompleted(CommonConstant.STATUS_1);
                        entity.setSafetyCheckCompleted(CommonConstant.STATUS_0);
                    }
                } else if ("equipment_precision_check".equals(flowMyBusiness.getTaskNameId())) {
                    //处理精度检验
                    if (CommonConstant.STATUS_1.equals(entity.getPrecisionCheckCompleted())) {
                        values.put("precisionCheckFlag", request.getPrecisionCheckConfirmResult());
                        entity.setPrecisionCheckConfirmResult(request.getPrecisionCheckConfirmResult());
                        entity.setPrecisionCheckConfirm(user.getUsername());
                        entity.setPrecisionCheckConfirmTime(new Date());
                        entity.setPrecisionCheckConfirmComment(request.getPrecisionCheckConfirmComment());
                        //维修室主任审批
                        if (!CommonConstant.STATUS_1.equals(request.getPrecisionCheckConfirmResult())) {
                            //驳回 ç»™ç›‘察人
                            userApprovalList = Collections.singletonList(request.getTableDetailList().get(0).getRepairmanSignature());
                            values.put("NextAssignee", userApprovalList);
                            entity.setPrecisionCheckCompleted(CommonConstant.STATUS_0);
                        }
                    } else {
                        //设备精度检查结果填报
                        List<EamTechnicalStatusEvaluationOrderDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.PRECISION_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList());
                        if(CollectionUtil.isEmpty(collect)) {
                            throw new JeecgBootException("设备精度检查项明细为空！");
                        }
                        //结果项检查
                        checkDetailResult(request.getTableDetailList(), TechnicalStatusEvaluationCheckCategoryEnum.PRECISION_CHECK);
                        //添加操作人信息
                        for (EamTechnicalStatusEvaluationOrderDetail detail : collect) {
                            detail.setRepairmanSignature(user.getUsername());
                            detail.setRepairmanSignatureTime(new Date());
                        }
                        orderDetailService.updateBatchById(collect);
                        values.put("NextAssignee", userApprovalList);
                        entity.setPrecisionCheckCompleted(CommonConstant.STATUS_1);
                    //设备精度检查结果填报
                    List<EamTechnicalStatusEvaluationOrderDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.PRECISION_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList());
                    if (CollectionUtil.isEmpty(collect)) {
                        throw new JeecgBootException("设备精度检查项明细为空！");
                    }

                    //结果项检查
                    checkDetailResult(request.getTableDetailList(), TechnicalStatusEvaluationCheckCategoryEnum.PRECISION_CHECK);
                    //添加操作人信息
                    for (EamTechnicalStatusEvaluationOrderDetail detail : collect) {
                        detail.setRepairmanSignature(user.getUsername());
                        detail.setRepairmanSignatureTime(new Date());
                    }
                    orderDetailService.updateBatchById(collect);
                    values.put("NextAssignee", userApprovalList);
                    entity.setPrecisionCheckCompleted(CommonConstant.STATUS_1);
                } else if ("equipment_precision_check_confirm".equals(flowMyBusiness.getTaskNameId()) && CommonConstant.STATUS_1.equals(entity.getPrecisionCheckCompleted())) {
                    values.put("precisionCheckFlag", request.getPrecisionCheckConfirmResult());
                    entity.setPrecisionCheckConfirmResult(request.getPrecisionCheckConfirmResult());
                    entity.setPrecisionCheckConfirm(user.getUsername());
                    entity.setPrecisionCheckConfirmTime(new Date());
                    entity.setPrecisionCheckConfirmComment(request.getPrecisionCheckConfirmComment());
                    //维修室主任审批
                    if (!CommonConstant.STATUS_1.equals(request.getPrecisionCheckConfirmResult())) {
                        //驳回 ç»™ç›‘察人
                        userApprovalList = Collections.singletonList(request.getTableDetailList().get(0).getRepairmanSignature());
                        values.put("NextAssignee", userApprovalList);
                        entity.setPrecisionCheckCompleted(CommonConstant.STATUS_0);
                    }
                } else if ("other_check".equals(flowMyBusiness.getTaskNameId())) {
                    //处理其他检查
                    if (CommonConstant.STATUS_1.equals(entity.getOtherCheckCompleted())) {
                        values.put("otherCheckFlag", request.getOtherCheckResult());
                        entity.setOtherCheckResult(request.getOtherCheckConfirmResult());
                        entity.setOtherCheckConfirm(user.getUsername());
                        entity.setOtherCheckConfirmTime(new Date());
                        entity.setOtherCheckConfirmComment(request.getOtherCheckConfirmComment());
                        //维修室主任审批
                        if (!CommonConstant.STATUS_1.equals(request.getOtherCheckConfirmResult())) {
                            //驳回 ç»™ç›‘察人
                            userApprovalList = Collections.singletonList(request.getTableDetailList().get(0).getRepairmanSignature());
                            values.put("NextAssignee", userApprovalList);
                            entity.setOtherCheckCompleted(CommonConstant.STATUS_0);
                        }
                    } else {
                        //其他检查结果填报
                        List<EamTechnicalStatusEvaluationOrderDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.OTHER_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList());
                        if(CollectionUtil.isEmpty(collect)) {
                            throw new JeecgBootException("其他检查项明细为空！");
                        }
                        //结果项检查
                        checkDetailResult(request.getTableDetailList(), TechnicalStatusEvaluationCheckCategoryEnum.OTHER_CHECK);
                        //添加操作人信息
                        for (EamTechnicalStatusEvaluationOrderDetail detail : collect) {
                            detail.setRepairmanSignature(user.getUsername());
                            detail.setRepairmanSignatureTime(new Date());
                        }
                        orderDetailService.updateBatchById(collect);
                    //其他检查结果填报
                    List<EamTechnicalStatusEvaluationOrderDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.OTHER_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList());
                    if (CollectionUtil.isEmpty(collect)) {
                        throw new JeecgBootException("其他检查项明细为空！");
                    }
                    //结果项检查
                    checkDetailResult(request.getTableDetailList(), TechnicalStatusEvaluationCheckCategoryEnum.OTHER_CHECK);
                    //添加操作人信息
                    for (EamTechnicalStatusEvaluationOrderDetail detail : collect) {
                        detail.setRepairmanSignature(user.getUsername());
                        detail.setRepairmanSignatureTime(new Date());
                    }
                    orderDetailService.updateBatchById(collect);
                    values.put("NextAssignee", userApprovalList);
                    entity.setOtherCheckCompleted(CommonConstant.STATUS_1);
                } else if ("other_check_confirm".equals(flowMyBusiness.getTaskNameId()) && CommonConstant.STATUS_1.equals(entity.getOtherCheckCompleted())) {
                    values.put("otherCheckFlag", request.getOtherCheckConfirmResult());
                    entity.setOtherCheckConfirmResult(request.getOtherCheckConfirmResult());
                    entity.setOtherCheckConfirm(user.getUsername());
                    entity.setOtherCheckConfirmTime(new Date());
                    entity.setOtherCheckConfirmComment(request.getOtherCheckConfirmComment());
                    //维修室主任审批
                    if (!CommonConstant.STATUS_1.equals(request.getOtherCheckConfirmResult())) {
                        //驳回 ç»™ç›‘察人
                        userApprovalList = Collections.singletonList(request.getTableDetailList().get(0).getRepairmanSignature());
                        values.put("NextAssignee", userApprovalList);
                        entity.setOtherCheckCompleted(CommonConstant.STATUS_1);
                        entity.setOtherCheckCompleted(CommonConstant.STATUS_0);
                    }
                }
                break;
@@ -486,6 +485,7 @@
                entity.setRepairManagerSignature(user.getUsername());
                entity.setRepairManagerSignatureTime(new Date());
                entity.setRepairManagerComment(request.getRepairManagerComment());
                entity.setRepairManagerSignatureResult(request.getRepairManagerSignatureResult());
                //设置entity
                if (BusinessCodeConst.APPROVED.equals(request.getRepairManagerSignatureResult())) {
                    values.put("NextAssignee", userApprovalList);
@@ -532,14 +532,15 @@
                entity.setDepartTechnicalLeaderSignature(user.getUsername());
                entity.setDepartTechnicalLeaderSignatureTime(new Date());
                entity.setDepartTechnicalLeaderComment(request.getDepartTechnicalLeaderComment());
                entity.setDepartTechnicalLeaderSignatureResult(request.getDepartTechnicalLeaderSignatureResult());
                //设置entity
                if (BusinessCodeConst.APPROVED.equals(request.getDepartTechnicalLeaderSignatureResult())) {
                    values.put("NextAssignee", userApprovalList);
                    entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.PROCESS_TECHNICIAN_SIGNING.name());
                    entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.INSPECTOR_SIGNING.name());
                } else {
                    userApprovalList = Collections.singletonList(entity.getProcessTechnicianSignature());
                    values.put("NextAssignee", userApprovalList);
                    entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.INSPECTOR_SIGNING.name());
                    entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.PROCESS_TECHNICIAN_SIGNING.name());
                }
                break;
            case INSPECTOR_SIGNING:
@@ -586,19 +587,19 @@
        switch (checkCategory) {
            case SAFETY_EQUIPMENT_CHECK:
                b = detailList.stream().allMatch(item -> StringUtils.isNotBlank(item.getSafetyEquipmentCheckResult()));
                if(!b) {
                if (!b) {
                    throw new JeecgBootException("有安全装置检查结果未填写！");
                }
                break;
            case PRECISION_CHECK:
                b = detailList.stream().allMatch(item -> item.getPrecisionCheckResult() != null);
                if(!b) {
                if (!b) {
                    throw new JeecgBootException("有设备精度检查结果未填写！");
                }
                break;
            case OTHER_CHECK:
                b = detailList.stream().allMatch(item -> StringUtils.isNotBlank(item.getOtherCheckResult()));
                if(!b) {
                if (!b) {
                    throw new JeecgBootException("有其他检查结果未填写！");
                }
                break;

 lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java

@@ -163,80 +163,85 @@
            UserTask nextTask = nextFlowNode.getUserTask();
            Task task2 = null;
            Optional<Task> first = task2List.stream().filter(t -> t.getTaskDefinitionKey().equals(nextTask.getId())).findFirst();
            task2 = first.orElseGet(() -> task2List.get(0));
            if (task2 != null) {
                // ä¸‹ä¸ªèŠ‚点候选人
                List<String> beforeParamsCandidateUsernames = flowCallBackService.flowCandidateUsernamesOfTask(task2.getTaskDefinitionKey(), taskVo.getValues());
                List<String> candidateUsers = taskVo.getCandidateUsers();
                if (CollUtil.isNotEmpty(candidateUsers)) {
                    //    å‰ç«¯ä¼ å…¥å€™é€‰äºº è¦†ç›–
                    beforeParamsCandidateUsernames = candidateUsers;
                }
                if (task.getTaskDefinitionKey().equals(task2.getTaskDefinitionKey())) {
                    //多实例 ä¼šç­¾ TODO
                    //    * å½“前节点是会签节点，没有走完
                    business.setTaskId(task2.getId())
//                    .setActStatus(ActStatus.doing)
                            .setDoneUsers(doneUserList.toJSONString())
                    ;
                    String todoUsersStr = business.getTodoUsers();
                    JSONArray todosArr = JSON.parseArray(todoUsersStr);
                    // åˆ é™¤åŽé‡å†™
                    for (Object oldUser : todosArr) {
                        taskService.deleteCandidateUser(task2.getId(), oldUser.toString());
                    }
                    // é‡å†™
                    if (CollUtil.isNotEmpty(beforeParamsCandidateUsernames)) {
                        beforeParamsCandidateUsernames.remove(loginUser.getUsername());
                        // ä¸šåŠ¡å±‚有指定候选人，覆盖
                        for (String newUser : beforeParamsCandidateUsernames) {
                            taskService.addCandidateUser(task2.getId(), newUser);
                        }
                        business.setTodoUsers(JSON.toJSONString(beforeParamsCandidateUsernames));
                    } else {
                        todosArr.remove(loginUser.getUsername());
                        for (Object oldUser : todosArr) {
                            taskService.addCandidateUser(task2.getId(), oldUser.toString());
                        }
                        business.setTodoUsers(todosArr.toJSONString());
                    }

                } else {
                    //能够处理下个节点的候选人
                    List<SysUser> nextFlowNodeUserList = nextFlowNode.getUserList();
                    List<String> collect_username = nextFlowNodeUserList.stream().map(SysUser::getUsername).collect(Collectors.toList());
            if(!first.isPresent() && !checkParallelCompletion(taskVo.getTaskId())){
                //下个节点任务还是并行网关的任务
                flowMyBusinessService.removeById(business.getId());
            } else {
                task2 = first.orElseGet(() -> task2List.get(0));
                if (task2 != null) {
                    // ä¸‹ä¸ªèŠ‚点候选人
                    List<String> beforeParamsCandidateUsernames = flowCallBackService.flowCandidateUsernamesOfTask(task2.getTaskDefinitionKey(), taskVo.getValues());
                    List<String> candidateUsers = taskVo.getCandidateUsers();
                    if (CollUtil.isNotEmpty(candidateUsers)) {
                        //    å‰ç«¯ä¼ å…¥å€™é€‰äºº
                        collect_username = candidateUsers;
                        //    å‰ç«¯ä¼ å…¥å€™é€‰äºº è¦†ç›–
                        beforeParamsCandidateUsernames = candidateUsers;
                    }
                    business
                            .setTaskId(task2.getId())
//                        .setActStatus(ActStatus.doing)
                            .setTaskNameId(nextTask.getId())
                            .setTaskName(nextTask.getName())
                            .setPriority(nextTask.getPriority())
                            .setDoneUsers(doneUserList.toJSONString())
                            .setTodoUsers(JSON.toJSONString(collect_username))
                    ;
                    // åˆ é™¤åŽé‡å†™
                    for (String oldUser : collect_username) {
                        taskService.deleteCandidateUser(task2.getId(), oldUser);
                    }
                    if (CollUtil.isNotEmpty(beforeParamsCandidateUsernames)) {
                        // å‰ç«¯æ²¡æœ‰ä¼ å…¥å€™é€‰äºº && ä¸šåŠ¡å±‚有指定候选人，覆盖
                        for (String newUser : beforeParamsCandidateUsernames) {
                            taskService.addCandidateUser(task2.getId(), newUser);
                    if (task.getTaskDefinitionKey().equals(task2.getTaskDefinitionKey())) {
                        //多实例 ä¼šç­¾ TODO
                        //    * å½“前节点是会签节点，没有走完
                        business.setTaskId(task2.getId())
//                    .setActStatus(ActStatus.doing)
                                .setDoneUsers(doneUserList.toJSONString())
                        ;
                        String todoUsersStr = business.getTodoUsers();
                        JSONArray todosArr = JSON.parseArray(todoUsersStr);
                        // åˆ é™¤åŽé‡å†™
                        for (Object oldUser : todosArr) {
                            taskService.deleteCandidateUser(task2.getId(), oldUser.toString());
                        }
                        business.setTodoUsers(JSON.toJSONString(beforeParamsCandidateUsernames));
                        // é‡å†™
                        if (CollUtil.isNotEmpty(beforeParamsCandidateUsernames)) {
                            beforeParamsCandidateUsernames.remove(loginUser.getUsername());
                            // ä¸šåŠ¡å±‚有指定候选人，覆盖
                            for (String newUser : beforeParamsCandidateUsernames) {
                                taskService.addCandidateUser(task2.getId(), newUser);
                            }
                            business.setTodoUsers(JSON.toJSONString(beforeParamsCandidateUsernames));
                        } else {
                            todosArr.remove(loginUser.getUsername());
                            for (Object oldUser : todosArr) {
                                taskService.addCandidateUser(task2.getId(), oldUser.toString());
                            }
                            business.setTodoUsers(todosArr.toJSONString());
                        }

                    } else {
                        for (String oldUser : collect_username) {
                            taskService.addCandidateUser(task2.getId(), oldUser);
                        //能够处理下个节点的候选人
                        List<SysUser> nextFlowNodeUserList = nextFlowNode.getUserList();
                        List<String> collect_username = nextFlowNodeUserList.stream().map(SysUser::getUsername).collect(Collectors.toList());
                        if (CollUtil.isNotEmpty(candidateUsers)) {
                            //    å‰ç«¯ä¼ å…¥å€™é€‰äºº
                            collect_username = candidateUsers;
                        }
                        business.setTodoUsers(JSON.toJSONString(collect_username));
                        business
                                .setTaskId(task2.getId())
//                        .setActStatus(ActStatus.doing)
                                .setTaskNameId(nextTask.getId())
                                .setTaskName(nextTask.getName())
                                .setPriority(nextTask.getPriority())
                                .setDoneUsers(doneUserList.toJSONString())
                                .setTodoUsers(JSON.toJSONString(collect_username))
                        ;
                        // åˆ é™¤åŽé‡å†™
                        for (String oldUser : collect_username) {
                            taskService.deleteCandidateUser(task2.getId(), oldUser);
                        }
                        if (CollUtil.isNotEmpty(beforeParamsCandidateUsernames)) {
                            // å‰ç«¯æ²¡æœ‰ä¼ å…¥å€™é€‰äºº && ä¸šåŠ¡å±‚有指定候选人，覆盖
                            for (String newUser : beforeParamsCandidateUsernames) {
                                taskService.addCandidateUser(task2.getId(), newUser);
                            }
                            business.setTodoUsers(JSON.toJSONString(beforeParamsCandidateUsernames));
                        } else {
                            for (String oldUser : collect_username) {
                                taskService.addCandidateUser(task2.getId(), oldUser);
                            }
                            business.setTodoUsers(JSON.toJSONString(collect_username));
                        }
                    }
                }
                flowMyBusinessService.updateById(business);
            }
            flowMyBusinessService.updateById(business);
        }
        else {
            for(FlowNextDto nextFlowNode : nextFlowNodeList) {