Browse Source

修改订单跳过审核修改开发

anderx 1 year ago
parent
commit
ddeb568007

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

@@ -2136,7 +2136,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   <select id="selectByFinanceNotExamine" resultType="string">
     select a.order_no orderNo
     from t_order_new a left join t_order_examine b on a.order_no=b.order_no
-    where b.status=0 and b.aid = #{financeId} and a.process_status = 3
+    where  b.aid = #{financeId} and a.process_status = 3
   </select>
     <select id="selectExpenseCount" parameterType="com.goafanti.expenseAccount.bo.ExpenseCountsInput" resultType="com.goafanti.expenseAccount.bo.ExpenseCountsBo">
       select a.order_no orderNo,a.contract_no contractNo,b.buyer_name buyerName,toc.max_duration maxDuration ,toc.actual_duration actualDuration ,

+ 11 - 6
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -286,11 +286,12 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 						}
 						if (i == tOrderExamines.size()) {
 							//推送订单流程
-							addOrderLog(s,OrderLogProcess.XMZJSH.getCode(),"订单修改技术总监,判定审核通过");
+							addOrderLog(s,OrderLogProcess.XMZJSH.getCode(),"部门修改技术总监,判定审核通过");
 							StringBuilder str = new StringBuilder();
 							TOrderNew tOrderNew = torderNewMapper.selectByPrimaryKey(s);
 							TOrderNewBo order = torderNewMapper.getSaleIdByOno(s);
 							TOrderNew newOrder = new TOrderNew();
+							newOrder.setOrderNo(s);
 							//如果订单是特批
 							if (tOrderNew.getApproval() == ApprovalNewState.TPDSH.getCode() || tOrderNew.getApproval() == ApprovalNewState.TPBH.getCode()) {
 								if (StringUtils.isNotEmpty(in.getOperationGuaranteeId())) {
@@ -298,14 +299,16 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 									str.append(order.getOperationGuaranteeName()).append(",");
 									aids.add(order.getOperationGuaranteeId());
 								} else if (order.getApprovalStatus() == 0) {
+									addOrderLog(s,OrderLogProcess.YYBZSHTG.getCode(),"运营保障审核人未设置,系统自动通过");
+									addOrderLog(s,OrderLogProcess.TP.getCode(),"部门特批审核未设置,系统自动通过");
 									newOrder.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
 									newOrder.setApproval(ApprovalNewState.TPTG.getCode());
-									addOrderLog(s,OrderLogProcess.TP.getCode(),"部门特批审核人未设置,系统自动通过");
 								} else {
+									addOrderLog(s,OrderLogProcess.YYBZSHTG.getCode(),"运营保障审核人未设置,系统自动通过");
 									newOrder.setProcessStatus(ProcessStatus.YPTPSH.getCode());
 									aids.add(order.getApprovalAid());
 									str.append(order.getApprovalName()).append(",");
-									addOrderLog(s,OrderLogProcess.YYBZSHTG.getCode(),"运营保障审核人未设置,系统自动通过");
+
 								}
 							}
 							newOrder.setExamineName(str.substring(0,str.length()-1));
@@ -335,11 +338,12 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 						}
 						if (i == tOrderExamines.size()) {
 							//推送订单流程
-							addOrderLog(s,OrderLogProcess.CWFS.getCode(),"订单修改财务复审,判定审核通过");
+							addOrderLog(s,OrderLogProcess.CWFS.getCode(),"部门修改财务复审,判定审核通过");
 							StringBuilder str = new StringBuilder();
 							TOrderNew tOrderNew = torderNewMapper.selectByPrimaryKey(s);
 							TOrderNewBo order = torderNewMapper.getSaleIdByOno(s);
 							TOrderNew newOrder = new TOrderNew();
+							newOrder.setOrderNo(s);
 							//如果订单是特批
 							if (tOrderNew.getApproval() == ApprovalNewState.TPDSH.getCode() || tOrderNew.getApproval() == ApprovalNewState.TPBH.getCode()) {
 								if (StringUtils.isNotEmpty(in.getOperationGuaranteeId())) {
@@ -347,14 +351,15 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 									str.append(order.getOperationGuaranteeName()).append(",");
 									aids.add(order.getOperationGuaranteeId());
 								} else if (order.getApprovalStatus() == 0) {
+									addOrderLog(s,OrderLogProcess.YYBZSHTG.getCode(),"运营保障审核人未设置,系统自动通过");
+									addOrderLog(s,OrderLogProcess.TP.getCode(),"部门特批审核未设置,系统自动通过");
 									newOrder.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
 									newOrder.setApproval(ApprovalNewState.TPTG.getCode());
-									addOrderLog(s,OrderLogProcess.TP.getCode(),"部门特批审核人未设置,系统自动通过");
 								} else {
+									addOrderLog(s,OrderLogProcess.YYBZSHTG.getCode(),"运营保障审核人未设置,系统自动通过");
 									newOrder.setProcessStatus(ProcessStatus.YPTPSH.getCode());
 									aids.add(order.getApprovalAid());
 									str.append(order.getApprovalName()).append(",");
-									addOrderLog(s,OrderLogProcess.YYBZSHTG.getCode(),"运营保障审核人未设置,系统自动通过");
 								}
 							}
 							newOrder.setExamineName(str.substring(0,str.length()-1));