anderx пре 2 година
родитељ
комит
729322f780

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

@@ -2062,10 +2062,10 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   </select>
   <select id="getProcessName" resultType="com.goafanti.order.bo.OrderProcessName">
     select a.order_no orderNo,a.approval,a.process_status processStatus  ,b.name yxy,mg.name yxjl,
-        yxgly.name yxgly,d.name cwzy,zc.name zc, zxsgly.name zxsgly,dsz.name dsz
+        yxgly.name yxgly,d.name cwzy,zc.name zc, zxsgly.name zxsgly,dsz.name dsz,rf.name retrialFinanceName
     from t_order_new a left join admin b on a.salesman_id =b.id
-    left join admin mg on b.manager_id =mg.id
-     left join department c on a.order_dep =c.id
+    left join admin mg on b.manager_id =mg.id left join department c on a.order_dep =c.id
+     left join admin rf on c.retrial_finance_id=rf.id
      left join (select a.department_id depId,group_concat(a.name) name
         from admin a left join user_role b on a.id=b.uid left join `role` c on b.rid =c.id
         where c.role_type ='9996' and a.status ='0' group by a.department_id )yxgly on c.id =yxgly.depId

+ 9 - 0
src/main/java/com/goafanti/order/bo/OrderProcessName.java

@@ -9,10 +9,19 @@ public class OrderProcessName {
     private String yxjl;
     private String yxgly;
     private String cwzy;
+    private String retrialFinanceName;
     private String zc;
     private String zxsgly;
     private String dsz;
 
+    public String getRetrialFinanceName() {
+        return retrialFinanceName;
+    }
+
+    public void setRetrialFinanceName(String retrialFinanceName) {
+        this.retrialFinanceName = retrialFinanceName;
+    }
+
     public String getYxjl() {
         return yxjl;
     }

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

@@ -189,15 +189,27 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	private void addOrderExamine(TOrderNew o) {
 		List<TOrderExamine> tOrderExamines = tOrderExamineMapper.selectByOrderNo(o.getOrderNo());
 		if (tOrderExamines.isEmpty()){
-			OrganizationListOut dep = departmentMapper.selectAllById(o.getOrderDep());
-			List<TOrderExamine> list =new ArrayList<>();
-			if (dep!=null&&dep.getFinanceId()!=null)list.add(new TOrderExamine(o.getOrderNo(),dep.getFinanceId(),dep.getFinanceName()));
-			List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.TECH_ADMIN);
-			for (Admin admin : admins) {
-				list.add(new TOrderExamine(o.getOrderNo(),admin.getId(),admin.getName()));
+			addTOrderExamines(o);
+		}
+	}
+
+	private List<TOrderExamine> addTOrderExamines(TOrderNew o) {
+		OrganizationListOut dep = departmentMapper.selectAllById(o.getOrderDep());
+		List<TOrderExamine> list =new ArrayList<>();
+		if(!Objects.isNull(dep)){
+			if (!Objects.isNull(dep.getFinanceId())){
+				list.add(new TOrderExamine(o.getOrderNo(),dep.getFinanceId(),dep.getFinanceName()));
 			}
-			tOrderExamineMapper.insertBatch(list);
+			if (!Objects.isNull(dep.getRetrialFinanceId())){
+				list.add(new TOrderExamine(o.getOrderNo(),dep.getRetrialFinanceId(),dep.getRetrialFinanceName()));
+			}
+		}
+		List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.TECH_ADMIN);
+		for (Admin admin : admins) {
+			list.add(new TOrderExamine(o.getOrderNo(),admin.getId(),admin.getName()));
 		}
+		tOrderExamineMapper.insertBatch(list);
+		return list;
 	}
 
 	@Override
@@ -1096,16 +1108,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				//为了处理旧数据,后期可以去掉新增
 				List<TOrderExamine> tOrderExamines = tOrderExamineMapper.selectByOrderNo(orderNo);
 				if (tOrderExamines.isEmpty()){
-					OrganizationListOut dep = departmentMapper.selectAllById(t.getOrderDep());
-					List<TOrderExamine> list =new ArrayList<>();
-					list.add(new TOrderExamine(orderNo,dep.getFinanceId(),dep.getFinanceName()));
-					aids.add(dep.getFinanceId());
-					List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.TECH_ADMIN);
-					for (Admin admin : admins) {
-						aids.add(admin.getId());
-						list.add(new TOrderExamine(orderNo,admin.getId(),admin.getName()));
+					List<TOrderExamine> tOrderExamines1 = addTOrderExamines(t2);
+					for (TOrderExamine e : tOrderExamines1) {
+						aids.add(e.getAid());
 					}
-					tOrderExamineMapper.insertBatch(list);
 				}else {
 					tOrderExamineMapper.updateStatusByOrderNo(orderNo,null,0);
 					for (TOrderExamine e : tOrderExamines) {
@@ -1161,11 +1167,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			}
 		}else if (t.getProcessStatus()==ProcessStatus.YPCW_JSZJ.getCode()){
 			if (t.getOrderDep()!=null){
-				OrganizationListOut dep = departmentMapper.selectAllById(t.getOrderDep());
-				str=str.append(dep.getFinanceName()).append(",");
-				List<Admin> admins = adminMapper.getAdminRoleTypeList(AFTConstants.TECH_ADMIN);
-				for (Admin admin : admins) {
-					str=str.append(admin.getName()).append(",");
+				List<TOrderExamine> list = tOrderExamineMapper.selectByOrderNo(t.getOrderNo());
+				for (TOrderExamine e : list) {
+					str=str.append(e.getAname()).append(",");
 				}
 			}
 		}else if (t.getProcessStatus()==ProcessStatus.YPYXY.getCode()){