根据合同工作内容查询列表

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

@@ -69,6 +69,17 @@ public class CmcContractController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 模糊查询cmc合同评审列表
+     */
+    @GetMapping("/listFuzzy")
+    public TableDataInfo listFuzzy(CmcContract cmcContract)
+    {
+        startPage();
+        List<CmcContract> list = cmcContractService.selectCmcContractListFuzzy(cmcContract);
+        return getDataTable(list);
+    }
+
     /**
      * 获取cmc承接合同统计信息
      */

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

@@ -135,6 +135,9 @@ public class CmcContract extends BaseEntity
     /** 结算总额 */
     private BigDecimal settleAmount;
 
+    /** 查询字符 */
+    private String queryString;
+
     private SysUser draftUser;
 
     private SysUser managerUser;
@@ -470,6 +473,16 @@ public class CmcContract extends BaseEntity
         return budgetAmount;
     }
 
+    public void setQueryString(String queryString)
+    {
+        this.queryString = queryString;
+    }
+
+    public String getQueryString()
+    {
+        return queryString;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcContractMapper.java

@@ -37,6 +37,14 @@ public interface CmcContractMapper
      */
     public List<CmcContract> selectCmcContractList(CmcContract cmcContract);
 
+    /**
+     * 模糊查询cmc合同评审列表
+     *
+     * @param cmcContract cmc合同评审
+     * @return cmc合同评审集合
+     */
+    public List<CmcContract> selectCmcContractListFuzzy(CmcContract cmcContract);
+
     /**
      * 按时间范围查询cmc合同评审列表
      *

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcContractService.java

@@ -38,6 +38,14 @@ public interface ICmcContractService
      */
     public List<CmcContract> selectCmcContractList(CmcContract cmcContract);
 
+    /**
+     *模糊查询cmc合同评审列表
+     *
+     * @param cmcContract cmc合同评审
+     * @return cmc合同评审集合
+     */
+    public List<CmcContract> selectCmcContractListFuzzy(CmcContract cmcContract);
+
     /**
      * 按时间范围查询cmc合同评审列表
      *

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcContractServiceImpl.java

@@ -57,6 +57,18 @@ public class CmcContractServiceImpl implements ICmcContractService
         return cmcContractMapper.selectCmcContractList(cmcContract);
     }
 
+    /**
+     * 模糊查询cmc合同评审列表
+     *
+     * @param cmcContract cmc合同评审
+     * @return cmc合同评审
+     */
+    @Override
+    public List<CmcContract> selectCmcContractListFuzzy(CmcContract cmcContract)
+    {
+        return cmcContractMapper.selectCmcContractListFuzzy(cmcContract);
+    }
+
     /**
      * 按时间范围查询cmc合同评审列表
      *

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

@@ -114,6 +114,45 @@
         order by c.draft_time desc
     </select>
 
+    <select id="selectCmcContractListFuzzy" parameterType="CmcContract" resultMap="CmcContractResult">
+        select distinct c.contract_id, c.contract_code, c.contract_name, c.contract_number, c.tender_id, t.project_name as t_project_name, p.project_number, p.project_name,
+        p.project_source, c.party_a_id, pa.party_a_name, t.a_person as a_person, t.a_phone as a_phone, t.agent as agent, t.agent_person as agent_person, sum(cp.paid_amount) as paid_amount,
+        t.agent_phone as agent_phone, c.amount, c.deposit, c.contract_document, c.drafter, u.nick_name as draft_nick_name, c.draft_time, c.remark, c.sign_date, c.sign_remark, c.sign_scan,
+        c.comment_type, c.manager_comment, c.manager_user_id, u1.nick_name as manager_nick_name, c.manager_time, c.gm_user_id, u2.nick_name as gm_nick_name, c.gm_time, c.gm_comment from cmc_contract as c
+        left join sys_user as u on u.user_id = c.drafter
+        left join sys_user as u1 on u1.user_id = c.manager_user_id
+        left join sys_user as u2 on u2.user_id = c.gm_user_id
+        left join cmc_tender as t on t.tender_id = c.tender_id
+        left join cmc_party_a as pa on pa.party_a_id = c.party_a_id
+        left join cmc_project_contract as pc on pc.contract_id = c.contract_id
+        left join cmc_project as p on pc.project_id = p.project_id
+        left join cmc_contract_paid as cp on cp.contract_id = c.contract_id
+        left join cmc_contract_work as cw on cw.contract_id = c.contract_id
+        <where>
+            cw.content like concat('%', #{queryString}, '%')
+            <if test="contractId != null  and contractId != ''"> and c.contract_id like concat('%', #{contractId}, '%')</if>
+            <if test="contractName!= null  and contractName != ''"> and c.contract_name like concat('%', #{contractName}, '%')</if>
+            <if test="contractCode!= null  and contractCode != ''"> and c.contract_code like concat('%', #{contractCode}, '%')</if>
+            <if test="tenderId != null  and tenderId != ''"> and c.tender_id = #{tenderId}</if>
+            <if test="contractNumber != null  and contractNumber != ''"> and c.contract_number = #{contractNumber}</if>
+            <if test="partyAId != null  and partyAId != ''"> and c.party_a_id = #{partyAId}</if>
+            <if test="amount != null "> and c.amount = #{amount}</if>
+            <if test="deposit != null "> and c.deposit = #{deposit}</if>
+            <if test="contractDocument != null  and contractDocument != ''"> and c.contract_document = #{contractDocument}</if>
+            <if test="drafter != null "> and c.drafter = #{drafter}</if>
+            <if test="draftTime != null "> and c.draft_time = #{draftTime}</if>
+            <if test="signDate != null "> and YEAR(c.sign_date) = YEAR(#{signDate})</if>
+            <if test="signRemark != null  and signRemark != ''"> and c.sign_remark = #{signRemark}</if>
+            <if test="signScan != null  and signScan != ''"> and c.sign_scan = #{signScan}</if>
+            <if test="commentType != null  and commentType != ''"> and c.comment_type = #{commentType}</if>
+            <if test="projectSource != null  and projectSource != ''"> and p.project_source = #{projectSource}</if>
+            <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
+            <if test="partyAName != null  and partyAName != ''"> and pa.party_a_name like concat('%', #{partyAName}, '%')</if>
+        </where>
+        group by c.contract_id
+        order by c.draft_time desc
+    </select>
+
     <select id="selectCmcContractListByRange" parameterType="CmcContract" resultMap="CmcContractResult">
         <include refid="selectCmcContractVo"/>
         <where>

oa-ui/src/api/oa/contract/contract.js

@@ -1,8 +1,8 @@
 /*
  * @Author: ysh
  * @Date: 2024-06-21 18:51:09
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-20 09:37:59
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-07-17 10:09:46
  */
 import request from '@/utils/request'
 
@@ -15,6 +15,15 @@ export function listContract(query) {
   })
 }
 
+// 模糊查询cmc合同评审列表
+export function listContractFuzzy(query) {
+  return request({
+    url: '/oa/contract/listFuzzy',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询cmc合同评审详细
 export function getContract(contractId) {
   return request({

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-06-21 18:52:00
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-02-17 15:12:03
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-07-17 10:57:14
 -->
 <template>
   <div class="app-container">
@@ -22,7 +22,11 @@
             :value="partyA.partyAId">
           </el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item>      
+      <el-form-item label="工作内容" prop="queryString">
+          <el-input v-model="queryParams.queryString" placeholder="请输入关键字" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -128,7 +132,7 @@
 </template>
 
 <script>
-import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
+import { listContract, listContractFuzzy, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
 import { listPartyA } from "@/api/oa/partyA/partyA";
 import contractInfo from './contractInfo.vue';
 import ContractForm from '../../flowable/form/business/contractForm.vue';
@@ -178,7 +182,8 @@ export default {
         signDate: null,
         signRemark: null,
         signScan: null,
-        commentType: null
+        commentType: null,
+        queryString: undefined,
       },
       // 表单参数
       form: {},
@@ -202,23 +207,44 @@ export default {
     /** 查询cmc合同评审列表 */
     getList() {
       this.loading = true;
-      listContract(this.queryParams).then(response => {
-        this.contractList = response.rows;
-        this.total = response.total;
-        for (let contract of this.contractList) {
-          listContractPaid({ contractId: contract.contractId }).then(res => {
-            if (res.total > 0) {
-              let percentage = res.rows.reduce((sum, item) => sum + Number(item.paidPercentage), 0);
-              let paidAmount = res.rows.reduce((sum, item) => sum + Number(item.paidAmount), 0);
-              this.$set(contract, 'percentage', Number(percentage.toFixed(2)))
-              this.$set(contract, 'paidAmount', Number(paidAmount.toFixed(2)))
-            } else {
-              this.$set(contract, 'percentage', 0)
-            }
-            this.loading = false;
-          })
-        }
-      });
+      if (this.queryParams.queryString == '' || this.queryParams.queryString == undefined || this.queryParams.queryString == null) {
+        listContract(this.queryParams).then(response => {
+          this.contractList = response.rows;
+          this.total = response.total;
+          for (let contract of this.contractList) {
+            listContractPaid({ contractId: contract.contractId }).then(res => {
+              if (res.total > 0) {
+                let percentage = res.rows.reduce((sum, item) => sum + Number(item.paidPercentage), 0);
+                let paidAmount = res.rows.reduce((sum, item) => sum + Number(item.paidAmount), 0);
+                this.$set(contract, 'percentage', Number(percentage.toFixed(2)))
+                this.$set(contract, 'paidAmount', Number(paidAmount.toFixed(2)))
+              } else {
+                this.$set(contract, 'percentage', 0)
+              }
+              this.loading = false;
+            })
+          }
+        });
+      }
+      else {
+        listContractFuzzy(this.queryParams).then(response => {
+          this.contractList = response.rows;
+          this.total = response.total;
+          for (let contract of this.contractList) {
+            listContractPaid({ contractId: contract.contractId }).then(res => {
+              if (res.total > 0) {
+                let percentage = res.rows.reduce((sum, item) => sum + Number(item.paidPercentage), 0);
+                let paidAmount = res.rows.reduce((sum, item) => sum + Number(item.paidAmount), 0);
+                this.$set(contract, 'percentage', Number(percentage.toFixed(2)))
+                this.$set(contract, 'paidAmount', Number(paidAmount.toFixed(2)))
+              } else {
+                this.$set(contract, 'percentage', 0)
+              }
+              this.loading = false;
+            })
+          }
+        });
+      }
     },
     // 取消按钮
     cancel() {