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