anderx 1 год назад
Родитель
Сommit
0f3f622cea

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

@@ -469,6 +469,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
 
 
     @Override
     @Override
     public void pushExpenseTotalAmount() {
     public void pushExpenseTotalAmount() {
+//                        orderNewService.pushOrderPublicReleaseCount("800326086952370176");
         List<TOrderNew> tOrderNews = orderNewService.selectGetAll();
         List<TOrderNew> tOrderNews = orderNewService.selectGetAll();
         for (TOrderNew e : tOrderNews) {
         for (TOrderNew e : tOrderNews) {
                 orderNewService.pushOrderPublicReleaseCount(e.getOrderNo());
                 orderNewService.pushOrderPublicReleaseCount(e.getOrderNo());

+ 11 - 2
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -654,7 +654,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 	}
 
 
 
 
-
+	/**
+	 * 处理订单公出&报销之间数据统计
+	 * @param orderNo
+	 */
 	public void pushOrderPublicReleaseCount(String orderNo) {
 	public void pushOrderPublicReleaseCount(String orderNo) {
 		List<PublicRelease> list = publicReleaseMapper.selectByOrderNo(orderNo);
 		List<PublicRelease> list = publicReleaseMapper.selectByOrderNo(orderNo);
 		TOrderNewBo t = tOrderNewMapper.getOrderNewDetail(orderNo);
 		TOrderNewBo t = tOrderNewMapper.getOrderNewDetail(orderNo);
@@ -679,7 +682,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				}
 				}
 			}
 			}
 			for (TTaskMember e : tTaskMembers) {
 			for (TTaskMember e : tTaskMembers) {
-				if(e.getYearSum()!=null&&e.getYearSum()>1){
+				if(e.getYearSum()!=null&&e.getYearSum()>yearSum){
 					yearSum=e.getYearSum();
 					yearSum=e.getYearSum();
 				}
 				}
 			}
 			}
@@ -764,6 +767,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}
 	}
 
 
+	/**
+	 * 处理订单公出&报销最大公出
+	 * @param t
+	 * @param out
+	 * @param yearSum
+	 */
 	private void pushMaxDuration(TOrderNewBo t,TOrderPublicReleaseCount out ,int yearSum) {
 	private void pushMaxDuration(TOrderNewBo t,TOrderPublicReleaseCount out ,int yearSum) {
 		BigDecimal res=BigDecimal.ZERO;
 		BigDecimal res=BigDecimal.ZERO;
 		BigDecimal totalAmount=t.getTotalAmount();
 		BigDecimal totalAmount=t.getTotalAmount();