art: 技术状态鉴定工单变更-接口问题修改

zhangherong

5 天以前 a185b002c0bb9e1a3c09601e61ce9b61efe4a2a7

art: 技术状态鉴定工单变更-接口问题修改

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderChangeController.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.TechnicalStatusEvaluationOrderChangeStatusEnum;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderChangeQuery;
@@ -32,6 +37,10 @@
public class EamTechnicalStatusEvaluationOrderChangeController extends JeecgController<EamTechnicalStatusEvaluationOrderChange, IEamTechnicalStatusEvaluationOrderChangeService> {
    @Autowired
    private IEamTechnicalStatusEvaluationOrderChangeService eamTechnicalStatusEvaluationOrderChangeService;
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private TranslateDictTextUtils translateDictTextUtils;

    /**
     * 分页列表查询
@@ -148,8 +157,21 @@
    @ApiOperation(value = "技术状态鉴定工单变更-通过id查询", notes = "技术状态鉴定工单变更-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
        EamTechnicalStatusEvaluationOrderChange eamTechnicalStatusEvaluationOrderChange = eamTechnicalStatusEvaluationOrderChangeService.getById(id);
        return Result.OK(eamTechnicalStatusEvaluationOrderChange);
        EamTechnicalStatusEvaluationOrderChange entity = eamTechnicalStatusEvaluationOrderChangeService.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_technical_status_evaluation_order,order_num,id");
            translateDictTextUtils.translateField("applicant", entity.getApplicant(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("factoryOrgCode", entity.getFactoryOrgCode(), item, "eam_base_factory,factory_name,org_code");
            translateDictTextUtils.translateField("applyReason", entity.getApplyReason(), item, "technical_status_evaluation_order_change_reason");
            return Result.OK(item);
        } catch (JsonProcessingException e) {
            return Result.error("数据转译失败！");
        }
    }

}

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

@@ -93,7 +93,7 @@
    private Date equipmentManagerSignatureTime;
    /**主管领导签字结果*/
    @ApiModelProperty(value = "主管领导签字结果")
    @Dict(dicCode = "approved_rejected")
    @Dict(dicCode = "approve_reject")
    private String equipmentManagerSignatureResult;
    /**主管领导意见*/
    @ApiModelProperty(value = "主管领导意见")
@@ -109,7 +109,7 @@
    private Date departManagerSignatureTime;
    /**部门领导签字结果*/
    @ApiModelProperty(value = "部门领导签字结果")
    @Dict(dicCode = "approved_rejected")
    @Dict(dicCode = "approve_reject")
    private String departManagerSignatureResult;
    /**部门领导意见*/
    @ApiModelProperty(value = "部门领导意见")
@@ -125,7 +125,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/request/EamTechnicalStatusEvaluationOrderChangeRequest.java

@@ -1,11 +1,13 @@
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.flowable.domain.vo.FlowTaskVo;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;
@@ -29,6 +31,8 @@
    private String applyReason;
    /**变更鉴定日期*/
    @ApiModelProperty(value = "变更鉴定日期")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date deferredEvaluationDate;
    /**主管领导签字结果*/
    @ApiModelProperty(value = "主管领导签字结果")

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

@@ -391,6 +391,7 @@
                entity.setDepartManagerSignatureTime(new Date());
                entity.setDepartManagerSignatureResult(request.getDepartManagerSignatureResult());
                entity.setDepartManagerComment(request.getDepartManagerComment());
                values.put("departLeaderConfirmFlag", request.getEquipmentManagerSignatureResult());
                if(BusinessCodeConst.APPROVED.equals(request.getDepartManagerSignatureResult())) {
                    //通过
                    entity.setChangeStatus(TechnicalStatusEvaluationOrderChangeStatusEnum.PRODUCTION_SUPPORT_SIGNING.name());