Merge remote-tracking branch 'origin/master'

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/ReimbursementInfoService.java

@@ -421,7 +421,7 @@ public class ReimbursementInfoService {
                             //文件类型处理
                             List<String> strings = Arrays.asList(amountInfo.getName().split("\\."));
                             if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                                reimbursementAmountInfo.setFileType(strings.get(1));
+                                reimbursementAmountInfo.setFileType(strings.get(strings.size() - 1));
                             }
                             reimbursementAmountInfo.setAttachmentName(amountInfo.getName());
                             reimbursementAmountInfo.setAttachmentFlag("invoiceReimbursement");
@@ -474,7 +474,7 @@ public class ReimbursementInfoService {
                 //文件类型处理
                 List<String> strings = Arrays.asList(dto.getName().split("\\."));
                 if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                    i.setType(strings.get(1));
+                    i.setType(strings.get(strings.size() - 1));
                 }
                 i.setAttachmentId(id);
                 i.setAttachmentName(dto.getName());
@@ -655,7 +655,7 @@ public class ReimbursementInfoService {
                             //文件类型处理
                             List<String> strings = Arrays.asList(amountInfo.getName().split("\\."));
                             if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                                reimbursementAmountInfo.setFileType(strings.get(1));
+                                reimbursementAmountInfo.setFileType(strings.get(strings.size() - 1));
                             }
                             reimbursementAmountInfo.setAttachmentName(amountInfo.getName());
                             reimbursementAmountInfo.setAttachmentFlag("invoiceReimbursement");
@@ -744,7 +744,7 @@ public class ReimbursementInfoService {
                     //文件类型处理
                     List<String> strings = Arrays.asList(dto.getName().split("\\."));
                     if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                        i.setType(strings.get(1));
+                        i.setType(strings.get(strings.size() - 1));
                     }
                     i.setAttachmentId(id);
                     i.setAttachmentName(dto.getName());
@@ -1881,7 +1881,7 @@ public class ReimbursementInfoService {
                                 //文件类型处理
                                 List<String> strings = Arrays.asList(amountInfo.getName().split("\\."));
                                 if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                                    reimbursementAmountInfo.setFileType(strings.get(1));
+                                    reimbursementAmountInfo.setFileType(strings.get(strings.size() - 1));
                                 }
                                 reimbursementAmountInfo.setAttachmentName(amountInfo.getName());
                                 reimbursementAmountInfo.setAttachmentFlag("invoiceReimbursement");

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/service/CcpmReimbursementInfoService.java

@@ -387,7 +387,7 @@ public class CcpmReimbursementInfoService {
                             //文件类型处理
                             List<String> strings = Arrays.asList(amountInfo.getName().split("\\."));
                             if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                                reimbursementAmountInfo.setFileType(strings.get(1));
+                                reimbursementAmountInfo.setFileType(strings.get(strings.size() - 1));
                             }
                             reimbursementAmountInfo.setAttachmentName(amountInfo.getName());
                             reimbursementAmountInfo.setAttachmentFlag("invoiceReimbursement");
@@ -439,7 +439,7 @@ public class CcpmReimbursementInfoService {
                 //文件类型处理
                 List<String> strings = Arrays.asList(dto.getName().split("\\."));
                 if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                    i.setType(strings.get(1));
+                    i.setType(strings.get(strings.size() - 1));
                 }
                 i.setAttachmentId(id);
                 i.setAttachmentName(dto.getName());
@@ -614,7 +614,7 @@ public class CcpmReimbursementInfoService {
                             //文件类型处理
                             List<String> strings = Arrays.asList(amountInfo.getName().split("\\."));
                             if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                                reimbursementAmountInfo.setFileType(strings.get(1));
+                                reimbursementAmountInfo.setFileType(strings.get(strings.size() - 1));
                             }
                             reimbursementAmountInfo.setAttachmentName(amountInfo.getName());
                             reimbursementAmountInfo.setAttachmentFlag("invoiceReimbursement");
@@ -700,7 +700,7 @@ public class CcpmReimbursementInfoService {
                     //文件类型处理
                     List<String> strings = Arrays.asList(dto.getName().split("\\."));
                     if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                        i.setType(strings.get(1));
+                        i.setType(strings.get(strings.size() - 1));
                     }
                     i.setAttachmentId(id);
                     i.setAttachmentName(dto.getName());
@@ -1345,7 +1345,7 @@ public class CcpmReimbursementInfoService {
                                 //文件类型处理
                                 List<String> strings = Arrays.asList(amountInfo.getName().split("\\."));
                                 if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                                    reimbursementAmountInfo.setFileType(strings.get(1));
+                                    reimbursementAmountInfo.setFileType(strings.get(strings.size() - 1));
                                 }
                                 reimbursementAmountInfo.setAttachmentName(amountInfo.getName());
                                 reimbursementAmountInfo.setAttachmentFlag("invoiceReimbursement");

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/service/ZsReimbursementInfoService.java

@@ -406,7 +406,7 @@ public class ZsReimbursementInfoService {
                             //文件类型处理
                             List<String> strings = Arrays.asList(amountInfo.getName().split("\\."));
                             if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                                reimbursementAmountInfo.setFileType(strings.get(1));
+                                reimbursementAmountInfo.setFileType(strings.get(strings.size() - 1));
                             }
                             reimbursementAmountInfo.setAttachmentName(amountInfo.getName());
                             reimbursementAmountInfo.setAttachmentFlag("invoiceReimbursement");
@@ -459,7 +459,7 @@ public class ZsReimbursementInfoService {
                 //文件类型处理
                 List<String> strings = Arrays.asList(dto.getName().split("\\."));
                 if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                    i.setType(strings.get(1));
+                    i.setType(strings.get(strings.size() - 1));
                 }
                 i.setAttachmentId(id);
                 i.setAttachmentName(dto.getName());
@@ -635,7 +635,7 @@ public class ZsReimbursementInfoService {
                             //文件类型处理
                             List<String> strings = Arrays.asList(amountInfo.getName().split("\\."));
                             if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                                reimbursementAmountInfo.setFileType(strings.get(1));
+                                reimbursementAmountInfo.setFileType(strings.get(strings.size() - 1));
                             }
                             reimbursementAmountInfo.setAttachmentName(amountInfo.getName());
                             reimbursementAmountInfo.setAttachmentFlag("invoiceReimbursement");
@@ -722,7 +722,7 @@ public class ZsReimbursementInfoService {
                     //文件类型处理
                     List<String> strings = Arrays.asList(dto.getName().split("\\."));
                     if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                        i.setType(strings.get(1));
+                        i.setType(strings.get(strings.size() - 1));
                     }
                     i.setAttachmentId(id);
                     i.setAttachmentName(dto.getName());
@@ -1379,7 +1379,7 @@ public class ZsReimbursementInfoService {
                                 //文件类型处理
                                 List<String> strings = Arrays.asList(amountInfo.getName().split("\\."));
                                 if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                                    reimbursementAmountInfo.setFileType(strings.get(1));
+                                    reimbursementAmountInfo.setFileType(strings.get(strings.size() - 1));
                                 }
                                 reimbursementAmountInfo.setAttachmentName(amountInfo.getName());
                                 reimbursementAmountInfo.setAttachmentFlag("invoiceReimbursement");

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/service/ConsultancyReimbursementInfoService.java

@@ -386,7 +386,7 @@ public class ConsultancyReimbursementInfoService {
                             //文件类型处理
                             List<String> strings = Arrays.asList(amountInfo.getName().split("\\."));
                             if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                                reimbursementAmountInfo.setFileType(strings.get(1));
+                                reimbursementAmountInfo.setFileType(strings.get(strings.size() - 1));
                             }
                             reimbursementAmountInfo.setAttachmentName(amountInfo.getName());
                             reimbursementAmountInfo.setAttachmentFlag("invoiceReimbursement");
@@ -439,7 +439,7 @@ public class ConsultancyReimbursementInfoService {
                 //文件类型处理
                 List<String> strings = Arrays.asList(dto.getName().split("\\."));
                 if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                    i.setType(strings.get(1));
+                    i.setType(strings.get(strings.size() - 1));
                 }
                 i.setAttachmentId(id);
                 i.setAttachmentName(dto.getName());
@@ -615,7 +615,7 @@ public class ConsultancyReimbursementInfoService {
                             //文件类型处理
                             List<String> strings = Arrays.asList(amountInfo.getName().split("\\."));
                             if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                                reimbursementAmountInfo.setFileType(strings.get(1));
+                                reimbursementAmountInfo.setFileType(strings.get(strings.size() - 1));
                             }
                             reimbursementAmountInfo.setAttachmentName(amountInfo.getName());
                             reimbursementAmountInfo.setAttachmentFlag("invoiceReimbursement");
@@ -702,7 +702,7 @@ public class ConsultancyReimbursementInfoService {
                     //文件类型处理
                     List<String> strings = Arrays.asList(dto.getName().split("\\."));
                     if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                        i.setType(strings.get(1));
+                        i.setType(strings.get(strings.size() - 1));
                     }
                     i.setAttachmentId(id);
                     i.setAttachmentName(dto.getName());
@@ -1330,7 +1330,7 @@ public class ConsultancyReimbursementInfoService {
                                 //文件类型处理
                                 List<String> strings = Arrays.asList(amountInfo.getName().split("\\."));
                                 if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                                    reimbursementAmountInfo.setFileType(strings.get(1));
+                                    reimbursementAmountInfo.setFileType(strings.get(strings.size() - 1));
                                 }
                                 reimbursementAmountInfo.setAttachmentName(amountInfo.getName());
                                 reimbursementAmountInfo.setAttachmentFlag("invoiceReimbursement");

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/mapper/xml/CwFinanceInvoiceMapper.xml

@@ -54,7 +54,8 @@
             <collection property="financeInvoiceReceivablesDTOList" column="id" select="getFirList" ofType="com.jeeplus.finance.invoice.service.dto.CwFinanceInvoiceReceivablesDTO"></collection>
             <collection property="financeInvoiceBaseDTOList" column="id" select="getBaseList" ofType="com.jeeplus.finance.invoice.service.dto.CwFinanceInvoiceBaseDTO"></collection>
             <collection property="financeInvoiceDetailDTOList" column="id" select="getFidList" ofType="com.jeeplus.finance.invoice.service.dto.CwFinanceInvoiceDetailDTO"></collection>
-            <collection property="workAttachmentDtoList" ofType="com.jeeplus.sys.domain.WorkAttachmentInfo" column="id" select="getFileList"></collection>
+        <collection property="workAttachmentDtoList" ofType="com.jeeplus.sys.domain.WorkAttachmentInfo" column="id" select="getFileList"></collection>
+        <collection property="workAttachmenSignContract" ofType="com.jeeplus.sys.domain.WorkAttachmentInfo" column="id" select="getFileListSignContarct"></collection>
     </resultMap>
     <resultMap id="BaseExportResultMap" type="com.jeeplus.finance.invoice.service.dto.CwFinanceInvoiceDTO">
             <id property="id" column="id" jdbcType="VARCHAR"/>
@@ -247,7 +248,16 @@
         su.name as create_name
         from work_attachment wa
         left join sys_user su on su.id = wa.create_by_id and su.del_flag = '0'
-        where wa.del_flag = '0' and wa.attachment_id = #{id}
+        where wa.del_flag = '0' and wa.attachment_id = #{id} and wa.attachment_flag = 'cw_invoice'
+    </select>
+
+    <select id="getFileListSignContarct" resultMap="AttachmentMap">
+        select
+        <include refid="File_Column_List"></include>,
+        su.name as create_name
+        from work_attachment wa
+        left join sys_user su on su.id = wa.create_by_id and su.del_flag = '0'
+        where wa.del_flag = '0' and wa.attachment_id = #{id} and wa.attachment_flag = 'cw_invoice_sign_contract'
     </select>
 
     <select id="getFii" resultType="com.jeeplus.finance.invoice.service.dto.CwFinanceInvoiceInvalidDTO">

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/CwFinanceInvoiceService.java

@@ -770,7 +770,18 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
             map.put("attachmentId",attachmentId);
             map.put("attachmentFlag",attachmentFlag);
             map.put("currentToken", TokenProvider.getCurrentToken ( ));
-            SpringUtil.getBean ( IWorkAttachmentApi.class ).saveOrUpdateFileList(map);
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).saveOrUpdateFileListFlag(map);
+
+            // 签约合同附件
+            Map<String,String> map1 = new HashMap<>();
+            String fileList1 = JSON.toJSONString((cwFinanceInvoiceDTO.getWorkAttachmenSignContract()));
+            String attachmentId1 = cwFinanceInvoice.getId();
+            String attachmentFlag1 = "cw_invoice_sign_contract";
+            map1.put("fileList",fileList1);
+            map1.put("attachmentId",attachmentId1);
+            map1.put("attachmentFlag",attachmentFlag1);
+            map1.put("currentToken", TokenProvider.getCurrentToken ( ));
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).saveOrUpdateFileListFlag(map1);
 
             // 发票明细保存
             if(CollectionUtil.isNotEmpty(cwFinanceInvoiceDTO.getFinanceInvoiceDetailDTOList())){

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/dto/CwFinanceInvoiceDTO.java

@@ -258,6 +258,11 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
     private List<WorkAttachmentInfo> workAttachmentDtoList;
 
     /**
+     * 签约合同信息
+     */
+    private List<WorkAttachmentInfo> workAttachmenSignContract;
+
+    /**
      * 发票明细
      */
     private List<CwFinanceInvoiceDetailDTO> financeInvoiceDetailDTOList;

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

@@ -652,21 +652,25 @@ public class CwProjectReportData extends BaseDTO {
     /**
      * 审定金额(不含税)
      */
+    @Excel(name = "审定金额(不含税/元)",width = 20,orderNum = "20")
     private String approvedNoIncludingTax;
 
     /**
      * 审定金额(含税)
      */
+    @Excel(name = "审定金额(含税/元)",width = 20,orderNum = "21")
     private String approvedIncludingTax;
 
     /**
      * 银行函证发出数量
      */
+    @Excel(name = "银行函证发出数量(份)",width = 20,orderNum = "22")
     private String bankLettersCount;
 
     /**
      * 其中采用数字函证发函数量
      */
+    @Excel(name = "其中采用数字函证发函数量(份)",width = 28,orderNum = "23")
     private String digitalLetterCount;
 
 

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

@@ -106,6 +106,8 @@
                         new_line.report_date,
                         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,
                         cwcb.name AS servedUnitName,
                         a.industry,
                         a.business_objects,

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/service/CwReimbursementInfoService.java

@@ -627,7 +627,7 @@ public class CwReimbursementInfoService {
                             //文件类型处理
                             List<String> strings = Arrays.asList(amountInfo.getName().split("\\."));
                             if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                                reimbursementAmountInfo.setFileType(strings.get(1));
+                                reimbursementAmountInfo.setFileType(strings.get(strings.size() - 1));
                             }
                             reimbursementAmountInfo.setAttachmentName(amountInfo.getName());
                             reimbursementAmountInfo.setAttachmentFlag("invoiceReimbursement");
@@ -680,7 +680,7 @@ public class CwReimbursementInfoService {
                 //文件类型处理
                 List<String> strings = Arrays.asList(dto.getName().split("\\."));
                 if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                    i.setType(strings.get(1));
+                    i.setType(strings.get(strings.size() - 1));
                 }
                 i.setAttachmentId(id);
                 i.setAttachmentName(dto.getName());
@@ -879,7 +879,7 @@ public class CwReimbursementInfoService {
                             //文件类型处理
                             List<String> strings = Arrays.asList(amountInfo.getName().split("\\."));
                             if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                                reimbursementAmountInfo.setFileType(strings.get(1));
+                                reimbursementAmountInfo.setFileType(strings.get(strings.size() - 1));
                             }
                             reimbursementAmountInfo.setAttachmentName(amountInfo.getName());
                             reimbursementAmountInfo.setAttachmentFlag("invoiceReimbursement");
@@ -951,7 +951,7 @@ public class CwReimbursementInfoService {
                     //文件类型处理
                     List<String> strings = Arrays.asList(dto.getName().split("\\."));
                     if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                        i.setType(strings.get(1));
+                        i.setType(strings.get(strings.size() - 1));
                     }
                     i.setAttachmentId(id);
                     i.setAttachmentName(dto.getName());
@@ -1156,16 +1156,24 @@ public class CwReimbursementInfoService {
         BeanUtils.copyProperties(invoiceReimbursement, ccpmReimAmountAndFileDto);
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         // 将字符串转换为 LocalDate
-        LocalDate invoiceDate = LocalDate.parse(invoiceReimbursement.getInvoiceDate(), formatter);
-        if (ObjectUtil.isNotEmpty(invoiceDate)){
-            String year = String.valueOf(invoiceDate.getYear());
-            String month = String.valueOf(invoiceDate.getMonthValue());
-            String day = String.valueOf(invoiceDate.getDayOfMonth());
-            // 设置到 ccpmReimAmountAndFileDto 中
-            ccpmReimAmountAndFileDto.setInvoiceDate(year + "-" + month + "-" + day);
-        }else {
-            ccpmReimAmountAndFileDto.setInvoiceDate("");
+        String dateStr = invoiceReimbursement.getInvoiceDate();
+        LocalDate invoiceDate = null;
+        if (dateStr != null && !dateStr.trim().isEmpty()) {
+            invoiceDate = LocalDate.parse(dateStr, formatter);
+            if (ObjectUtil.isNotEmpty(invoiceDate)){
+                String year = String.valueOf(invoiceDate.getYear());
+                String month = String.valueOf(invoiceDate.getMonthValue());
+                String day = String.valueOf(invoiceDate.getDayOfMonth());
+                // 设置到 ccpmReimAmountAndFileDto 中
+                ccpmReimAmountAndFileDto.setInvoiceDate(year + "-" + month + "-" + day);
+            }else {
+                ccpmReimAmountAndFileDto.setInvoiceDate("");
+            }
+        }else{
+            ccpmReimAmountAndFileDto.setInvoiceDate(null);
         }
+        //LocalDate invoiceDate = LocalDate.parse(invoiceReimbursement.getInvoiceDate(), formatter);
+
         ccpmReimAmountAndFileDto.setId(i.getId());
         ccpmReimAmountAndFileDto.setCreateBy(SpringUtil.getBean(IUserApi.class).getById(i.getBy()));
         invoiceReimbursementFiles.add(ccpmReimAmountAndFileDto);
@@ -1793,7 +1801,7 @@ public class CwReimbursementInfoService {
                                 //文件类型处理
                                 List<String> strings = Arrays.asList(amountInfo.getName().split("\\."));
                                 if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
-                                    reimbursementAmountInfo.setFileType(strings.get(1));
+                                    reimbursementAmountInfo.setFileType(strings.get(strings.size() - 1));
                                 }
                                 reimbursementAmountInfo.setAttachmentName(amountInfo.getName());
                                 reimbursementAmountInfo.setAttachmentFlag("invoiceReimbursement");

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/workCollectAccessory/service/WorkCollectAccessoryService.java

@@ -299,7 +299,7 @@ public class WorkCollectAccessoryService {
             //文件类型处理
             List<String> strings = Arrays.asList(dto.getName().split("\\."));
             if (CollectionUtils.isNotEmpty(strings)) {
-                i.setType(strings.get(1));
+                i.setType(strings.get(strings.size() - 1));
             }
             i.setAttachmentId(id);
             i.setAttachmentName(dto.getName());