Explorar o código

发起订单BUG修复
发起公出BUG修复
公出&报销列表BUG修复

anderx hai 1 ano
pai
achega
d40174221c

+ 7 - 2
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -759,12 +759,17 @@
         left join t_order_public_release_count toc on a.order_no =toc.order_no
         left join (select a.order_no,a.expenseCount,b.peopleCount,c.notExamine, c.rejectCount,a.days,a.amount
                 from (select a.order_no,count(a.id)expenseCount,sum(a.amount) amount,sum(ROUND(a.duration/7.5) )days
-                    from expense_account a where a.target_type = 1 and a.status=2 group by order_no )a
+                    from expense_account a where a.target_type = 1 and a.status=2
+                                           <if test="startTime !=null and endTime !=null">
+                                               and a.create_time BETWEEN #{startTime} and #{endTime}
+                                           </if>
+                                           group by order_no )a
                     left join (select order_no,count(aid)peopleCount from (select a.order_no,aid from expense_account a
                     where a.target_type = 1 and a.status=2 group by order_no,aid )a group by order_no)b on a.order_no=b.order_no
                     left join (select a.order_no,sum(notExamine)notExamine,sum(rejectCount)rejectCount
                     from (select a.order_no,status ,IF(status=1,1,0)notExamine,IF(status=3,1,0)rejectCount
-                          from expense_account a where a.target_type=1 )a group by order_no)c on a.order_no=c.order_no )c on a.order_no =c.order_no
+                          from expense_account a where a.target_type=1
+                )a group by order_no)c on a.order_no=c.order_no )c on a.order_no =c.order_no
         left join (    select a.order_no ,sum(c.payment_amount) paymentAmount
             from t_order_new a left join t_order_task b on a.order_no =b.order_no left join  t_order_payment c on b.id =c.tid
             where c.status =3       group by order_no )d on a.order_no=d.order_no

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

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

+ 19 - 0
src/main/java/com/goafanti/weChat/bo/InputreleaseAndExpenseCount.java

@@ -6,6 +6,25 @@ public class InputreleaseAndExpenseCount {
     private String depId;
     private String aid;
     private Integer allStatus;
+    private String startTime;
+
+    private String endTime;
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 
     public String getContractNo() {
         return contractNo;

+ 1 - 1
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1987,7 +1987,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 
 	@Override
-	@Cacheable(value = "releaseAndExpenseCount#300", key = "'getCounts:key='+#in.buyerName+#in.contractNo+#in.aid+#in.depId+#in.allStatus")
+	@Cacheable(value = "releaseAndExpenseCount#300", key = "'getCounts:key='+#in.buyerName+#in.contractNo+#in.aid+#in.depId+#in.allStatus+#in.startTime+#in.endTime")
 	public List<releaseAndExpenseCountOut> releaseAndExpenseCount(InputreleaseAndExpenseCount in) {
 		List<releaseAndExpenseCountOut> expenseCountsOrders = publicReleaseMapper.releaseAndExpenseCount(in);
 		expenseCountsOrders.forEach(e->{

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -2,7 +2,7 @@ dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 
 static.host=//uat.jishutao.com/1.3.16
-#static.host=//172.16.1.187/1.3.15
+#static.host=//172.16.1.187/1.3.16
 
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20240430?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false