From c6b25668f3c53d9448df2c68904db4bf673d1eb7 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期一, 06 十一月 2023 14:54:28 +0800
Subject: [PATCH] 部门加导入优化
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Team.java | 4 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java | 10 +-
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java | 39 +++++++++++++
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java | 34 ++++++++---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 24 ++++---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/TeamController.java | 11 ++-
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java | 15 ++--
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java | 8 +-
8 files changed, 103 insertions(+), 42 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index dce198e..cdedcbf 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/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)
+ //宸ュ尯銆佸瀷鍙枫�佽澶囩姸鎬併�佹妧鏈姸鎬併�丄BC鏍囪瘑鏈夌┖鍊硷紱缁存姢閮ㄩ棬銆佺淮淇彮缁勪负缂栫爜闇�瑕佹湁瀵圭収鍊笺��
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++;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/TeamController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/TeamController.java
index 7b4568b..1ca2a46 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/TeamController.java
+++ b/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鏌ヨ
*
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
index 6cdce5b..5ac21d5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
+++ b/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")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Team.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Team.java
index 2a6d990..be67a12 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Team.java
+++ b/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;
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
index 500c02b..7580fa2 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
+++ b/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);
+ }
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
index 0d154ab..b63a0e6 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
+++ b/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);
/**瀵规帴浼佷笟寰俊鐨処D*/
private String qywxIdentifier;
/**鍒涘缓浜�*/
@@ -101,7 +102,7 @@
@TableField(exist = false)
private String oldDirectorUserIds;
//update-end---author:wangshuai ---date:20200308 for锛歔JTC-119]鏂板瀛楁璐熻矗浜篿ds鍜屾棫鐨勮礋璐ｄ汉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);
}
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
index e446e76..54b5434 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
+++ b/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瀛楁,鍓嶇鏁版嵁鏍戜腑鐨刱ey*/
private String key;
@@ -32,7 +33,7 @@
private boolean isLeaf;
// 浠ヤ笅鎵�鏈夊瓧娈靛潎涓嶴ysDepart鐩稿悓
-
+
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 @@
/**閮ㄩ棬璐熻矗浜篿ds*/
private String directorUserIds;
//update-end---author:wangshuai ---date:20200308 for锛歔JTC-119]鍦ㄩ儴闂ㄧ鐞嗚彍鍗曚笅璁剧疆閮ㄩ棬璐熻矗浜猴紝鏂板瀛楁閮ㄩ棬璐熻矗浜篿ds
-
+
private List<SysDepartTreeModel> children = new ArrayList<>();
+ private ScopedSlots scopedSlots = new ScopedSlots();
+ private SysDepart entity;
/**
* 灏哠ysDepart瀵硅薄杞崲鎴怱ysDepartTreeModel瀵硅薄
* @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);
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java
index 4bf73bf..89b5b9c 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java
+++ b/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>();
-
+
//閮ㄩ棬鏍慽d-鏍戠粨鏋�
//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====
--
Gitblit v1.9.3