art: 技术状态鉴定-字段修改

zhangherong

2025-07-10 8f0fea34594bb5da8c4fb804a7f9f5cb2698c141

art: 技术状态鉴定-字段修改

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

@@ -4,7 +4,7 @@
  "avatar": "",
  "version": "4.9.2",
  "createdTime": "2025-3-10 16:38:19",
  "updatedTime": "2025-7-10 10:43:18",
  "updatedTime": "2025-7-10 12:02:35",
  "dbConns": [],
  "profile": {
    "default": {
@@ -24725,7 +24725,7 @@
        {
          "defKey": "evaluation_status",
          "defName": "鉴定状态",
          "comment": "待鉴定、鉴定中、维修室主任签字、工艺人员签字、技术主管签字、设备检验员签字、已完成、已锁定、变更中、已过期",
          "comment": "待鉴定、鉴定中、维修室主任签字、工艺人员签字、使用单位技术主管签字、设备检验员签字、已完成、已锁定、变更中、已过期",
          "type": "",
          "len": "",
          "scale": "",
@@ -24899,7 +24899,7 @@
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "repair_manager_signature_time_1",
          "defKey": "repair_manager_signature_time",
          "defName": "维修室主任签字时间",
          "comment": "",
          "type": "",
@@ -24925,6 +24925,24 @@
          "attr9": "",
          "id": "ADE87D39-0E76-4D32-8C2E-05F1D4C0B137",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
        },
        {
          "defKey": "repair_manager_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": "0F13D1D1-36B5-4A0D-BD5B-AFDA084E1DDB"
        },
        {
          "defKey": "sample_check_result",
@@ -24979,6 +24997,78 @@
          "extProps": {},
          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
          "id": "CD0EC1A3-9216-45AE-A386-43654B1F1F3C"
        },
        {
          "defKey": "process_technician_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": "47FF3E75-03DE-4CF8-B26E-6648E50AFF57"
        },
        {
          "defKey": "depart_technical_leader_signature",
          "defName": "使用单位技术主管签字",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "id": "6ADA4571-938B-45C3-94E9-597976870FC9"
        },
        {
          "defKey": "depart_technical_leader_signature_time",
          "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": "0B2E03D2-7AE1-447D-AE76-91D7287805A9"
        },
        {
          "defKey": "depart_technical_leader_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": "83DD647B-8CF8-431D-AFF0-E73ECE6A107D"
        },
        {
          "defKey": "evaluation_result",
@@ -25073,6 +25163,24 @@
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
        },
        {
          "defKey": "inspector_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": "8DA86471-B224-4E8C-9290-9C3BF5BC2B5D"
        },
        {
          "defKey": "hf_code_a",
          "defName": "附录A HF编码",
          "comment": "",

 db/ZHR/business_code_zhr.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,3 @@
--技术状态鉴定相关编码规则
INSERT INTO [dbo].[sys_business_code_rule] ([id], [create_by], [create_time], [update_by], [update_time], [del_flag], [business_name], [business_code], [prefix], [year_format], [month_format], [day_format], [seq_length]) VALUES (N'1942396178475687937', N'admin', '2025-07-08 09:31:51.5660000', NULL, NULL, 0, N'技术状态鉴定规范编码规则', N'TechnicalStatusStandardCodeRule', N'TSES', N'yyyy', NULL, NULL, 4);
INSERT INTO [dbo].[sys_business_code_rule] ([id], [create_by], [create_time], [update_by], [update_time], [del_flag], [business_name], [business_code], [prefix], [year_format], [month_format], [day_format], [seq_length]) VALUES (N'1943153060836503553', N'admin', '2025-07-10 11:39:26.4060000', NULL, NULL, 0, N'技术状态鉴定工单编码规则', N'TechnicalStatusEvaluationOrderCodeRule', N'TSEO', N'yyyy', NULL, NULL, 4);

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

@@ -29,6 +29,8 @@
    String SCRAP_CODE_RULE = "EquipmentScrapCodeRule";
    //技术状态鉴定规范编码规则
    String TECHNICAL_STATUS_EVALUATION_STANDARD_CODE_RULE = "TechnicalStatusStandardCodeRule";
    //技术状态鉴定工单编码规则
    String TECHNICAL_STATUS_EVALUATION_ORDER_CODE_RULE = "TechnicalStatusEvaluationOrderCodeRule";
    /**
     * å¤‡ä»¶è¯·è´­å•çŠ¶æ€ 1:已创建 2:已提交 3:已通过 4:已驳回 5:已完成
     */

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

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

public enum EamTechnicalStatusEvaluationOrderEnum {
    WAIT_EVALUATION, //待鉴定
    UNDER_EVALUATION, //鉴定中
    repair_manager_signing, //维修室主任签字
    PROCESS_TECHNICIAN_SIGNING, //工艺人员签字
    DEPART_TECHNICAL_LEADER_SIGNING, //使用单位技术主管签字
    INSPECTOR_SIGNING, //设备检验员签字
    COMPLETED, //已完成
    LOCKED, //已锁定
    CHANGING, //变更中
    EXPIRED, //已过期
    ;
}

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

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

import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -8,9 +9,13 @@
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.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderQuery;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderRequest;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -27,7 +32,8 @@
public class EamTechnicalStatusEvaluationOrderController extends JeecgController<EamTechnicalStatusEvaluationOrder, IEamTechnicalStatusEvaluationOrderService> {
    @Autowired
    private IEamTechnicalStatusEvaluationOrderService eamTechnicalStatusEvaluationOrderService;
	
     @Autowired
     private ISysBusinessCodeRuleService businessCodeRuleService;
    /**
     * åˆ†é¡µåˆ—表查询
     *
@@ -49,14 +55,26 @@
    /**
     * æ·»åŠ 
     *
     * @param eamTechnicalStatusEvaluationOrder
     * @param request
     * @return
     */
    @AutoLog(value = "技术状态鉴定工单-添加")
    @ApiOperation(value="技术状态鉴定工单-添加", notes="技术状态鉴定工单-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamTechnicalStatusEvaluationOrder eamTechnicalStatusEvaluationOrder) {
        eamTechnicalStatusEvaluationOrderService.save(eamTechnicalStatusEvaluationOrder);
    public Result<?> add(@RequestBody EamTechnicalStatusEvaluationOrderRequest request) {
        if (request == null) {
            return Result.error("添加的对象不能为空！");
        }
        if (CollectionUtil.isEmpty(request.getTableDetailList())) {
            return Result.error("检查项不能为空！");
        }
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_EVALUATION_ORDER_CODE_RULE);
        request.setOrderNum(codeSeq);
        request.setCreationMethod(OrderCreationMethodEnum.MANUAL.name());
        boolean b = eamTechnicalStatusEvaluationOrderService.addTechnicalStatusEvaluationOrder(request);
        if (!b) {
            return Result.error("添加失败！");
        }
        return Result.OK("添加成功！");
    }
    

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

@@ -94,7 +94,10 @@
    private String repairManagerSignature;
    /**维修室主任签字时间*/
    @ApiModelProperty(value = "维修室主任签字时间")
    private Date repairManagerSignatureTime1;
    private Date repairManagerSignatureTime;
    /**维修室主任意见*/
    @ApiModelProperty(value = "维修室主任意见")
    private String repairManagerComment;
    /**试件检查结果;合格、不合格*/
    @ApiModelProperty(value = "试件检查结果;合格、不合格")
    private String sampleCheckResult;
@@ -104,6 +107,18 @@
    /**工艺员签字时间*/
    @ApiModelProperty(value = "工艺员签字时间")
    private Date processTechnicianSignatureTime;
    /**工艺员意见*/
    @ApiModelProperty(value = "工艺员意见")
    private String processTechnicianComment;
    /**使用单位技术主管签字*/
    @ApiModelProperty(value = "使用单位技术主管签字")
    private String departTechnicalLeaderSignature;
    /**使用单位技术主管签字时间*/
    @ApiModelProperty(value = "使用单位技术主管签字时间")
    private Date departTechnicalLeaderSignatureTime;
    /**使用单位技术主管意见*/
    @ApiModelProperty(value = "使用单位技术主管意见")
    private String departTechnicalLeaderComment;
    /**鉴定结果;合格、限用、禁用*/
    @ApiModelProperty(value = "鉴定结果;合格、限用、禁用")
    private String evaluationResult;
@@ -116,6 +131,9 @@
    /**设备检查人签字时间*/
    @ApiModelProperty(value = "设备检查人签字时间")
    private Date inspectorSignatureTime;
    /**设备检查人意见*/
    @ApiModelProperty(value = "设备检查人意见")
    private String inspectorComment;
    /**附录A HF编码*/
    @ApiModelProperty(value = "附录A HF编码")
    private String hfCodeA;

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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderDetail;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;
import java.util.List;

@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="技术状态鉴定工单对象", description="技术状态鉴定工单")
public class EamTechnicalStatusEvaluationOrderRequest extends FlowTaskVo implements Serializable {
    /**主键*/
    @ApiModelProperty(value = "主键")
    private String id;
    /**工单号*/
    @ApiModelProperty(value = "工单号")
    private String orderNum;
    /**设备ID*/
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**规范ID*/
    @ApiModelProperty(value = "规范ID")
    private String standardId;
    /**计划鉴定日期*/
    @ApiModelProperty(value = "计划鉴定日期")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date evaluationDate;
    /**鉴定人*/
    @ApiModelProperty(value = "鉴定人")
    private String evaluator;
    /**创建方式*/
    @ApiModelProperty(value = "创建方式")
    private String creationMethod;
    /**备注*/
    @ApiModelProperty(value = "备注")
    private String remark;
    /**列表 ä¿å…»é¡¹æ˜Žç»†*/
    @ApiModelProperty(value = "列表 æ£€æŸ¥é¡¹æ˜Žç»†")
    private List<EamTechnicalStatusEvaluationOrderDetail> tableDetailList;

    //审批操作
    /**安全装置检查结果;是、否*/
    @ApiModelProperty(value = "安全装置检查结果;是、否")
    private String safetyEquipmentCheckResult;
    /**精度参数检查结果;是、否、无*/
    @ApiModelProperty(value = "精度参数检查结果;是、否、无")
    private String precisionCheckResult;
    /**功能状态检查结果;是、否*/
    @ApiModelProperty(value = "功能状态检查结果;是、否")
    private String functionalCheckResult;
    /**其他检查结果;是、否、无*/
    @ApiModelProperty(value = "其他检查结果;是、否、无")
    private String otherCheckResult;
    /**试件检查结果;合格、不合格*/
    @ApiModelProperty(value = "试件检查结果;合格、不合格")
    private String sampleCheckResult;
    /**鉴定结果;合格、限用、禁用*/
    @ApiModelProperty(value = "鉴定结果;合格、限用、禁用")
    private String evaluationResult;
    /**限\禁用原因(多选);安全装置、设备功能、精度、试件、其他*/
    @ApiModelProperty(value = "限/禁用原因(多选);安全装置、设备功能、精度、试件、其他")
    private String evaluationReason;
}

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderQuery;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderRequest;

/**
 * @Description: æŠ€æœ¯çŠ¶æ€é‰´å®šå·¥å•
@@ -21,4 +22,11 @@
     * @return
     */
    IPage<EamTechnicalStatusEvaluationOrder> queryPageList(Page<EamTechnicalStatusEvaluationOrder> page, EamTechnicalStatusEvaluationOrderQuery query);

    /**
     * æ‰‹åŠ¨æ·»åŠ æŠ€æœ¯é‰´å®šå·¥å•
     * @param request
     * @return
     */
    boolean addTechnicalStatusEvaluationOrder(EamTechnicalStatusEvaluationOrderRequest request);
}

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

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

import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,11 +11,15 @@
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.constant.EamTechnicalStatusEvaluationOrderEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder;
import org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationOrderMapper;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderQuery;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderRequest;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderDetailService;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderService;
@@ -25,6 +30,7 @@
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Arrays;
import java.util.List;
@@ -113,4 +119,35 @@
        queryWrapper.orderByDesc("ems.create_time");
        return this.getBaseMapper().queryPageList(page, queryWrapper);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean addTechnicalStatusEvaluationOrder(EamTechnicalStatusEvaluationOrderRequest request) {
        EamEquipment equipment = equipmentService.getById(request.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备不存在，添加失败！");
        }
        EamTechnicalStatusEvaluationOrder order = new EamTechnicalStatusEvaluationOrder();
        order.setOrderNum(request.getOrderNum());
        order.setEquipmentId(request.getEquipmentId());
        order.setStandardId(request.getStandardId());
        order.setEvaluationDate(request.getEvaluationDate());
        order.setEvaluator(request.getEvaluator());
        order.setRemark(request.getRemark());
        //状态初始化
        order.setEvaluationStatus(EamTechnicalStatusEvaluationOrderEnum.WAIT_EVALUATION.name());
        order.setCreationMethod(request.getCreationMethod());
        //删除标记
        order.setDelFlag(CommonConstant.DEL_FLAG_0);
        this.getBaseMapper().insert(order);
        //处理明细数据
        if (CollectionUtil.isNotEmpty(request.getTableDetailList())) {
            request.getTableDetailList().forEach(tableDetail -> {
                tableDetail.setId(null);
                tableDetail.setOrderId(order.getId());
            });
            orderDetailService.saveBatch(request.getTableDetailList());
        }
        return true;
    }
}