art: 设备管理-周保-保养流程调试修改

zhangherong

2025-04-15 aea668fc4c96677196978bf3af80be86fd6fa21d

art: 设备管理-周保-保养流程调试修改

 db/Êý¾Ý¿â²úÆ·»¯Éè¼Æ.pdma.json

@@ -4,7 +4,7 @@
  "avatar": "",
  "version": "4.9.2",
  "createdTime": "2025-3-10 16:38:19",
  "updatedTime": "2025-4-8 16:18:02",
  "updatedTime": "2025-4-15 16:12:47",
  "dbConns": [],
  "profile": {
    "default": {
@@ -6277,6 +6277,24 @@
          "uiHint": null
        },
        {
          "defKey": "confirm_deal_type",
          "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": "EF6D9EAA-0BD3-462A-84A8-093D70D919EB"
        },
        {
          "defKey": "confirm_comment",
          "defName": "确认意见",
          "comment": "",

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

@@ -96,6 +96,9 @@
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date confirmTime;
    /** ç¡®è®¤ç±»åž‹ 1 é€šè¿‡  2 é©³å›ž */
    @ApiModelProperty(value = "确认类型")
    private String confirmDealType;
    /**保养执行图片;id以逗号分隔*/
    @ApiModelProperty(value = "保养执行图片;id以逗号分隔")
    private String imageFiles;

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

@@ -367,6 +367,9 @@
                }
                break;
            case WAIT_CONFIRM:
                if(StringUtils.isBlank(equipment.getEquipmentManager())) {
                    throw new JeecgBootException("设备未分配设备管理员，无法进入下级审批！");
                }
                //班组长确认
                userApprovalList = new ArrayList<>();
                userApprovalList.add(equipment.getEquipmentManager());
@@ -397,7 +400,7 @@
            case WAIT_INITIAL_ACCEPTANCE:
                userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0005);
                if (CollectionUtil.isEmpty(userSelectors)) {
                    throw new JeecgBootException("设备未分配给班组长，无法进入下级审批！");
                    throw new JeecgBootException("设备未分配给设能部管理员，无法进入下级审批！");
                }
                userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
                values.put("dataId", entity.getId());