项目登记添加合同信息

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.domain.BaseEntity;
 import com.jeeplus.core.query.Query;
+import com.jeeplus.core.query.QueryType;
 import com.jeeplus.test.cw.workClientInfo.service.dto.CwWorkClientBaseDTO;
 import com.jeeplus.test.workContract.service.dto.WorkAttachmentDto;
 import lombok.Data;
@@ -54,7 +55,7 @@ public class ContractInfo extends BaseEntity {
     private String createBy;                //创建人名称
 
     @TableField(exist = false)
-    @Query(tableColumn = "c.id")
+    @Query(tableColumn = "c.id",type = QueryType.EQ)
     private String createId;                //创建人id
 
     @TableField(exist = false)

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/domain/CwProjectRecords.java

@@ -83,4 +83,9 @@ public class CwProjectRecords extends BaseEntity {
     @Query(tableColumn = "a.status", type = QueryType.EQ)
     private String status;
 
+    /**
+     * 合同id
+     */
+    private String contractId;
+
 }

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

@@ -27,6 +27,12 @@
         <result property="status" column="status" jdbcType="VARCHAR"/>
         <result property="createBy.name" column="user_name" jdbcType="VARCHAR"/>
         <result property="projectMasterName" column="project_master_name" jdbcType="VARCHAR"/>
+        <result property="contractId" column="contract_id" jdbcType="VARCHAR"/>
+        <result property="contractName" column="contract_name" jdbcType="VARCHAR"/>
+        <result property="contractAmount" column="contract_amount" jdbcType="VARCHAR"/>
+        <result property="contractNum" column="contract_num" jdbcType="VARCHAR"/>
+        <result property="payerSubject" column="payer_subject" jdbcType="VARCHAR"/>
+        <result property="paymentMethod" column="payment_method" 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>
@@ -63,7 +69,8 @@
         a.project_leader_id,
         a.proc_ins_id,
         a.status,
-        a.process_definition_id
+        a.process_definition_id,
+        a.contract_id
     </sql>
     <sql id="File_Column_List">
         wa.id,
@@ -135,8 +142,6 @@
         where cw_pci.project_id = #{id}
     </select>
 
-
-
     <select id="getFileList" resultMap="AttachmentMap">
         select
         <include refid="File_Column_List"></include>,
@@ -150,10 +155,16 @@
         select
         <include refid="Base_Column_List"></include>,
         su.name as user_name,
-        su2.name as project_master_name
+        su2.name as project_master_name,
+        cw_wci.contract_name,
+        cw_wci.contract_amount,
+        cw_wci.contract_num,
+        cw_wci.payer_subject,
+        cw_wci.payment_method
         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'
         ${ew.customSqlSegment}
     </select>
 
@@ -161,10 +172,16 @@
         select
         <include refid="Base_Column_List"></include>,
         su.name as user_name,
-        su2.name as project_master_name
+        su2.name as project_master_name,
+        cw_wci.contract_name,
+        cw_wci.contract_amount,
+        cw_wci.contract_num,
+        cw_wci.payer_subject,
+        cw_wci.payment_method
         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'
         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

@@ -114,4 +114,34 @@ public class CwProjectRecordsDTO extends BaseDTO {
      * 时间查询
      */
     private String[] createDates;
+
+    /**
+     * 合同id
+     */
+    private String contractId;
+
+    /**
+     * 付款方式
+     */
+    private String paymentMethod;
+
+    /**
+     * 付款主体
+     */
+    private String payerSubject;
+
+    /**
+     * 合同份数
+     */
+    private String contractNum;
+
+    /**
+     * 合同金额(元)
+     */
+    private String contractAmount;
+
+    /**
+     * 合同名称
+     */
+    private String contractName;
 }