结算表单查询修改

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

@@ -69,11 +69,7 @@ public class CmcProjectController extends BaseController
     public TableDataInfo list(CmcProject cmcProject)
     {
         startPage();
-        List<CmcProject> list = new ArrayList<>();
-        if (cmcProject.getUndertakingDept() != null && cmcProject.getUndertakingDept().equals("113"))
-            list = cmcProjectService.selectCmcInvestProjectList(cmcProject);
-        else
-            list = cmcProjectService.selectCmcProjectList(cmcProject);
+        List<CmcProject> list = cmcProjectService.selectCmcAllProjectList(cmcProject);
         for (CmcProject project : list) {
             project.setUndertakingDeptName(deptIdToName(project));
             project.setQualityInspectorName(inspectorIdToName(project));

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

@@ -108,6 +108,7 @@
     <select id="selectCmcContractByContractId" parameterType="String" resultMap="CmcContractResult">
         <include refid="selectCmcContractVo"/>
         where c.contract_id = #{contractId}
+        group by c.contract_id
     </select>
 
     <insert id="insertCmcContract" parameterType="CmcContract">

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

@@ -95,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCmcSubContractBySubContractId" parameterType="String" resultMap="CmcSubContractResult">
         <include refid="selectCmcSubContractVo"/>
         where sc.sub_contract_id = #{subContractId}
+        group by sc.sub_contract_id
     </select>
         
     <insert id="insertCmcSubContract" parameterType="CmcSubContract">

oa-ui/src/views/flowable/form/inProgress/settleData.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 14:45:03
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-04 11:33:23
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-10-22 15:20:58
 -->
 <template>
   <div class="mt20">
@@ -143,7 +143,7 @@ export default {
       })
     },
     getSummaryList(settleId) {
-      listSettleSummary({ settleId }).then(res => {
+      listSettleSummary({ settleId: settleId, pageSize: 20 }).then(res => {
         if (res.rows) {
           this.summaryList = res.rows
         }

oa-ui/src/views/flowable/form/settleForm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-10 16:15:50
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-10-22 15:20:01
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -662,7 +662,7 @@ export default {
           getProject(res.rows[0].projectId),
           listBudget({ projectId: res.rows[0].projectId }),
           listSettleWork({ settleId: settleId, pageSize: 30 }),
-          listSettleSummary({ settleId })
+          listSettleSummary({ settleId, pageSize: 20 })
         ]);
 
         if (projectResponse) {

oa-ui/src/views/flowable/form/settleOther.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-08 09:38:18
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-10-22 15:20:14
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -448,7 +448,7 @@ export default {
           settleSummaryResponse
         ] = await Promise.all([
           listSettleWork({ settleId: settleId, pageSize: 30 }),
-          listSettleSummary({ settleId })
+          listSettleSummary({ settleId, pageSize: 20 })
         ]);
 
         // 获取申请工作量列表