部门加导入优化

“linengliang”

2023-11-06 c6b25668f3c53d9448df2c68904db4bf673d1eb7

部门加导入优化

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

@@ -549,6 +549,7 @@
      */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     @Transactional(rollbackFor = Exception.class)
     //工区、型号、设备状态、技术状态、ABC标识有空值；维护部门、维修班组为编码需要有对照值。
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
         LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -580,23 +581,18 @@
                         exceptionNum++;
                         continue;
                     }
                     else if(StringUtils.isBlank(equipmentImportVo.getTeamId())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:维修班组缺失,请填写必填项后再导入;";
                         exceptionNum++;
                         continue;
                     }
                     else if(StringUtils.isBlank(equipmentImportVo.getEquipmentImportanceId())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:ABC标识缺失,请填写必填项后再导入;";
                         exceptionNum++;
                         continue;
                     }
//                     else if(StringUtils.isBlank(equipmentImportVo.getEquipmentImportanceId())){
//                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:ABC标识缺失,请填写必填项后再导入;";
//                         exceptionNum++;
//                         continue;
//                     }
                     else if(StringUtils.isBlank(equipmentImportVo.getEquipmentStatus())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:设备状态缺失,请填写必填项后再导入;";
                         exceptionNum++;
                         continue;
                     }
                     else if(StringUtils.isBlank(equipmentImportVo.getTechnologyStatus())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:设备技术状态缺失,请填写必填项后再导入;";
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:技术状态缺失,请填写必填项后再导入;";
                         exceptionNum++;
                         continue;
                     }
@@ -693,8 +689,11 @@
                             continue;
                         }
                         Area area = areaService.getOne(new QueryWrapper<Area>().eq("name",areaId.trim()));
                         Area area1 = areaService.getOne(new QueryWrapper<Area>().eq("num",areaId.trim()));
                         if(ObjectUtils.isNotNull(area)){
                             equipment.setFactoryModelId(area.getId());
                         }else if(ObjectUtils.isNotNull(area1)) {
                             equipment.setFactoryModelId(area1.getId());
                         }else {
                             exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:不存在该工区,请维护工区数据后再导入;";
                             exceptionNum++;
@@ -718,8 +717,11 @@
                             continue;
                         }
                         Team team = teamService.getOne(new QueryWrapper<Team>().eq("name",teamId.trim()),false);
                         Team team1 = teamService.getOne(new QueryWrapper<Team>().eq("num",teamId.trim()),false);
                         if(ObjectUtils.isNotNull(team)){
                             equipment.setTeamId(team.getId());
                         }else if(ObjectUtils.isNotNull(team1)) {
                             equipment.setTeamId(team1.getId());
                         }else {
                             exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:不存在该班组,请先维护班组数据后再导入;";
                             exceptionNum++;

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -62,7 +63,7 @@
        IPage<Team> pageList = teamService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
	

    /**
     *   添加
     *
@@ -77,7 +78,7 @@
        teamService.save(team);
        return Result.OK("添加成功！");
    }
	

    /**
     *  编辑
     *
@@ -92,7 +93,7 @@
        teamService.updateById(team);
        return Result.OK("编辑成功!");
    }
	

    /**
     *   通过id删除
     *
@@ -107,7 +108,7 @@
        teamService.removeById(id);
        return Result.OK("删除成功!");
    }
	

    /**
     *  批量删除
     *
@@ -122,7 +123,7 @@
        this.teamService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }
	

    /**
     * 通过id查询
     *

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

@@ -26,19 +26,19 @@
    @Excel(name = "型号")
    private String model;

//    @Excel(name = "使用部门",dictTable = "sys_depart",dicCode = "id",dicText = "depart_name")
    @Excel(name = "使用部门")
    private String useId;

//    @Excel(name = "工区",dicCode = "id",dictTable = "mom_base_area",dicText = "name")
    @Excel(name = "工区")
    private String factoryModelId;

//    @Excel(name = "维护部门",dictTable = "sys_depart",dicCode = "id",dicText = "depart_name")
    @Excel(name = "维护部门")
    private String manageId;

//    @Excel(name = "维修班组",dictTable = "mom_base_team",dicCode = "id"2,dicText = "name")
    @Excel(name = "维修班组")
    private String teamId;

//    @Excel(name = "资产制造商",dicCode = "id",dictTable="mom_base_constructor",dicText="name")
    @Excel(name = "资产制造商")
    private String constructorId;

    @Excel(name = "ABC标识",dicCode = "ABC-standard-result")

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

@@ -5,11 +5,13 @@
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.constant.CommonConstant;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
@@ -114,4 +116,6 @@
    @ApiModelProperty(value = "所属部门")
    @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
    private String departId;
    @TableField(exist = false)
    private String noEqId;
}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java

@@ -3,6 +3,8 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -120,7 +122,32 @@
        }
        return result;
    }
    @GetMapping("/myTree")
    public Result<List<SysDepartTreeModel>> myTree(@RequestParam(name = "ids", required = false) String ids){
        SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel();
        sysDepartTreeModel.setKey("-1");
        sysDepartTreeModel.setTitle("部门管理");
        Result<List<SysDepartTreeModel>> result = new Result<>();
        List<SysDepartTreeModel> fristList = new ArrayList<>();
        try {
            if(oConvertUtils.isNotEmpty(ids)){
                List<SysDepartTreeModel> departList = sysDepartService.queryTreeList(ids);
                sysDepartTreeModel.setChildren(departList);
                fristList.add(sysDepartTreeModel);
                result.setResult(fristList);
            }else{
                List<SysDepartTreeModel> list = sysDepartService.queryTreeList();
                sysDepartTreeModel.setChildren(list);
                fristList.add(sysDepartTreeModel);
                result.setResult(fristList);
            }
            result.setSuccess(true);
        } catch (Exception e) {
            log.error(e.getMessage(),e);
        }
        return result;

    }
    @AutoLog(value = "部门表-根据用户id获取部门下拉树选项")
    @ApiOperation(value = "部门表-根据用户id获取部门下拉树选项", notes = "部门表-根据用户id获取部门下拉树选项")
    @GetMapping(value = "/loadDepartTreeOptions")
@@ -226,6 +253,7 @@
        }
        return result;
    }


    /**
     * 编辑数据 编辑部门的部分数据,并保存到数据库
@@ -561,4 +589,15 @@
        result.setResult(sysUsers);
        return result;
    }

    @GetMapping(value = "/list")
    public Result<IPage<SysDepart>> queryPageList(SysDepart sysDepart,
                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                  HttpServletRequest req) {
        QueryWrapper<SysDepart> queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, req.getParameterMap());
        Page<SysDepart> page = new Page<SysDepart>(pageNo, pageSize);
        IPage<SysDepart> pageList = sysDepartService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
}

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

@@ -7,6 +7,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.constant.CommonConstant;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

@@ -18,7 +19,7 @@
 * <p>
 * 部门表
 * <p>
 * 
 *
 * @Author Steve
 * @Since  2019-01-22
 */
@@ -26,7 +27,7 @@
@TableName("sys_depart")
public class SysDepart implements Serializable {
    private static final long serialVersionUID = 1L;
    

    /**ID*/
    @TableId(type = IdType.ASSIGN_ID)
    private String id;
@@ -71,7 +72,7 @@
    private String status;
    /**删除状态（0，正常，1已删除）*/
    @Dict(dicCode = "del_flag")
    private String delFlag;
    private String delFlag = String.valueOf(CommonConstant.DEL_FLAG_0);
    /**对接企业微信的ID*/
    private String qywxIdentifier;
    /**创建人*/
@@ -101,7 +102,7 @@
    @TableField(exist = false)
    private String oldDirectorUserIds;
    //update-end---author:wangshuai ---date:20200308  for：[JTC-119]新增字段负责人ids和旧的负责人ids
	

    /**
     * 重写equals方法
     */
@@ -147,9 +148,9 @@
    @Override
    public int hashCode() {

        return Objects.hash(super.hashCode(), id, parentId, departName, 
                departNameEn, departNameAbbr, departOrder, description,orgCategory, 
                orgType, orgCode, mobile, fax, address, memo, status, 
        return Objects.hash(super.hashCode(), id, parentId, departName,
                departNameEn, departNameAbbr, departOrder, description,orgCategory,
                orgType, orgCode, mobile, fax, address, memo, status,
                delFlag, createBy, createTime, updateBy, updateTime,useDepartNum,repairDepartNum);
    }
}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java

@@ -1,5 +1,6 @@
package org.jeecg.modules.system.model;

import org.jeecg.common.api.vo.ScopedSlots;
import org.jeecg.modules.system.entity.SysDepart;

import java.io.Serializable;
@@ -12,14 +13,14 @@
 * <p>
 * 部门表 存储树结构数据的实体类
 * <p>
 * 
 *
 * @Author Steve
 * @Since 2019-01-22 
 * @Since 2019-01-22
 */
public class SysDepartTreeModel implements Serializable{
	

    private static final long serialVersionUID = 1L;
    

    /** 对应SysDepart中的id字段,前端数据树中的key*/
    private String key;

@@ -32,7 +33,7 @@

    private boolean isLeaf;
    // 以下所有字段均与SysDepart相同
    

    private String id;

    private String parentId;
@@ -46,7 +47,7 @@
    private Integer departOrder;

    private String description;
    

    private String orgCategory;

    private String orgType;
@@ -85,10 +86,12 @@
    /**部门负责人ids*/
    private String directorUserIds;
    //update-end---author:wangshuai ---date:20200308  for：[JTC-119]在部门管理菜单下设置部门负责人，新增字段部门负责人ids
    

    private List<SysDepartTreeModel> children = new ArrayList<>();

    private ScopedSlots scopedSlots = new ScopedSlots();

    private SysDepart entity;
    /**
     * 将SysDepart对象转换成SysDepartTreeModel对象
     * @param sysDepart
@@ -121,6 +124,7 @@
        this.directorUserIds = sysDepart.getDirectorUserIds();
        this.useDepartNum = sysDepart.getUseDepartNum();
        this.repairDepartNum = sysDepart.getRepairDepartNum();
        this.entity = sysDepart;
    }

    public boolean getIsLeaf() {
@@ -199,7 +203,7 @@
    public void setDepartName(String departName) {
        this.departName = departName;
    }
    

    public String getOrgCategory() {
        return orgCategory;
    }
@@ -370,6 +374,16 @@
        this.repairDepartNum = repairDepartNum;
    }

    public ScopedSlots getScopedSlots(){return scopedSlots;}

    public void  setScopedSlots(ScopedSlots scopedSlots){this.scopedSlots = scopedSlots;}

    public SysDepart getEntity(){return entity;}

    public void setEntity(SysDepart entity){this.entity = entity;}



    /**
     * 重写equals方法
     */
@@ -408,7 +422,7 @@
                Objects.equals(repairDepartNum, model.repairDepartNum) &&
                Objects.equals(children, model.children);
    }
    

    /**
     * 重写hashCode方法
     */
@@ -416,7 +430,7 @@
    public int hashCode() {

        return Objects.hash(id, parentId, departName, departNameEn, departNameAbbr,
                departOrder, description, orgCategory, orgType, orgCode, mobile, fax, address, 
                departOrder, description, orgCategory, orgType, orgCode, mobile, fax, address,
                memo, status, delFlag, qywxIdentifier, createBy, createTime, updateBy, updateTime,
                children,directorUserIds,useDepartNum,repairDepartNum);
    }

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java

@@ -15,7 +15,7 @@
 * <P>
 * 对应部门的表,处理并查找树级数据
 * <P>
 * 
 *
 * @Author: Steve
 * @Date: 2019-01-22
 */
@@ -23,7 +23,7 @@

    //部门树信息-树结构
    //private static List<SysDepartTreeModel> sysDepartTreeList = new ArrayList<SysDepartTreeModel>();
	

    //部门树id-树结构
    //private static List<DepartIdModel> idList = new ArrayList<>();

@@ -81,7 +81,7 @@
            }
        }
        getGrandChildren(treeList,recordList,departIdList);
        

        //idList = departIdList;
        return treeList;
    }
@@ -107,7 +107,7 @@
        }

    }
    


    /**
     * queryTreeList的子方法 ====4====