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

@@ -4,7 +4,7 @@
  "avatar": "",
  "version": "4.9.2",
  "createdTime": "2025-3-10 16:38:19",
  "updatedTime": "2025-7-21 18:29:46",
  "updatedTime": "2025-7-22 14:27:53",
  "dbConns": [],
  "profile": {
    "default": {
@@ -2328,7 +2328,7 @@
          "id": "951E3090-8A27-4E30-A5F0-308B3E9F8E6D"
        },
        {
          "defKey": "technology_genarate_flag",
          "defKey": "technology_generate_flag",
          "defName": "技术状态鉴定生成标记",
          "comment": "1 å·²ç”Ÿæˆ 0 ä¸‹æ¬¡å¾…生成",
          "type": "",
@@ -2346,7 +2346,7 @@
          "id": "0F8E5A79-4399-42B0-B893-254A6D9DEFAD"
        },
        {
          "defKey": "third_maintenance_genarate_flag",
          "defKey": "third_maintenance_generate_flag",
          "defName": "三保生成标记",
          "comment": "1 å·²ç”Ÿæˆ 0 ä¸‹æ¬¡å¾…生成",
          "type": "",
@@ -30332,6 +30332,24 @@
          "extProps": {},
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "id": "589C45F0-0F8C-4497-8999-A8314DE5D601"
        },
        {
          "defKey": "acceptance_check_comment",
          "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": "0177078A-470B-44DE-8196-D8013935A223"
        }
      ],
      "correlations": [],
@@ -30699,6 +30717,24 @@
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
        },
        {
          "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": "013BD2A8-0A95-4AC3-BF62-11D03C96304F"
        },
        {
          "defKey": "application_status",
          "defName": "申请单状态",
          "comment": "待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成",
@@ -30915,6 +30951,24 @@
          "attr9": "",
          "id": "1FDD4335-E2A5-4925-B353-DFB1518E8893",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "remark",
          "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": "77353547-B01B-4592-BCF4-04635339597F"
        }
      ],
      "correlations": [],

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

@@ -19,6 +19,8 @@
    String SECOND_MAINTENANCE_CODE_RULE = "SecondMaintenanceCodeRule";
    //三保编码规则
    String THIRD_MAINTENANCE_CODE_RULE = "ThirdMaintenanceCodeRule";
    //三保变更编码规则
    String THIRD_MAINTENANCE_CHANGE_CODE_RULE = "ThirdMaintenanceChangeCodeRule";
    //设备借出归还
    String LEAN_OUT_CODE_RULE = "EquipmentLeanOutCodeRule";
    //设备封存启封

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

@@ -5,6 +5,7 @@
    SECOND_MAINTENANCE, //二保
    THIRD_MAINTENANCE_HANDOVER, //三保移交单
    THIRD_MAINTENANCE_ACCEPTANCE, //三保验收单
    THIRD_MAINTENANCE_CHANGE, //三保变更单
    TECHNICAL_STATUS_EVALUATION, //技术状态鉴定表
    TECHNICAL_STATUS_EVALUATION_SAFETY_CHECK, //设备安全装置检查单
    TECHNICAL_STATUS_EVALUATION_OTHER_CHECK, //其他检查项目

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

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

public enum ThirdMaintenanceChangeReasonEnum {
    PRODUCTION_WORK_ORDER_EXPEDITED, //生产任务急无法停机
    EQUIPMENT_BREAKDOWN_REPAIR, //设备故障正处于维修状态
    EQUIPMENT_SCRAPPED, //设备已报废
    EQUIPMENT_MAJOR, //设备大修、项修
    EQUIPMENT_RETROFITTING, //设备改造
    ;
}

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

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

public enum ThirdMaintenanceChangeStatusEnum {
    WAIT_SUBMIT, //待提交
    EQUIPMENT_MANAGER_SIGNING, //主管领导签字中
    DEPART_MANAGER_SIGNING, //部门领导签字中
    PRODUCTION_SUPPORT_SIGNING, //保障部领导签字中
    ABOLISH, //已作废
    REJECTED, //已驳回
    COMPLETED, //已完成
    ;

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

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

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

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -41,6 +42,7 @@
     */
    @Excel(name = "三保工单ID", width = 15)
    @ApiModelProperty(value = "三保工单ID")
    @Dict(dictTable = "eam_third_maintenance_order", dicCode = "id", dicText = "order_num")
    private String orderId;
    /**
     * å˜æ›´å•å·
@@ -53,13 +55,14 @@
     */
    @Excel(name = "申请人", width = 15)
    @ApiModelProperty(value = "申请人")
    @Dict(dicCode = "sys_user, realname, username")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String applicant;
    /**
     * ç”³è¯·éƒ¨é—¨
     */
    @Excel(name = "申请部门", width = 15)
    @ApiModelProperty(value = "申请部门")
    @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
    private String factoryOrgCode;
    /**
     * ç”³è¯·æ—¥æœŸ
@@ -74,18 +77,21 @@
     */
    @Excel(name = "申请类型;报废、延保", width = 15)
    @ApiModelProperty(value = "申请类型;报废、延保")
    @Dict(dicCode = "third_maintenance_change_category")
    private String applyCategory;
    /**
     * å˜æ›´çŠ¶æ€;待提交、待主管审核、待部门确认、待保障部确认、已作废、已完成
     */
    @Excel(name = "变更状态;待提交、待主管审核、待部门确认、待保障部确认、已作废、已完成", width = 15)
    @ApiModelProperty(value = "变更状态;待提交、待主管审核、待部门确认、待保障部确认、已作废、已完成")
    @Dict(dicCode = "third_maintenance_change_status")
    private String changeStatus;
    /**
     * å»¶ä¿åŽŸå› ç±»åž‹;生产任务、设备故障、报废、大修项修、搬迁
     */
    @Excel(name = "延保原因类型;生产任务、设备故障、报废、大修项修、搬迁", width = 15)
    @ApiModelProperty(value = "延保原因类型;生产任务、设备故障、报废、大修项修、搬迁")
    @Dict(dicCode = "third_maintenance_change_reason")
    private String applyReasonType;
    /**
     * å»¶ä¿(变更)原因
@@ -106,7 +112,7 @@
     */
    @Excel(name = "主管领导签字", width = 15)
    @ApiModelProperty(value = "主管领导签字")
    @Dict(dicCode = "sys_user, realname, username")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String equipmentManagerSignature;
    /**
     * ä¸»ç®¡é¢†å¯¼ç­¾å­—时间
@@ -121,7 +127,7 @@
     */
    @Excel(name = "部门领导签字;根据延保原因类型区分不同的人审批", width = 15)
    @ApiModelProperty(value = "部门领导签字;根据延保原因类型区分不同的人审批")
    @Dict(dicCode = "sys_user, realname, username")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String departManagerSignature;
    /**
     * éƒ¨é—¨é¢†å¯¼ç­¾å­—时间
@@ -142,7 +148,7 @@
     */
    @Excel(name = "生产保障部领导签字", width = 15)
    @ApiModelProperty(value = "生产保障部领导签字")
    @Dict(dicCode = "sys_user, realname, username")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String productionSupportSignature;
    /**
     * ç”Ÿäº§ä¿éšœéƒ¨é¢†å¯¼ç­¾å­—时间
@@ -164,4 +170,12 @@
    @Excel(name = "HF编码", width = 15)
    @ApiModelProperty(value = "HF编码")
    private String hfCode;

    //列表展示
    @TableField(exist = false)
    private String equipmentCode;
    @TableField(exist = false)
    private String equipmentName;
    @TableField(exist = false)
    private String equipmentModel;
}

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

@@ -243,4 +243,6 @@
    private String equipmentCode;
    @TableField(exist = false)
    private String equipmentName;
    @TableField(exist = false)
    private String equipmentModel;
}

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

@@ -28,7 +28,7 @@
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "点检日期")
    private Date inspectionDate;
    private Date planInspectionDate;

    /**点检人*/
    @ApiModelProperty(value = "点检人-是领取人")

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

@@ -57,7 +57,7 @@
     * @param pageSize
     * @return
     */
    List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize, String id);
    List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize, String id, String factoryOrgCode);

    /**
     * æŸ¥è¯¢è®¾å¤‡ä¿¡æ¯

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

@@ -235,7 +235,7 @@
    }

    @Override
    public List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize, String id) {
    public List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize, String id, String factoryOrgCode) {
        if (StringUtils.isNotBlank(id)) {
            EamEquipment eamEquipment = eamEquipmentMapper.selectById(id);
            if (eamEquipment != null) {
@@ -261,7 +261,7 @@
                    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> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
                Set<String> factoryCode = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
                queryWrapper.in("e.factory_org_code", factoryCode);
            } else {
                return Collections.emptyList();
@@ -269,10 +269,13 @@
        }

        if (StringUtils.isNotBlank(keyword)) {
            queryWrapper.like("equipment_code", keyword);
            queryWrapper.or().like("equipment_name", keyword);
            queryWrapper.like("e.equipment_code", keyword);
            queryWrapper.or().like("e.equipment_name", keyword);
        }
        queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
        if(StringUtils.isNotBlank(factoryOrgCode)){
            queryWrapper.likeRight("e.factory_org_code", factoryOrgCode);
        }
        queryWrapper.eq("e.del_flag", CommonConstant.DEL_FLAG_0);
        IPage<EamEquipment> pageResult = eamEquipmentMapper.queryPageList(page, queryWrapper);
        if (pageResult != null && CollectionUtil.isNotEmpty(pageResult.getRecords())) {
            List<EquipmentSearchResult> resultList = new ArrayList<>();

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/vo/EquipmentSearchResult.java

@@ -16,11 +16,20 @@
     */
    private String text;

    private String equipmentModel;
    private String equipmentCode;
    private String equipmentName;
    private String factoryOrgCode;

    public EquipmentSearchResult() {
    }

    public EquipmentSearchResult(EamEquipment eamEquipment) {
        this.value = eamEquipment.getId();
        this.text = eamEquipment.getEquipmentCode() + "[" + eamEquipment.getEquipmentName() + "]";
        this.equipmentModel = eamEquipment.getEquipmentModel();
        this.equipmentCode = eamEquipment.getEquipmentCode();
        this.equipmentName = eamEquipment.getEquipmentName();
        this.factoryOrgCode = eamEquipment.getFactoryOrgCode();
    }
}

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

@@ -384,9 +384,21 @@
    @GetMapping(value = "/asyncLoadEquipment")
    public Result<?> asyncLoadEquipment(@RequestParam(name="keyword",required = false) String keyword,
                                        @RequestParam(value = "pageSize", required = false, defaultValue = "20") Integer pageSize,
                                        @RequestParam(name="id",required = false) String id) {
        List<EquipmentSearchResult> resultList = eamEquipmentService.asyncLoadEquipment(keyword, pageSize, id);
        return Result.ok(resultList);
                                        @RequestParam(name="id",required = false) String id,
                                        @RequestParam(name="factoryOrgCode",required = false) String factoryOrgCode) {
        List<EquipmentSearchResult> resultList = eamEquipmentService.asyncLoadEquipment(keyword, pageSize, id, factoryOrgCode);
        List<JSONObject> items = new ArrayList<>();
        try {
            for(EquipmentSearchResult vo : resultList) {
                String json = objectMapper.writeValueAsString(vo);
                JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
                translateDictTextUtils.translateField("factoryOrgCode", vo.getFactoryOrgCode(), item, "eam_base_factory,factory_name,org_code");
                items.add(item);
            }
            return Result.OK(items);
        }catch (Exception e) {
            return Result.error("数据转译失败！");
        }
    }

}

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

@@ -305,31 +305,6 @@
    }

    /**
     * å¯¼å‡ºexcel
     *
     * @param request
     * @param eamInspectionOrder
     */
    //@RequiresPermissions("org.jeecg.modules:点检工单:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, EamInspectionOrder eamInspectionOrder) {
        return super.exportXls(request, eamInspectionOrder, EamInspectionOrder.class, "点检工单");
    }

    /**
     * é€šè¿‡excel导入数据
     *
     * @param request
     * @param response
     * @return
     */
    //@RequiresPermissions("点检工单:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, EamInspectionOrder.class);
    }

    /**
     * å¯¼å‡ºèŽ·å–基本信息
     * @param equipmentCode ç»Ÿä¸€ç¼–码
     * @param inspectionDate æ—¥æœŸ

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

@@ -2,16 +2,22 @@

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.constant.TechnicalStatusChangeOrderStatusEnum;
import org.jeecg.modules.eam.entity.EamTechnicalStatusChange;
import org.jeecg.modules.eam.entity.EamTechnicalStatusChangeDetail;
import org.jeecg.modules.eam.request.EamTechnicalStatusChangeQuery;
import org.jeecg.modules.eam.request.EamTechnicalStatusChangeRequest;
import org.jeecg.modules.eam.service.IEamTechnicalStatusChangeService;
@@ -31,6 +37,10 @@
public class EamTechnicalStatusChangeController extends JeecgController<EamTechnicalStatusChange, IEamTechnicalStatusChangeService> {
    @Autowired
    private IEamTechnicalStatusChangeService eamTechnicalStatusChangeService;
     @Autowired
     private ObjectMapper objectMapper;
     @Autowired
     private TranslateDictTextUtils translateDictTextUtils;
    
    /**
     * åˆ†é¡µåˆ—表查询
@@ -149,7 +159,36 @@
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
        EamTechnicalStatusChange eamTechnicalStatusChange = eamTechnicalStatusChangeService.getById(id);
        return Result.OK(eamTechnicalStatusChange);
        if (eamTechnicalStatusChange == null) {
            return Result.error("未找到对应数据");
        }
        try {
            String json = objectMapper.writeValueAsString(eamTechnicalStatusChange);
            JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
            translateDictTextUtils.translateField("designer", eamTechnicalStatusChange.getDesigner(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("factoryOrgCode", eamTechnicalStatusChange.getFactoryOrgCode(), item, "eam_base_factory,factory_name,org_code");
            return Result.OK(item);
        } catch (JsonProcessingException e) {
            return Result.error("数据转译失败！");
        }
    }

     /**
      * éªŒæ”¶
      * @param request
      * @return
      */
     @ApiOperation(value = "技术状态变更申请明细-验收", notes = "技术状态变更申请明细-验收")
     @PostMapping(value = "/acceptance")
     public Result<?> acceptance(@RequestBody EamTechnicalStatusChangeDetail request) {
         if (request == null) {
             return Result.error("验收结果对象不能为空！");
         }
         boolean b = eamTechnicalStatusChangeService.acceptance(request);
         if (!b) {
             return Result.error("操作失败！");
         }
         return Result.OK("操作成功！");
     }

}

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

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

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
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.system.base.controller.JeecgController;
import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.entity.EamTechnicalStatusChangeDetail;
import org.jeecg.modules.eam.service.IEamTechnicalStatusChangeDetailService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +17,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.List;

/**
@@ -28,6 +33,10 @@
public class EamTechnicalStatusChangeDetailController extends JeecgController<EamTechnicalStatusChangeDetail, IEamTechnicalStatusChangeDetailService> {
    @Autowired
    private IEamTechnicalStatusChangeDetailService orderDetailService;
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private TranslateDictTextUtils translateDictTextUtils;

    /**
     * ä¸€æ¬¡åŠ è½½
@@ -39,6 +48,20 @@
    @GetMapping(value = "/queryList")
    public Result<?> queryList(@RequestParam("orderId") String orderId) {
        List<EamTechnicalStatusChangeDetail> list = orderDetailService.queryList(orderId);
        return Result.OK(list);
        List<JSONObject> items = new ArrayList<>();
        try {
            for(EamTechnicalStatusChangeDetail vo : list) {
                String json = objectMapper.writeValueAsString(vo);
                JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
                translateDictTextUtils.translateField("acceptanceChecker", vo.getAcceptanceChecker(), item, "sys_user,realname,username");
                translateDictTextUtils.translateField("changeCategory", vo.getChangeCategory(), item, "technical_status_change_reason");
                translateDictTextUtils.translateField("changeTechnicalStatus", vo.getChangeTechnicalStatus(), item, "equipment_technology_status");
                translateDictTextUtils.translateField("acceptanceCheckResult", vo.getAcceptanceCheckResult(), item, "equipment_technology_status");
                items.add(item);
            }
            return Result.OK(items);
        }catch (Exception e) {
            return Result.error("数据转译失败！");
        }
    }
}

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

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

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.constant.TechnicalStatusEvaluationApplicationStatusEnum;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationApplication;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationApplicationQuery;
@@ -32,7 +37,10 @@
public class EamTechnicalStatusEvaluationApplicationController extends JeecgController<EamTechnicalStatusEvaluationApplication, IEamTechnicalStatusEvaluationApplicationService> {
    @Autowired
    private IEamTechnicalStatusEvaluationApplicationService eamTechnicalStatusEvaluationApplicationService;

    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private TranslateDictTextUtils translateDictTextUtils;
    /**
     * åˆ†é¡µåˆ—表查询
     *
@@ -149,7 +157,18 @@
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
        EamTechnicalStatusEvaluationApplication eamTechnicalStatusEvaluationApplication = eamTechnicalStatusEvaluationApplicationService.getById(id);
        return Result.OK(eamTechnicalStatusEvaluationApplication);
        if (eamTechnicalStatusEvaluationApplication == null) {
            return Result.error("未找到对应数据");
        }
        try {
            String json = objectMapper.writeValueAsString(eamTechnicalStatusEvaluationApplication);
            JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
            translateDictTextUtils.translateField("applicant", eamTechnicalStatusEvaluationApplication.getApplicant(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("factoryOrgCode", eamTechnicalStatusEvaluationApplication.getFactoryOrgCode(), item, "eam_base_factory,factory_name,org_code");
            return Result.OK(item);
        } catch (JsonProcessingException e) {
            return Result.error("数据转译失败！");
        }
    }

}

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

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

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.system.query.QueryGenerator;
import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.ThirdMaintenanceChangeStatusEnum;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceChange;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderChangeRequest;
import org.jeecg.modules.eam.request.EamThirdMaintenanceChangeQuery;
import org.jeecg.modules.eam.request.EamThirdMaintenanceChangeRequest;
import org.jeecg.modules.eam.service.IEamThirdMaintenanceChangeService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

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

/**
@@ -34,11 +41,15 @@

    @Resource
    private IEamThirdMaintenanceChangeService eamThirdMaintenanceChangeService;
    @Resource
    private ObjectMapper objectMapper;
    @Resource
    private TranslateDictTextUtils translateDictTextUtils;

    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param eamThirdMaintenanceChange
     * @param query
     * @param pageNo
     * @param pageSize
     * @param req
@@ -47,41 +58,52 @@
    @AutoLog(value = "三保变更-分页列表查询")
    @ApiOperation(value = "三保变更-分页列表查询", notes = "三保变更-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamThirdMaintenanceChange eamThirdMaintenanceChange,
    public Result<?> queryPageList(EamThirdMaintenanceChangeQuery query,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<EamThirdMaintenanceChange> queryWrapper = QueryGenerator.initQueryWrapper(eamThirdMaintenanceChange, req.getParameterMap());
        Page<EamThirdMaintenanceChange> page = new Page<EamThirdMaintenanceChange>(pageNo, pageSize);
        IPage<EamThirdMaintenanceChange> pageList = eamThirdMaintenanceChangeService.page(page, queryWrapper);
        IPage<EamThirdMaintenanceChange> pageList = eamThirdMaintenanceChangeService.queryPageList(page, query);
        return Result.OK(pageList);
    }

    /**
     * æ·»åŠ 
     *
     * @param eamThirdMaintenanceChange
     * @param request
     * @return
     */
    @AutoLog(value = "三保变更-添加")
    @ApiOperation(value = "三保变更-添加", notes = "三保变更-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamThirdMaintenanceChange eamThirdMaintenanceChange) {
        eamThirdMaintenanceChangeService.save(eamThirdMaintenanceChange);
        return Result.OK("添加成功！");
    public Result<?> add(@RequestBody EamThirdMaintenanceChange request) {
        if (request == null) {
            return Result.error("添加的对象不能为空！");
        }
        boolean b = eamThirdMaintenanceChangeService.saveThirdMaintenanceChange(request);
        if (!b) {
            return Result.error("变更失败！");
        }
        return Result.OK("变更成功！");
    }

    /**
     * ç¼–辑
     *
     * @param eamThirdMaintenanceChange
     * @param request
     * @return
     */
    @AutoLog(value = "三保变更-编辑")
    @ApiOperation(value = "三保变更-编辑", notes = "三保变更-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> edit(@RequestBody EamThirdMaintenanceChange eamThirdMaintenanceChange) {
        eamThirdMaintenanceChangeService.updateById(eamThirdMaintenanceChange);
    public Result<?> edit(@RequestBody EamThirdMaintenanceChange request) {
        if (request == null) {
            return Result.error("编辑的对象不能为空！");
        }
        boolean b = eamThirdMaintenanceChangeService.editThirdMaintenanceChange(request);
        if (!b) {
            return Result.error("编辑失败！");
        }
        return Result.OK("编辑成功!");
    }

@@ -113,6 +135,51 @@
        return Result.OK("批量删除成功！");
    }

    @AutoLog(value = "三保变更-提交")
    @ApiOperation(value = "三保变更-提交", notes = "三保变更-提交")
    @GetMapping("/submit")
    public Result<?> submit(@RequestParam(name = "id") String id) {
        boolean b = eamThirdMaintenanceChangeService.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) {
        EamThirdMaintenanceChange entity = eamThirdMaintenanceChangeService.getById(id);
        if (entity == null) {
            return Result.error("要作废的数据不存在，请刷新重试！");
        }
        if (!ThirdMaintenanceChangeStatusEnum.WAIT_SUBMIT.name().equals(entity.getChangeStatus())) {
            return Result.error("该状态的数据不允许进行作废！");
        }
        entity.setChangeStatus(ThirdMaintenanceChangeStatusEnum.ABOLISH.name());
        eamThirdMaintenanceChangeService.updateById(entity);
        return Result.OK("作废成功!");
    }

    @AutoLog(value = "三保变更-审批")
    @ApiOperation(value = "三保变更-审批", notes = "三保变更-审批")
    @PostMapping("/approval")
    public Result<?> approval(@RequestBody EamThirdMaintenanceChangeRequest request) {
        if (request == null) {
            return Result.error("审批的对象不能为空！");
        }
        // æ£€æŸ¥è¯·æ±‚参数
        if (StrUtil.isBlank(request.getTaskId()) || StrUtil.isBlank(request.getDataId()) || StrUtil.isBlank(request.getInstanceId())) {
            return Result.error("审批任务错误或不存在！");
        }
        EamThirdMaintenanceChange b = eamThirdMaintenanceChangeService.approval(request);
        if (b == null) {
            return Result.error("操作失败！");
        }
        return Result.ok("操作成功！");
    }

    /**
     * é€šè¿‡id查询
     *
@@ -123,31 +190,24 @@
    @ApiOperation(value = "三保变更-通过id查询", notes = "三保变更-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
        EamThirdMaintenanceChange eamThirdMaintenanceChange = eamThirdMaintenanceChangeService.getById(id);
        return Result.OK(eamThirdMaintenanceChange);
    }

    /**
     * å¯¼å‡ºexcel
     *
     * @param request
     * @param eamThirdMaintenanceChange
     */
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, EamThirdMaintenanceChange eamThirdMaintenanceChange) {
        return super.exportXls(request, eamThirdMaintenanceChange, EamThirdMaintenanceChange.class, "三保变更");
    }

    /**
     * é€šè¿‡excel导入数据
     *
     * @param request
     * @param response
     * @return
     */
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, EamThirdMaintenanceChange.class);
        EamThirdMaintenanceChange entity = eamThirdMaintenanceChangeService.getById(id);
        if (entity == null) {
            return Result.error("未找到对应数据");
        }
        try {
            String json = objectMapper.writeValueAsString(entity);
            JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
            translateDictTextUtils.translateField("orderId", entity.getOrderId(), item, "eam_third_maintenance_order,order_num,id");
            translateDictTextUtils.translateField("applicant", entity.getApplicant(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("changeStatus", entity.getChangeStatus(), item, "third_maintenance_change_status");
            translateDictTextUtils.translateField("applyReasonType", entity.getApplyReasonType(), item, "third_maintenance_change_reason");
            translateDictTextUtils.translateField("equipmentManagerSignature", entity.getEquipmentManagerSignature(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("departManagerSignature", entity.getDepartManagerSignature(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("productionSupportSignature", entity.getProductionSupportSignature(), 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/EamTechnicalStatusChangeDetail.java

@@ -69,6 +69,9 @@
    /**验收检查结果;大修、改造 éœ€è¦å¡«å†™éªŒæ”¶ç»“果，搬迁按照技术状态鉴定工单维护，其他暂未使用到，只预留此类型*/
    @ApiModelProperty(value = "验收检查结果;大修、改造 éœ€è¦å¡«å†™éªŒæ”¶ç»“果，搬迁按照技术状态鉴定工单维护，其他暂未使用到，只预留此类型")
    private String acceptanceCheckResult;
    /**验收意见*/
    @ApiModelProperty(value = "验收意见")
    private String acceptanceCheckComment;

    //列表展示
    @TableField(exist = false)

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

@@ -73,6 +73,7 @@
    private Date evaluationDate;
    /**申请单状态;待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成*/
    @ApiModelProperty(value = "申请单状态;待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成")
    @Dict(dicCode = "technical_status_evaluation_application_status")
    private String applicationStatus;
    /**申请单位室级领导签字*/
    @ApiModelProperty(value = "申请单位室级领导签字")
@@ -85,7 +86,7 @@
    private Date departHeaderSignatureTime;
    /**申请单位室级领导签字结果*/
    @ApiModelProperty(value = "申请单位室级领导签字结果")
    @Dict(dicCode = "approved_rejected")
    @Dict(dicCode = "approve_reject")
    private String departHeaderSignatureResult;
    /**申请单位室级领导意见*/
    @ApiModelProperty(value = "申请单位室级领导意见")
@@ -101,7 +102,7 @@
    private Date productionHeaderSignatureTime;
    /**生产设备管理主管签字结果*/
    @ApiModelProperty(value = "生产设备管理主管签字结果")
    @Dict(dicCode = "approved_rejected")
    @Dict(dicCode = "approve_reject")
    private String productionHeaderSignatureResult;
    /**生产设备管理主管意见*/
    @ApiModelProperty(value = "生产设备管理主管意见")
@@ -117,7 +118,7 @@
    private Date productionSupportSignatureTime;
    /**生产保障部领导签字解结果*/
    @ApiModelProperty(value = "生产保障部领导签字解结果")
    @Dict(dicCode = "approved_rejected")
    @Dict(dicCode = "approve_reject")
    private String productionSupportSignatureResult;
    /**生产保障部领导意见*/
    @ApiModelProperty(value = "生产保障部领导意见")

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderGenerateJob.java

@@ -8,7 +8,6 @@
import org.jeecg.modules.eam.constant.MaintenanceCategoryEnum;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.entity.EamInspectionOrder;
import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;

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

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

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.EamThirdMaintenanceChange;

/**
@@ -11,4 +16,5 @@
 */
public interface EamThirdMaintenanceChangeMapper extends BaseMapper<EamThirdMaintenanceChange> {

    IPage<EamThirdMaintenanceChange> queryPageList(Page<EamThirdMaintenanceChange> page, @Param(Constants.WRAPPER) QueryWrapper<EamThirdMaintenanceChange> queryWrapper);
}

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

@@ -2,4 +2,16 @@
<!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.EamThirdMaintenanceChangeMapper">

    <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamThirdMaintenanceChange">
        SELECT
            tmc.*,
            e.equipment_code,
            e.equipment_name,
            e.equipment_model
        FROM
            eam_third_maintenance_change tmc
                INNER JOIN eam_third_maintenance_order tmo ON tmc.order_id = tmo.id
                INNER JOIN eam_equipment e ON tmo.equipment_id = e.id
            ${ew.customSqlSegment}
    </select>
</mapper>

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

@@ -3,7 +3,7 @@
<mapper namespace="org.jeecg.modules.eam.mapper.EamThirdMaintenanceOrderMapper">

    <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder">
        select wmo.*, e.equipment_code, e.equipment_name
        select wmo.*, e.equipment_code, e.equipment_name, e.equipment_model
        from eam_third_maintenance_order wmo
        inner join eam_equipment e
        on wmo.equipment_id = e.id

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
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;

/**
 * @Author: Lius
 * @CreateTime: 2025-07-21
 * @Description:
 */
@Data
public class EamThirdMaintenanceChangeQuery {
    private String equipmentId;
    private String changeOrderNum;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date applyDateBegin;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date applyDateEnd;

    private String changeStatus;
    private String column;
    private String order;
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,36 @@
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;

/**
 * @Author: Lius
 * @CreateTime: 2025-07-21
 * @Description:
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "三保变更对象", description = "三保变更")
public class EamThirdMaintenanceChangeRequest extends FlowTaskVo implements Serializable {

    private static final long serialVersionUID = 80020193253190375L;

    /**
     * ä¸»é”®
     */
    @ApiModelProperty(value = "主键")
    private String id;

    /**
     * å·¥å•å·
     */
    @ApiModelProperty(value = "工单号")
    private String orderNum;
}

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.eam.entity.EamTechnicalStatusChange;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.entity.EamTechnicalStatusChangeDetail;
import org.jeecg.modules.eam.request.EamTechnicalStatusChangeQuery;
import org.jeecg.modules.eam.request.EamTechnicalStatusChangeRequest;

@@ -48,4 +49,11 @@
     * @return
     */
    EamTechnicalStatusChange approval(EamTechnicalStatusChangeRequest request);

    /**
     * éªŒæ”¶
     * @param request
     * @return
     */
    boolean acceptance(EamTechnicalStatusChangeDetail request);
}

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

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

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceChange;
import org.jeecg.modules.eam.request.EamThirdMaintenanceChangeQuery;
import org.jeecg.modules.eam.request.EamThirdMaintenanceChangeRequest;

/**
 * @Description: ä¸‰ä¿å˜æ›´
@@ -11,4 +16,40 @@
 */
public interface IEamThirdMaintenanceChangeService extends IService<EamThirdMaintenanceChange> {

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

    /**
     * æ·»åŠ 
     * @param request
     * @return
     */
    boolean saveThirdMaintenanceChange(EamThirdMaintenanceChange request);

    /**
     * ç¼–辑
     * @param request
     * @return
     */
    boolean editThirdMaintenanceChange(EamThirdMaintenanceChange request);

    /**
     * æäº¤ å¼€å¯æµç¨‹å®¡æ‰¹
     * @param id
     * @return
     */
    boolean submit(String id);

    /**
     * æµç¨‹å®¡æ‰¹
     * @param request
     * @return
     */
    EamThirdMaintenanceChange approval(EamThirdMaintenanceChangeRequest request);

}

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

@@ -58,4 +58,12 @@
     * @return
     */
    Result<?> selectVoById(String id);

    /**
     * æ›´æ–°ä¸‰ä¿å·¥å•çŠ¶æ€
     * @param orderId
     * @param maintenanceStatus
     * @return
     */
    boolean updateMaintenanceStatus(String orderId, String maintenanceStatus);
}

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

@@ -371,17 +371,19 @@
            resultMap.put("itemCode", weekInsDetailResultResponse.getItemCode());
            resultMap.put("itemName", weekInsDetailResultResponse.getItemName());
            resultMap.put("itemDemand", weekInsDetailResultResponse.getItemDemand());
            // ä½¿ç”¨AtomicInteger作为计数器，从1开始
            AtomicInteger counter = new AtomicInteger(1);
            Map<Integer, EamWeekInsDetailResultResponse> collect = weekInsDetailResultResponseList
                    .stream()
                    .collect(Collectors.toMap(
                            // åˆ†ç»„键：使用自增序号（从1开始）
                            item -> counter.getAndIncrement(),
                            // åˆ†ç»„键：使用planInspectionDate字段落在本月的周数
                            item -> {
                                Calendar calendar = Calendar.getInstance();
                                calendar.setTime(item.getPlanInspectionDate());
                                return calendar.get(Calendar.WEEK_OF_MONTH);
                            },
                            // å€¼ï¼šç›´æŽ¥ä½¿ç”¨å½“前对象
                            item -> item,
                            // åˆå¹¶å‡½æ•°ï¼šå½“同一序号有多个对象时（理论上不会发生），如何处理
                            (existing, replacement) -> existing, // è‹¥æœ‰é‡å¤é”®ï¼Œä¿ç•™å·²å­˜åœ¨çš„对象
                            // åˆå¹¶å‡½æ•°ï¼šå½“同一周有多个对象时（根据需求不会发生，但仍需提供）
                            (existing, replacement) -> existing,
                            // æŒ‡å®šMap的具体实现（可选）
                            LinkedHashMap::new // ä¿æŒæ’入顺序
                    ));
@@ -442,12 +444,18 @@
        Map<Integer, EamWeekInsDetailUserResponse> groupMap = eamWeekInsDetailUserResponseList
                .stream()
                .collect(Collectors.toMap(
                        // åˆ†ç»„键：使用自增序号（从1开始）
                        item -> counter.getAndIncrement(),
                        // å€¼ï¼šç›´æŽ¥ä½¿ç”¨å½“前对象（作为初始值）
                        // åˆ†ç»„键：使用 planInspectionDate å­—段落在本月的周数
                        item -> {
                            Calendar calendar = Calendar.getInstance();
                            calendar.setTime(item.getPlanInspectionDate());
                            return calendar.get(Calendar.WEEK_OF_MONTH);
                        },
                        // å€¼ï¼šç›´æŽ¥ä½¿ç”¨å½“前对象
                        item -> item,
                        // åˆå¹¶å‡½æ•°ï¼šå½“同一“天”有多个对象时，如何处理（这里示例取第一个）
                        (existing, replacement) -> existing // è‹¥æœ‰é‡å¤é”®ï¼Œä¿ç•™å·²å­˜åœ¨çš„对象
                        // åˆå¹¶å‡½æ•°ï¼šå½“同一周有多个对象时（根据需求不会发生）
                        (existing, replacement) -> existing,
                        // ä½¿ç”¨ LinkedHashMap ä¿æŒæ’入顺序
                        LinkedHashMap::new
                ));
        Map<String, Object> resultMap = new LinkedHashMap<>();
        for (int i = 1; i <= 5; i++) {

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

@@ -15,22 +15,16 @@
import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.TranslateDictTextUtils;
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.TechnicalStatusChangeOrderStatusEnum;
import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationOrderChangeStatusEnum;
import org.jeecg.modules.eam.entity.EamBaseHFCode;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamTechnicalStatusChange;
import org.jeecg.modules.eam.constant.*;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.mapper.EamTechnicalStatusChangeMapper;
import org.jeecg.modules.eam.request.EamTechnicalStatusChangeQuery;
import org.jeecg.modules.eam.request.EamTechnicalStatusChangeRequest;
import org.jeecg.modules.eam.service.IEamBaseHFCodeService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamTechnicalStatusChangeDetailService;
import org.jeecg.modules.eam.service.IEamTechnicalStatusChangeService;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderRequest;
import org.jeecg.modules.eam.service.*;
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;
@@ -48,6 +42,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

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

@@ -83,6 +78,12 @@
    private IFlowTaskService flowTaskService;
    @Autowired
    private TranslateDictTextUtils translateDictTextUtils;
    @Autowired
    private IEamEquipmentExtendService equipmentExtendService;
    @Autowired
    private IEamTechnicalStatusEvaluationStandardService evaluationStandardService;
    @Autowired
    private IEamTechnicalStatusEvaluationOrderService evaluationOrderService;

    @Override
    public IPage<EamTechnicalStatusChange> queryPageList(Page<EamTechnicalStatusChange> page, EamTechnicalStatusChangeQuery query) {
@@ -175,6 +176,7 @@
            detail.setCreateTime(null);
            detail.setUpdateBy(null);
            detail.setUpdateTime(null);
            detail.setChangeOrderId(order.getId());
        });
        changeDetailService.saveBatch(request.getTableDetailList());
        return true;
@@ -211,6 +213,7 @@
            detail.setCreateTime(null);
            detail.setUpdateBy(null);
            detail.setUpdateTime(null);
            detail.setChangeOrderId(entity.getId());
        });
        changeDetailService.saveBatch(request.getTableDetailList());
        return true;
@@ -370,6 +373,70 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean acceptance(EamTechnicalStatusChangeDetail request) {
        // èŽ·å–当前登录用户
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (user == null || StrUtil.isBlank(user.getId())) {
            throw new JeecgBootException("未获取到登录用户，请重新登录后再试！");
        }
        EamTechnicalStatusChange order = this.getBaseMapper().selectById(request.getChangeOrderId());
        if(order == null) {
            throw new JeecgBootException("变更工单不存在，请刷新重试！");
        }
        if(!TechnicalStatusChangeOrderStatusEnum.COMPLETED.name().equals(order.getChangeStatus())) {
            throw new JeecgBootException("变更工单未完成，无法提交验收！");
        }
        TechnicalStatusChangeReasonEnum instance = TechnicalStatusChangeReasonEnum.getInstance(request.getChangeCategory());
        if(instance == null) {
            throw new JeecgBootException("变更原因无效，操作失败！");
        }
        EamEquipment equipment = equipmentService.getById(request.getEquipmentId());
        if(equipment == null) {
            throw new JeecgBootException("设备信息不存在，操作失败！");
        }
        EamEquipmentExtend extend = equipmentExtendService.getById(request.getEquipmentId());
        if(extend == null) {
            throw new JeecgBootException("设备信息不存在，操作失败！");
        }
        switch (instance) {
            case EQUIPMENT_MAJOR:
            case EQUIPMENT_RETROFITTING:
            case OTHER:
                //设备大修、改造、其他的逻辑
                request.setAcceptanceChecker(user.getUsername());
                request.setAcceptanceCheckTime(new Date());
                changeDetailService.updateById(request);
                //更新设备技术鉴定状态
                equipmentExtendService.updateTechnologyParam(request.getEquipmentId(), request.getAcceptanceCheckResult(), DateUtils.localDateToDate(LocalDate.now()), null);
                break;
            case EQUIPMENT_RELOCATION:
                //设备搬迁逻辑
                request.setAcceptanceChecker(user.getUsername());
                request.setAcceptanceCheckTime(new Date());
                request.setAcceptanceCheckResult(null);
                changeDetailService.updateById(request);
                //生成技术状态鉴定工单
                EamTechnicalStatusEvaluationStandard standard = evaluationStandardService.queryEnableStandard(request.getEquipmentId());
                if (standard == null) {
                    throw new JeecgBootException("设备：{"+equipment.getEquipmentCode()+"}，未配置技术状态鉴定规范，无法生成技术鉴定工单！");
                }
                EamTechnicalStatusEvaluationOrderRequest orderRequest = new EamTechnicalStatusEvaluationOrderRequest();
                orderRequest.setEquipmentId(extend.getId());
                orderRequest.setStandardId(standard.getId());
                orderRequest.setEvaluationDate(DateUtils.localDateToDate(LocalDate.now()));
                orderRequest.setFreezeOrderDate(null);
                orderRequest.setOrderExpirationDate(null);
                orderRequest.setCreationMethod(OrderCreationMethodEnum.AUTO.name());
                evaluationOrderService.addTechnicalStatusEvaluationOrder(orderRequest);
                //更新扩展表中的生成标识
                equipmentExtendService.updateTechnologyParam(equipment.getId(), null, null, CommonConstant.STATUS_1);
                break;
        }
        return true;
    }

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

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

@@ -228,7 +228,7 @@
        //更新实体
        this.getBaseMapper().updateById(entity);
        //启动流程
        flowCommonService.initActBusiness("工单号: " + entity.getApplicationOrderNum() + ";设备编号: " + equipment.getEquipmentCode() + ";安装位置" + equipment.getInstallationPosition(),
        flowCommonService.initActBusiness("工单号: " + entity.getApplicationOrderNum() + ";设备编号: " + equipment.getEquipmentCode(),
                entity.getId(), "IEamTechnicalStatusEvaluationApplicationService", "technical_status_evaluation_apply_process", null);
        Map<String, Object> variables = new HashMap<>();
        variables.put("dataId", entity.getId());
@@ -344,6 +344,7 @@
                entity.setProductionHeaderSignatureTime(new Date());
                entity.setProductionHeaderSignatureResult(request.getProductionHeaderSignatureResult());
                entity.setProductionHeaderComment(request.getProductionHeaderComment());
                values.put("productionHeaderConfirmFlag", request.getProductionHeaderSignatureResult());
                if(BusinessCodeConst.APPROVED.equals(request.getProductionHeaderSignatureResult())) {
                    //通过
                    entity.setApplicationStatus(TechnicalStatusEvaluationApplicationStatusEnum.PRODUCTION_SUPPORT_SIGNING.name());

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

@@ -234,7 +234,7 @@
        //更新实体
        this.getBaseMapper().updateById(entity);
        //启动流程
        flowCommonService.initActBusiness("工单号: " + entity.getChangeOrderNum() + ";设备编号: " + equipment.getEquipmentCode() + ";安装位置" + equipment.getInstallationPosition(),
        flowCommonService.initActBusiness("工单号: " + entity.getChangeOrderNum() + ";设备编号: " + equipment.getEquipmentCode(),
                entity.getId(), "IEamTechnicalStatusEvaluationOrderChangeService", "evaluation_order_change_process", null);
        Map<String, Object> variables = new HashMap<>();
        variables.put("dataId", entity.getId());

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

@@ -252,7 +252,7 @@
        this.getBaseMapper().updateById(entity);

        //启动流程
        flowCommonService.initActBusiness("工单号: " + entity.getOrderNum() + ";设备编号: " + equipment.getEquipmentCode() + ";安装位置" + equipment.getInstallationPosition(),
        flowCommonService.initActBusiness("工单号: " + entity.getOrderNum() + ";设备编号: " + equipment.getEquipmentCode(),
                entity.getId(), "IEamTechnicalStatusEvaluationOrderService", "technical_status_evaluation_process", null);
        Map<String, Object> variables = new HashMap<>();
        variables.put("dataId", entity.getId());

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

@@ -1,10 +1,56 @@
package org.jeecg.modules.eam.service.impl;

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
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.flowable.engine.TaskService;
import org.flowable.task.api.Task;
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.TranslateDictTextUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.constant.*;
import org.jeecg.modules.eam.entity.EamBaseHFCode;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceChange;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder;
import org.jeecg.modules.eam.mapper.EamThirdMaintenanceChangeMapper;
import org.jeecg.modules.eam.request.EamThirdMaintenanceChangeQuery;
import org.jeecg.modules.eam.request.EamThirdMaintenanceChangeRequest;
import org.jeecg.modules.eam.service.IEamBaseHFCodeService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamThirdMaintenanceChangeService;
import org.jeecg.modules.eam.service.IEamThirdMaintenanceOrderService;
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.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 javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @Description: ä¸‰ä¿å˜æ›´
@@ -15,4 +61,287 @@
@Service
public class EamThirdMaintenanceChangeServiceImpl extends ServiceImpl<EamThirdMaintenanceChangeMapper, EamThirdMaintenanceChange> implements IEamThirdMaintenanceChangeService {

    @Resource
    private EamThirdMaintenanceChangeMapper eamThirdMaintenanceChangeMapper;
    @Resource
    private IBaseFactoryUserService baseFactoryUserService;
    @Resource
    private IBaseFactoryService baseFactoryService;
    @Resource
    private IEamThirdMaintenanceOrderService thirdMaintenanceOrderService;
    @Resource
    private IEamEquipmentService equipmentService;
    @Resource
    private ISysBusinessCodeRuleService businessCodeRuleService;
    @Resource
    private IEamBaseHFCodeService hfCodeService;
    @Resource
    private ISysUserService sysUserService;
    @Resource
    private FlowCommonService flowCommonService;
    @Resource
    private TranslateDictTextUtils translateDictTextUtils;
    @Resource
    private IFlowDefinitionService flowDefinitionService;
    @Resource
    private IFlowMyBusinessService flowMyBusinessService;
    @Resource
    private TaskService taskService;
    @Resource
    private IEamEquipmentService eamEquipmentService;
    @Resource
    private IFlowTaskService flowTaskService;

    @Override
    public IPage<EamThirdMaintenanceChange> queryPageList(Page<EamThirdMaintenanceChange> page, EamThirdMaintenanceChangeQuery query) {
        QueryWrapper<EamThirdMaintenanceChange> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("tmc.del_flag", CommonConstant.DEL_FLAG_0);
        //用户数据权限
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            return page;
        }
        if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
            //选择了设备，根据设备id过滤设备
            List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().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> factoryCode = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
                queryWrapper.in("e.factory_org_code", factoryCode);
            } else {
                return page;
            }
        }
        //查询条件过滤
        if (query != null) {
            if (StringUtils.isNotBlank(query.getEquipmentId())) {
                queryWrapper.eq("tmc.equipment_id", query.getEquipmentId());
            }
            if (StringUtils.isNotBlank(query.getChangeOrderNum())) {
                queryWrapper.like("tmc.order_num", query.getChangeOrderNum());
            }
            if (StringUtils.isNotBlank(query.getChangeStatus())) {
                queryWrapper.eq("tmc.change_status", query.getChangeStatus());
            }
            if (query.getApplyDateBegin() != null && query.getApplyDateEnd() != null) {
                queryWrapper.between("tmc.apply_date", query.getApplyDateBegin(), query.getApplyDateEnd());
            }
            //排序
            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("tmc." + oConvertUtils.camelToUnderline(column));
                } else {
                    queryWrapper.orderByDesc("tmc." + oConvertUtils.camelToUnderline(column));
                }
            } else {
                queryWrapper.orderByDesc("tmc.create_time");
            }
        } else {
            queryWrapper.orderByDesc("tmc.create_time");
        }
        return eamThirdMaintenanceChangeMapper.queryPageList(page, queryWrapper);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean saveThirdMaintenanceChange(EamThirdMaintenanceChange request) {
        //查询工单
        EamThirdMaintenanceOrder order = thirdMaintenanceOrderService.getById(request.getOrderId());
        if (order == null) {
            throw new JeecgBootException("三保工单不存在，操作失败！");
        }
        //查询设备
        EamEquipment equipment = equipmentService.getById(order.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备信息不存在，操作失败！");
        }
        //用户数据权限
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            throw new JeecgBootException("登录用户信息为空，操作失败！");
        }
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.THIRD_MAINTENANCE_CHANGE_CODE_RULE);
        request.setChangeOrderNum(codeSeq);
        request.setId(null);
        request.setChangeStatus(ThirdMaintenanceChangeStatusEnum.WAIT_SUBMIT.name());
        request.setDelFlag(CommonConstant.DEL_FLAG_0);
        request.setApplicant(sysUser.getUsername());
        request.setApplyDate(new Date());
        request.setFactoryOrgCode(equipment.getFactoryOrgCode());
        // ä¸‰ä¿å˜æ›´å·¥å•HF
        EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.THIRD_MAINTENANCE_CHANGE.name());
        if (eamBaseHFCode == null) {
            throw new JeecgBootException("未配置技术状态鉴定变更的HF编码，添加失败！");
        }
        request.setHfCode(eamBaseHFCode.getHfCode());
        this.getBaseMapper().insert(request);
        boolean b = thirdMaintenanceOrderService.updateMaintenanceStatus(request.getOrderId(), ThirdMaintenanceStatusEnum.CHANGE.name());
        if (!b) {
            throw new JeecgBootException("三保工单状态变更失败，无法变更！");
        }
        return true;
    }

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

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean submit(String id) {
        EamThirdMaintenanceChange entity = this.getBaseMapper().selectById(id);
        if (entity == null) {
            throw new JeecgBootException("要提交的工单不存在，请刷新重试！");
        }
        if (!ThirdMaintenanceChangeStatusEnum.WAIT_SUBMIT.name().equals(entity.getChangeStatus())) {
            throw new JeecgBootException("该工单已进行过提交！");
        }
        EamThirdMaintenanceOrder order = thirdMaintenanceOrderService.getById(entity.getOrderId());
        if(order == null) {
            throw new JeecgBootException("要变更的三保工单不存在，请刷新重试！");
        }
        EamEquipment equipment = equipmentService.getById(order.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.setChangeStatus(ThirdMaintenanceChangeStatusEnum.EQUIPMENT_MANAGER_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.getChangeOrderNum() + ";设备编号: " + equipment.getEquipmentCode(),
                entity.getId(), "IEamThirdMaintenanceChangeService", "third_maintenance_change", null);
        Map<String, Object> variables = new HashMap<>();
        variables.put("dataId", entity.getId());
        String applyReasonTypeText = translateDictTextUtils.translateField("applyReasonType", entity.getApplyReasonType(), "third_maintenance_change_reason");
        if (StrUtil.isEmpty(applyReasonTypeText)) {
            variables.put("organization", "新增三保工单变更默认启动流程");
            variables.put("comment", "新增三保工单变更默认启动流程");
        } else {
            variables.put("organization", applyReasonTypeText);
            variables.put("comment", applyReasonTypeText);
        }
        Result<?> result = flowDefinitionService.startProcessInstanceByKey("third_maintenance_change", variables);
        if(result == null || !result.isSuccess()) {
            throw new JeecgBootException("启动流程失败！");
        }
        //更新工单状态为变更中
        order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.CHANGE.name());
        boolean b = thirdMaintenanceOrderService.updateById(order);
        if(!b) {
            throw new JeecgBootException("三保工单状态更新失败！");
        }
        return true;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public EamThirdMaintenanceChange approval(EamThirdMaintenanceChangeRequest request) {
        EamThirdMaintenanceChange entity = this.getBaseMapper().selectById(request.getId());
        if (entity == null) {
            throw new JeecgBootException("审批的数据已删除，请刷新重试！");
        }
        EamThirdMaintenanceOrder order = thirdMaintenanceOrderService.getById(entity.getOrderId());
        if(order == 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("流程实例不存在，请刷新后重试！");
        }

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

        // è®¾ç½®æµç¨‹å˜é‡
        setupProcessVariables(request, order, user, equipment);

        // å®Œæˆæµç¨‹ä»»åŠ¡
        Result result = flowTaskService.complete(request);

        // æ ¹æ®ä»»åŠ¡å®Œæˆç»“果更新工单状态
        updateOrderStatus(result, request, order, user);

        //更新工单信息
        this.getBaseMapper().updateById(entity);
        return entity;
    }

    /**
     * è®¾ç½®æµç¨‹å˜é‡
     */
    private void setupProcessVariables(EamThirdMaintenanceChangeRequest request, EamThirdMaintenanceOrder order, LoginUser user, EamEquipment equipment) {

    }

    /**
     * æ›´æ–°å·¥å•çŠ¶æ€
     */
    private void updateOrderStatus(Result result, EamThirdMaintenanceChangeRequest request, EamThirdMaintenanceOrder order, LoginUser user) {

    }

    private boolean isUserAuthorized(FlowMyBusiness flowMyBusiness, LoginUser user) {
        List<String> todoUsers = JSON.parseArray(flowMyBusiness.getTodoUsers(), String.class);
        return todoUsers != null && todoUsers.contains(user.getUsername());
    }

    private boolean claimTask(String taskId, LoginUser user) {
        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
        if (task == null) {
            return false;
        }
        if (task.getAssignee() != null && !task.getAssignee().equals(user.getUsername())) {
            return false;
        }
        taskService.claim(taskId, user.getUsername());
        return true;
    }

}

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

@@ -5,6 +5,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -22,12 +23,8 @@
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.*;
import org.jeecg.modules.eam.entity.EamBaseHFCode;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrderDetail;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.mapper.EamThirdMaintenanceOrderMapper;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
import org.jeecg.modules.eam.request.EamThirdMaintenanceQuery;
import org.jeecg.modules.eam.request.EamThirdMaintenanceRequest;
import org.jeecg.modules.eam.service.*;
@@ -360,6 +357,18 @@
        return Result.ok(eamThirdMaintenanceRequestList);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean updateMaintenanceStatus(String orderId, String maintenanceStatus) {
        LambdaUpdateWrapper<EamThirdMaintenanceOrder> updateWrapper = new LambdaUpdateWrapper<>();
        updateWrapper.eq(EamThirdMaintenanceOrder::getId, orderId);
        updateWrapper.set(EamThirdMaintenanceOrder::getMaintenanceStatus, maintenanceStatus);
        updateWrapper.eq(EamThirdMaintenanceOrder::getDelFlag, CommonConstant.DEL_FLAG_0);
        updateWrapper.in(EamThirdMaintenanceOrder::getMaintenanceStatus, Arrays.asList(ThirdMaintenanceStatusEnum.WAIT_MAINTENANCE.name(), ThirdMaintenanceStatusEnum.FREEZE.name()));
        int update = this.getBaseMapper().update(null, updateWrapper);
        return update > 0;
    }

    /**
     * è®¾ç½®æµç¨‹å˜é‡
     */