From c0adbaad1b32844aafb1be0f51a7294c63ff53bb Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Wed, 12 Aug 2020 14:54:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/TestController.java | 55 +++++ .../lz/modules/app/dao/DepartmentsDao.java | 4 + .../app/dao/DepartmentsStaffRelateDao.java | 2 + .../modules/app/entity/DepartmentsEntity.java | 219 ++++++++++++++++-- .../entity/DepartmentsStaffRelateEntity.java | 122 +++++++++- .../app/service/DepartmentsService.java | 4 + .../DepartmentsStaffRelateService.java | 1 + .../service/impl/DepartmentsServiceImpl.java | 10 + .../DepartmentsStaffRelateServiceImpl.java | 5 + .../app/impl/ResultRecordServiceImpl.java | 2 +- .../mapper/generator/DepartmentsDao.xml | 8 +- .../generator/DepartmentsStaffRelateDao.xml | 9 +- src/test/java/com/lz/mysql/MysqlMain.java | 3 +- 13 files changed, 419 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/TestController.java b/src/main/java/com/lz/modules/app/controller/TestController.java index 98f4fce0..18f4f6b3 100644 --- a/src/main/java/com/lz/modules/app/controller/TestController.java +++ b/src/main/java/com/lz/modules/app/controller/TestController.java @@ -1,13 +1,20 @@ package com.lz.modules.app.controller; +import com.lz.modules.app.dao.DepartmentsDao; +import com.lz.modules.app.entity.DepartmentsEntity; +import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; +import com.lz.modules.app.service.DepartmentsService; +import com.lz.modules.app.service.DepartmentsStaffRelateService; import com.lz.modules.sys.entity.app.ResultRecord; import com.lz.modules.sys.service.app.ResultRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.swing.*; import java.math.BigDecimal; import java.util.Date; +import java.util.List; @RestController public class TestController { @@ -15,6 +22,13 @@ public class TestController { @Autowired private ResultRecordService resultRecordService; + @Autowired + private DepartmentsService departmentsService; + + + @Autowired + private DepartmentsStaffRelateService departmentsStaffRelateService; + @RequestMapping("/test/xx") public void test(){ ResultRecord resultRecord = new ResultRecord(); @@ -23,4 +37,45 @@ public class TestController { resultRecord.setMonthTime(new Date()); resultRecordService.insertResultRecord(resultRecord); } + + + @RequestMapping("/test/department") + public void department(){ + List departmentsEntityList = departmentsService.selectEntityByParentDepartmentId("0"); + for(DepartmentsEntity child1:departmentsEntityList){ + child1.setLevel(1); + departmentsService.updateById(child1); + List departmentsEntityList2 = departmentsService.selectEntityByParentDepartmentId(child1.getDepartmentId()); + for(DepartmentsEntity child2: departmentsEntityList2){ + child2.setLevel(2); + departmentsService.updateById(child2); + List departmentsEntityList3 = departmentsService.selectEntityByParentDepartmentId(child2.getDepartmentId()); + for(DepartmentsEntity child3: departmentsEntityList3){ + child3.setLevel(3); + departmentsService.updateById(child3); + List departmentsEntityList4 = departmentsService.selectEntityByParentDepartmentId(child3.getDepartmentId()); + for(DepartmentsEntity child4: departmentsEntityList4){ + child4.setLevel(4); + departmentsService.updateById(child4); + } + } + } + } + } + + + + + + + + @RequestMapping("/test/relate") + public void relate(){ + List list = departmentsStaffRelateService.selectAll(); + for(DepartmentsStaffRelateEntity l:list){ + DepartmentsEntity departmentsEntity = departmentsService.selectByDepartmentId(l.getDepartmentId()); + l.setLevel(departmentsEntity.getLevel()); + departmentsStaffRelateService.updateById(l); + } + } } diff --git a/src/main/java/com/lz/modules/app/dao/DepartmentsDao.java b/src/main/java/com/lz/modules/app/dao/DepartmentsDao.java index 06724b0f..3df03af0 100644 --- a/src/main/java/com/lz/modules/app/dao/DepartmentsDao.java +++ b/src/main/java/com/lz/modules/app/dao/DepartmentsDao.java @@ -30,4 +30,8 @@ public interface DepartmentsDao extends BaseMapper { List selectAll(); + + List selectEntityByParentDepartmentId(@Param("parentId") String parentId); + + DepartmentsEntity selectByDepartmentId(@Param("departmentId") String departmentId); } diff --git a/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java b/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java index 63876180..7535fca9 100644 --- a/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java +++ b/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java @@ -46,4 +46,6 @@ public interface DepartmentsStaffRelateDao extends BaseMapper selectByDepartmentIds(@Param("departmentIds") List departmentIds); List selectByStaffIds(@Param("staffIds") List staffIds); + + List selectAll(); } diff --git a/src/main/java/com/lz/modules/app/entity/DepartmentsEntity.java b/src/main/java/com/lz/modules/app/entity/DepartmentsEntity.java index 6347c39e..5c35b7b5 100644 --- a/src/main/java/com/lz/modules/app/entity/DepartmentsEntity.java +++ b/src/main/java/com/lz/modules/app/entity/DepartmentsEntity.java @@ -1,5 +1,6 @@ package com.lz.modules.app.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -18,55 +19,245 @@ import lombok.Data; @TableName("lz_departments") public class DepartmentsEntity implements Serializable { private static final long serialVersionUID = 1L; - + //自增主键 + @TableId(value = "id", type = IdType.AUTO) + private Long id; + //是否删除状态，1：删除，0：有效 + private Integer isDelete; + //创建时间 + private Date createTime; + //更新时间 + private Date updateTime; + //飞书部门id + private String departmentId; + //飞书上级部门id + private String departmentParentId; + //飞书显示部门人数 + private Integer memberCount; + //组织架构名称/部门名称 + private String departmentName; + //飞书部门群id + private String chatId; + //飞书部门leader_id + private String leaderEmployeeId; + //飞书部门leader的open_id + private String leaderOpenId; + //部门状态【0 无效，1 有效】 + private Integer status; + //第几级部门 + private Integer level; /** * 自增主键 + * @return */ - @TableId - private Long id; + public Long getId() { + return id; + } + /** + * 自增主键 + * @param id + */ + public void setId(Long id) { + this.id = id; + } + /** * 是否删除状态，1：删除，0：有效 + * @return */ - private Integer isDelete; + public Integer getIsDelete() { + return isDelete; + } + /** + * 是否删除状态，1：删除，0：有效 + * @param isDelete + */ + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; + } + /** * 创建时间 + * @return */ - private Date createTime; + public Date getCreateTime() { + return createTime; + } + /** + * 创建时间 + * @param createTime + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + /** * 更新时间 + * @return */ - private Date updateTime; + public Date getUpdateTime() { + return updateTime; + } + /** + * 更新时间 + * @param updateTime + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + /** * 飞书部门id + * @return */ - private String departmentId; + public String getDepartmentId() { + return departmentId; + } + /** + * 飞书部门id + * @param departmentId + */ + public void setDepartmentId(String departmentId) { + this.departmentId = departmentId; + } + /** * 飞书上级部门id + * @return */ - private String departmentParentId; + public String getDepartmentParentId() { + return departmentParentId; + } + /** + * 飞书上级部门id + * @param departmentParentId + */ + public void setDepartmentParentId(String departmentParentId) { + this.departmentParentId = departmentParentId; + } + /** * 飞书显示部门人数 + * @return */ - private Integer memberCount; + public Integer getMemberCount() { + return memberCount; + } + /** + * 飞书显示部门人数 + * @param memberCount + */ + public void setMemberCount(Integer memberCount) { + this.memberCount = memberCount; + } + /** * 组织架构名称/部门名称 + * @return */ - private String departmentName; + public String getDepartmentName() { + return departmentName; + } + /** + * 组织架构名称/部门名称 + * @param departmentName + */ + public void setDepartmentName(String departmentName) { + this.departmentName = departmentName; + } + /** * 飞书部门群id + * @return */ - private String chatId; + public String getChatId() { + return chatId; + } + /** + * 飞书部门群id + * @param chatId + */ + public void setChatId(String chatId) { + this.chatId = chatId; + } + /** * 飞书部门leader_id + * @return */ - private String leaderEmployeeId; + public String getLeaderEmployeeId() { + return leaderEmployeeId; + } + /** + * 飞书部门leader_id + * @param leaderEmployeeId + */ + public void setLeaderEmployeeId(String leaderEmployeeId) { + this.leaderEmployeeId = leaderEmployeeId; + } + /** * 飞书部门leader的open_id + * @return */ - private String leaderOpenId; + public String getLeaderOpenId() { + return leaderOpenId; + } + /** + * 飞书部门leader的open_id + * @param leaderOpenId + */ + public void setLeaderOpenId(String leaderOpenId) { + this.leaderOpenId = leaderOpenId; + } + /** * 部门状态【0 无效，1 有效】 + * @return */ - private Integer status; + public Integer getStatus() { + return status; + } + /** + * 部门状态【0 无效，1 有效】 + * @param status + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 第几级部门 + * @return + */ + public Integer getLevel() { + return level; + } + /** + * 第几级部门 + * @param level + */ + public void setLevel(Integer level) { + this.level = level; + } + + @Override + public String toString() { + return "Departments{" + + ",id=" + id + + ",isDelete=" + isDelete + + ",createTime=" + createTime + + ",updateTime=" + updateTime + + ",departmentId=" + departmentId + + ",departmentParentId=" + departmentParentId + + ",memberCount=" + memberCount + + ",departmentName=" + departmentName + + ",chatId=" + chatId + + ",leaderEmployeeId=" + leaderEmployeeId + + ",leaderOpenId=" + leaderOpenId + + ",status=" + status + + ",level=" + level + + "}"; + } } diff --git a/src/main/java/com/lz/modules/app/entity/DepartmentsStaffRelateEntity.java b/src/main/java/com/lz/modules/app/entity/DepartmentsStaffRelateEntity.java index cac82953..a21a313f 100644 --- a/src/main/java/com/lz/modules/app/entity/DepartmentsStaffRelateEntity.java +++ b/src/main/java/com/lz/modules/app/entity/DepartmentsStaffRelateEntity.java @@ -1,5 +1,6 @@ package com.lz.modules.app.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -19,30 +20,137 @@ import lombok.Data; public class DepartmentsStaffRelateEntity implements Serializable { private static final long serialVersionUID = 1L; + //自增主键 + @TableId(value = "id", type = IdType.AUTO) + private Long id; + //是否删除状态，1：删除，0：有效 + private Integer isDelete; + //创建时间 + private Date createTime; + //更新时间 + private Date updateTime; + //部门id + private String departmentId; + //员工id + private Long staffId; + //第几级部门 + private Integer level; /** * 自增主键 + * @return */ - @TableId - private Long id; + public Long getId() { + return id; + } + /** + * 自增主键 + * @param id + */ + public void setId(Long id) { + this.id = id; + } + /** * 是否删除状态，1：删除，0：有效 + * @return */ - private Integer isDelete; + public Integer getIsDelete() { + return isDelete; + } + /** + * 是否删除状态，1：删除，0：有效 + * @param isDelete + */ + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; + } + /** * 创建时间 + * @return */ - private Date createTime; + public Date getCreateTime() { + return createTime; + } + /** + * 创建时间 + * @param createTime + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + /** * 更新时间 + * @return */ - private Date updateTime; + public Date getUpdateTime() { + return updateTime; + } + /** + * 更新时间 + * @param updateTime + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + /** * 部门id + * @return */ - private String departmentId; + public String getDepartmentId() { + return departmentId; + } + /** + * 部门id + * @param departmentId + */ + public void setDepartmentId(String departmentId) { + this.departmentId = departmentId; + } + /** * 员工id + * @return */ - private Long staffId; + public Long getStaffId() { + return staffId; + } + /** + * 员工id + * @param staffId + */ + public void setStaffId(Long staffId) { + this.staffId = staffId; + } + + /** + * 第几级部门 + * @return + */ + public Integer getLevel() { + return level; + } + /** + * 第几级部门 + * @param level + */ + public void setLevel(Integer level) { + this.level = level; + } + + @Override + public String toString() { + return "DepartmentsStaffRelate{" + + ",id=" + id + + ",isDelete=" + isDelete + + ",createTime=" + createTime + + ",updateTime=" + updateTime + + ",departmentId=" + departmentId + + ",staffId=" + staffId + + ",level=" + level + + "}"; + } } diff --git a/src/main/java/com/lz/modules/app/service/DepartmentsService.java b/src/main/java/com/lz/modules/app/service/DepartmentsService.java index e7fa5ff1..8ea55217 100644 --- a/src/main/java/com/lz/modules/app/service/DepartmentsService.java +++ b/src/main/java/com/lz/modules/app/service/DepartmentsService.java @@ -27,5 +27,9 @@ public interface DepartmentsService extends IService { List getDepartmentTree(); List selectByParentDepartmentId(String deparentId); + + List selectEntityByParentDepartmentId(String parentId); + + DepartmentsEntity selectByDepartmentId(String departmentId); } diff --git a/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.java b/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.java index 64dfbbdf..c12aabf0 100644 --- a/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.java +++ b/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.java @@ -27,5 +27,6 @@ public interface DepartmentsStaffRelateService extends IService selectAll(); } diff --git a/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java index 8ba8f8e4..10334696 100644 --- a/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java @@ -63,6 +63,16 @@ public class DepartmentsServiceImpl extends ServiceImpl selectEntityByParentDepartmentId(String parentId) { + return departmentsDao.selectEntityByParentDepartmentId(parentId); + } + + @Override + public DepartmentsEntity selectByDepartmentId(String departmentId) { + return departmentsDao.selectByDepartmentId(departmentId); + } + private List getDepartmentTreeList(List departmentList) { List DepartmentsList = Lists.newArrayList(); for (DepartmentsDto departmentsDto : departmentList) { diff --git a/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java index 45152e30..d7d0c3a3 100644 --- a/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java @@ -58,5 +58,10 @@ public class DepartmentsStaffRelateServiceImpl extends ServiceImpl selectAll() { + return departmentsStaffRelateDao.selectAll(); + } + } diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 32efb35f..2a291ba9 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -171,7 +171,7 @@ public class ResultRecordServiceImpl extends ServiceImpl list = new ArrayList<>(); for(DepartmentsEntity child : tDepartments) { - if(child.getDepartmentId().equals(department.getDepartmentParentId())){ + if(child.getDepartmentParentId().equals(department.getDepartmentId())){ list.add(child); } } diff --git a/src/main/resources/mapper/generator/DepartmentsDao.xml b/src/main/resources/mapper/generator/DepartmentsDao.xml index 53b1cac7..41a53af0 100644 --- a/src/main/resources/mapper/generator/DepartmentsDao.xml +++ b/src/main/resources/mapper/generator/DepartmentsDao.xml @@ -17,6 +17,7 @@ + select * from lz_departments where is_delete=0 - + + diff --git a/src/main/resources/mapper/generator/DepartmentsStaffRelateDao.xml b/src/main/resources/mapper/generator/DepartmentsStaffRelateDao.xml index d96ad990..92ac5d7a 100644 --- a/src/main/resources/mapper/generator/DepartmentsStaffRelateDao.xml +++ b/src/main/resources/mapper/generator/DepartmentsStaffRelateDao.xml @@ -11,8 +11,11 @@ + + + INSERT INTO lz_departments_staff_relate(department_id, staff_id) VALUES @@ -46,12 +49,16 @@ + diff --git a/src/test/java/com/lz/mysql/MysqlMain.java b/src/test/java/com/lz/mysql/MysqlMain.java index 450f96be..7c438b59 100644 --- a/src/test/java/com/lz/mysql/MysqlMain.java +++ b/src/test/java/com/lz/mysql/MysqlMain.java @@ -60,7 +60,8 @@ public class MysqlMain { file.mkdirs(); } List list = new ArrayList(); - list.add(new TablesBean("lz_result_record")); + list.add(new TablesBean("lz_departments_staff_relate")); + list.add(new TablesBean("lz_departments")); List list2 = new ArrayList(); Map map = MysqlUtil2ShowCreateTable.getComments();