Browse Source

财务统计报销模块修改

anderx 2 years ago
parent
commit
61ca421f91

+ 1 - 0
src/main/java/com/goafanti/admin/bo/OutFinanceCount.java

@@ -70,4 +70,5 @@ public class OutFinanceCount extends FinanceCount {
     public void setRangeReceivables(BigDecimal rangeReceivables) {
         this.rangeReceivables = rangeReceivables;
     }
+
 }

+ 2 - 0
src/main/java/com/goafanti/admin/service/impl/AdminStatisticsServiceImpl.java

@@ -201,6 +201,7 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
     public Object financeInfo(String startTime, String endTime) {
         String aid = TokenManager.getAdminId();
         OutFinanceCount financeCount=adminMapper.financeInfo(aid, startTime, endTime);
+        if (financeCount==null)financeCount= new OutFinanceCount();
         Integer rangePublicCount = publicReleaseMapper.selectCountByaidAndDate(aid, startTime, endTime);
         if (rangePublicCount==null) rangePublicCount=0;
         financeCount.setRangePublicCount(rangePublicCount);
@@ -208,6 +209,7 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
         if (rangeReceivables==null)rangeReceivables=new BigDecimal(0);
         financeCount.setRangeReceivables(rangeReceivables);
         OutFinanceCount outFinanceCount = adminMapper.selectFinanceChangeCount(aid);
+        if (outFinanceCount==null) outFinanceCount= new OutFinanceCount();
         if (outFinanceCount.getChangeCount()==null)outFinanceCount.setChangeCount(0);
         if (outFinanceCount.getChangeInvoiceCount()==null)outFinanceCount.setChangeInvoiceCount(0);
         financeCount.setChangeCount(outFinanceCount.getChangeCount());

+ 7 - 3
src/main/java/com/goafanti/common/model/FinanceCount.java

@@ -83,8 +83,7 @@ public class FinanceCount implements Serializable {
     public FinanceCount(){
 
     }
-
-    public static FinanceCount initialization(String aid, String date) {
+    public static FinanceCount  initialization(String aid,Date date){
         FinanceCount financeCount=new FinanceCount();
         financeCount.aid=aid;
         financeCount.orderCount=0;
@@ -97,10 +96,15 @@ public class FinanceCount implements Serializable {
         financeCount.memberUnauditedCount=0;
         financeCount.paymentCount=0;
         financeCount.paymentUnauditedCount=0;
-        financeCount.dateTime= DateUtils.StringToDate(date, AFTConstants.YYYYMMDD);
+        if (date!=null)financeCount.dateTime= date;
         return financeCount;
     }
 
+    public static FinanceCount initialization(String aid, String date) {
+        Date toDate = DateUtils.StringToDate(date, AFTConstants.YYYYMMDD);
+        return initialization(aid, toDate);
+    }
+
     public static FinanceCount initialization(FinanceCount in) {
         if (in.getOrderCount()==null)in.setOrderCount(0);
         if (in.getOrderUnauditedCount()==null)in.setOrderUnauditedCount(0);

+ 1 - 0
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -545,6 +545,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         FinanceCount financeCount = financeCountMapper.selectByAidAndDates(aid, startTime);
         FinanceCount newFinance=new FinanceCount();
         if (financeCount==null){
+            newFinance=FinanceCount.initialization(aid,createTime);
             newFinance.setExpenseCount(1);
             newFinance.setExpenseUnauditedCount(1);
             financeCountMapper.insertSelective(newFinance);