Bläddra i källkod

项目日志修改

anderx 1 år sedan
förälder
incheckning
3f31ed4795

+ 7 - 7
src/main/java/com/goafanti/expenseAccount/bo/ExpenseCountsBo.java

@@ -12,7 +12,7 @@ public class ExpenseCountsBo {
 
 
     private String depName;
     private String depName;
 
 
-    private Double maxDuration ,actualDuration ,exceedDuration;
+    private String  maxDuration ,actualDuration ,exceedDuration;
     private BigDecimal totalAmount;
     private BigDecimal totalAmount;
     private BigDecimal settlementAmount;
     private BigDecimal settlementAmount;
     private BigDecimal expenseAmount;
     private BigDecimal expenseAmount;
@@ -33,27 +33,27 @@ public class ExpenseCountsBo {
         this.bidType = bidType;
         this.bidType = bidType;
     }
     }
 
 
-    public Double getMaxDuration() {
+    public String getMaxDuration() {
         return maxDuration;
         return maxDuration;
     }
     }
 
 
-    public void setMaxDuration(Double maxDuration) {
+    public void setMaxDuration(String maxDuration) {
         this.maxDuration = maxDuration;
         this.maxDuration = maxDuration;
     }
     }
 
 
-    public Double getActualDuration() {
+    public String getActualDuration() {
         return actualDuration;
         return actualDuration;
     }
     }
 
 
-    public void setActualDuration(Double actualDuration) {
+    public void setActualDuration(String actualDuration) {
         this.actualDuration = actualDuration;
         this.actualDuration = actualDuration;
     }
     }
 
 
-    public Double getExceedDuration() {
+    public String getExceedDuration() {
         return exceedDuration;
         return exceedDuration;
     }
     }
 
 
-    public void setExceedDuration(Double exceedDuration) {
+    public void setExceedDuration(String exceedDuration) {
         this.exceedDuration = exceedDuration;
         this.exceedDuration = exceedDuration;
     }
     }
 
 

+ 36 - 0
src/main/java/com/goafanti/expenseAccount/bo/ExpenseCountsOrder.java

@@ -13,6 +13,12 @@ public class ExpenseCountsOrder extends ExpenseCountsBo{
     @Excel(name = "客户名称")
     @Excel(name = "客户名称")
     private String buyerName;
     private String buyerName;
 
 
+    @Excel(name = "应公出工时")
+    private String  maxDuration;
+    @Excel(name = "实际公出工时")
+    private String actualDuration;
+    @Excel(name = "超出工时")
+    private String exceedDuration;
     @Excel(name = "合同金额")
     @Excel(name = "合同金额")
     private BigDecimal totalAmount;
     private BigDecimal totalAmount;
     @Excel(name = "已收款")
     @Excel(name = "已收款")
@@ -34,6 +40,36 @@ public class ExpenseCountsOrder extends ExpenseCountsBo{
     private Integer rejectCount;
     private Integer rejectCount;
 
 
     @Override
     @Override
+    public String getMaxDuration() {
+        return maxDuration;
+    }
+
+    @Override
+    public void setMaxDuration(String maxDuration) {
+        this.maxDuration = maxDuration;
+    }
+
+    @Override
+    public String getActualDuration() {
+        return actualDuration;
+    }
+
+    @Override
+    public void setActualDuration(String actualDuration) {
+        this.actualDuration = actualDuration;
+    }
+
+    @Override
+    public String getExceedDuration() {
+        return exceedDuration;
+    }
+
+    @Override
+    public void setExceedDuration(String exceedDuration) {
+        this.exceedDuration = exceedDuration;
+    }
+
+    @Override
     public String getOrderNo() {
     public String getOrderNo() {
         return orderNo;
         return orderNo;
     }
     }

+ 13 - 7
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -1415,13 +1415,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 TOrderPublicReleaseCount out = tOrderPublicReleaseCountMapper.selectByOrderNo(e.getOrderNo());
                 TOrderPublicReleaseCount out = tOrderPublicReleaseCountMapper.selectByOrderNo(e.getOrderNo());
                 List<ExpenseAccount> expenseAccounts = expenseAccountMapper.selectByOrderNo(e.getOrderNo());
                 List<ExpenseAccount> expenseAccounts = expenseAccountMapper.selectByOrderNo(e.getOrderNo());
                 BigDecimal reduce = expenseAccounts.stream().map(ExpenseAccount::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
                 BigDecimal reduce = expenseAccounts.stream().map(ExpenseAccount::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-                String str = e.getBuyerName() + e.getContractNo() +
-                        ":应公出" + out.getMaxDuration() + "小时" +
-                        ",已" + out.getPeopleCount() + "人公出," +
-                        out.getFrequency() + "次" +
-                        "," + out.getActualDuration() + "小时" +
-                        ",超过" + out.getExceedDuration() + "小时" +
-                        ",已报销" + reduce.stripTrailingZeros().toPlainString() + "元";
+                String str = getString(e, out, reduce);
                 e.setCountStr(str);
                 e.setCountStr(str);
             }
             }
         }
         }
@@ -1431,6 +1425,18 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
 
 
     }
     }
 
 
+    private String getString(SonExpenseAccount e, TOrderPublicReleaseCount out, BigDecimal reduce) {
+        String maxString=":应公出" + out.getMaxDuration() + "小时";
+        if (out.getMaxDuration().equals(-1d))maxString=":不限制公出小时";
+        String str = e.getBuyerName() + e.getContractNo() +
+                maxString +
+                ",已" + out.getPeopleCount() + "人公出," +
+                out.getFrequency() + "次" +
+                "," + out.getActualDuration() + "小时" +
+                ",超过" + out.getExceedDuration() + "小时" +
+                ",已报销" + reduce.stripTrailingZeros().toPlainString() + "元";
+        return str;
+    }
 
 
 
 
     @Override
     @Override

+ 10 - 1
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseCountsServiceImpl.java

@@ -2,6 +2,7 @@ package com.goafanti.expenseAccount.service.impl;
 
 
 import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.LoggerUtils;
+import com.goafanti.expenseAccount.bo.ExpenseCountsBo;
 import com.goafanti.expenseAccount.bo.ExpenseCountsInput;
 import com.goafanti.expenseAccount.bo.ExpenseCountsInput;
 import com.goafanti.expenseAccount.service.ExpenseCountsService;
 import com.goafanti.expenseAccount.service.ExpenseCountsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +10,8 @@ import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.util.List;
+
 @Service
 @Service
 public class ExpenseCountsServiceImpl implements ExpenseCountsService {
 public class ExpenseCountsServiceImpl implements ExpenseCountsService {
 
 
@@ -19,7 +22,13 @@ public class ExpenseCountsServiceImpl implements ExpenseCountsService {
     public Object getCounts(ExpenseCountsInput in) {
     public Object getCounts(ExpenseCountsInput in) {
         if (in.getTargetType()==null)in.setTargetType(1);
         if (in.getTargetType()==null)in.setTargetType(1);
         if (in.getTargetType()==1){
         if (in.getTargetType()==1){
-            return tOrderNewMapper.selectExpenseCount(in);
+            List<ExpenseCountsBo> expenseCountsBos = tOrderNewMapper.selectExpenseCount(in);
+            expenseCountsBos.forEach(e->{
+               if (e.getMaxDuration().equals("-1")){
+                   e.setMaxDuration("不限制");
+               }
+            });
+            return expenseCountsBos;
         }else {
         }else {
             return tOrderNewMapper.selectExpenseDepCount(in);
             return tOrderNewMapper.selectExpenseDepCount(in);
         }
         }