art: 技术状态鉴定申请-接口添加

zhangherong

6 天以前 b14ba88936db357c8394f0826212caf54a8edd8c

art: 技术状态鉴定申请-接口添加

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

@@ -4,7 +4,7 @@
  "avatar": "",
  "version": "4.9.2",
  "createdTime": "2025-3-10 16:38:19",
  "updatedTime": "2025-7-16 17:21:35",
  "updatedTime": "2025-7-17 15:28:19",
  "dbConns": [],
  "profile": {
    "default": {
@@ -30579,6 +30579,24 @@
          "id": "054483BD-F2AA-4DD4-9A80-704EE7CDB735"
        },
        {
          "defKey": "equipment_id",
          "defName": "设备ID",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "id": "725DECE8-22D5-4ABF-9EF1-08F2ABA68507"
        },
        {
          "defKey": "applicant",
          "defName": "申请人",
          "comment": "",
@@ -30727,6 +30745,24 @@
          "id": "69D24654-9C0B-41E5-BACA-8205ADC593B5"
        },
        {
          "defKey": "depart_header_signature_result",
          "defName": "申请单位室级领导签字结果",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "id": "12E6E83C-632B-4282-B140-0A3ADA001810"
        },
        {
          "defKey": "depart_header_comment",
          "defName": "申请单位室级领导意见",
          "comment": "",
@@ -30764,7 +30800,7 @@
        },
        {
          "defKey": "production_header_signature_time",
          "defName": "生产设备管理主管签字四件",
          "defName": "生产设备管理主管签字时间",
          "comment": "",
          "type": "",
          "len": "",
@@ -30779,6 +30815,24 @@
          "extProps": {},
          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
          "id": "211441D2-7629-4881-8140-77EBB38A346E"
        },
        {
          "defKey": "production_header_signature_result",
          "defName": "生产设备管理主管签字结果",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "id": "75B946F2-25CB-4A20-9ABF-CE46C4F8F22E"
        },
        {
          "defKey": "production_header_comment",
@@ -30835,6 +30889,24 @@
          "id": "235E86E2-B79D-456A-AFA0-0402225859F7"
        },
        {
          "defKey": "production_support_signature_result",
          "defName": "生产保障部领导签字结果",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "id": "E0246F70-42C2-4A36-8594-1A001E5CDB91"
        },
        {
          "defKey": "production_support_comment",
          "defName": "生产保障部领导意见",
          "comment": "",

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

@@ -32,9 +32,11 @@
    //技术状态鉴定工单编码规则
    String TECHNICAL_STATUS_EVALUATION_ORDER_CODE_RULE = "TechnicalStatusEvaluationOrderCodeRule";
    //技术状态鉴定工单变更编码规则
    String TECHNICAL_STATUS_EVALUATION_ORDER_CHANG_CODE_RULE = "TechnicalStatusEvaluationOrderChangeCodeRule";
    String TECHNICAL_STATUS_EVALUATION_ORDER_CHANGE_CODE_RULE = "TechnicalStatusEvaluationOrderChangeCodeRule";
    //技术状态变更编码规则
    String TECHNICAL_STATUS_CHANG_CODE_RULE = "TechnicalStatusChangeCodeRule";
    String TECHNICAL_STATUS_CHANGE_CODE_RULE = "TechnicalStatusChangeCodeRule";
    //技术状态变更编码规则
    String TECHNICAL_STATUS_EVALUATION_APPLY_CODE_RULE = "TechnicalStatusEvaluationApplyCodeRule";
    /**
     * å¤‡ä»¶è¯·è´­å•çŠ¶æ€ 1:已创建 2:已提交 3:已通过 4:已驳回 5:已完成
     */

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

@@ -11,5 +11,6 @@
    TECHNICAL_STATUS_EVALUATION_PRECISION_CHECK, //设备精度检查单
    TECHNICAL_STATUS_EVALUATION_ORDER_CHANGE, //技术状态鉴定工单变更
    TECHNICAL_STATUS_CHANGE, //技术状态变更申请
    TECHNICAL_STATUS_EVALUATION_APPLY, //技术状态鉴定申请
    ;
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package org.jeecg.modules.eam.constant;

public enum TechnicalStatusEvaluationApplicationStatusEnum {
    WAIT_SUBMIT, //待提交
    DEPART_HEADER_SIGNING, //申请单位室级领导签字中
    PRODUCTION_HEADER_SIGNING, //生产设备管理主管签字
    PRODUCTION_SUPPORT_SIGNING, //生产保障部领导签字
    ABOLISH, //已作废
    REJECTED, //已驳回
    COMPLETED, //已完成
    ;

    public static TechnicalStatusEvaluationApplicationStatusEnum getInstance(String code) {
        TechnicalStatusEvaluationApplicationStatusEnum[] values = TechnicalStatusEvaluationApplicationStatusEnum.values();
        for (TechnicalStatusEvaluationApplicationStatusEnum value : values) {
            if (value.name().equals(code)) {
                return value;
            }
        }
        return null;
    }
}

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

@@ -1,6 +1,6 @@
package org.jeecg.modules.eam.controller;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -9,143 +9,147 @@
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.system.query.QueryGenerator;
import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationApplicationStatusEnum;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationApplication;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationApplicationQuery;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationApplicationRequest;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationApplicationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;

 /**
/**
 * @Description: åŠ å·¥è®¾å¤‡æŠ€æœ¯é‰´å®šç”³è¯·
 * @Author: jeecg-boot
 * @Date:   2025-07-09
 * @Date: 2025-07-09
 * @Version: V1.0
 */
@Slf4j
@Api(tags="加工设备技术鉴定申请")
@Api(tags = "加工设备技术鉴定申请")
@RestController
@RequestMapping("/eam/eamTechnicalStatusEvaluationApplication")
public class EamTechnicalStatusEvaluationApplicationController extends JeecgController<EamTechnicalStatusEvaluationApplication, IEamTechnicalStatusEvaluationApplicationService> {
    @Autowired
    private IEamTechnicalStatusEvaluationApplicationService eamTechnicalStatusEvaluationApplicationService;
	
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param eamTechnicalStatusEvaluationApplication
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @ApiOperation(value="加工设备技术鉴定申请-分页列表查询", notes="加工设备技术鉴定申请-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamTechnicalStatusEvaluationApplication eamTechnicalStatusEvaluationApplication,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<EamTechnicalStatusEvaluationApplication> queryWrapper = QueryGenerator.initQueryWrapper(eamTechnicalStatusEvaluationApplication, req.getParameterMap());
        Page<EamTechnicalStatusEvaluationApplication> page = new Page<EamTechnicalStatusEvaluationApplication>(pageNo, pageSize);
        IPage<EamTechnicalStatusEvaluationApplication> pageList = eamTechnicalStatusEvaluationApplicationService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
	
    /**
     * æ·»åŠ 
     *
     * @param eamTechnicalStatusEvaluationApplication
     * @return
     */
    @AutoLog(value = "加工设备技术鉴定申请-添加")
    @ApiOperation(value="加工设备技术鉴定申请-添加", notes="加工设备技术鉴定申请-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamTechnicalStatusEvaluationApplication eamTechnicalStatusEvaluationApplication) {
        eamTechnicalStatusEvaluationApplicationService.save(eamTechnicalStatusEvaluationApplication);
        return Result.OK("添加成功！");
    }
	
    /**
     * ç¼–辑
     *
     * @param eamTechnicalStatusEvaluationApplication
     * @return
     */
    @AutoLog(value = "加工设备技术鉴定申请-编辑")
    @ApiOperation(value="加工设备技术鉴定申请-编辑", notes="加工设备技术鉴定申请-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<?> edit(@RequestBody EamTechnicalStatusEvaluationApplication eamTechnicalStatusEvaluationApplication) {
        eamTechnicalStatusEvaluationApplicationService.updateById(eamTechnicalStatusEvaluationApplication);
        return Result.OK("编辑成功!");
    }
	
    /**
     * é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "加工设备技术鉴定申请-通过id删除")
    @ApiOperation(value="加工设备技术鉴定申请-通过id删除", notes="加工设备技术鉴定申请-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<?> delete(@RequestParam(name="id",required=true) String id) {
        eamTechnicalStatusEvaluationApplicationService.removeById(id);
        return Result.OK("删除成功!");
    }
	
    /**
     * æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "加工设备技术鉴定申请-批量删除")
    @ApiOperation(value="加工设备技术鉴定申请-批量删除", notes="加工设备技术鉴定申请-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.eamTechnicalStatusEvaluationApplicationService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功！");
    }
	
    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    @AutoLog(value = "加工设备技术鉴定申请-通过id查询")
    @ApiOperation(value="加工设备技术鉴定申请-通过id查询", notes="加工设备技术鉴定申请-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
        EamTechnicalStatusEvaluationApplication eamTechnicalStatusEvaluationApplication = eamTechnicalStatusEvaluationApplicationService.getById(id);
        return Result.OK(eamTechnicalStatusEvaluationApplication);
    }
    @Autowired
    private IEamTechnicalStatusEvaluationApplicationService eamTechnicalStatusEvaluationApplicationService;

  /**
   * å¯¼å‡ºexcel
   *
   * @param request
   * @param eamTechnicalStatusEvaluationApplication
   */
  @RequestMapping(value = "/exportXls")
  public ModelAndView exportXls(HttpServletRequest request, EamTechnicalStatusEvaluationApplication eamTechnicalStatusEvaluationApplication) {
      return super.exportXls(request, eamTechnicalStatusEvaluationApplication, EamTechnicalStatusEvaluationApplication.class, "加工设备技术鉴定申请");
  }
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param query
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @ApiOperation(value = "加工设备技术鉴定申请-分页列表查询", notes = "加工设备技术鉴定申请-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamTechnicalStatusEvaluationApplicationQuery query,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                   HttpServletRequest req) {
        Page<EamTechnicalStatusEvaluationApplication> page = new Page<EamTechnicalStatusEvaluationApplication>(pageNo, pageSize);
        IPage<EamTechnicalStatusEvaluationApplication> pageList = eamTechnicalStatusEvaluationApplicationService.queryPageList(page, query);
        return Result.OK(pageList);
    }

  /**
   * é€šè¿‡excel导入数据
   *
   * @param request
   * @param response
   * @return
   */
  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
      return super.importExcel(request, response, EamTechnicalStatusEvaluationApplication.class);
  }
    /**
     * æ·»åŠ 
     *
     * @param request
     * @return
     */
    @AutoLog(value = "加工设备技术鉴定申请-添加")
    @ApiOperation(value = "加工设备技术鉴定申请-添加", notes = "加工设备技术鉴定申请-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamTechnicalStatusEvaluationApplication request) {
        if (request == null) {
            return Result.error("添加的对象不能为空！");
        }
        boolean b = eamTechnicalStatusEvaluationApplicationService.addEamTechnicalStatusEvaluationApplication(request);
        if (!b) {
            return Result.error("添加失败！");
        }
        return Result.OK("添加成功！");
    }

    /**
     * ç¼–辑
     *
     * @param request
     * @return
     */
    @AutoLog(value = "加工设备技术鉴定申请-编辑")
    @ApiOperation(value = "加工设备技术鉴定申请-编辑", notes = "加工设备技术鉴定申请-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> edit(@RequestBody EamTechnicalStatusEvaluationApplication request) {
        if (request == null) {
            return Result.error("编辑的对象不能为空！");
        }
        boolean b = eamTechnicalStatusEvaluationApplicationService.editEamTechnicalStatusEvaluationApplication(request);
        if (!b) {
            return Result.error("编辑失败！");
        }
        return Result.OK("编辑成功!");
    }

    @AutoLog(value = "加工设备技术鉴定申请-提交")
    @ApiOperation(value = "加工设备技术鉴定申请-提交", notes = "加工设备技术鉴定申请-提交")
    @GetMapping("/submit")
    public Result<?> submit(@RequestParam(name = "id") String id) {
        boolean b = eamTechnicalStatusEvaluationApplicationService.submit(id);
        if (!b) {
            return Result.error("提交失败！");
        }
        return Result.OK("提交成功!");
    }

    @AutoLog(value = "加工设备技术鉴定申请-作废")
    @ApiOperation(value = "加工设备技术鉴定申请-作废", notes = "加工设备技术鉴定申请-作废")
    @GetMapping("/abolish")
    public Result<?> abolish(@RequestParam(name = "id") String id) {
        EamTechnicalStatusEvaluationApplication entity = eamTechnicalStatusEvaluationApplicationService.getById(id);
        if (entity == null) {
            return Result.error("要作废的数据不存在，请刷新重试！");
        }
        if (!TechnicalStatusEvaluationApplicationStatusEnum.WAIT_SUBMIT.name().equals(entity.getApplicationStatus())) {
            return Result.error("该状态的数据不允许进行作废！");
        }
        entity.setApplicationStatus(TechnicalStatusEvaluationApplicationStatusEnum.ABOLISH.name());
        eamTechnicalStatusEvaluationApplicationService.updateById(entity);
        return Result.OK("作废成功!");
    }

    @AutoLog(value = "加工设备技术鉴定申请-审批")
    @ApiOperation(value = "加工设备技术鉴定申请-审批", notes = "加工设备技术鉴定申请-审批")
    @PostMapping("/approval")
    public Result<?> approval(@RequestBody EamTechnicalStatusEvaluationApplicationRequest request) {
        if (request == null) {
            return Result.error("审批的对象不能为空！");
        }
        // æ£€æŸ¥è¯·æ±‚参数
        if (StrUtil.isBlank(request.getTaskId()) || StrUtil.isBlank(request.getDataId()) || StrUtil.isBlank(request.getInstanceId())) {
            return Result.error("审批任务错误或不存在！");
        }
        EamTechnicalStatusEvaluationApplication b = eamTechnicalStatusEvaluationApplicationService.approval(request);
        if (b == null) {
            return Result.error("操作失败！");
        }
        return Result.ok("操作成功！");
    }

    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    @AutoLog(value = "加工设备技术鉴定申请-通过id查询")
    @ApiOperation(value = "加工设备技术鉴定申请-通过id查询", notes = "加工设备技术鉴定申请-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
        EamTechnicalStatusEvaluationApplication eamTechnicalStatusEvaluationApplication = eamTechnicalStatusEvaluationApplicationService.getById(id);
        return Result.OK(eamTechnicalStatusEvaluationApplication);
    }

}

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

@@ -1,13 +1,17 @@
package org.jeecg.modules.eam.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

@@ -46,46 +50,84 @@
    /**申请单号*/
    @ApiModelProperty(value = "申请单号")
    private String applicationOrderNum;
    /**设备ID*/
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**申请人*/
    @ApiModelProperty(value = "申请人")
    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
    private String applicant;
    /**申请部门*/
    @ApiModelProperty(value = "申请部门")
    @Dict(dictTable = "eam_base_factory", dicText = "factory_name", dicCode = "org_code")
    private String factoryOrgCode;
    /**申请日期*/
    @ApiModelProperty(value = "申请日期")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date applyDate;
    /**申请单状态;待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成*/
    @ApiModelProperty(value = "申请单状态;待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成")
    private String applicationStatus;
    /**申请单位室级领导签字*/
    @ApiModelProperty(value = "申请单位室级领导签字")
    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
    private String departHeaderSignature;
    /**申请单位室级领导签字时间*/
    @ApiModelProperty(value = "申请单位室级领导签字时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date departHeaderSignatureTime;
    /**申请单位室级领导签字结果*/
    @ApiModelProperty(value = "申请单位室级领导签字结果")
    @Dict(dicCode = "approved_rejected")
    private String departHeaderSignatureResult;
    /**申请单位室级领导意见*/
    @ApiModelProperty(value = "申请单位室级领导意见")
    private String departHeaderComment;
    /**生产设备管理主管签字*/
    @ApiModelProperty(value = "生产设备管理主管签字")
    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
    private String productionHeaderSignature;
    /**生产设备管理主管签字四件*/
    @ApiModelProperty(value = "生产设备管理主管签字四件")
    /**生产设备管理主管签字时间*/
    @ApiModelProperty(value = "生产设备管理主管签字时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date productionHeaderSignatureTime;
    /**生产设备管理主管签字结果*/
    @ApiModelProperty(value = "生产设备管理主管签字结果")
    @Dict(dicCode = "approved_rejected")
    private String productionHeaderSignatureResult;
    /**生产设备管理主管意见*/
    @ApiModelProperty(value = "生产设备管理主管意见")
    private String productionHeaderComment;
    /**生产保障部领导签字*/
    @ApiModelProperty(value = "生产保障部领导签字")
    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
    private String productionSupportSignature;
    /**生产保障部领导签字时间*/
    @ApiModelProperty(value = "生产保障部领导签字时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date productionSupportSignatureTime;
    /**生产保障部领导签字解结果*/
    @ApiModelProperty(value = "生产保障部领导签字解结果")
    @Dict(dicCode = "approved_rejected")
    private String productionSupportSignatureResult;
    /**生产保障部领导意见*/
    @ApiModelProperty(value = "生产保障部领导意见")
    private String productionSupportComment;
    /**HF编码*/
    @ApiModelProperty(value = "HF编码")
    private String hfCode;
    /**备注*/
    @ApiModelProperty(value = "备注")
    private String remark;

    @TableField(exist = false)
    private String equipmentCode;
    @TableField(exist = false)
    private String equipmentName;
    @TableField(exist = false)
    private String equipmentModel;
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationApplicationMapper.java

@@ -1,10 +1,13 @@
package org.jeecg.modules.eam.mapper;

import java.util.List;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationApplication;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange;

/**
 * @Description: åŠ å·¥è®¾å¤‡æŠ€æœ¯é‰´å®šç”³è¯·
@@ -14,4 +17,11 @@
 */
public interface EamTechnicalStatusEvaluationApplicationMapper extends BaseMapper<EamTechnicalStatusEvaluationApplication> {

    /**
     * åˆ†é¡µæŸ¥è¯¢
     * @param page
     * @param queryWrapper
     * @return
     */
    IPage<EamTechnicalStatusEvaluationApplication> queryPageList(Page<EamTechnicalStatusEvaluationApplication> page, @Param(Constants.WRAPPER) QueryWrapper<EamTechnicalStatusEvaluationOrderChange> queryWrapper);
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationApplicationMapper.xml

@@ -2,4 +2,11 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationApplicationMapper">

    <select id="queryPageList"
            resultType="org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationApplication">
        select ems.*, e.equipment_code, e.equipment_name, e.equipment_model
        from eam_technical_status_evaluation_application ems
        inner join eam_equipment e on ems.equipment_id = e.id
        ${ew.customSqlSegment}
    </select>
</mapper>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package org.jeecg.modules.eam.request;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

@Data
public class EamTechnicalStatusEvaluationApplicationQuery {
    private String applicationOrderNum;
    private String equipmentId;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date dateBegin;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date dateEnd;
    private String applicationStatus;
    private String factoryOrgCode;

    private String column;
    private String order;
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,48 @@
package org.jeecg.modules.eam.request;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;

import java.io.Serializable;

@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="技术状态鉴定申请审批对象", description="技术状态鉴定申请审批")
public class EamTechnicalStatusEvaluationApplicationRequest extends FlowTaskVo implements Serializable {
    /**主键*/
    @ApiModelProperty(value = "主键")
    private String id;
    /**设备ID*/
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**申请部门*/
    @ApiModelProperty(value = "申请部门")
    private String factoryOrgCode;
    /**备注*/
    @ApiModelProperty(value = "备注")
    private String remark;

    /**申请单位室级领导签字结果*/
    @ApiModelProperty(value = "申请单位室级领导签字结果")
    private String departHeaderSignatureResult;
    /**申请单位室级领导意见*/
    @ApiModelProperty(value = "申请单位室级领导意见")
    private String departHeaderComment;
    /**生产设备管理主管签字结果*/
    @ApiModelProperty(value = "生产设备管理主管签字结果")
    private String productionHeaderSignatureResult;
    /**生产设备管理主管意见*/
    @ApiModelProperty(value = "生产设备管理主管意见")
    private String productionHeaderComment;
    /**生产保障部领导签字解结果*/
    @ApiModelProperty(value = "生产保障部领导签字解结果")
    private String productionSupportSignatureResult;
    /**生产保障部领导意见*/
    @ApiModelProperty(value = "生产保障部领导意见")
    private String productionSupportComment;
}

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

@@ -1,7 +1,11 @@
package org.jeecg.modules.eam.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationApplication;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationApplicationQuery;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationApplicationRequest;

/**
 * @Description: åŠ å·¥è®¾å¤‡æŠ€æœ¯é‰´å®šç”³è¯·
@@ -11,4 +15,39 @@
 */
public interface IEamTechnicalStatusEvaluationApplicationService extends IService<EamTechnicalStatusEvaluationApplication> {

    /**
     * åˆ†é¡µæŸ¥è¯¢
     * @param page
     * @param query
     * @return
     */
    IPage<EamTechnicalStatusEvaluationApplication> queryPageList(Page<EamTechnicalStatusEvaluationApplication> page, EamTechnicalStatusEvaluationApplicationQuery query);

    /**
     * æ–°å¢ž
     * @param request
     * @return
     */
    boolean addEamTechnicalStatusEvaluationApplication(EamTechnicalStatusEvaluationApplication request);

    /**
     * ç¼–辑
     * @param request
     * @return
     */
    boolean editEamTechnicalStatusEvaluationApplication(EamTechnicalStatusEvaluationApplication request);

    /**
     * æäº¤
     * @param id
     * @return
     */
    boolean submit(String id);

    /**
     * å®¡æ‰¹
     * @param request
     * @return
     */
    EamTechnicalStatusEvaluationApplication approval(EamTechnicalStatusEvaluationApplicationRequest request);
}

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

@@ -153,7 +153,7 @@
        order.setRemark(request.getRemark());
        order.setChangeStatus(TechnicalStatusChangeOrderStatusEnum.WAIT_SUBMIT.name());
        order.setFactoryOrgCode(request.getFactoryOrgCode());
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_CHANG_CODE_RULE);
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_CHANGE_CODE_RULE);
        order.setChangeOrderNum(codeSeq);
        //删除标记
        order.setDelFlag(CommonConstant.DEL_FLAG_0);

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

@@ -1,11 +1,53 @@
package org.jeecg.modules.eam.service.impl;

import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationApplication;
import org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationApplicationMapper;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationApplicationService;
import org.springframework.stereotype.Service;

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.HfTemplateCategoryEnum;
import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationApplicationStatusEnum;
import org.jeecg.modules.eam.entity.EamBaseHFCode;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationApplication;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange;
import org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationApplicationMapper;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationApplicationQuery;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationApplicationRequest;
import org.jeecg.modules.eam.service.IEamBaseHFCodeService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationApplicationService;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
import org.jeecg.modules.flowable.service.IFlowDefinitionService;
import org.jeecg.modules.flowable.service.IFlowTaskService;
import org.jeecg.modules.system.entity.BaseFactory;
import org.jeecg.modules.system.entity.BaseFactoryUser;
import org.jeecg.modules.system.service.IBaseFactoryService;
import org.jeecg.modules.system.service.IBaseFactoryUserService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.system.vo.UserSelector;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.*;
import java.util.stream.Collectors;

/**
 * @Description: åŠ å·¥è®¾å¤‡æŠ€æœ¯é‰´å®šç”³è¯·
@@ -13,7 +55,353 @@
 * @Date:   2025-07-09
 * @Version: V1.0
 */
@Service
public class EamTechnicalStatusEvaluationApplicationServiceImpl extends ServiceImpl<EamTechnicalStatusEvaluationApplicationMapper, EamTechnicalStatusEvaluationApplication> implements IEamTechnicalStatusEvaluationApplicationService {
@Service("IEamTechnicalStatusEvaluationApplicationService")
public class EamTechnicalStatusEvaluationApplicationServiceImpl extends ServiceImpl<EamTechnicalStatusEvaluationApplicationMapper, EamTechnicalStatusEvaluationApplication> implements IEamTechnicalStatusEvaluationApplicationService, FlowCallBackServiceI {
    @Autowired
    private IBaseFactoryUserService baseFactoryUserService;
    @Autowired
    private IBaseFactoryService baseFactoryService;
    @Autowired
    private IEamEquipmentService equipmentService;
    @Autowired
    private ISysBusinessCodeRuleService businessCodeRuleService;
    @Autowired
    private IEamBaseHFCodeService hfCodeService;
    @Autowired
    private FlowCommonService flowCommonService;
    @Autowired
    private IFlowDefinitionService flowDefinitionService;
    @Autowired
    private IFlowMyBusinessService flowMyBusinessService;
    @Autowired
    private IFlowTaskService flowTaskService;
    @Autowired
    private ISysUserService sysUserService;

    @Override
    public IPage<EamTechnicalStatusEvaluationApplication> queryPageList(Page<EamTechnicalStatusEvaluationApplication> page, EamTechnicalStatusEvaluationApplicationQuery query) {
        QueryWrapper<EamTechnicalStatusEvaluationOrderChange> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("ems.del_flag", CommonConstant.DEL_FLAG_0);
        //用户数据权限
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            return page;
        }
        if (StringUtils.isNotBlank(sysUser.getEamEquipmentIds())) {
            //选择了设备，根据设备id过滤设备
            List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(","));
            queryWrapper.in("e.equipment_code", equipArr);
        } else {
            //没有选择设备，根据中心过滤设备
            List<BaseFactoryUser> baseFactoryUserList = baseFactoryUserService.
                    list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId, sysUser.getId()));
            if (!CollectionUtils.isEmpty(baseFactoryUserList)) {
                Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet());
                Set<String> factoryCodeList = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
                queryWrapper.in("e.factory_org_code", factoryCodeList);
            } else {
                return page;
            }
        }
        if (query != null) {
            //编码 æ¨¡ç³ŠæŸ¥è¯¢
            if (StringUtils.isNotBlank(query.getApplicationOrderNum())) {
                queryWrapper.like("ems.application_order_num", query.getApplicationOrderNum());
            }
            //设备
            if (StringUtils.isNotBlank(query.getEquipmentId())) {
                queryWrapper.eq("ems.equipment_id", query.getEquipmentId());
            }
            //使用单位
            if(StringUtils.isNotBlank(query.getFactoryOrgCode())) {
                queryWrapper.eq("ems.factory_org_code", query.getFactoryOrgCode());
            }
            //保养分类
            if (StringUtils.isNotBlank(query.getApplicationStatus())) {
                queryWrapper.eq("ems.application_status", query.getApplicationStatus());
            }
            if (query.getDateBegin() != null && query.getDateEnd() != null) {
                queryWrapper.between("ems.apply_date", query.getDateBegin(), query.getDateEnd());
            }
            //排序
            if (StringUtils.isNotBlank(query.getColumn()) && StringUtils.isNotBlank(query.getOrder())) {
                String column = query.getColumn();
                if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
                    column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
                }
                if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(query.getOrder())) {
                    queryWrapper.orderByAsc("ems." + oConvertUtils.camelToUnderline(column));
                } else {
                    queryWrapper.orderByDesc("ems." + oConvertUtils.camelToUnderline(column));
                }
            } else {
                queryWrapper.orderByDesc("ems.create_time");
            }
        } else {
            queryWrapper.orderByDesc("ems.create_time");
        }
        return this.getBaseMapper().queryPageList(page, queryWrapper);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean addEamTechnicalStatusEvaluationApplication(EamTechnicalStatusEvaluationApplication request) {
        //查询设备
        EamEquipment equipment = equipmentService.getById(request.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备信息不存在，操作失败！");
        }
        //用户数据权限
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            throw new JeecgBootException("登录用户信息为空，操作失败！");
        }
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_EVALUATION_APPLY_CODE_RULE);
        request.setApplicationOrderNum(codeSeq);
        request.setId(null);
        request.setApplicationStatus(TechnicalStatusEvaluationApplicationStatusEnum.WAIT_SUBMIT.name());
        request.setDelFlag(CommonConstant.DEL_FLAG_0);
        request.setApplicant(sysUser.getUsername());
        request.setApplyDate(new Date());
        request.setFactoryOrgCode(equipment.getFactoryOrgCode());
        //技术状态鉴定表
        EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.TECHNICAL_STATUS_EVALUATION_APPLY.name());
        if (eamBaseHFCode == null) {
            throw new JeecgBootException("未配置技术状态鉴定申请的HF编码，添加失败！");
        }
        request.setHfCode(eamBaseHFCode.getHfCode());
        this.getBaseMapper().insert(request);
        return true;
    }

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

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean submit(String id) {
        EamTechnicalStatusEvaluationApplication entity = this.getBaseMapper().selectById(id);
        if (entity == null) {
            throw new JeecgBootException("要提交的工单不存在，请刷新重试！");
        }
        if (!TechnicalStatusEvaluationApplicationStatusEnum.WAIT_SUBMIT.name().equals(entity.getApplicationStatus())) {
            throw new JeecgBootException("该工单已进行过提交！");
        }
        EamEquipment equipment = equipmentService.getById(entity.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备不存在，添加失败！");
        }
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if(sysUser == null || !sysUser.getUsername().equals(entity.getApplicant())) {
            throw new JeecgBootException("不是本人，不能提交此工单！");
        }
        entity.setApplicationStatus(TechnicalStatusEvaluationApplicationStatusEnum.DEPART_HEADER_SIGNING.name());
        //查询下级审批人员
        List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0011);
        if (CollectionUtil.isEmpty(userSelectors)) {
            throw new JeecgBootException("设备未分配给使用单位主管室级领导，无法提交！");
        }
        List<String> userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
        //更新实体
        this.getBaseMapper().updateById(entity);
        //启动流程
        flowCommonService.initActBusiness("工单号: " + entity.getApplicationOrderNum() + ";设备编号: " + equipment.getEquipmentCode() + ";安装位置" + equipment.getInstallationPosition(),
                entity.getId(), "IEamTechnicalStatusEvaluationApplicationService", "technical_status_evaluation_apply_process", null);
        Map<String, Object> variables = new HashMap<>();
        variables.put("dataId", entity.getId());
        if (StrUtil.isEmpty(entity.getRemark())) {
            variables.put("organization", "新增技术状态鉴定工单变更默认启动流程");
            variables.put("comment", "新增技术状态鉴定工单变更默认启动流程");
        } else {
            variables.put("organization", entity.getRemark());
            variables.put("comment", entity.getRemark());
        }
        variables.put("proofreading", true);
        variables.put("NextAssignee", userApprovalList);
        Result<?> result = flowDefinitionService.startProcessInstanceByKey("technical_status_evaluation_apply_process", variables);
        if(result == null || !result.isSuccess()) {
            throw new JeecgBootException("启动流程失败！");
        }
        return true;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public EamTechnicalStatusEvaluationApplication approval(EamTechnicalStatusEvaluationApplicationRequest request) {
        EamTechnicalStatusEvaluationApplication entity = this.getBaseMapper().selectById(request.getId());
        if (entity == null) {
            throw new JeecgBootException("审批的数据已删除，请刷新重试！");
        }
        // èŽ·å–当前登录用户
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (user == null || StrUtil.isBlank(user.getId())) {
            throw new JeecgBootException("未获取到登录用户，请重新登录后再试！");
        }
        request.setAssignee(user.getUsername());
        // èŽ·å–流程业务记录
        FlowMyBusiness flowMyBusiness = flowMyBusinessService.getFlowMyBusiness(request.getInstanceId(), request.getTaskId());
        if (flowMyBusiness == null) {
            throw new JeecgBootException("流程实例不存在，请刷新后重试！");
        }

        boolean userAuthorized = flowMyBusinessService.isUserAuthorized(flowMyBusiness, user);
        if (!userAuthorized) {
            throw new JeecgBootException("用户无权操作此任务，请刷新后重试！");
        }
        // è®¤é¢†ä»»åŠ¡
        if (!flowMyBusinessService.claimTask(flowMyBusiness.getTaskId(), user)) {
            throw new JeecgBootException("任务不存在、已完成或已被他人认领！");
        }

        EamEquipment equipment = equipmentService.getById(entity.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备不存在，请检查！");
        }

        TechnicalStatusEvaluationApplicationStatusEnum status = TechnicalStatusEvaluationApplicationStatusEnum.getInstance(entity.getApplicationStatus());
        if (status == null) {
            return null;
        }
        //流程变量
        Map<String, Object> values = new HashMap<>();
        List<String> userApprovalList;
        List<UserSelector> userSelectors;
        switch (status) {
            case DEPART_HEADER_SIGNING:
                //使用单位主管室级领导
                userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0006);
                if (CollectionUtil.isEmpty(userSelectors)) {
                    throw new JeecgBootException("设备未分配给生产设备管理主管，无法进入下级审批！");
                }
                userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
                values.put("dataId", entity.getId());
                if(StringUtils.isBlank(request.getDepartHeaderComment())) {
                    values.put("organization", "技术状态鉴定申请使用单位主管室级领导");
                    values.put("comment", "技术状态鉴定申请使用单位主管室级领导");
                    request.setComment("技术状态鉴定申请使用单位主管室级领导");
                } else {
                    values.put("organization", request.getDepartHeaderComment());
                    values.put("comment", request.getDepartHeaderComment());
                    request.setComment(request.getDepartHeaderComment());
                }
                //设置entity
                entity.setDepartHeaderSignature(user.getUsername());
                entity.setDepartHeaderSignatureTime(new Date());
                entity.setDepartHeaderComment(request.getDepartHeaderComment());
                entity.setDepartHeaderSignatureResult(request.getDepartHeaderSignatureResult());
                values.put("departHeaderConfirmFlag", request.getDepartHeaderSignatureResult());
                if(BusinessCodeConst.APPROVED.equals(request.getDepartHeaderSignatureResult())) {
                    //通过
                    entity.setApplicationStatus(TechnicalStatusEvaluationApplicationStatusEnum.PRODUCTION_HEADER_SIGNING.name());
                    values.put("NextAssignee", userApprovalList);
                }else {
                    //驳回
                    entity.setApplicationStatus(TechnicalStatusEvaluationApplicationStatusEnum.REJECTED.name());
                }
                break;
            case PRODUCTION_HEADER_SIGNING:
                //部门领导审核
                userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0017);
                if (CollectionUtil.isEmpty(userSelectors)) {
                    throw new JeecgBootException("设备未分配给生产保障部领导，无法进入下级审批！");
                }
                userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
                values.put("dataId", entity.getId());
                if(StringUtils.isBlank(request.getProductionHeaderComment())) {
                    values.put("organization", "技术状态鉴定申请生产设备管理主管审核");
                    values.put("comment", "技术状态鉴定申请生产设备管理主管审核");
                    request.setComment("技术状态鉴定申请生产设备管理主管审核");
                } else {
                    values.put("organization", request.getProductionHeaderComment());
                    values.put("comment", request.getProductionHeaderComment());
                    request.setComment(request.getProductionHeaderComment());
                }
                //设置entity
                entity.setProductionHeaderSignature(user.getUsername());
                entity.setProductionHeaderSignatureTime(new Date());
                entity.setProductionHeaderSignatureResult(request.getProductionHeaderSignatureResult());
                entity.setProductionHeaderComment(request.getProductionHeaderComment());
                if(BusinessCodeConst.APPROVED.equals(request.getProductionHeaderSignatureResult())) {
                    //通过
                    entity.setApplicationStatus(TechnicalStatusEvaluationApplicationStatusEnum.PRODUCTION_SUPPORT_SIGNING.name());
                    values.put("NextAssignee", userApprovalList);
                }else {
                    //驳回
                    entity.setApplicationStatus(TechnicalStatusEvaluationApplicationStatusEnum.REJECTED.name());
                }
                break;
            case PRODUCTION_SUPPORT_SIGNING:
                //维修室主任签字
                values.put("dataId", entity.getId());
                if(StringUtils.isBlank(request.getProductionSupportComment())) {
                    values.put("organization", "技术状态鉴定工单变更生产保障部审核");
                    values.put("comment", "技术状态鉴定工单变更生产保障部审核");
                    request.setComment("技术状态鉴定工单变更生产保障部审核");
                } else {
                    values.put("organization", request.getProductionSupportComment());
                    values.put("comment", request.getProductionSupportComment());
                    request.setComment(request.getProductionSupportComment());
                }
                //设置entity
                entity.setProductionSupportSignature(user.getUsername());
                entity.setProductionSupportSignatureTime(new Date());
                entity.setProductionSupportSignatureResult(request.getProductionSupportSignatureResult());
                entity.setProductionSupportComment(request.getProductionSupportComment());
                if(BusinessCodeConst.APPROVED.equals(request.getProductionSupportSignatureResult())) {
                    //通过
                    entity.setApplicationStatus(TechnicalStatusEvaluationApplicationStatusEnum.COMPLETED.name());
                }else {
                    //驳回
                    entity.setApplicationStatus(TechnicalStatusEvaluationApplicationStatusEnum.REJECTED.name());
                }
                break;
        }
        request.setValues(values);

        // å®Œæˆæµç¨‹ä»»åŠ¡
        Result<?> result = flowTaskService.complete(request);
        if (!result.isSuccess()) {
            throw new JeecgBootException("审批失败，请刷新查看！");
        }
        //保存工单
        this.getBaseMapper().updateById(entity);
        return entity;
    }

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

    @Override
    public Object getBusinessDataById(String dataId) {
        return this.getById(dataId);
    }

    @Override
    public Map<String, Object> flowValuesOfTask(String taskNameId, Map<String, Object> values) {
        return null;
    }

    @Override
    public List<String> flowCandidateUsernamesOfTask(String taskNameId, Map<String, Object> values) {
        //业务是否干预流程，业务干预，流程干预，指定人员进行处理
        //获取下一步处理人
        Object object = values.get("NextAssignee");
        return (List<String>) object;
    }
}

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

@@ -163,7 +163,7 @@
        if (sysUser == null) {
            throw new JeecgBootException("登录用户信息为空，操作失败！");
        }
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_EVALUATION_ORDER_CHANG_CODE_RULE);
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_EVALUATION_ORDER_CHANGE_CODE_RULE);
        request.setChangeOrderNum(codeSeq);
        request.setId(null);
        request.setChangeStatus(TechnicalStatusEvaluationOrderChangeStatusEnum.WAIT_SUBMIT.name());