二保流程代码

lyh

8 天以前 a9e041cfce0bacbf37f8c28ca02d816aa385dc35

二保流程代码

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

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

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

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

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

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

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

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

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

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

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

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

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

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


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

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

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

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

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

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

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

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

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

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

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