浏览代码

获取部门负责人由修改前端改为修改后端,新增实际回款备注字段

lamphua 3 个月前
父节点
当前提交
1e027877ae

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

102
     @GetMapping("/deptLeaderByDept")
102
     @GetMapping("/deptLeaderByDept")
103
     public AjaxResult getDeptLeaderByDeptId(String deptId)
103
     public AjaxResult getDeptLeaderByDeptId(String deptId)
104
     {
104
     {
105
+        if (deptId.equals("116"))
106
+            deptId = "102";
105
         SysUser deptLeader = postService.selectDeptLeaderByDeptId(deptId);
107
         SysUser deptLeader = postService.selectDeptLeaderByDeptId(deptId);
106
         if (deptLeader == null)
108
         if (deptLeader == null)
107
             deptLeader = postService.selectViceDeptLeaderByDeptId(deptId);
109
             deptLeader = postService.selectViceDeptLeaderByDeptId(deptId);

+ 5
- 1
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcContractPaidMapper.xml 查看文件

10
         <result property="paidPercentage"    column="paid_percentage"    />
10
         <result property="paidPercentage"    column="paid_percentage"    />
11
         <result property="paidAmount"    column="paid_amount"    />
11
         <result property="paidAmount"    column="paid_amount"    />
12
         <result property="paidTime"    column="paid_time"    />
12
         <result property="paidTime"    column="paid_time"    />
13
+        <result property="remark"    column="remark"    />
13
     </resultMap>
14
     </resultMap>
14
 
15
 
15
     <sql id="selectCmcContractPaidVo">
16
     <sql id="selectCmcContractPaidVo">
16
-        select paid_id, contract_id, paid_percentage, paid_amount, paid_time from cmc_contract_paid
17
+        select paid_id, contract_id, paid_percentage, paid_amount, paid_time, remark from cmc_contract_paid
17
     </sql>
18
     </sql>
18
 
19
 
19
     <select id="selectCmcContractPaidList" parameterType="CmcContractPaid" resultMap="CmcContractPaidResult">
20
     <select id="selectCmcContractPaidList" parameterType="CmcContractPaid" resultMap="CmcContractPaidResult">
38
             <if test="paidPercentage != null">paid_percentage,</if>
39
             <if test="paidPercentage != null">paid_percentage,</if>
39
             <if test="paidAmount != null">paid_amount,</if>
40
             <if test="paidAmount != null">paid_amount,</if>
40
             <if test="paidTime != null">paid_time,</if>
41
             <if test="paidTime != null">paid_time,</if>
42
+            <if test="remark != null">remark,</if>
41
          </trim>
43
          </trim>
42
         <trim prefix="values (" suffix=")" suffixOverrides=",">
44
         <trim prefix="values (" suffix=")" suffixOverrides=",">
43
             <if test="contractId != null">#{contractId},</if>
45
             <if test="contractId != null">#{contractId},</if>
44
             <if test="paidPercentage != null">#{paidPercentage},</if>
46
             <if test="paidPercentage != null">#{paidPercentage},</if>
45
             <if test="paidAmount != null">#{paidAmount},</if>
47
             <if test="paidAmount != null">#{paidAmount},</if>
46
             <if test="paidTime != null">#{paidTime},</if>
48
             <if test="paidTime != null">#{paidTime},</if>
49
+            <if test="remark != null">#{remark},</if>
47
          </trim>
50
          </trim>
48
     </insert>
51
     </insert>
49
 
52
 
54
             <if test="paidPercentage != null">paid_percentage = #{paidPercentage},</if>
57
             <if test="paidPercentage != null">paid_percentage = #{paidPercentage},</if>
55
             <if test="paidAmount != null">paid_amount = #{paidAmount},</if>
58
             <if test="paidAmount != null">paid_amount = #{paidAmount},</if>
56
             <if test="paidTime != null">paid_time = #{paidTime},</if>
59
             <if test="paidTime != null">paid_time = #{paidTime},</if>
60
+            <if test="remark != null">remark = #{remark},</if>
57
         </trim>
61
         </trim>
58
         where paid_id = #{paidId}
62
         where paid_id = #{paidId}
59
     </update>
63
     </update>

+ 0
- 2
oa-ui/src/views/flowable/form/projectProcess/addproject.vue 查看文件

297
     async getDeptLeader(val) {
297
     async getDeptLeader(val) {
298
       this.deptLeaderList = [];
298
       this.deptLeaderList = [];
299
       for (let v of val) {
299
       for (let v of val) {
300
-        if (v == 116)
301
-          v = 102
302
         let res = await getUsersDeptLeaderByDept({ deptId: Number(v) })
300
         let res = await getUsersDeptLeaderByDept({ deptId: Number(v) })
303
         this.deptLeaderList.push(res.data.userId);
301
         this.deptLeaderList.push(res.data.userId);
304
       }
302
       }

+ 3
- 4
oa-ui/src/views/flowable/form/projectProcess/assessWork.vue 查看文件

1
 <!--
1
 <!--
2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-07-08 16:16:27
3
  * @Date: 2024-07-08 16:16:27
4
- * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2025-01-22 17:01:42
4
+ * @LastEditors: wrh
5
+ * @LastEditTime: 2025-02-12 15:22:45
6
 -->
6
 -->
7
 <template>
7
 <template>
8
   <div class="app-container">
8
   <div class="app-container">
192
       })
192
       })
193
     },
193
     },
194
     getDeptLeader(val) {
194
     getDeptLeader(val) {
195
-      let deptId = Number(val[0])
196
-      getUsersDeptLeaderByDept({ deptId: Number(deptId) }).then(res => {
195
+      getUsersDeptLeaderByDept({ deptId: Number(val[0]) }).then(res => {
197
         this.taskForm.variables = {}
196
         this.taskForm.variables = {}
198
         this.$set(this.taskForm.variables, "approval", res.data.userId);
197
         this.$set(this.taskForm.variables, "approval", res.data.userId);
199
       })
198
       })

正在加载...
取消
保存