Bläddra i källkod

报销详情修改

anderx 1 år sedan
förälder
incheckning
047685e8c3

+ 3 - 1
src/main/java/com/goafanti/expenseAccount/controller/ExpenseCountsController.java

@@ -29,6 +29,7 @@ public class ExpenseCountsController extends CertifyApiController {
     @RequestMapping(value = "/getCounts",method = RequestMethod.GET)
     public Result<ExpenseCountsBo> getCounts(ExpenseCountsInput in){
         Result res=new Result();
+        if (in.getEndTime() != null)in.setEndTime(in.getEndTime()+ " 23:59:59");
         return res.data(expenseAccountService.getCounts(in));
     }
 
@@ -36,7 +37,8 @@ public class ExpenseCountsController extends CertifyApiController {
     @RequestMapping(value = "/getCounts/Export",method = RequestMethod.GET)
     public Result<ExpenseCountsBo> getCountsExport(ExpenseCountsInput in){
         NewExcelUtil excelUtil =null;
-            List<ExpenseCountsBo> list  = (List<ExpenseCountsBo>) expenseAccountService.getCounts(in);
+        if (in.getEndTime() != null)in.setEndTime(in.getEndTime()+ " 23:59:59");
+        List<ExpenseCountsBo> list  = (List<ExpenseCountsBo>) expenseAccountService.getCounts(in);
         if (in.getTargetType()==1){
             excelUtil=new NewExcelUtil(ExpenseCountsOrder.class);
             List<ExpenseCountsOrder>orderList = new ArrayList<>();

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

@@ -1442,7 +1442,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             maxString=":不限制公出小时";
             actualString=",";
         }
-        if (out.getActualDuration()<=0){
+        if (out.getActualDuration()<=out.getMaxDuration()){
             actualString=",";
         }
         return e.getBuyerName() + e.getContractNo() +
@@ -1451,7 +1451,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 out.getFrequency() + "次" +
                 "," + out.getActualDuration() + "小时" +
                 actualString+
-                ",已报销" + reduce.stripTrailingZeros().toPlainString() + "元";
+                "已报销" + reduce.stripTrailingZeros().toPlainString() + "元";
     }
 
 

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

@@ -21,7 +21,6 @@ public class ExpenseCountsServiceImpl implements ExpenseCountsService {
     @Cacheable(value = "getCounts#300", key = "'getCounts:key='+#in.buyerName+#in.startTime+#in.endTime+#in.depId+#in.contactNo+#in.targetType")
     public Object getCounts(ExpenseCountsInput in) {
         if (in.getTargetType()==null)in.setTargetType(1);
-        if (in.getEndTime() == null)in.setEndTime(in.getEndTime()+ " 23:59:59");
         if (in.getTargetType()==1){
             List<ExpenseCountsBo> expenseCountsBos = tOrderNewMapper.selectExpenseCount(in);
             expenseCountsBos.forEach(e->{