发票管理新增报告查询

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/CwProjectRecordsService.java

@@ -29,6 +29,7 @@ import com.jeeplus.finance.projectRecords.service.dto.CwProjectRecordsDTO;
 import com.jeeplus.finance.projectRecords.service.mapstruct.CwProjectClientContactWrapper;
 import com.jeeplus.finance.projectRecords.service.mapstruct.CwProjectMembersWrapper;
 import com.jeeplus.finance.projectRecords.service.mapstruct.CwProjectRecordsWrapper;
+import com.jeeplus.finance.projectReport.domain.CwProjectReportData;
 import com.jeeplus.finance.workClientInfo.domain.CwWorkClientContact;
 import com.jeeplus.finance.workClientInfo.service.CwWorkClientContactService;
 import com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientBaseDTO;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/domain/CwProjectReportData.java

@@ -33,6 +33,8 @@ public class CwProjectReportData extends BaseDTO {
     @TableField(exist = false)
     private String projectInfoId;
 
+
+
     //单据编号（字典值）
     public static final String BIZ_CODE = "13";
     /**
@@ -137,6 +139,9 @@ public class CwProjectReportData extends BaseDTO {
     @TableField(exist = false)
     private String[] contractDates;
 
+    @TableField(exist = false)
+    private String[] createDates;
+
     /**
      * 签章documentId
      */
@@ -478,4 +483,9 @@ public class CwProjectReportData extends BaseDTO {
      * 报备类型
      */
     private String filingType;
+
+    /**
+     * 合同名称
+     */
+    private String contractName;
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -89,7 +89,8 @@
         art2.ID_ as sign_task_id2,
         art3.ID_ as sign_task_id3,
         a.industry,
-        a.business_objects
+        a.business_objects,
+        cw_ci.contract_name
         FROM cw_project_report a
         left join cw_project_records b on a.project_id = b.id
         LEFT JOIN sys_office c on a.office_id = c.id
@@ -111,6 +112,7 @@
         left join sys_user sub on cpm.user_id = sub.id
         left join sys_user_manage_office sumo on sumo.office_id = sub.office_id
         left join cw_work_client_base cwcb on new_line.served_unit_id = cwcb.id
+        LEFT JOIN cw_work_contract_info cw_ci on  b.contract_id=cw_ci.id
         ${ew.customSqlSegment}
         ORDER BY a.create_time DESC
     </select>