Browse Source

报销审核修改

anderx 2 years ago
parent
commit
3ab9bf25a9

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

@@ -269,7 +269,7 @@
     from finance_count
     where aid = #{aid} and date_time = #{startTime}
   </select>
-  <select id="selectByAidAndDates"  parameterType="java.lang.Integer" resultMap="BaseResultMap">
+  <select id="selectByAidAndDates"   resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from finance_count

+ 7 - 2
src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java

@@ -121,7 +121,8 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 		int i=tOrderInvoiceMapper.updateByPrimaryKeySelective(o);
 		pushOrderInvoiceExamine(o);
 		if (o.getApproval()==0){
-			String startTime = DateUtils.formatDate(o.getCreateTime(),AFTConstants.YYYYMMDD);
+			TOrderInvoice use = tOrderInvoiceMapper.selectByPrimaryKey(o.getId());
+			String startTime = DateUtils.formatDate(use.getCreateTime(),AFTConstants.YYYYMMDD);
 			Admin admin = adminMapper.selectOrderByFinanacial(o.getOrderNo());
 			FinanceCount financeCount = financeCountMapper.selectByAidAndDates(admin.getId(), startTime);
 			addFinanceCount(startTime, admin, financeCount);
@@ -392,8 +393,12 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 			}else if(o.getType()==1) {
 				aids.addAll(adminMapper.listNameByDepAndName(ts.getOrderDep(), AFTConstants.SALESMAN_ADMIN));
 			}
-
+			String startTime = DateUtils.formatDate(o.getCreateTime(),AFTConstants.YYYYMMDD);
+			Admin admin = adminMapper.selectOrderByFinanacial(o.getOrderNo());
+			FinanceCount financeCount = financeCountMapper.selectByAidAndDates(admin.getId(), startTime);
+			addFinanceCount(startTime,admin,financeCount);
 		}
+
 		pushOrderInvoiceExamine(t);
 		TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(o.getOrderNo());
 		pushGeneralSendNoticeAndEmail(aids,type,order, TokenManager.getAdminId(),0);