部门负责人查询借款、结算列表

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBorrow.java

@@ -29,6 +29,8 @@ public class CmcBorrow extends BaseEntity
     private String projectNumber;
     @Excel(name = "项目名称")
     private String projectName;
+    @Excel(name = "承担部门")
+    private String undertakingDept;
 
     /** 借款事由 */
     @Excel(name = "借款事由")
@@ -197,6 +199,15 @@ public class CmcBorrow extends BaseEntity
     {
         return project;
     }
+    public void setUndertakingDept(String undertakingDept)
+    {
+        this.undertakingDept = undertakingDept;
+    }
+
+    public String getUndertakingDept()
+    {
+        return undertakingDept;
+    }
     public void setApplyReason(String applyReason) 
     {
         this.applyReason = applyReason;

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcSettle.java

@@ -27,6 +27,8 @@ public class CmcSettle extends BaseEntity
     private String projectNumber;
     @Excel(name = "项目名称")
     private String projectName;
+    @Excel(name = "承担部门")
+    private String undertakingDept;
 
     /** 其他项目名称 */
     @Excel(name = "其他项目名称")
@@ -200,6 +202,15 @@ public class CmcSettle extends BaseEntity
     {
         return project;
     }
+    public void setUndertakingDept(String undertakingDept)
+    {
+        this.undertakingDept = undertakingDept;
+    }
+
+    public String getUndertakingDept()
+    {
+        return undertakingDept;
+    }
     public void setWorkloadReport(String workloadReport) 
     {
         this.workloadReport = workloadReport;

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcBorrow" id="CmcBorrowResult">
         <result property="borrowId"    column="borrow_id"    />
         <result property="projectId"    column="project_id"    />
+        <result property="undertakingDept"    column="undertaking_dept"    />
         <result property="applyReason"    column="apply_reason"    />
         <result property="borrowUsage"    column="borrow_usage"    />
         <result property="applier"    column="applier"    />
@@ -90,10 +91,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="projectId"    column="project_id"    />
         <result property="projectNumber"    column="project_number"    />
         <result property="projectName"    column="project_name"    />
+        <result property="undertakingDept"    column="undertaking_dept"    />
     </resultMap>
 
     <sql id="selectCmcBorrowVo">
-        select b.borrow_id, b.project_id, p.project_number, p.project_name, b.apply_reason, b.applier, u.nick_name as applier_nick_name, d.dept_name, b.apply_dept, b.remark, b.borrow_usage,
+        select b.borrow_id, b.project_id, p.project_number, p.project_name, p.undertaking_dept, b.apply_reason, b.applier, u.nick_name as applier_nick_name, d.dept_name, b.apply_dept, b.remark, b.borrow_usage,
                b.apply_date, b.apply_amount, b.manager_amount, b.dept_comment, b.dept_user_id, u1.nick_name as dept_nick_name, b.manager_comment, b.manager_user_id, u2.nick_name as manager_nick_name,
                b.zjl_user_id, u3.nick_name as zjl_nick_name, b.zjl_comment, b.dsz_comment,  b.union_user_id, u4.nick_name as union_nick_name, b.union_comment, b.cw_user_id, u5.nick_name as cw_nick_name,
                b.dsz_user_id, u6.nick_name as dsz_nick_name, b.cw_comment, b.dept_time, b.manager_time, b.zjl_time, b.dsz_time, b.lend_time, b.lend_document, b.borrow_document, b.union_time from cmc_borrow as b
@@ -112,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectCmcBorrowVo"/>
         <where>  
             <if test="projectId != null  and projectId != ''"> and b.project_id = #{projectId}</if>
+            <if test="undertakingDept != null  and undertakingDept != ''"> and p.undertaking_dept = #{undertakingDept}</if>
             <if test="applyReason != null  and applyReason != ''"> and b.apply_reason = #{applyReason}</if>
             <if test="borrowUsage != null  and borrowUsage != ''"> and b.borrow_usage = #{borrowUsage}</if>
             <if test="applyDept != null  and applyDept != ''"> and b.apply_dept = #{applyDept}</if>

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcSettle" id="CmcSettleResult">
         <result property="settleId"    column="settle_id"    />
         <result property="projectId"    column="project_id"    />
+        <result property="undertakingDept"    column="undertaking_dept"    />
         <result property="xmName"    column="xm_name"    />
         <result property="workloadReport"    column="workload_report"    />
         <result property="reporter"    column="reporter"    />
@@ -82,10 +83,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="projectId"    column="project_id"    />
         <result property="projectNumber"    column="project_number"    />
         <result property="projectName"    column="project_name"    />
+        <result property="undertakingDept"    column="undertaking_dept"    />
     </resultMap>
 
     <sql id="selectCmcSettleVo">
-        select s.settle_id, s.project_id, p.project_number, p.project_name, s.xm_name, s.workload_report, s.reporter, u.nick_name as reporter_nick_name, s.report_time, s.settle_comment, s.zh_user_id, u1.nick_name as zh_nick_name,
+        select s.settle_id, s.project_id, p.project_number, p.project_name, p.undertaking_dept, s.xm_name, s.workload_report, s.reporter, u.nick_name as reporter_nick_name, s.report_time, s.settle_comment, s.zh_user_id, u1.nick_name as zh_nick_name,
                s.zh_time, s.zh_comment, s.js_user_id, u2.nick_name as js_nick_name, s.js_time, s.js_comment, s.jy_user_id, u3.nick_name as jy_nick_name, s.jy_time, s.jy_comment, 
                s.manager_user_id, u4.nick_name as manager_nick_name, s.manager_time, s.manager_comment, s.gm_user_id, u5.nick_name as gm_nick_name, s.gm_time, s.gm_comment,
                s.dsz_user_id, u6.nick_name as dsz_nick_name, s.dsz_time, s.dsz_comment, s.settle_document, s.modify_document, s.final_document from cmc_settle as s
@@ -104,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="settleId != null  and settleId != ''"> and s.settle_id = #{settleId}</if>
             <if test="projectId != null"> and s.project_id = #{projectId}</if>
+            <if test="undertakingDept != null  and undertakingDept != ''"> and p.undertaking_dept = #{undertakingDept}</if>
             <if test="xmName != null"> and s.xm_name like concat('%', #{xmName}, '%')</if>
             <if test="workloadReport != null  and workloadReport != ''"> and s.workload_report = #{workloadReport}</if>
             <if test="reporter != null "> and s.reporter = #{reporter}</if>

oa-ui/src/views/file/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:51:49
  * @LastEditors: wrh
- * @LastEditTime: 2024-08-19 11:45:35
+ * @LastEditTime: 2024-08-20 11:05:25
 -->
 <template>
   <div class="warpper-container">
@@ -193,8 +193,8 @@
                       label="数据年份:">{{
                         props.row.dataYear }}</el-descriptions-item>
                     <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
-                      label="成果类型:">{{
-                        props.row.resultType }}</el-descriptions-item>
+                      label="成果类型:">{{ selectDictLabel(dict.type.cmc_achi_type, props.row.resultType)
+                      }}</el-descriptions-item>
                     <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
                       label="文件类型:">{{
                         props.row.fileType }}</el-descriptions-item>
@@ -211,7 +211,8 @@
                       label="分辨率:">{{
                         props.row.resolution }}</el-descriptions-item>
                     <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
-                      label="比例尺或等级:">{{ props.row.scaleOrder }}</el-descriptions-item>
+                      label="比例尺或等级:">{{ selectDictLabel(dict.type.cmc_scale_grade, props.row.scaleGrade)
+                      }}</el-descriptions-item>
                     <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
                       label="数据类型:">{{
                         props.row.dataType }}</el-descriptions-item>
@@ -266,6 +267,7 @@ import { MousePosition, ScaleLine, defaults as defaultControls } from 'ol/contro
 import { getAchievementByProject, listAchievement } from "@/api/file/achievement";
 export default {
   components: { infoBox },
+  dicts: ['cmc_achi_type', 'cmc_scale_grade'],
   data() {
     return {
       queryParams: {
@@ -832,6 +834,7 @@ export default {
           this.achiDialogData = [];
         } else {
           this.dialogTableVisible = true;
+          console.log(res.rows);
           this.achiDialogData = res.rows;
         }
       })