数据更新

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

@@ -76,7 +76,7 @@ public class CmcDepositController extends BaseController
     public AjaxResult add(@RequestBody CmcDeposit cmcDeposit)
     {
         if (cmcDeposit.getContractId() != null && cmcDeposit.getTenderId() == null) {
-            cmcDeposit.setTenderId("0");
+            cmcDeposit.setTenderId(0);
         }
         if (cmcDeposit.getTenderId() != null && cmcDeposit.getContractId() == null) {
             cmcDeposit.setContractId("0");

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

@@ -37,9 +37,6 @@ public class CmcTenderController extends BaseController
     @Autowired
     private ICmcTenderService cmcTenderService;
 
-    @Autowired
-    private ICmcPartyAService cmcPartyAService;
-
     /**
      * 查询投标管理列表
      */

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

@@ -35,7 +35,7 @@ public class CmcContract extends BaseEntity
     private String contractNumber;
 
     /** 投标项目 */
-    private String tenderId;
+    private Integer tenderId;
 
     @Excel(name = "投标项目")
     private String tenderName;
@@ -156,12 +156,12 @@ public class CmcContract extends BaseEntity
     {
         return contractNumber;
     }
-    public void setTenderId(String tenderId)
+    public void setTenderId(Integer tenderId)
     {
         this.tenderId = tenderId;
     }
 
-    public String getTenderId()
+    public Integer getTenderId()
     {
         return tenderId;
     }

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

@@ -26,7 +26,7 @@ public class CmcDeposit extends BaseEntity
     private String depositType;
 
     /** 投标项目id */
-    private String tenderId;
+    private Integer tenderId;
     @Excel(name = "投标项目名称")
     private String projectName;
     private CmcTender tender;
@@ -142,12 +142,12 @@ public class CmcDeposit extends BaseEntity
     {
         return depositType;
     }
-    public void setTenderId(String tenderId) 
+    public void setTenderId(Integer tenderId)
     {
         this.tenderId = tenderId;
     }
 
-    public String getTenderId() 
+    public Integer getTenderId()
     {
         return tenderId;
     }

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

@@ -21,17 +21,15 @@ public class CmcTender extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 投标id（2024-001） */
-    private String tenderId;
+    private Integer tenderId;
 
     /** 投标项目名称 */
     @Excel(name = "投标项目名称")
     private String projectName;
 
     /** 招标业主 */
-    private String partyAId;
-
     @Excel(name = "招标业主")
-    private CmcPartyA partyA;
+    private String partyAName;
 
     /** 业主联系人 */
     @Excel(name = "业主联系人")
@@ -154,12 +152,12 @@ public class CmcTender extends BaseEntity
     private String tenderDeptName;
     private SysDept tenderDept;
 
-    public void setTenderId(String tenderId) 
+    public void setTenderId(Integer tenderId)
     {
         this.tenderId = tenderId;
     }
 
-    public String getTenderId() 
+    public Integer getTenderId()
     {
         return tenderId;
     }
@@ -172,23 +170,14 @@ public class CmcTender extends BaseEntity
     {
         return projectName;
     }
-    public void setPartyAId(String partyAId) 
-    {
-        this.partyAId = partyAId;
-    }
-
-    public String getPartyAId() 
-    {
-        return partyAId;
-    }
-    public void setPartyA(CmcPartyA partyA)
+    public void setPartyAName(String partyAName)
     {
-        this.partyA = partyA;
+        this.partyAName = partyAName;
     }
 
-    public CmcPartyA getPartyA()
+    public String getPartyAName()
     {
-        return partyA;
+        return partyAName;
     }
     public void setaPerson(String aPerson) 
     {
@@ -483,7 +472,7 @@ public class CmcTender extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("tenderId", getTenderId())
             .append("projectName", getProjectName())
-            .append("partyAId", getPartyAId())
+            .append("partyAName", getPartyAName())
             .append("aPerson", getaPerson())
             .append("aPhone", getaPhone())
             .append("agent", getAgent())

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

@@ -37,7 +37,7 @@
     <resultMap type="CmcTender" id="CmcTenderResult">
         <result property="tenderId"    column="tender_id"    />
         <result property="projectName"    column="project_name"    />
-        <result property="partyAId"    column="party_a_id"    />
+        <result property="partyAName"    column="party_a_name"    />
         <result property="aPerson"    column="a_person"    />
         <result property="aPhone"    column="a_phone"    />
         <result property="agent"    column="agent"    />
@@ -66,7 +66,7 @@
     </resultMap>
 
     <sql id="selectCmcContractVo">
-        select c.contract_id, c.contract_code, c.contract_name, c.contract_number, c.tender_id, c.party_a_id, pa.party_a_name, t.project_name as project_name, t.party_a_id as party_a_id, t.a_person as a_person,
+        select c.contract_id, c.contract_code, c.contract_name, c.contract_number, c.tender_id, c.party_a_id, pa.party_a_name, t.project_name as project_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

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

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
         <association property="gmUser"    javaType="SysUser"         resultMap="GmUserResult" />
         <association property="dszUser"    javaType="SysUser"         resultMap="DszUserResult" />
+        <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="ReporterUserResult">
@@ -76,8 +77,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nickName"    column="dsz_nick_name"    />
     </resultMap>
 
+    <resultMap type="CmcProject" id="CmcProjectResult">
+        <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="projectName"    column="project_name"    />
+    </resultMap>
+
     <sql id="selectCmcSettleVo">
-        select s.settle_id, s.project_id, 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, 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
@@ -88,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_user as u4 on u4.user_id = s.manager_user_id
         left join sys_user as u5 on u5.user_id = s.gm_user_id
         left join sys_user as u6 on u6.user_id = s.dsz_user_id
+        left join cmc_project as p on p.project_id = s.project_id
     </sql>
 
     <select id="selectCmcSettleList" parameterType="CmcSettle" resultMap="CmcSettleResult">

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

@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcTender" id="CmcTenderResult">
         <result property="tenderId"    column="tender_id"    />
         <result property="projectName"    column="project_name"    />
-        <result property="partyAId"    column="party_a_id"    />
+        <result property="partyAName"    column="party_a_name"    />
         <result property="aPerson"    column="a_person"    />
         <result property="aPhone"    column="a_phone"    />
         <result property="agent"    column="agent"    />
@@ -39,8 +39,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <association property="checkerUser"    javaType="SysUser"         resultMap="CheckerUserResult" />
         <association property="printerUser"    javaType="SysUser"         resultMap="PrinterUserResult" />
         <association property="tenderDept"    javaType="SysDept"         resultMap="SysDeptResult" />
-        <association property="tenderDept"    javaType="SysDept"         resultMap="SysDeptResult" />
-        <association property="partyA"    javaType="CmcPartyA"         resultMap="CmcPartyAResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="TrusteeUserResult">
@@ -78,13 +76,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName"    column="dept_name"    />
     </resultMap>
 
-    <resultMap type="CmcPartyA" id="CmcPartyAResult">
-        <result property="partyAId"    column="party_a_id"    />
-        <result property="partyAName"    column="party_a_name"    />
-    </resultMap>
-
     <sql id="selectCmcTenderVo">
-        select t.tender_id, t.project_name, t.party_a_id, pa.party_a_name, t.a_person, t.a_phone, t.agent, t.agent_person, t.agent_phone, t.place, t.dept, t.trustee, t.budget, t.quote, t.deposit, t.tender_time,
+        select t.tender_id, t.project_name, t.party_a_name, t.a_person, t.a_phone, t.agent, t.agent_person, t.agent_phone, t.place, t.dept, t.trustee, t.budget, t.quote, t.deposit, t.tender_time,
                t.bid_buy_deadline, t.bid_website, t.bid_document, t.project_briefly, t.business_writer, t.business_deadline, t.tech_writer, t.tech_deadline, t.tender_combiner, t.tender_checker,
                t.tender_printer, t.tender_document, u.nick_name as trustee_nick_name, u1.nick_name as business_nick_name, u2.nick_name as tech_nick_name, u3.nick_name as combiner_nick_name,
                u4.nick_name as checker_nick_name, u5.nick_name as printer_nick_name, d.dept_name from cmc_tender as t
@@ -95,14 +88,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_user as u4 on u4.user_id = t.tender_checker
         left join sys_user as u5 on u5.user_id = t.tender_printer
         left join sys_dept as d on d.dept_id = t.dept
-        left join cmc_party_a as pa on pa.party_a_id = t.party_a_id
     </sql>
 
     <select id="selectCmcTenderList" parameterType="CmcTender" resultMap="CmcTenderResult">
         <include refid="selectCmcTenderVo"/>
         <where>  
             <if test="projectName != null  and projectName != ''"> and t.project_name like concat('%', #{projectName}, '%')</if>
-            <if test="partyAId != null  and partyAId != ''"> and t.party_a_id like concat('%', #{partyAId}, '%')</if>
+            <if test="partyAName != null  and partyAName != ''"> and t.party_a_name like concat('%', #{partyAName}, '%')</if>
             <if test="aPerson != null  and aPerson != ''"> and t.a_person like concat('%', #{aPerson}, '%')</if>
             <if test="aPhone != null  and aPhone != ''"> and t.a_phone like concat('%', #{aPhone}, '%')</if>
             <if test="agent != null  and agent != ''"> and t.agent like concat('%', #{agent}, '%')</if>
@@ -139,9 +131,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertCmcTender" parameterType="CmcTender">
         insert into cmc_tender
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="tenderId != null">tender_id,</if>
             <if test="projectName != null">project_name,</if>
-            <if test="partyAId != null">party_a_id,</if>
+            <if test="partyAName != null">party_a_name,</if>
             <if test="aPerson != null">a_person,</if>
             <if test="aPhone != null">a_phone,</if>
             <if test="agent != null">agent,</if>
@@ -168,9 +159,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tenderDocument != null">tender_document,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="tenderId != null">#{tenderId},</if>
             <if test="projectName != null">#{projectName},</if>
-            <if test="partyAId != null">#{partyAId},</if>
+            <if test="partyAName != null">#{partyAName},</if>
             <if test="aPerson != null">#{aPerson},</if>
             <if test="aPhone != null">#{aPhone},</if>
             <if test="agent != null">#{agent},</if>
@@ -202,7 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update cmc_tender
         <trim prefix="SET" suffixOverrides=",">
             <if test="projectName != null">project_name = #{projectName},</if>
-            <if test="partyAId != null">party_a_id = #{partyAId},</if>
+            <if test="partyAName != null">party_a_name = #{partyAName},</if>
             <if test="aPerson != null">a_person = #{aPerson},</if>
             <if test="aPhone != null">a_phone = #{aPhone},</if>
             <if test="agent != null">agent = #{agent},</if>

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

@@ -92,13 +92,13 @@
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名：" label-width="120px" v-if="taskName == '技术部审核' || taskName == '成果归档'">
+              <el-form-item label="签名：" label-width="120px" v-if="taskName == '技术部审核' || taskName == '成果归档' || taskName == ''">
                 <span class="auditor"> {{ form.deptUser ? form.deptUser.nickName : deptUser }}
                 </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px" v-if="taskName == '技术部审核' || taskName == '成果归档'">
+              <el-form-item label="日期：" label-width="120px" v-if="taskName == '技术部审核' || taskName == '成果归档' || taskName == ''">
                 <span> {{ form.deptTime ? form.deptTime : deptTime }} </span>
               </el-form-item>
             </el-col>
@@ -112,13 +112,13 @@
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名：" label-width="120px" v-if="taskName == '成果归档'">
+              <el-form-item label="签名：" label-width="120px" v-if="taskName == '成果归档' || taskName == ''">
                 <span class="auditor"> {{ form.archiveUser ? form.archiveUser.nickName : archiveUser }}
                 </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="归档日期：" label-width="120px" v-if="taskName == '成果归档'">
+              <el-form-item label="归档日期：" label-width="120px" v-if="taskName == '成果归档' || taskName == ''">
                 <span> {{ form.archiveTime ? form.archiveTime : archiveTime }} </span>
               </el-form-item>
             </el-col>

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-07-11 17:44:18
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-07-11 20:14:35
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -60,7 +60,7 @@
             </el-descriptions>
           </el-form-item>
           <el-form-item label="工作量上报说明" prop="workloadReport">
-            <el-input v-model="form.workloadReport" type="textarea" :disabled="taskName != '结算发起'"
+            <el-input v-model="form.workloadReport" type="textarea" :rows="4" :disabled="taskName != '结算发起'"
               placeholder="请输入工作量上报说明" />
           </el-form-item>
           <el-row>
@@ -649,7 +649,7 @@ export default {
         ] = await Promise.all([
           getProject(res.rows[0].projectId),
           listBudget({ projectId: res.rows[0].projectId }),
-          listSettleWork({ settleId }),
+          listSettleWork({ settleId: settleId, pageSize: 30 }),
           listSettleSummary({ settleId })
         ]);
 

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

@@ -255,7 +255,7 @@ export default {
     /** 查询cmc保证金审批列表 */
     getList() {
       this.loading = true;
-      this.queryParams.tenderId = '0';
+      this.queryParams.tenderId = 0;
       listDeposit(this.queryParams).then(response => {
         this.depositList = response.rows;
         this.total = response.total;

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

@@ -40,7 +40,7 @@
       <el-table-column type="selection" width="55" align="center" min-width="100px" />
       <el-table-column type="index" label="序号" width="55" align="center" min-width="100px" />
       <el-table-column label="投标项目名称" align="center" prop="projectName" min-width="100px" />
-      <el-table-column label="招标业主" align="center" prop="partyA.partyAName" min-width="100px" />
+      <el-table-column label="招标业主" align="center" prop="partyAName" min-width="100px" />
       <el-table-column label="招标代理" align="center" prop="agent" min-width="100px" />
       <el-table-column label="招标地点" align="center" prop="place" min-width="100px" />
       <!-- <el-table-column label="投标部门" align="center" prop="dept" min-width="100px">
@@ -50,7 +50,7 @@
 </el-table-column> -->
       <el-table-column label="投标委托人" align="center" prop="trustee" min-width="100px">
         <template slot-scope="scope">
-          {{ getNameByUserId(scope.row.trustee) }}
+          {{ scope.row.trusteeUser ? scope.row.trusteeUser.nickName : '' }}
         </template>
       </el-table-column>
       <el-table-column label="业主预算" align="center" prop="budget" min-width="100px" />
@@ -116,13 +116,8 @@
             <template slot="label">
               <span class="require_input">* </span>招标业主
             </template>
-            <el-form-item prop="partyAId">
-              <el-select allow-create v-model="form.partyAId" filterable disabled placeholder="请选择" style="width: 100%;"
-                clearable>
-                <el-option v-for="item in partyAList" :key="item.value" :label="item.partyAName" :value="item.partyAId">
-                </el-option>
-              </el-select>
-              <el-button type="primary" @click="partyAOpen = true" size="mini">选择单位</el-button>
+            <el-form-item prop="partyAName">
+              <el-input v-model="form.partyAName"></el-input>
             </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item>
@@ -379,10 +374,6 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
-    <el-dialog title="选择甲方单位" :visible.sync="partyAOpen" width="70%" append-to-body>
-      <ChoosePartyA @confirm="confirmPartyA"></ChoosePartyA>
-    </el-dialog>
   </div>
 </template>
 
@@ -390,13 +381,9 @@
 import { listTender, getTender, delTender, addTender, updateTender } from "@/api/oa/tender/tender";
 import { listDept } from '@/api/system/dept'
 import { listUser, deptTreeSelect } from "@/api/system/user";
-import { Snowflake } from '@/utils/snowFlake.js'
-import { listPartyA } from "@/api/oa/partyA/partyA";
-import ChoosePartyA from '@/views/flowable/form/components/choosePartyA.vue';
 export default {
   name: "Tender",
   components:{
-    ChoosePartyA
   },
   data() {
     return {
@@ -415,12 +402,10 @@ export default {
       total: 0,
       // 投标管理表格数据
       tenderList: [],
-      partyAList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
-      partyAOpen: false,
       isView: true,
       // 对话框属性
       dialogProperty: {
@@ -433,7 +418,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         projectName: null,
-        partyAId: null,
+        partyAName: null,
         aPerson: null,
         aPhone: null,
         agent: null,
@@ -468,7 +453,7 @@ export default {
         projectName: [
           { required: true, message: '投标项目名称不能为空', trigger: 'blur' }
         ],
-        partyAId: [
+        partyAName: [
           { required: true, message: '招标业主不能为空', trigger: 'blur' }
         ],
         budget: [
@@ -523,7 +508,6 @@ export default {
   },
   created() {
     this.getList();
-    this.getPartyAList();
     this.getDeptTree();
     if (this.$store.state.app.device == 'mobile') {
       this.dialogProperty.column = 1
@@ -541,7 +525,7 @@ export default {
       });
     },/** 查询用户列表 */
     getUserList() {
-      listUser({ pageNum: 1, pageSize: 99999, deptId: this.form.dept }).then(response => {
+      listUser({ pageNum: 1, pageSize: 99999 }).then(response => {
         this.userList = response.rows;
       }
       );
@@ -568,16 +552,6 @@ export default {
         return curDept[0].label
       }
     },
-    // 查询业主单位列表
-    getPartyAList() {
-      this.loading = true
-      listPartyA({
-        pageNum: 1,
-        pageSize: 99999999
-      }).then(response => {
-        this.partyAList = response.rows;
-      })
-    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -588,7 +562,7 @@ export default {
       this.form = {
         tenderId: null,
         projectName: null,
-        partyAId: null,
+        partyAName: null,
         aPerson: null,
         aPhone: null,
         agent: null,
@@ -673,7 +647,6 @@ export default {
               this.getList();
             });
           } else {
-            this.form.tenderId = new Snowflake(1n, 1n, 0n).nextId().toString();
             addTender(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -733,16 +706,6 @@ export default {
       this.open = false
       this.reviewWord(url)
     },
-    confirmPartyA(val) {
-      this.partyAOpen = false
-      if (val && val.length > 1) {
-        return this.$message.error('请选择一个甲方单位')
-      }
-      if (val) {
-        this.getPartyAList();
-        this.$set(this.form, 'partyAId', val[0].partyAId)
-      }
-    }
   }
 };
 </script>