台账导入修改

qushaowei

2025-06-04 fff5ef18854efe6a4eb03049a1ddcc16edb0087e

台账导入修改

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

@@ -978,7 +978,7 @@
                                         .setEquipmentUda4(equipmentImportVo.getEquipmentUda4())
                                         .setEquipmentUda5(equipmentImportVo.getEquipmentUda5())
                                         .setLocation(equipmentImportVo.getLocation())
                                         .setLastVerificationDate(equipmentImportVo.getLeaveFactoryDate())
                                         .setLeaveFactoryDate(equipmentImportVo.getLeaveFactoryDate())
                                         .setProjectApprovalNo(equipmentImportVo.getProjectApprovalNo())
                                         .setFundSource(equipmentImportVo.getFundSource())
                                         .setAcceptanceCheckDate(equipmentImportVo.getAcceptanceCheckDate())
@@ -986,9 +986,14 @@
                                         .setSourceCountry(equipmentImportVo.getSourceCountry())
                                         .setModel(equipmentImportVo.getModel())
                                         .setSpecification(equipmentImportVo.getSpecification())
                                         .setPropertyStatus("normal")
                                         .setPropertyStatus(equipmentImportVo.getPropertyStatus())
                                         .setOperatingSystem(equipmentImportVo.getOperatingSystem())
                                         .setWarrantyStart(equipmentImportVo.getWarrantyStart())
                                         .setWarrantyEnd(equipmentImportVo.getWarrantyEnd())
                                         .setCreateBy(equipmentImportVo.getCreateBy())
                                         .setCreateTime(equipmentImportVo.getCreateTime())
                                         .setUpdateBy(equipmentImportVo.getUpdateBy())
                                         .setUpdateTime(equipmentImportVo.getUpdateTime())
                                         .setIsLineEquip("no")
                                         .setIsLine("no")
                                         .setNextTechnologyStatusQualificationTime(equipmentImportVo.getNextTechnologyStatusQualificationTime())
@@ -1036,11 +1041,100 @@
                                     Date date = DateUtils.getDayAfter(equipment.getThirdMaintenanceTime(), checkPeriod);
                                     equipment.setNextThirdMaintenanceTime(date);
                                 }
                                 equipmentService.save(equipment);
                                 equipmentService.saveOrUpdate(equipment);
                             }else {
                                 exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败，原因：统一编码已存在，数据重复导入;";
                                 exceptionNum++;
                                 continue;
//                                 oriEquipment.setUseId(equipment.getUseId());
//                                 oriEquipment.setWorkCenterId(equipment.getWorkCenterId());
//                                 oriEquipment.setFactoryModelId(equipment.getFactoryModelId());
//                                 oriEquipment.setAreaId(equipment.getAreaId());
//                                 oriEquipment.setManageId(equipment.getManageId());
//                                 oriEquipment.setEquipmentCategoryId(equipment.getEquipmentCategoryId());
//                                 oriEquipment.setTeamId(equipment.getTeamId());
//                                 oriEquipment.setConstructorId(equipment.getConstructorId());
//                                 oriEquipment.setNum(equipmentImportVo.getNum())
//                                         .setName(equipmentImportVo.getName())
//                                         .setTechnologyStatus(equipmentImportVo.getTechnologyStatus())
//                                         .setEquipmentImportanceId(equipmentImportVo.getEquipmentImportanceId())
//                                         .setSpecificEquipment(equipmentImportVo.getKeyEquipmentIdentification())
//                                         .setSecurityConfiguration(equipmentImportVo.getSecurityConfiguration())
//                                         .setCoolingSystem(equipmentImportVo.getCoolingSystem())
//                                         .setFireExtinguisher(equipmentImportVo.getFireExtinguisher())
//                                         .setFireExtinguisherValidityPeriod(equipmentImportVo.getFireExtinguisherValidityPeriod())
//                                         .setSystem(equipmentImportVo.getSystem())
//                                         .setPort(equipmentImportVo.getPort())
//                                         .setCoordinateNum(equipmentImportVo.getCoordinateNum())
//                                         .setEquipmentStatus(equipmentImportVo.getEquipmentStatus())
//                                         .setEquipmentUda3(equipmentImportVo.getEquipmentUda3())
//                                         .setEquipmentUda4(equipmentImportVo.getEquipmentUda4())
//                                         .setEquipmentUda5(equipmentImportVo.getEquipmentUda5())
//                                         .setLocation(equipmentImportVo.getLocation())
//                                         .setLeaveFactoryDate(equipmentImportVo.getLeaveFactoryDate())
//                                         .setProjectApprovalNo(equipmentImportVo.getProjectApprovalNo())
//                                         .setFundSource(equipmentImportVo.getFundSource())
//                                         .setAcceptanceCheckDate(equipmentImportVo.getAcceptanceCheckDate())
//                                         .setFactoryNumber(equipmentImportVo.getFactoryNumber())
//                                         .setSourceCountry(equipmentImportVo.getSourceCountry())
//                                         .setModel(equipmentImportVo.getModel())
//                                         .setSpecification(equipmentImportVo.getSpecification())
//                                         .setPropertyStatus(equipmentImportVo.getPropertyStatus())
//                                         .setOperatingSystem(equipmentImportVo.getOperatingSystem())
//                                         .setWarrantyStart(equipmentImportVo.getWarrantyStart())
//                                         .setWarrantyEnd(equipmentImportVo.getWarrantyEnd())
//                                         .setCreateBy(equipmentImportVo.getCreateBy())
//                                         .setCreateTime(equipmentImportVo.getCreateTime())
//                                         .setUpdateBy(equipmentImportVo.getUpdateBy())
//                                         .setUpdateTime(equipmentImportVo.getUpdateTime())
//                                         .setIsLineEquip("no")
//                                         .setIsLine("no")
//                                         .setNextTechnologyStatusQualificationTime(equipmentImportVo.getNextTechnologyStatusQualificationTime())
//                                         .setThirdMaintenanceTime(equipmentImportVo.getThirdMaintenanceTime())
//                                         .setTechnologyStatusQualificationTime(equipmentImportVo.getTechnologyStatusQualificationTime())
//                                         .setGpo(equipmentImportVo.getGpo());
//                                 if(equipmentCategory.getEquipmentCategoryUda1().equals("weldingMachine")){
//                                     oriEquipment.setCheckPeriod(365*3+"");
//                                 }
//                                 if(equipmentCategory.getEquipmentCategoryUda1().equals("filesCarousel")){
//                                     oriEquipment.setCheckPeriod(365*4+"");
//                                 }
//                                 if(equipmentCategory.getEquipmentCategoryUda1().equals("tester")){
//                                     oriEquipment.setCheckPeriod(365*1+"");
//                                 }
//                                 if(
//                                         !equipmentCategory.getEquipmentCategoryUda1().equals("weldingMachine")
//                                                 &&!equipmentCategory.getEquipmentCategoryUda1().equals("filesCarousel")
//                                                 &&!equipmentCategory.getEquipmentCategoryUda1().equals("tester")
//                                 ){
//                                     if(StringUtils.isNotBlank(abc)){
//                                         if(abc.equals("A")){
//                                             oriEquipment.setCheckPeriod(365*3+"");
//                                         }
//                                         if(
//                                                 abc.equals("B")
//                                                         ||abc.equals("C")
//                                                         ||abc.equals("D")
//                                         ){
//                                             oriEquipment.setCheckPeriod(365*4+"");
//                                         }
//                                     }
//                                 }
//                                 //下次三保日期处理
//                                 if(oriEquipment.getThirdMaintenanceTime() == null && oriEquipment.getAcceptanceCheckDate() != null && StringUtils.isNotBlank(oriEquipment.getCheckPeriod())){
//                                     //如果没有三保日期 按照验收日期计算下次三保日期
//                                     int checkPeriod = Integer.parseInt(oriEquipment.getCheckPeriod()) - 1;
//                                     LocalDate acceptanceCheckDate = LocalDate.parse(oriEquipment.getAcceptanceCheckDate());
//                                     LocalDate localDate = acceptanceCheckDate.plusDays(checkPeriod);
//                                     Date date = DateUtils.str2Date(localDate.toString(), DateUtils.date_sdf.get());
//                                     oriEquipment.setNextThirdMaintenanceTime(date);
//                                 }else if(oriEquipment.getThirdMaintenanceTime() != null && StringUtils.isNotBlank(oriEquipment.getCheckPeriod())){
//                                     //如果有三保日期 则使用三保日期计算 下次三保日期
//                                     int checkPeriod = Integer.parseInt(oriEquipment.getCheckPeriod()) - 1;
//                                     Date date = DateUtils.getDayAfter(oriEquipment.getThirdMaintenanceTime(), checkPeriod);
//                                     oriEquipment.setNextThirdMaintenanceTime(date);
//                                 }
//                                 equipmentService.updateById(oriEquipment);
                             }
                         }
                     }

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

@@ -263,6 +263,7 @@
    private String  fireExtinguisherValidityPeriod;
    @Excel(name = "操作系统", width = 15,orderNum = "13")
    @ApiModelProperty(value = "操作系统")
    @Dict(dicCode = "operation_flag")
    private String  operatingSystem;
    @Excel(name = "系统", width = 15,orderNum = "14")
    @ApiModelProperty(value = "系统")

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

@@ -73,6 +73,9 @@
    @Excel(name = "灭火器有效期")
    private String fireExtinguisherValidityPeriod;

    @Excel(name = "操作系统",dicCode = "operation_flag")
    private String operatingSystem;

    @Excel(name = "系统")
    private String system;

@@ -109,26 +112,26 @@
    @Excel(name = "出厂编号")
    private String factoryNumber;

    @Excel(name = "资产的来源国家")
    @Excel(name = "资产来源国家")
    private String sourceCountry;

    @Excel(name = "安全配置")
    private String securityConfiguration;

    @Excel(name = "规格")
    @Excel(name = "设备规格")
    private String specification;

    @Excel(name = "总功率")
    private String gpo;

    @Excel(name = "质保开始日期",format = "yyyyMMdd")
    private Date warrantyStart;
    @Excel(name = "质保开始日期",format = "yyyy-MM-dd")
    private java.util.Date warrantyStart;

    @Excel(name = "质保结束日期",format = "yyyyMMdd")
    private Date warrantyEnd;
    @Excel(name = "质保结束日期",format = "yyyy-MM-dd")
    private java.util.Date warrantyEnd;

    @Excel(name = "下次技术状态鉴定时间", width = 20, format = "yyyyMMdd")
    private Date  nextTechnologyStatusQualificationTime;
    @Excel(name = "下次技术状态鉴定时间", width = 20, format = "yyyy-MM-dd")
    private java.util.Date  nextTechnologyStatusQualificationTime;

    @Excel(name = "三保日期", format = "yyyy-MM-dd")
    private java.util.Date     thirdMaintenanceTime;
@@ -136,4 +139,18 @@
    @Excel(name = "技术状态鉴定日期", format = "yyyy-MM-dd")
    private java.util.Date     technologyStatusQualificationTime;

    @Excel(name = "创建人", width = 15)
    private java.lang.String createBy;

    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private java.util.Date createTime;

    @Excel(name = "更新人", width = 15)
    private java.lang.String updateBy;

    @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private java.util.Date updateTime;

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml

@@ -350,8 +350,8 @@
        t1.constructor_id constructorId,
        t1.supplier_id supplierId,
        t1.factory_number factoryNumber,
        t1.leave_factory_date leaveFactoryDate,
        t1.acceptance_check_date acceptanceCheckDate,
        CONVERT(VARCHAR(10), t1.leave_factory_date, 120) leaveFactoryDate,
        CONVERT(VARCHAR(10), t1.acceptance_check_date, 120) acceptanceCheckDate,
        t1.affiliation_id affiliationId,
        t1.manage_id manageId,
        t1.manager manager,