feature: 部门管理改造

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java

@@ -8,17 +8,18 @@ import lombok.EqualsAndHashCode;
 import org.dromara.common.tenant.core.TenantEntity;
 
 import java.io.Serial;
+import java.util.Date;
 
 
 /**
- * 部门表 sys_dept
+ * 部门表 t_sys_dept
  *
  * @author Lion Li
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys_dept")
+@TableName("t_sys_dept")
 public class SysDept extends TenantEntity {
 
     @Serial
@@ -51,9 +52,9 @@ public class SysDept extends TenantEntity {
     private Integer orderNum;
 
     /**
-     * 负责人
+     * 传真号码
      */
-    private Long leader;
+    private String fax;
 
     /**
      * 联系电话
@@ -70,15 +71,66 @@ public class SysDept extends TenantEntity {
      */
     private String status;
 
-    /**
-     * 删除标志（0代表存在 2代表删除）
-     */
-//    @TableLogic
-//    private String delFlag;
 
     /**
      * 祖级列表
      */
     private String ancestors;
 
+    /**
+     * 主管部门
+     */
+    private Long superDept;
+
+    /**
+     * 主管岗位
+     */
+    private Long superJob;
+
+    /**
+     * 唯一标识
+     */
+    private String otherId;
+
+    /**
+     * 开班日期
+     */
+    private Date beginDate;
+
+    /**
+     * 结业日期
+     */
+    private Date endDate;
+
+    /**
+     * 报到日期
+     */
+    private Date checkDate;
+
+    /**
+     * 是否自主选房
+     */
+    private String chooseRoom;
+
+    /**
+     * 是否就餐
+     */
+    private String canEat;
+
+    /**
+     * 是否先缴费再报到
+     */
+    private String payCheck;
+
+    /**
+     * 缴费开始日期
+     */
+    private Date payBegin;
+
+    /**
+     * 缴费开始日期
+     */
+    private Date payEnd;
+
+
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java

@@ -11,7 +11,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.system.domain.SysDept;
 
 /**
- * 部门业务对象 sys_dept
+ * 部门业务对象 t_sys_dept
  *
  * @author Michelle.Chung
  */
@@ -50,11 +50,6 @@ public class SysDeptBo extends BaseEntity {
     @NotNull(message = "显示顺序不能为空")
     private Integer orderNum;
 
-    /**
-     * 负责人
-     */
-    private Long leader;
-
     /**
      * 联系电话
      */
@@ -73,4 +68,9 @@ public class SysDeptBo extends BaseEntity {
      */
     private String status;
 
+    /**
+     * 唯一标识
+     */
+    private String otherId;
+
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 部门视图对象 sys_dept
+ * 部门视图对象 t_sys_dept
  *
  * @author Michelle.Chung
  */
@@ -63,16 +63,16 @@ public class SysDeptVo implements Serializable {
      */
     private Integer orderNum;
 
-    /**
-     * 负责人ID
-     */
-    private Long leader;
-
-    /**
-     * 负责人
-     */
-    @ExcelProperty(value = "负责人")
-    private String leaderName;
+//    /**
+//     * 负责人ID
+//     */
+//    private Long leader;
+//
+//    /**
+//     * 负责人
+//     */
+//    @ExcelProperty(value = "负责人")
+//    private String leaderName;
 
     /**
      * 联系电话
@@ -99,4 +99,9 @@ public class SysDeptVo implements Serializable {
     @ExcelProperty(value = "创建时间")
     private Date createTime;
 
+    /**
+     * 唯一标识
+     */
+    private String otherId;
+
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java

@@ -148,7 +148,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
     @Override
     public List<SysDeptVo> selectDeptByIds(List<Long> deptIds) {
         return baseMapper.selectDeptList(new LambdaQueryWrapper<SysDept>()
-            .select(SysDept::getDeptId, SysDept::getDeptName, SysDept::getLeader)
+            .select(SysDept::getDeptId, SysDept::getDeptName)
             .eq(SysDept::getStatus, UserConstants.DEPT_NORMAL)
             .in(CollUtil.isNotEmpty(deptIds), SysDept::getDeptId, deptIds));
     }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java

@@ -153,10 +153,9 @@ public class SysTenantServiceImpl implements ISysTenantService {
         user.setDeptId(deptId);
         userMapper.insert(user);
         //新增系统用户后，默认当前用户为部门的负责人
-        SysDept sd = new SysDept();
-        sd.setLeader(user.getUserId());
-        sd.setDeptId(deptId);
-        deptMapper.updateById(sd);
+//        SysDept sd = new SysDept();
+//        sd.setDeptId(deptId);
+//        deptMapper.updateById(sd);
 
         // 用户和角色关联表
         SysUserRole userRole = new SysUserRole();

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -15,20 +15,20 @@
         <if test="ew.getSqlSelect == null">
             *
         </if>
-        from sys_dept ${ew.getCustomSqlSegment}
+        from t_sys_dept ${ew.getCustomSqlSegment}
     </select>
 
     <select id="countDeptById" resultType="Long">
-        select count(*) from sys_dept where del_flag = '0' and dept_id = #{deptId}
+        select count(*) from t_sys_dept where del_flag = '0' and dept_id = #{deptId}
     </select>
 
     <select id="selectDeptListByRoleId" resultType="Long">
         select d.dept_id
-        from sys_dept d
+        from t_sys_dept d
             left join sys_role_dept rd on d.dept_id = rd.dept_id
         where rd.role_id = #{roleId}
             <if test="deptCheckStrictly">
-                and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
+                and d.dept_id not in (select d.parent_id from t_sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
             </if>
         order by d.parent_id, d.order_num
     </select>

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -22,7 +22,7 @@
         from t_sys_role r
                  left join sys_user_role sur on sur.role_id = r.role_id
                  left join t_sys_user u on u.user_id = sur.user_id
-                 left join sys_dept d on u.dept_id = d.dept_id
+                 left join t_sys_dept d on u.dept_id = d.dept_id
     </sql>
 
     <select id="selectPageRoleList" resultMap="SysRoleResult">

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -42,7 +42,7 @@
                u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
                d.dept_name, d.leader, u1.user_name as leaderName
         from t_sys_user u
-                 left join sys_dept d on u.dept_id = d.dept_id
+                 left join t_sys_dept d on u.dept_id = d.dept_id
                  left join sys_user u1 on u1.user_id = d.leader
             ${ew.getCustomSqlSegment}
     </select>
@@ -50,7 +50,7 @@
     <select id="selectAllocatedList" resultMap="SysUserResult">
         select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
         from t_sys_user u
-             left join sys_dept d on u.dept_id = d.dept_id
+             left join t_sys_dept d on u.dept_id = d.dept_id
              left join sys_user_role sur on u.user_id = sur.user_id
              left join sys_role r on r.role_id = sur.role_id
         ${ew.getCustomSqlSegment}
@@ -59,7 +59,7 @@
     <select id="selectUnallocatedList" resultMap="SysUserResult">
         select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
         from t_sys_user u
-             left join sys_dept d on u.dept_id = d.dept_id
+             left join t_sys_dept d on u.dept_id = d.dept_id
              left join sys_user_role sur on u.user_id = sur.user_id
              left join sys_role r on r.role_id = sur.role_id
         ${ew.getCustomSqlSegment}