ソースを参照

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

anderx 1 年間 前
コミット
26b9749363
共有1 個のファイルを変更した82 個の追加2 個の削除を含む
  1. 82 2
      src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

+ 82 - 2
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -341,6 +341,76 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 			}
 			updateRetrialFinance=true;
 		}
+		if (in.getOperationGuaranteeId()==null&&StringUtils.isBlank(useDep.getOperationGuaranteeId())){
+			List<String> strings = torderNewMapper.selectByDepAndProcess(useDep.getId(), ProcessStatus.YYBZSH.getCode());
+			for (String s : strings) {
+				addOrderLog(s,OrderLogProcess.YYBZSHTG.getCode(),"运营保障审核人未设置,系统自动通过");
+				TOrderNew tOrderNew = torderNewMapper.selectByPrimaryKey(s);
+				TOrderNewBo order = torderNewMapper.getSaleIdByOno(s);
+				StringBuilder str = new StringBuilder();
+				TOrderNew newOrder = new TOrderNew();
+				if (order.getApprovalStatus() == 0) {
+					addOrderLog(s,OrderLogProcess.TP.getCode(),"部门特批审核未设置,系统自动通过");
+					newOrder.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
+					newOrder.setApproval(ApprovalNewState.TPTG.getCode());
+					pushJSZJidAndName(aids, str);
+				} else {
+					newOrder.setProcessStatus(ProcessStatus.YPTPSH.getCode());
+					if (Objects.equals(tOrderNew.getApproval(), ApprovalNewState.TPDSH.getCode())){
+						aids.add(order.getApprovalAid());
+						str.append(order.getApprovalName()).append(",");
+					}else {
+						if (Objects.equals(tOrderNew.getApproval(), ApprovalNewState.DSZBH.getCode())) {
+							List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.APPROVAL_DECISION);
+							for (Admin admin : admins) {
+								aids.add(admin.getId());
+								str.append(admin.getName()).append(",");
+							}
+
+						}
+					}
+				}
+				newOrder.setExamineName(str.substring(0,str.length()-1));
+				torderNewMapper.updateByPrimaryKeySelective(newOrder);
+			}
+		} else if (!useDep.getOperationGuaranteeId().equals(in.getOperationGuaranteeId())) {
+			List<String> strings = torderNewMapper.selectByDepAndProcess(useDep.getId(), ProcessStatus.YYBZSH.getCode());
+			Admin admin = adminMapper.selectByPrimaryKey(in.getOperationGuaranteeId());
+			for (String s : strings) {
+				TOrderNew newOrder = new TOrderNew();
+				newOrder.setOrderNo(s);
+				newOrder.setExamineName(admin.getName());
+				torderNewMapper.updateByPrimaryKeySelective(newOrder);
+			}
+		}
+		//关掉特批审核
+		if (in.getApproval()==0&&useDep.getApproval()==1){
+			List<String> strings = torderNewMapper.selectByDepAndProcess(useDep.getId(), ProcessStatus.YPTPSH.getCode());
+			for (String s : strings) {
+				TOrderNew tOrderNew = torderNewMapper.selectByPrimaryKey(s);
+				if (Objects.equals(tOrderNew.getApproval(), ApprovalNewState.TPDSH.getCode())){
+					TOrderNew newOrder=new TOrderNew();
+					newOrder.setOrderNo(s);
+					newOrder.setApproval(ApprovalNewState.TPTG.getCode());
+					torderNewMapper.updateByPrimaryKeySelective(newOrder);
+					addOrderLog(s,OrderLogProcess.TP.getCode(),"特批审核人未设置,系统自动通过");
+				}
+			}
+		} else if (in.getApprovalAid().equals(useDep.getApprovalAid())) {
+			List<String> strings = torderNewMapper.selectByDepAndProcess(useDep.getId(), ProcessStatus.YPTPSH.getCode());
+			for (String s : strings) {
+				TOrderNew tOrderNew = torderNewMapper.selectByPrimaryKey(s);
+				if (Objects.equals(tOrderNew.getApproval(), ApprovalNewState.TPDSH.getCode())){
+					TOrderNewBo order = torderNewMapper.getSaleIdByOno(s);
+					TOrderNew newOrder=new TOrderNew();
+					newOrder.setOrderNo(s);
+					newOrder.setExamineName(order.getApprovalName());
+					torderNewMapper.updateByPrimaryKeySelective(newOrder);
+				}
+			}
+
+		}
+
 		if (in.getExpenseFinanceId()!=null&&!in.getExpenseFinanceId().equals(useDep.getExpenseFinanceId())){
 			dep.setExpenseFinanceId(in.getExpenseFinanceId());
 			departmentMapper.updateExpenseFinanceNotExamine(in.getExpenseFinanceId(), useDep.getExpenseFinanceId());
@@ -417,8 +487,18 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 				} else {
 					addOrderLog(s,OrderLogProcess.YYBZSHTG.getCode(),"运营保障审核人未设置,系统自动通过");
 					newOrder.setProcessStatus(ProcessStatus.YPTPSH.getCode());
-					aids.add(order.getApprovalAid());
-					str.append(order.getApprovalName()).append(",");
+					if (Objects.equals(tOrderNew.getApproval(), ApprovalNewState.TPDSH.getCode())){
+						aids.add(order.getApprovalAid());
+						str.append(order.getApprovalName()).append(",");
+					}else {
+						if (Objects.equals(tOrderNew.getApproval(), ApprovalNewState.DSZBH.getCode())) {
+							List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.APPROVAL_DECISION);
+							for (Admin admin : admins) {
+								aids.add(admin.getId());
+								str.append(admin.getName()).append(",");
+							}
+						}
+					}
 				}
 			}else {
 				newOrder.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());