Browse Source

审核数量修改

anderx 2 years ago
parent
commit
9cdea5c253

+ 1 - 1
src/main/java/com/goafanti/common/dao/FinanceCountMapper.java

@@ -18,7 +18,7 @@ public interface FinanceCountMapper {
 
     int selectByAidAndDates(@Param("aid") String aid, @Param("startTime") String startTime);
 
-    void updateByAidAndDates(FinanceCount selectFinanceCount);
+    void updateOrderCountAdd(@Param("aid") String aid, @Param("startTime") String startTime);
 
     void updateOrderUnauditedSubtraction(@Param("aid") String aid, @Param("startTime") String startTime,@Param("type") Integer type);
 }

+ 1 - 2
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -88,6 +88,5 @@ public interface TOrderNewMapper {
     int selectAidAndDate(@Param("aid") String aid, @Param("startTime") String startTime,
                          @Param("endTime")String endTime);
 
-    FinanceCount selectFinanceCount(@Param("aid") String aid, @Param("startTime") String startTime,
-                                    @Param("endTime")String endTime);
+
 }

+ 6 - 0
src/main/java/com/goafanti/common/mapper/FinanceCountMapper.xml

@@ -257,6 +257,12 @@
     </if>
       where aid = #{aid} and date_time = #{startTime}
   </update>
+  <update id="updateOrderCountAdd">
+    update finance_count
+      set order_unaudited_count=order_unaudited_count+1,
+      order_count=order_count+1
+    where aid = #{aid} and date_time = #{startTime}
+  </update>
 
   <select id="selectByAidAndDates" resultType="java.lang.Integer">
     select count(*)

+ 1 - 9
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -2135,13 +2135,5 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
     and salesman_id = #{aid}
     and create_time  BETWEEN #{startTime} and  #{endTime}
   </select>
-    <select id="selectFinanceCount" resultType="com.goafanti.common.model.FinanceCount">
-      select x.aid,x.dates dateTime,count(*)orderCount,sum(if(x.process_status=3,1,0))orderUnauditedCount
-      from (SELECT b.finance_id aid, a.process_status,DATE_FORMAT(a.create_time , '%Y-%m-%d') dates
-            from t_order_new a left join department b on a.order_dep =b.id
-            where a.delete_sign in (0,2,3) and process_status >2
-              and b.finance_id =#{aid}
-              and a.create_time between #{startTime} and #{endTime})x
-      group by x.aid,x.dates
-    </select>
+
 </mapper>

+ 1 - 1
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -225,5 +225,5 @@ public interface OrderNewService {
 	void updateAdminUserCountOrder(String aid,Date transferTime);
 
 
-	void updateFinanceCount(String orderNo, Date createTime);
+	void financeCountOrderUnauditedSubtraction(TOrderNew use, Integer i);
 }

+ 4 - 14
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -226,7 +226,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		}
 		orderNewService.updateAdminUserCountOrder(t.getSalesmanId(),t.getCreateTime());
 		Admin admin=adminMapper.selectFinanceAdminByOrderDep(t.getOrderDep());
-		financeCountOrderUnauditedSubtraction(t,1);
+		orderNewService.financeCountOrderUnauditedSubtraction(t,1);
 		return c;
 	}
 	public void pushGeneralSendNoticeAndEmail(List<String> alist, Integer type,TOrderNewBo o,String adminId,Integer approval){
@@ -509,8 +509,8 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		tl.setOrderNo(t.getOrderNo());
 		if (TokenManager.hasRole(AFTConstants.FINANCE)){
 			tl.setProcess(OrderLogProcess.CWSH.getCode());
-			//财务审核当天
-			financeCountOrderUnauditedSubtraction(use,0);
+			//财务审核当天未审核数量减一
+			orderNewService.financeCountOrderUnauditedSubtraction(use,0);
 		}else if (TokenManager.hasRole(AFTConstants.TECH_ADMIN)){
 			tl.setProcess(OrderLogProcess.XMZJSH.getCode());
 		}
@@ -532,20 +532,10 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		}
 
 		tOrderNewMapper.updateByPrimaryKeySelective(t);
-
 		return 1;
 	}
 
-	/**
-	 *
-	 * @param use
-	 * @param type 0 未审核减一 1未审核与派单数都减一
-	 */
-	private void financeCountOrderUnauditedSubtraction(TOrderNew use,Integer type) {
-		Admin admin = adminMapper.selectFinanceAdminByOrderDep(use.getOrderDep());
-		String startTime= DateUtils.formatDate(use.getCreateTime(),AFTConstants.YYYYMMDD);
-		financeCountMapper.updateOrderUnauditedSubtraction(admin.getId(),startTime,type);
-	}
+
 
 	private void pushNoticeAndEmail(TOrderNew t, TOrderNew new1) {
 		List<String> aids = new ArrayList<>();

+ 21 - 12
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -656,21 +656,17 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	}
 
-	@Override
 	public void updateFinanceCount(String aid, Date createTime){
 		String startTime= DateUtils.formatDate(createTime,AFTConstants.YYYYMMDD);
 		String endTime=startTime+" 23:59:59";
-		FinanceCount financeCount= FinanceCount.initialization(aid,startTime);
-		FinanceCount selectFinanceCount=tOrderNewMapper.selectFinanceCount(aid,startTime,endTime);
-		if(selectFinanceCount!=null){
-			financeCount.setOrderCount(selectFinanceCount.getOrderCount());
-			financeCount.setOrderUnauditedCount(selectFinanceCount.getOrderUnauditedCount());
-			int i = financeCountMapper.selectByAidAndDates(aid, startTime);
-			if (i==0){
-				financeCountMapper.insertSelective(financeCount);
-			}else {
-				financeCountMapper.updateByAidAndDates(selectFinanceCount);
-			}
+		int i = financeCountMapper.selectByAidAndDates(aid, startTime);
+		if (i==0){
+			FinanceCount financeCount= FinanceCount.initialization(aid,startTime);
+			financeCount.setOrderCount(1);
+			financeCount.setOrderUnauditedCount(1);
+			financeCountMapper.insertSelective(financeCount);
+		}else {
+			financeCountMapper.updateOrderCountAdd(aid,startTime);
 		}
 	}
 
@@ -1741,9 +1737,22 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),order, TokenManager.getAdminId(),t.getApproval());
 		tOrderNewMapper.updateByPrimaryKeySelective(t);
 		updateAdminUserCountOrder(t.getSalesmanId(),t.getCreateTime());
+		financeCountOrderUnauditedSubtraction(t,1);
 		return 1;
 	}
 
+	/**
+	 *
+	 * @param use
+	 * @param type 0 未审核减一 1未审核与派单数都减一
+	 */
+	@Override
+	public void financeCountOrderUnauditedSubtraction(TOrderNew use,Integer type) {
+		Admin admin = adminMapper.selectFinanceAdminByOrderDep(use.getOrderDep());
+		String startTime= DateUtils.formatDate(use.getCreateTime(),AFTConstants.YYYYMMDD);
+		financeCountMapper.updateOrderUnauditedSubtraction(admin.getId(),startTime,type);
+	}
+
 	private TOrderNew checkDeleteSign(String orderNo) {
 		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
 		//if(t.getDeleteSign()==2) throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, t.getOrderNo(),""));