Merge branch 'develop'

zenglf

2023-11-10 7972601aa993d1296f198ca16fae73c7988c0177

Merge branch 'develop'

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

@@ -571,6 +571,8 @@
                     String manageId = equipmentImportVo.getManageId();
                     String constructorId = equipmentImportVo.getConstructorId();
                     String teamId = equipmentImportVo.getTeamId();
                     String propertyStatus = equipmentImportVo.getPropertyStatus();
                     String abc = equipmentImportVo.getEquipmentImportanceId();
                     if(StringUtils.isBlank(equipmentImportVo.getNum())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:统一编码缺失,请填写必填项后再导入;";
                         exceptionNum++;
@@ -681,7 +683,7 @@
//                     }
                     else{
                         SysDepart use = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",useId.trim()),false);
                         if(ObjectUtils.isNull(useId)){
                         if(ObjectUtils.isNotNull(use)){
                             equipment.setUseId(use.getId());
                         }else {
                             exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:不存在该使用部门,请维护部门数据后再导入;";
@@ -739,13 +741,14 @@
                                 equipment.setConstructorId(constructor.getId());
                             }
                         }
                         if(equipmentImportVo.getPropertyStatus().equals("warranty")){
                         if(StringUtils.isNotBlank(propertyStatus)&&propertyStatus.equals("warranty")){
                             if(
                                     ObjectUtils.isNull(equipmentImportVo.getWarrantyStart())
                                     ||ObjectUtils.isNull(equipmentImportVo.getWarrantyEnd())
                             ){
                                 exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:该设备处于质保期，质保信息缺失，请先维护质保开始时间或结束时间;";
                                 exceptionNum++;
                                 continue;
                             }

                         }else{
@@ -797,16 +800,18 @@
                                         &&!equipmentCategory.getEquipmentCategoryUda1().equals("filesCarousel")
                                         &&!equipmentCategory.getEquipmentCategoryUda1().equals("tester")
                                 ){
                                     if(equipmentImportVo.getEquipmentImportanceId().equals("A")){
                                        equipment.setCheckPeriod(365*3+"");
                                     if(StringUtils.isNotBlank(abc)){
                                        if(abc.equals("A")){
                                            equipment.setCheckPeriod(365*3+"");
                                        }
                                        if(
                                                abc.equals("B")
                                                        ||abc.equals("C")
                                                        ||abc.equals("D")
                                        ){
                                            equipment.setCheckPeriod(365*4+"");
                                        }
                                    }
                                     if(
                                             equipmentImportVo.getEquipmentImportanceId().equals("B")
                                            ||equipmentImportVo.getEquipmentImportanceId().equals("C")
                                            ||equipmentImportVo.getEquipmentImportanceId().equals("D")
                                    ){
                                         equipment.setCheckPeriod(365*4+"");
                                     }
                                 }
                                 equipmentService.save(equipment);
                             }else {

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

@@ -256,7 +256,7 @@
            and t1.num like concat('%',#{num},'%')
        </if>
        <if test="name != null and name != ''">
            and t1.num like concat('%',#{name},'%')
            and t1.name like concat('%',#{name},'%')
        </if>
        <if test="model != null and model != ''">
            and t1.model like concat('%',#{model},'%')

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java

@@ -89,11 +89,11 @@
    private Date updateTime;

    /**使用部门编码*/
    @TableField(exist = false)
//    @TableField(exist = false)
    private String useDepartNum;

    /**维修部门编码*/
    @TableField(exist = false)
//    @TableField(exist = false)
    private String repairDepartNum;

    //update-begin---author:wangshuai ---date:20200308  for：[JTC-119]在部门管理菜单下设置部门负责人，新增字段负责人ids和旧的负责人ids