合同导出查询内容

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

@@ -259,7 +259,11 @@ public class CmcContractController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcContract cmcContract)
     {
-        List<CmcContract> list = cmcContractService.selectCmcContractList(cmcContract);
+        List<CmcContract> list;
+        if (cmcContract.getQueryString() != null && !cmcContract.getQueryString().equals(""))
+            list = cmcContractService.selectCmcContractListFuzzy(cmcContract);
+        else
+            list = cmcContractService.selectCmcContractList(cmcContract);
         ExcelUtil<CmcContract> util = new ExcelUtil<CmcContract>(CmcContract.class);
         util.exportExcel(response, list, "cmc合同评审数据");
     }
@@ -271,7 +275,11 @@ public class CmcContractController extends BaseController
     @PostMapping("/exportSelectFields")
     public void export(HttpServletResponse response, CmcContract cmcContract, String selectFields)
     {
-        List<CmcContract> list = cmcContractService.selectCmcContractList(cmcContract);
+        List<CmcContract> list;
+        if (cmcContract.getQueryString() != null && !cmcContract.getQueryString().equals(""))
+            list = cmcContractService.selectCmcContractListFuzzy(cmcContract);
+        else
+            list = cmcContractService.selectCmcContractList(cmcContract);
         List<String> selectFieldList = Arrays.asList(selectFields.split(","));
         ExcelUtil<CmcContract> util = new ExcelUtil<CmcContract>(CmcContract.class);
         util.exportExcel(response, selectFieldList, list, "cmc合同评审数据", StringUtils.EMPTY);

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

@@ -122,8 +122,12 @@ public class CmcProjectController extends BaseController
         List<CmcProject> list = new ArrayList<>();
         if (cmcProject.getUndertakingDept() != null && cmcProject.getUndertakingDept().equals("113"))
             list = cmcProjectService.selectCmcInvestProjectList(cmcProject);
-        else
-            list = cmcProjectService.selectCmcProjectList(cmcProject);
+        else {
+            if (cmcProject.getQueryString() != null && !cmcProject.getQueryString().equals(""))
+                list = cmcProjectService.selectCmcProjectListFuzzy(cmcProject);
+            else
+                list = cmcProjectService.selectCmcProjectList(cmcProject);
+        }
         for (CmcProject project : list) {
             project.setUndertakingDeptName(deptIdToName(project));
             project.setQualityInspectorName(inspectorIdToName(project));

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

@@ -34,6 +34,11 @@ public class CmcContract extends BaseEntity
     @Excel(name = "合同编号")
     private String contractNumber;
 
+    /** 合同内容 */
+    @Excel(name = "合同内容")
+    private String content;
+    private CmcContractWork contractWork;
+
     /** 投标项目 */
     @Excel(name = "投标项目")
     private String tenderName;
@@ -522,6 +527,27 @@ public class CmcContract extends BaseEntity
         return queryString;
     }
 
+    public void setContractWork(CmcContractWork contractWork)
+    {
+        this.contractWork = contractWork;
+        this.content = contractWork == null ? "" : contractWork.getContent();
+    }
+
+    public CmcContractWork getContractWork()
+    {
+        return contractWork;
+    }
+
+    public void setContent(String content)
+    {
+        this.content = content;
+    }
+
+    public String getContent()
+    {
+        return content;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -3,6 +3,7 @@ package com.ruoyi.oa.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -30,6 +31,12 @@ public class CmcWage extends BaseEntity
     @Excel(name = "姓名")
     private String nickName;
 
+    /** 姓名 */
+    @Excel(name = "部门")
+    private String deptName;
+    private String deptId;
+    private SysDept dept;
+
     /** 基础工资 */
     @Excel(name = "基础工资")
     private BigDecimal baseSalary;
@@ -347,6 +354,25 @@ public class CmcWage extends BaseEntity
     {
         return user;
     }
+    public void setDeptId(String deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public String getDeptId()
+    {
+        return deptId;
+    }
+    public void setDept(SysDept dept)
+    {
+        this.dept = dept;
+        this.deptName = dept == null ? "" : dept.getDeptName();
+    }
+
+    public SysDept getDept()
+    {
+        return dept;
+    }
 
     @Override
     public String toString() {

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

@@ -42,6 +42,7 @@
         <association property="tender"    javaType="CmcTender"         resultMap="CmcTenderResult" />
         <association property="partyA"    javaType="CmcPartyA"         resultMap="CmcPartyAResult" />
         <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
+        <association property="contractWork"    javaType="CmcContractWork"         resultMap="CmcContractWorkResult" />
     </resultMap>
 
     <resultMap type="CmcTender" id="CmcTenderResult">
@@ -76,6 +77,11 @@
         <result property="projectType"    column="project_type"    />
     </resultMap>
 
+    <resultMap type="CmcContractWork" id="CmcContractWorkResult">
+        <result property="contractId"    column="contract_id"    />
+        <result property="content"    column="content"    />
+    </resultMap>
+
     <sql id="selectCmcContractVo">
         select distinct c.contract_id, c.contract_code, c.contract_name, c.contract_number, c.tender_id, t.project_name as t_project_name,
         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,
@@ -168,8 +174,9 @@
     <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,
         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,
-        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
+        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, cw.content 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

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

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
         <result property="performanceId"    column="performance_id"    />
         <association property="user"    javaType="SysUser"         resultMap="SysUserResult" />
+        <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="SysUserResult">
@@ -38,17 +39,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nickName"    column="nick_name"    />
     </resultMap>
 
+    <resultMap type="SysDept" id="SysDeptResult">
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+    </resultMap>
+
     <sql id="selectCmcWageVo">
-        select w.wage_id, w.user_id, w.base_salary, w.year_salary, w.post_salary, w.performance_salary, w.certificates_subsidy, w.festival_subsidy, w.post_stable_subsidy,
+        select w.wage_id, w.user_id, u.dept_id, d.dept_name, w.base_salary, w.year_salary, w.post_salary, w.performance_salary, w.certificates_subsidy, w.festival_subsidy, w.post_stable_subsidy,
                w.high_temperature_subsidy, w.attendance_deduct, w.payable_wage, w.house_fund, w.endowment_insurance, w.unemployment_insurance, w.medical_insurance, w.property_fee,
                w.deduct_total, w.social_security_unit, w.individual_income_tax, w.paid_wage, w.pay_day, w.pay_month, w.remark, w.performance_id, u.nick_name from cmc_wage as w
         left join sys_user as u on u.user_id = w.user_id
+        left join sys_dept as d on d.dept_id = u.dept_id
     </sql>
 
     <select id="selectCmcWageList" parameterType="CmcWage" resultMap="CmcWageResult">
         <include refid="selectCmcWageVo"/>
         <where>  
             <if test="userId != null "> and w.user_id = #{userId}</if>
+            <if test="deptId != null "> and u.dept_id = #{deptId}</if>
             <if test="baseSalary != null "> and w.base_salary = #{baseSalary}</if>
             <if test="yearSalary != null "> and w.year_salary = #{yearSalary}</if>
             <if test="postSalary != null "> and w.post_salary = #{postSalary}</if>
@@ -72,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payMonth != null "> and MONTH(w.pay_month) = MONTH(#{payMonth})</if>
             <if test="performanceId != null and performanceId != ''"> and w.performance_id = #{performanceId}</if>
         </where>
+        order by w.user_id, w.pay_month
     </select>
     
     <select id="selectCmcWageByWageId" parameterType="Integer" resultMap="CmcWageResult">

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-07-24 14:37:14
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-10-29 10:29:35
 -->
 <template>
   <div class="app-container">
@@ -230,6 +230,7 @@ export default {
       exportOpen: false,
       fieldsObj: [
         { label: '合同名称', value: 'contractName' },
+        { label: '合同内容', value: 'content' },
         { label: '合同金额', value: 'amount' },
         { label: '甲方单位', value: 'partyAName' },
         { label: '合同编码（公司）', value: 'contractCode' },

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

@@ -1,26 +1,41 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="姓名" prop="userId">
-        <el-select v-model="queryParams.userId" filterable clearable @change="handleQuery">
-          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
-            :value="item.userId">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="发放月份" prop="payMonth">
-        <el-date-picker clearable v-model="queryParams.payMonth" type="month" value-format="yyyy-MM-dd"
-          placeholder="请选择发放月份">
-        </el-date-picker>
-      </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>
-      </el-form-item>
-    </el-form>
+    <el-row :gutter="20">
+      <!--部门数据-->
+      <el-col :span="5" :xs="24">
+        <div class="head-container">
+          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
+            style="margin-bottom: 20px" />
+        </div>
+        <div class="head-container">
+          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
+            :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
+            @node-click="handleNodeClick" />
+        </div>
+      </el-col>
+      <!--用户数据-->
+      <el-col :span="19" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="姓名" prop="userId">
+            <el-select v-model="queryParams.userId" filterable clearable @change="handleQuery">
+              <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+                :value="item.userId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="发放月份" prop="payMonth">
+            <el-date-picker clearable v-model="queryParams.payMonth" type="month" value-format="yyyy-MM-dd"
+              placeholder="请选择发放月份">
+            </el-date-picker>
+          </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>
+          </el-form-item>
+        </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
+        <el-row :gutter="10" class="mb8">
+          <!-- <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
           v-hasPermi="['oa:wage:add']">新增</el-button>
       </el-col>
@@ -36,20 +51,19 @@
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['oa:wage:export']">导出</el-button>
       </el-col> -->
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-upload2" size="mini" @click="handleImport"
-          v-hasPermi="['oa:wage:export']">上传社保公积金</el-button>
-      </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="el-icon-upload2" size="mini" @click="handleImport"
+              v-hasPermi="['oa:wage:export']">上传社保公积金</el-button>
+          </el-col>
 
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
 
-    <el-table v-loading="loading" :data="wageList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="姓名" align="center" prop="user.nickName">
-
-      </el-table-column>
-      <!-- <el-table-column label="基础工资" align="center" prop="baseSalary" />
+        <el-table v-loading="loading" :data="wageList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="姓名" align="center" prop="user.nickName" />
+          <el-table-column label="部门" align="center" prop="dept.deptName" />
+          <!-- <el-table-column label="基础工资" align="center" prop="baseSalary" />
       <el-table-column label="工龄工资" align="center" prop="yearSalary" />
       <el-table-column label="岗位工资" align="center" prop="postSalary" />
       <el-table-column label="绩效工资" align="center" prop="performanceSalary" />
@@ -59,38 +73,39 @@
       <el-table-column label="高温补贴" align="center" prop="highTemperatureSubsidy" />
       <el-table-column label="考勤扣款" align="center" prop="attendanceDeduct" />
       <el-table-column label="应发小计" align="center" prop="payableWage" /> -->
-      <el-table-column label="公积金单位部分" align="center" prop="houseFund" />
-      <!-- <el-table-column label="养老保险" align="center" prop="endowmentInsurance" />
+          <el-table-column label="公积金单位部分" align="center" prop="houseFund" />
+          <!-- <el-table-column label="养老保险" align="center" prop="endowmentInsurance" />
       <el-table-column label="失业保险" align="center" prop="unemploymentInsurance" />
       <el-table-column label="医疗保险" align="center" prop="medicalInsurance" />
       <el-table-column label="水韵物管费" align="center" prop="propertyFee" />
       <el-table-column label="扣款小计" align="center" prop="deductTotal" /> -->
-      <el-table-column label="社保单位部分" align="center" prop="socialSecurityUnit" />
-      <!-- <el-table-column label="个税" align="center" prop="individualIncomeTax" />
+          <el-table-column label="社保单位部分" align="center" prop="socialSecurityUnit" />
+          <!-- <el-table-column label="个税" align="center" prop="individualIncomeTax" />
       <el-table-column label="实发工资" align="center" prop="paidWage" /> -->
-      <!-- <el-table-column label="发放日期" align="center" prop="payDay" width="180">
+          <!-- <el-table-column label="发放日期" align="center" prop="payDay" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.payDay, '{y}-{m}-{d}') }}</span>
         </template>
 </el-table-column> -->
-      <el-table-column label="发放月份" align="center" prop="payMonth" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.payMonth, '{y}-{m}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:wage:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:wage:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+          <el-table-column label="发放月份" align="center" prop="payMonth" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.payMonth, '{y}-{m}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                v-hasPermi="['oa:wage:edit']">修改</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['oa:wage:remove']">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
 
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+          @pagination="getList" />
+      </el-col>
+    </el-row>
     <!-- 添加或修改员工工资对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="400px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -194,9 +209,11 @@
 </template>
 
 <script>
+import { deptTreeSelectNew } from "@/api/system/user";
 import { listWage, getWage, delWage, addWage, updateWage } from "@/api/oa/wage/wage";
 import { downloadTemplate } from "@/api/file/project";
 import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
 
 export default {
   name: "Wage",
@@ -217,6 +234,14 @@ export default {
       total: 0,
       // 员工工资表格数据
       wageList: [],
+      // 部门名称
+      deptName: undefined,
+      // 部门树选项
+      deptOptions: undefined,
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -226,6 +251,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         userId: null,
+        deptId: null,
         baseSalary: null,
         yearSalary: null,
         postSalary: null,
@@ -272,8 +298,15 @@ export default {
       uploadFormData: undefined,
     };
   },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
   created() {
     this.getList();
+    this.getDeptTree();
   },
   methods: {
     /** 查询员工工资列表 */
@@ -285,6 +318,22 @@ export default {
         this.loading = false;
       });
     },
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelectNew().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.deptId = data.id;
+      this.handleQuery();
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -295,6 +344,7 @@ export default {
       this.form = {
         wageId: null,
         userId: null,
+        deptId: null,
         baseSalary: null,
         yearSalary: null,
         postSalary: null,