设备台账2.0

“linengliang”

2023-08-25 d1c8237871f3f2370b8ef7a9e534c4bc29bfc467

设备台账2.0

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

@@ -153,17 +153,17 @@
                eq.setPrecisionParametersTemplateName("");
            }

//            String processParametersTemplateId = eq.getProcessParametersTemplateId();
//            if(StringUtils.isNotBlank(processParametersTemplateId)){
//                ProcessParametersTemplate processParametersTemplate = processParametersTemplateService.getById(processParametersTemplateId);
//                if(processParametersTemplate != null){
//                    eq.setProcessParametersTemplateName(processParametersTemplate.getName());
//                }else{
//                    eq.setProcessParametersTemplateName("");
//                }
//            }else{
//                eq.setProcessParametersTemplateName("");
//            }
            String processParametersTemplateId = eq.getProcessParametersTemplateId();
            if(StringUtils.isNotBlank(processParametersTemplateId)){
                ProcessParametersTemplate processParametersTemplate = processParametersTemplateService.getById(processParametersTemplateId);
                if(processParametersTemplate != null){
                    eq.setProcessParametersTemplateName(processParametersTemplate.getName());
                }else{
                    eq.setProcessParametersTemplateName("");
                }
            }else{
                eq.setProcessParametersTemplateName("");
            }
            //查询封存原因和封存日期
            List<EquipmentSealDetail> equipmentSealDetailList = equipmentSealDetailService.lambdaQuery().eq(EquipmentSealDetail::getEquipmentId,eq.getId())
                    .eq(EquipmentSealDetail::getDelFlag, CommonConstant.DEL_FLAG_0).orderByDesc(EquipmentSealDetail::getCreateTime).list();
@@ -580,7 +580,7 @@
                                     .setTeamId(equipmentImportVo.getTeamId())
                                     .setEquipmentImportanceId(equipmentImportVo.getEquipmentImportanceId())
                                     .setEquipmentCategoryId(equipmentCategory.getId())
                                     .setKeyEquipmentIdentification(equipmentImportVo.getKeyEquipmentIdentification())
                                     .setSpecificEquipment(equipmentImportVo.getKeyEquipmentIdentification())
                                     .setSecurityConfiguration(equipmentImportVo.getSecurityConfiguration())
                                     .setCoolingSystem(equipmentImportVo.getCoolingSystem())
                                     .setFireExtinguisher(equipmentImportVo.getFireExtinguisher())
@@ -593,12 +593,12 @@
                                     .setEquipmentUda3(equipmentImportVo.getEquipmentUda3())
                                     .setEquipmentUda4(equipmentImportVo.getEquipmentUda4())
                                     .setEquipmentUda5(equipmentImportVo.getEquipmentUda5())
                                     .setEquipmentUda2(equipmentImportVo.getEquipmentUda2())
                                     .setLocation(equipmentImportVo.getEquipmentUda2())
                                     .setLastVerificationDate(equipmentImportVo.getLeaveFactoryDate())
                                     .setProjectApprovalNo(equipmentImportVo.getProjectApprovalNo())
                                     .setFundSource(equipmentImportVo.getFundSource())
                                     .setAcceptanceCheckDate(equipmentImportVo.getAcceptanceCheckDate())
                                     .setFactoryNo(equipmentImportVo.getFactoryNo())
                                     .setFactoryNumber(equipmentImportVo.getFactoryNo())
                                     .setConstructorId(equipmentImportVo.getConstructorId())
                                     .setSourceCountry(equipmentImportVo.getSourceCountry())
                                     .setModel(equipmentImportVo.getModel())

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

@@ -68,6 +68,7 @@
    /**所属分类*/
    @Excel(name = "所属分类", width = 15)
    @ApiModelProperty(value = "所属分类")
    @Dict(dictTable = "mom_eam_equipment_category",dicCode = "id",dicText = "name")
    private String equipmentCategoryId;
    /**特种设备*/
    @Excel(name = "特种设备（是、否）", width = 15)
@@ -269,6 +270,10 @@
    private BigDecimal coordinateNum;
    @ApiModelProperty(value = "立项卡号")
    private String  projectApprovalNo;


    private String standardA;
    private String standardB;
    private String standardC;
    private String standardD;
    private String standardE;
    private String standardF;
}

 lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml

@@ -188,9 +188,9 @@
    app: http://localhost:8051
  path:
    #文件上传根目录 设置
    upload: /opt/upFiles
    upload: C://opt//upFiles
    #webapp文件路径
    webapp: /opt/webapp
    webapp: C://opt//upFiles
  shiro:
    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
  #阿里云oss存储和大鱼短信秘钥配置