From a8c85dbcc5aee8144830412f103bde23cc16e144 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Fri, 19 Aug 2022 19:40:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=9C=88=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/service/MonthlySettleService.java | 105 ++++++++++-------- 1 file changed, 59 insertions(+), 46 deletions(-) diff --git a/src/main/java/cn/palmte/work/service/MonthlySettleService.java b/src/main/java/cn/palmte/work/service/MonthlySettleService.java index 5489750..fa9c960 100644 --- a/src/main/java/cn/palmte/work/service/MonthlySettleService.java +++ b/src/main/java/cn/palmte/work/service/MonthlySettleService.java @@ -227,7 +227,7 @@ public class MonthlySettleService { return msg; } - private void saveMonthlySettle(Map m, String date, String projectName, List monthlySettleList) { + private void saveMonthlySettle(Map m, String date, String projectName, List monthlySettleList) throws Exception { MonthlySettle settle = new MonthlySettle(); String key; Object o1; @@ -244,33 +244,66 @@ public class MonthlySettleService { key = "项目名称"; o1 = m.get(key); settle.setProjectName((String) o1); - key = "合同金额"; - o1 = (m.get(key) == null || "".equals(m.get(key))) ? "0.00" : m.get(key); - settle.setContractAmount(new BigDecimal((String) o1)); - key = "累计已收款"; - o1 = (m.get(key) == null || "".equals(m.get(key))) ? "0.00" : m.get(key); - settle.setTotalCollect(new BigDecimal((String) o1)); - key = "已采购累计付款"; - o1 = (m.get(key) == null || "".equals(m.get(key))) ? "0.00" : m.get(key); - settle.setTotalPurchasedPaid(new BigDecimal((String) o1)); - key = "已采购累计未付款"; - o1 = (m.get(key) == null || "".equals(m.get(key))) ? "0.00" : m.get(key); - settle.setTotalPurchasedUnpaid(new BigDecimal((String) o1)); - key = "超期垫资金额"; - o1 = (m.get(key) == null || "".equals(m.get(key))) ? "0.00" : m.get(key); - settle.setTimeOutAmount(new BigDecimal((String) o1)); - key = "销售累计开票金额"; - o1 = (m.get(key) == null || "".equals(m.get(key))) ? "0.00" : m.get(key); - settle.setTotalBillAmount(new BigDecimal((String) o1)); + try { + key = "合同金额"; + o1 = (m.get(key) == null || "".equals(m.get(key))) ? "0.00" : m.get(key); + settle.setContractAmount(new BigDecimal((String) o1)); + key = "累计已收款"; + o1 = (m.get(key) == null || "".equals(m.get(key))) ? "0.00" : m.get(key); + settle.setTotalCollect(new BigDecimal((String) o1)); + key = "已采购累计付款"; + o1 = (m.get(key) == null || "".equals(m.get(key))) ? "0.00" : m.get(key); + settle.setTotalPurchasedPaid(new BigDecimal((String) o1)); + key = "已采购累计未付款"; + o1 = (m.get(key) == null || "".equals(m.get(key))) ? "0.00" : m.get(key); + settle.setTotalPurchasedUnpaid(new BigDecimal((String) o1)); + key = "超期垫资金额"; + o1 = (m.get(key) == null || "".equals(m.get(key))) ? "0.00" : m.get(key); + settle.setTimeOutAmount(new BigDecimal((String) o1)); + key = "销售累计开票金额"; + o1 = (m.get(key) == null || "".equals(m.get(key))) ? "0.00" : m.get(key); + settle.setTotalBillAmount(new BigDecimal((String) o1)); + key = "实际收款金额"; + o1 = (m.get(key) == null || "".equals(m.get(key))) ? "0.00" : m.get(key); + settle.setCollectActualAmount(new BigDecimal((String) o1)); + key = "实际欠收金额"; + o1 = (m.get(key) == null || "".equals(m.get(key))) ? "0.00" : m.get(key); + settle.setUncollectActualAmount(new BigDecimal((String) o1)); + key = "收款金额"; + o1 = (m.get(key) == null || "".equals(m.get(key))) ? "0.00" : m.get(key); + settle.setCollectAmount(new BigDecimal((String) o1)); + key = "已计收金额"; + o1 = (m.get(key) == null || "".equals(m.get(key))) ? "0.00" : m.get(key); + settle.setCalColAmount(new BigDecimal((String) o1)); + key = "未计收金额"; + o1 = (m.get(key) == null || "".equals(m.get(key))) ? "0.00" : m.get(key); + settle.setUncalColAmount(new BigDecimal((String) o1)); + } catch (Exception e) { + throw new Exception("金额请填入数字格式"); + } key = "合同编号"; o1 = m.get(key); settle.setContractNo((String) o1); key = "项目类型"; o1 = m.get(key); settle.setProjectType((String) o1); - key = "合同签订时间"; - o1 = m.get(key); - settle.setContractSignTime(DateKit.getDate((String) o1, DateKit.DATE_FORMAT)); + try { + key = "合同签订时间"; + o1 = m.get(key); + settle.setContractSignTime(DateKit.getDate((String) o1, DateKit.DATE_FORMAT)); + key = "收款要求时间"; + o1 = m.get(key); + settle.setCollectRequiredTime(DateKit.getDate((String) o1, DateKit.DATE_FORMAT)); + key = "验收报告时间"; + o1 = m.get(key); + settle.setInspectionReportTime(DateKit.getDate((String) o1, DateKit.DATE_FORMAT)); + key = "实际收款时间"; + o1 = m.get(key); + settle.setCollectActualTime(DateKit.getDate((String) o1, DateKit.DATE_FORMAT)); + } catch (Exception e) { + throw new Exception("时间请填入时间格式"); + } + key = "销售经理"; o1 = m.get(key); settle.setSaleManager((String) o1); @@ -280,39 +313,19 @@ public class MonthlySettleService { key = "收款节点"; o1 = m.get(key); settle.setCollectPoint((String) o1); - key = "收款要求时间"; - o1 = m.get(key); - settle.setCollectRequiredTime(DateKit.getDate((String) o1, DateKit.DATE_FORMAT)); - key = "收款金额"; - o1 = (m.get(key) == null || "".equals(m.get(key))) ? "0.00" : m.get(key); - settle.setCollectAmount(new BigDecimal((String) o1)); - key = "实际收款时间"; - o1 = m.get(key); - settle.setCollectActualTime(DateKit.getDate((String) o1, DateKit.DATE_FORMAT)); - key = "实际收款金额"; - o1 = (m.get(key) == null || "".equals(m.get(key))) ? "0.00" : m.get(key); - settle.setCollectActualAmount(new BigDecimal((String) o1)); - key = "实际欠收金额"; - o1 = (m.get(key) == null || "".equals(m.get(key))) ? "0.00" : m.get(key); - settle.setUncollectActualAmount(new BigDecimal((String) o1)); + + key = "超期天数"; o1 = m.get(key); settle.setTimeOutDay((String) o1); key = "到货证明"; o1 = m.get(key); settle.setProductCertificate((String) o1); - key = "验收报告时间"; - o1 = m.get(key); - settle.setInspectionReportTime(DateKit.getDate((String) o1, DateKit.DATE_FORMAT)); + key = "项目风险预警"; o1 = m.get(key); settle.setRiskWarning((String) o1); - key = "已计收金额"; - o1 = (m.get(key) == null || "".equals(m.get(key))) ? "0.00" : m.get(key); - settle.setCalColAmount(new BigDecimal((String) o1)); - key = "未计收金额"; - o1 = (m.get(key) == null || "".equals(m.get(key))) ? "0.00" : m.get(key); - settle.setUncalColAmount(new BigDecimal((String) o1)); + monthlySettleList.add(settle); }