Merge remote-tracking branch 'origin/master'

Lius

18 小时以前 dd62744092d27e98e9c998cf5b346be202399949

Merge remote-tracking branch 'origin/master'

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

@@ -2,14 +2,19 @@

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.TechnicalStatusDeactivateStatusEnum;
import org.jeecg.modules.eam.entity.EamTechnicalStatusDeactivate;
import org.jeecg.modules.eam.request.EamTechnicalStatusDeactivateQuery;
@@ -31,6 +36,10 @@
public class EamTechnicalStatusDeactivateController extends JeecgController<EamTechnicalStatusDeactivate, IEamTechnicalStatusDeactivateService> {
    @Autowired
    private IEamTechnicalStatusDeactivateService eamTechnicalStatusDeactivateService;
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private TranslateDictTextUtils translateDictTextUtils;

    /**
     * 分页列表查询
@@ -149,6 +158,17 @@
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
        EamTechnicalStatusDeactivate eamTechnicalStatusDeactivate = eamTechnicalStatusDeactivateService.getById(id);
        return Result.OK(eamTechnicalStatusDeactivate);
        if (eamTechnicalStatusDeactivate == null) {
            return Result.error("未找到对应数据");
        }
        try {
            String json = objectMapper.writeValueAsString(eamTechnicalStatusDeactivate);
            JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
            translateDictTextUtils.translateField("applicant", eamTechnicalStatusDeactivate.getApplicant(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("factoryOrgCode", eamTechnicalStatusDeactivate.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/entity/EamTechnicalStatusDeactivate.java

@@ -64,6 +64,7 @@
    private Date applyDate;
    /**申请单状态;待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成*/
    @ApiModelProperty(value = "申请单状态;待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成")
    @Dict(dicCode = "technical_status_deactivate_status")
    private String applicationStatus;
    /**使用单位室主管签字*/
    @ApiModelProperty(value = "使用单位室主管签字")

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

@@ -175,6 +175,7 @@
            detail.setCreateTime(null);
            detail.setUpdateBy(null);
            detail.setUpdateTime(null);
            detail.setApplicationId(order.getId());
        });
        deactivateDetailService.saveBatch(request.getTableDetailList());
        return true;
@@ -211,6 +212,7 @@
            detail.setCreateTime(null);
            detail.setUpdateBy(null);
            detail.setUpdateTime(null);
            detail.setApplicationId(entity.getId());
        });
        deactivateDetailService.saveBatch(request.getTableDetailList());
        return true;

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

@@ -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());