修改bug#40960

jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java

@@ -80,7 +80,7 @@ public class PayIncomeContractCommon {
      */
     public final static List<String> LIST_SPENDING_CONTRACT = Arrays.asList("合同编号","合同名称","签订单位","签订联系人","是否开口","负责人",
             "部门名称","签订合同总金额","税率","未税金额","合同签订日期","合同终止日期","合同约定主要时点",
-            "应收金额","已收金额","未收金额","账款状态","合同约定付款次数","是否打包","打包年份");
+            "应收金额","已收金额","未税金额","账款状态","合同约定付款次数","是否打包","打包年份");
     /**
      * 支出合同分期信息excel 表头
      */

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java

@@ -589,6 +589,13 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
                 paySpendingContract.setAmountReceived(new BigDecimal(map.get(14)));
             }
         }
+        if(!StringUtils.isBlank(map.get(15))){
+            if(!pattern.matcher(map.get(15)).matches()){
+                sb.append("第").append(n).append("行:未税金额格式错误！<br/>");
+            }else{
+                paySpendingContract.setNoTaxAmount(new BigDecimal(map.get(15)));
+            }
+        }
 
         paySpendingContract.setContractPaymentTimes(map.get(17));
         mapPack.forEach((k,v)->{