项目管理-合同选择添加委托人

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/domain/ContractInfo.java

@@ -167,4 +167,10 @@ public class ContractInfo extends BaseEntity {
      */
     @TableField(exist = false)
     private String address;
+
+    /**
+     * 委托方联系人名称
+     */
+    @TableField(exist = false)
+    private String clientContactsName;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/mapper/xml/ContractInfoMapper.xml

@@ -55,7 +55,8 @@
             h.filed_paper_type as filedPaperType,
             h.filed_no as filedNo,
             h.confirm_filed_no as confirmFiledNo,
-            h.proc_ins_id as taskFiledPaperProcInsId
+            h.proc_ins_id as taskFiledPaperProcInsId,
+            cw_wcb.name as client_contacts_name
 		FROM
 			cw_work_contract_info a
             LEFT JOIN cw_work_contract_file b on a.id = b.contract_info_id
@@ -65,6 +66,7 @@
             LEFT JOIN cw_work_contract_borrow f ON a.id = f.contract_info_id
             LEFT JOIN act_ru_task g ON f.proc_ins_id = g.PROC_INST_ID_
             LEFT JOIN cw_work_contract_file_paper h on a.id = h.contract_info_id
+            LEFT JOIN cw_work_client_base cw_wcb on a.client_contacts = cw_wcb.id and cw_wcb.del_flag = '0'
 		${ew.customSqlSegment}
 		ORDER BY a.update_date DESC
     </select>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/mapper/xml/CwProjectRecordsMapper.xml

@@ -39,6 +39,7 @@
         <result property="riskLevel" column="risk_level" jdbcType="VARCHAR"/>
         <result property="businessTypeName" column="business_type_name" jdbcType="VARCHAR"/>
         <result property="realHeader" column="real_header" jdbcType="VARCHAR"/>
+        <result property="clientContactsName" column="client_contacts_name" jdbcType="VARCHAR"/>
         <collection property="cwProjectClientInfoDTOList" ofType="com.jeeplus.test.cw.workClientInfo.service.dto.CwWorkClientBaseDTO" column="id" select="getProjectClient"></collection>
         <collection property="workAttachmentDtoList" ofType="com.jeeplus.test.workContract.service.dto.WorkAttachmentDto" column="id" select="getFileList"></collection>
     </resultMap>
@@ -170,11 +171,13 @@
         cw_wci.contract_num,
         cw_wci.payer_subject,
         cw_wci.payment_method,
+        cw_wcb.name as client_contacts_name,
         cw_pbt.name as business_type_name
         from cw_project_records a
         left join sys_user su on su.id = a.create_by and su.del_flag = '0'
         left join sys_user su2 on su2.id = a.project_master_id and su2.del_flag = '0'
         left join cw_work_contract_info cw_wci on cw_wci.id = a.contract_id and cw_wci.del_flag = '0'
+        left join cw_work_client_base cw_wcb on cw_wci.client_contacts = cw_wcb.id and cw_wcb.del_flag = '0'
         left join cw_project_business_type cw_pbt on cw_pbt.id = a.business_type and cw_pbt.del_flag = '0'
         ${ew.customSqlSegment}
     </select>
@@ -189,11 +192,13 @@
         cw_wci.contract_num,
         cw_wci.payer_subject,
         cw_wci.payment_method,
+        cw_wcb.name as client_contacts_name,
         cw_pbt.name as business_type_name
         from cw_project_records a
         left join sys_user su on su.id = a.create_by and su.del_flag = '0'
         left join sys_user su2 on su2.id = a.project_master_id and su2.del_flag = '0'
         left join cw_work_contract_info cw_wci on cw_wci.id = a.contract_id and cw_wci.del_flag = '0'
+        left join cw_work_client_base cw_wcb on cw_wci.client_contacts = cw_wcb.id and cw_wcb.del_flag = '0'
         left join cw_project_business_type cw_pbt on cw_pbt.id = a.business_type and cw_pbt.del_flag = '0'
         where a.del_flag = '0' and a.id = ${id}
     </select>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/service/dto/CwProjectRecordsDTO.java

@@ -1,6 +1,7 @@
 package com.jeeplus.test.cw.projectRecords.service.dto;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.query.Query;
 import com.jeeplus.core.query.QueryType;
@@ -192,4 +193,9 @@ public class CwProjectRecordsDTO extends BaseDTO {
      * 项目实际责任人
      */
     private String realHeader;
+
+    /**
+     * 合同委托人
+     */
+    private String clientContactsName;
 }