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

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

@@ -102,6 +102,8 @@ public class SysPostController extends BaseController
     @GetMapping("/deptLeaderByDept")
     public AjaxResult getDeptLeaderByDeptId(String deptId)
     {
+        if (deptId.equals("116"))
+            deptId = "102";
         SysUser deptLeader = postService.selectDeptLeaderByDeptId(deptId);
         if (deptLeader == null)
             deptLeader = postService.selectViceDeptLeaderByDeptId(deptId);

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcContractPaidMapper.xml

@@ -10,10 +10,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="paidPercentage"    column="paid_percentage"    />
         <result property="paidAmount"    column="paid_amount"    />
         <result property="paidTime"    column="paid_time"    />
+        <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectCmcContractPaidVo">
-        select paid_id, contract_id, paid_percentage, paid_amount, paid_time from cmc_contract_paid
+        select paid_id, contract_id, paid_percentage, paid_amount, paid_time, remark from cmc_contract_paid
     </sql>
 
     <select id="selectCmcContractPaidList" parameterType="CmcContractPaid" resultMap="CmcContractPaidResult">
@@ -38,12 +39,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="paidPercentage != null">paid_percentage,</if>
             <if test="paidAmount != null">paid_amount,</if>
             <if test="paidTime != null">paid_time,</if>
+            <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="contractId != null">#{contractId},</if>
             <if test="paidPercentage != null">#{paidPercentage},</if>
             <if test="paidAmount != null">#{paidAmount},</if>
             <if test="paidTime != null">#{paidTime},</if>
+            <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
 
@@ -54,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="paidPercentage != null">paid_percentage = #{paidPercentage},</if>
             <if test="paidAmount != null">paid_amount = #{paidAmount},</if>
             <if test="paidTime != null">paid_time = #{paidTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where paid_id = #{paidId}
     </update>

oa-ui/src/views/flowable/form/projectProcess/addproject.vue

@@ -297,8 +297,6 @@ export default {
     async getDeptLeader(val) {
       this.deptLeaderList = [];
       for (let v of val) {
-        if (v == 116)
-          v = 102
         let res = await getUsersDeptLeaderByDept({ deptId: Number(v) })
         this.deptLeaderList.push(res.data.userId);
       }

oa-ui/src/views/flowable/form/projectProcess/assessWork.vue

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