Selaa lähdekoodia

人员入职时间可置空

lamphua 1 viikko sitten
vanhempi
commit
95ff199cee

+ 14
- 13
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java Näytä tiedosto

73
         List<SysUser> list = userService.selectUserList(user);
73
         List<SysUser> list = userService.selectUserList(user);
74
         // 如果指定了部门ID,根据备注中的部门信息添加用户
74
         // 如果指定了部门ID,根据备注中的部门信息添加用户
75
         if (user.getDeptId() != null) {
75
         if (user.getDeptId() != null) {
76
+            if (user.getDeptId() == 101L) {
77
+                list.addAll(postService.selectDsSecretary(user));
78
+            }
79
+            if (user.getDeptId() == 102L) {
80
+                list.addAll(postService.selectJyLeader(user));
81
+            }
82
+            if (user.getDeptId() == 103L) {
83
+                list = postService.selectGmAssistant(user);
84
+            }
76
             SysDept dept = deptService.selectDeptById(user.getDeptId());
85
             SysDept dept = deptService.selectDeptById(user.getDeptId());
77
             if (dept != null) {
86
             if (dept != null) {
78
                 // 查询所有用户
87
                 // 查询所有用户
79
-                SysUser allUser = user;
80
-                allUser.setDeptId(null);
81
-                List<SysUser> allUsers = userService.selectUserList(allUser);
88
+                user.setDeptId(null);
89
+                List<SysUser> allUsers = userService.selectUserList(user);
82
                 for (SysUser sysUser : allUsers) {
90
                 for (SysUser sysUser : allUsers) {
83
                     // 检查用户备注中的部门信息
91
                     // 检查用户备注中的部门信息
84
                     if (sysUser.getRemark() != null) {
92
                     if (sysUser.getRemark() != null) {
96
                 }
104
                 }
97
             }
105
             }
98
         }
106
         }
99
-        if (user.getDeptId() != null && user.getDeptId() == 101L) {
100
-            list.addAll(postService.selectDsSecretary(user));
101
-        }
102
-        if (user.getDeptId() != null && user.getDeptId() == 102L) {
103
-            list.addAll(postService.selectJyLeader(user));
104
-        }
105
-        if (user.getDeptId() != null && user.getDeptId() == 103L) {
106
-            list = postService.selectGmAssistant(user);
107
-        }
108
         for (SysUser sysUser : list) {
107
         for (SysUser sysUser : list) {
109
             StringBuilder postName = new StringBuilder();
108
             StringBuilder postName = new StringBuilder();
110
             List<Long> userPostList = postService.selectPostListByUserId(sysUser.getUserId());
109
             List<Long> userPostList = postService.selectPostListByUserId(sysUser.getUserId());
433
         user.setUpdateReason(user.getUpdateReason());
432
         user.setUpdateReason(user.getUpdateReason());
434
         if (user.getBirthday() != null)
433
         if (user.getBirthday() != null)
435
             user.setAge(DateUtils.getAgeByBirth(user.getBirthday()));
434
             user.setAge(DateUtils.getAgeByBirth(user.getBirthday()));
436
-        if (user.getContractSign() == null || user.getContractExpire() == null) {
435
+        if (user.getContractSign() == null || user.getContractExpire() == null || user.getEntryDate() == null) {
436
+            if (user.getEntryDate() == null)
437
+                userService.updateUserEntryDate(user);
437
             if (user.getContractSign() == null)
438
             if (user.getContractSign() == null)
438
                 userService.updateUserContractSign(user);
439
                 userService.updateUserContractSign(user);
439
             if (user.getContractExpire() == null)
440
             if (user.getContractExpire() == null)

+ 8
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java Näytä tiedosto

92
      */
92
      */
93
     public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
93
     public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
94
 
94
 
95
+    /**
96
+     * 修改用户入职日期
97
+     *
98
+     * @param user 用户信息
99
+     * @return 结果
100
+     */
101
+    public int updateUserEntryDate(SysUser user);
102
+
95
     /**
103
     /**
96
      * 修改用户合同签订日期
104
      * 修改用户合同签订日期
97
      *
105
      *

+ 8
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java Näytä tiedosto

160
      */
160
      */
161
     public int updateUserStatus(SysUser user);
161
     public int updateUserStatus(SysUser user);
162
 
162
 
163
+    /**
164
+     * 修改用户入职日期
165
+     *
166
+     * @param user 用户信息
167
+     * @return 结果
168
+     */
169
+    public int updateUserEntryDate(SysUser user);
170
+
163
     /**
171
     /**
164
      * 修改用户合同签订日期
172
      * 修改用户合同签订日期
165
      *
173
      *

+ 12
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java Näytä tiedosto

350
         return userMapper.updateUser(user);
350
         return userMapper.updateUser(user);
351
     }
351
     }
352
 
352
 
353
+    /**
354
+     * 修改用户入职日期
355
+     *
356
+     * @param user 用户信息
357
+     * @return 结果
358
+     */
359
+    @Override
360
+    public int updateUserEntryDate(SysUser user)
361
+    {
362
+        return userMapper.updateUserEntryDate(user);
363
+    }
364
+
353
     /**
365
     /**
354
      * 修改用户合同签订日期
366
      * 修改用户合同签订日期
355
      *
367
      *

+ 4
- 0
oa-back/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml Näytä tiedosto

402
  		update sys_user set avatar = #{avatar} where user_name = #{userName}
402
  		update sys_user set avatar = #{avatar} where user_name = #{userName}
403
 	</update>
403
 	</update>
404
 
404
 
405
+	<update id="updateUserEntryDate" parameterType="SysUser">
406
+ 		update sys_user set entry_date = #{entryDate} where user_id = #{userId}
407
+	</update>
408
+
405
 	<update id="updateUserContractSign" parameterType="SysUser">
409
 	<update id="updateUserContractSign" parameterType="SysUser">
406
  		update sys_user set contract_sign = #{contractSign} where user_id = #{userId}
410
  		update sys_user set contract_sign = #{contractSign} where user_id = #{userId}
407
 	</update>
411
 	</update>

+ 1
- 1
oa-ui-app/pages/form/borrow/borrow.vue Näytä tiedosto

650
         let formData = new FormData();
650
         let formData = new FormData();
651
         let message = "您有一条新的借款申请: \n>" + 
651
         let message = "您有一条新的借款申请: \n>" + 
652
         "申请人:<font color='info'>" + this.getUserName(this.form.applier) + "</font> \n>" + 
652
         "申请人:<font color='info'>" + this.getUserName(this.form.applier) + "</font> \n>" + 
653
-        "借款金额:<font color='warning'>" + this.form.applyAmount + "</font> 元 \n>" + 
653
+        "借款金额:<font color='warning'>" + this.form.managerAmount ? this.form.managerAmount : this.form.applyAmount + "</font> 元 \n>" + 
654
         "借款说明:" + (this.form.applyReason ? this.form.applyReason : this.form.remark) + " \n>" + 
654
         "借款说明:" + (this.form.applyReason ? this.form.applyReason : this.form.remark) + " \n>" + 
655
         "\n>" + 
655
         "\n>" + 
656
 		"已办流程:<font color='comment'>" + this.taskName + "</font> \n>";
656
 		"已办流程:<font color='comment'>" + this.taskName + "</font> \n>";

Loading…
Peruuta
Tallenna