浏览代码

新增人员自动赋予普通角色,核算天数可计半天

lamphua 2 周前
父节点
当前提交
2bf5fdb2ad

+ 3
- 0
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java 查看文件

305
             user.setPoliticalAffiliation("13");
305
             user.setPoliticalAffiliation("13");
306
         String pinyin = Pinyin4jUtil.getPinyin(user.getNickName());
306
         String pinyin = Pinyin4jUtil.getPinyin(user.getNickName());
307
         user.setPinyin(pinyin.contains(",") ? pinyin.split(",")[0] : pinyin);
307
         user.setPinyin(pinyin.contains(",") ? pinyin.split(",")[0] : pinyin);
308
+        Long[] roleIds = new Long[1];
309
+        roleIds[0] = 2L;
310
+        user.setRoleIds(roleIds);
308
         user.setPassword(SecurityUtils.encryptPassword(user.getIdCard().substring(12,18)));
311
         user.setPassword(SecurityUtils.encryptPassword(user.getIdCard().substring(12,18)));
309
         if (user.getBirthday() != null)
312
         if (user.getBirthday() != null)
310
             user.setAge(DateUtils.getAgeByBirth(user.getBirthday()));
313
             user.setAge(DateUtils.getAgeByBirth(user.getBirthday()));

+ 6
- 6
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetStaff.java 查看文件

34
 
34
 
35
     /** 天数 */
35
     /** 天数 */
36
     @Excel(name = "天数")
36
     @Excel(name = "天数")
37
-    private Integer days;
37
+    private Double days;
38
 
38
 
39
     private CmcPostSalary salary;
39
     private CmcPostSalary salary;
40
 
40
 
48
 
48
 
49
     /** 核算天数 */
49
     /** 核算天数 */
50
     @Excel(name = "核算天数")
50
     @Excel(name = "核算天数")
51
-    private Long daysAdjust;
51
+    private Double daysAdjust;
52
 
52
 
53
     /** 预算绩效 */
53
     /** 预算绩效 */
54
     @Excel(name = "预算绩效")
54
     @Excel(name = "预算绩效")
114
     {
114
     {
115
         return user;
115
         return user;
116
     }
116
     }
117
-    public void setDays(Integer days) 
117
+    public void setDays(Double days)
118
     {
118
     {
119
         this.days = days;
119
         this.days = days;
120
     }
120
     }
121
 
121
 
122
-    public Integer getDays() 
122
+    public Double getDays()
123
     {
123
     {
124
         return days;
124
         return days;
125
     }
125
     }
150
     {
150
     {
151
         return type;
151
         return type;
152
     }
152
     }
153
-    public void setDaysAdjust(Long daysAdjust)
153
+    public void setDaysAdjust(Double daysAdjust)
154
     {
154
     {
155
         this.daysAdjust = daysAdjust;
155
         this.daysAdjust = daysAdjust;
156
     }
156
     }
157
 
157
 
158
-    public Long getDaysAdjust()
158
+    public Double getDaysAdjust()
159
     {
159
     {
160
         return daysAdjust;
160
         return daysAdjust;
161
     }
161
     }

+ 5
- 12
oa-ui/src/views/flowable/form/budget/adjust/budgetAdjust.vue 查看文件

1
 <!--
1
 <!--
2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2025-05-07 11:01:39
3
  * @Date: 2025-05-07 11:01:39
4
- * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2025-07-09 17:04:27
4
+ * @LastEditors: wrh
5
+ * @LastEditTime: 2025-09-10 13:58:29
6
 -->
6
 -->
7
 <template>
7
 <template>
8
   <div class="main">
8
   <div class="main">
410
   },
410
   },
411
   watch: {
411
   watch: {
412
     'taskForm.formId'() {
412
     'taskForm.formId'() {
413
-      if (!this.row.projectId) {
414
-        getCheck(this.taskForm.formId).then(res => {
415
-          this.row.projectId = res.data.projectId;
416
-          this.initBudgetForm();
417
-          this.initCheckForm();
418
-          this.getContractInfo();
419
-          this.getSubContractInfo();
420
-        });
421
-      } else {
413
+      getCheck(this.taskForm.formId).then(res => {
414
+        this.row.projectId = res.data.projectId;
422
         this.initBudgetForm();
415
         this.initBudgetForm();
423
         this.initCheckForm();
416
         this.initCheckForm();
424
         this.getContractInfo();
417
         this.getContractInfo();
425
         this.getSubContractInfo();
418
         this.getSubContractInfo();
426
-      }
419
+      });
427
 
420
 
428
     }
421
     }
429
   },
422
   },

+ 2
- 1
oa-ui/src/views/oa/check/index.vue 查看文件

187
     },
187
     },
188
     /** 查看按钮操作 */
188
     /** 查看按钮操作 */
189
     handleView(row) {
189
     handleView(row) {
190
-      this.$set(this.taskForm, 'formId', row.checkId)
191
       this.open = true;
190
       this.open = true;
192
       this.title = "查看cmc项目核算";
191
       this.title = "查看cmc项目核算";
192
+      this.form = row;
193
+      this.$set(this.taskForm, 'formId', row.checkId)
193
     },
194
     },
194
     /** 重置按钮操作 */
195
     /** 重置按钮操作 */
195
     resetQuery() {
196
     resetQuery() {

正在加载...
取消
保存