报告申请和复核添加 银行发函 相关字段

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

@@ -114,4 +114,16 @@ public class CwProjectInfoData extends BaseEntity {
      * 审定金额(含税)
      */
     private String approvedIncludingTax;
+
+    /**
+     * 银行函证发出数量
+     */
+    private String bankLettersCount;
+
+    /**
+     * 其中采用数字函证发函数量
+     */
+    private String digitalLetterCount;
+
+
 }

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

@@ -301,4 +301,15 @@ public class CwProjectReport extends BaseEntity {
     @TableField(exist = false)
     private String approvedIncludingTax;
 
+    /**
+     * 银行函证发出数量
+     */
+    @TableField(exist = false)
+    private String bankLettersCount;
+
+    /**
+     * 其中采用数字函证发函数量
+     */
+    @TableField(exist = false)
+    private String digitalLetterCount;
 }

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

@@ -659,4 +659,16 @@ public class CwProjectReportData extends BaseDTO {
      */
     private String approvedIncludingTax;
 
+    /**
+     * 银行函证发出数量
+     */
+    private String bankLettersCount;
+
+    /**
+     * 其中采用数字函证发函数量
+     */
+    private String digitalLetterCount;
+
+
+
 }

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

@@ -113,6 +113,12 @@
         <if test="approvedIncludingTax != null and approvedIncludingTax != ''">
             approved_including_tax = #{approvedIncludingTax},
         </if>
+        <if test="bankLettersCount != null and bankLettersCount != ''">
+            bank_letters_count = #{bankLettersCount},
+        </if>
+        <if test="digitalLetterCount != null and digitalLetterCount != ''">
+            digital_letter_count = #{digitalLetterCount},
+        </if>
         <if test="tenantId != null and tenantId != ''">
             tenant_id = #{tenantId},
         </if>

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

@@ -482,6 +482,8 @@
         new_line.seal_type as sealType,
         new_line.approved_no_including_tax as approvedNoIncludingTax,
         new_line.approved_including_tax as approvedIncludingTax,
+        new_line.bank_letters_count as bankLettersCount,
+        new_line.digital_letter_count as digitalLetterCount,
         cw_re.proc_ins_id as procInsId3,
         ifnull(cw_re.review_status,'0') as reviewStatus,
         cw_re.audit_time as auditTime,

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportService.java

@@ -194,6 +194,8 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         infoData.setUpdateById(userDTO.getId());
         infoData.setApprovedIncludingTax(report.getApprovedIncludingTax());
         infoData.setApprovedNoIncludingTax(report.getApprovedNoIncludingTax());
+        infoData.setBankLettersCount(report.getBankLettersCount());
+        infoData.setDigitalLetterCount(report.getDigitalLetterCount());
 //        infoData.setUpdateById(UserUtils.getCurrentUserDTO().getId());
         infoData.setUpdateTime(new Date());
         infoMapper.updateCwProjectInfoDataById(infoData);
@@ -294,6 +296,8 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         infoData.setUpdateById(userDTO.getId());
         infoData.setApprovedNoIncludingTax(report.getApprovedNoIncludingTax());
         infoData.setApprovedIncludingTax(report.getApprovedIncludingTax());
+        infoData.setBankLettersCount(report.getBankLettersCount());
+        infoData.setDigitalLetterCount(report.getDigitalLetterCount());
 //        infoData.setUpdateById(UserUtils.getCurrentUserDTO().getId());
         infoData.setUpdateTime(new Date());
         infoMapper.updateCwProjectInfoDataById(infoData);