anderx лет назад: 2
Родитель
Сommit
1b3462f2a1

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

@@ -867,13 +867,14 @@ select
 
   <select id="getProcessName" resultType="com.goafanti.order.bo.OutProcessName">
     select a.id,a.order_no orderNo ,a.`type`,a.change_amount changeAmount ,a.status,a.process_state processState,
-           if(dep.province=11,1,0)isHN,fzc.name fzc,
+           if(dep.province=11,1,0)isHN, da.name approvalName,dep.approval approvalStatus,
            c.name yxy,mg.name yxjl, yxgly.name yxgly,zxs.name zxs,zxsjl.name zxsjl, zxsgly.name zxsgly,
-           fm.name cwzy,cwgly.name cwgly, zc.name zc,dsz.name dsz,b.salesman_id salesmanId
+           fm.name cwzy,cwgly.name cwgly,dsz.name dsz,b.salesman_id salesmanId
     from new_order_change a
            left join t_order_new b on a.order_no =b.order_no
            left join admin c on b.salesman_id =c.id
            left join department dep on b.order_dep =dep.id
+           left join admin da on dep.approval_aid = da.id
            left join admin fm on dep.finance_id =fm.id
            left join admin mg on c.manager_id =mg.id
            left join (select a.department_id depId,group_concat(a.name) name

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

@@ -955,7 +955,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   <select id="getSaleIdByOno" parameterType="java.lang.String" resultType="com.goafanti.order.bo.TOrderNewBo">
     select o.order_no orderNo ,o.salesman_id as salesmanId, a.name as salesmanName,e.name managerName,
            o.contract_no contractNo,a.email ,u.nickname as userName,o.order_dep orderDep,d.name departmentName,
-           d.finance_id  financeId
+           d.finance_id  financeId,d.approval approvalStatus,approval_aid approvalAid
     from t_order_new o left join admin a on o.salesman_id = a.id left join `user` u on u.id = o.buyer_id
     left join department d on o.order_dep=d.id left join admin e on a.manager_id=e.id
     where order_no = #{_parameter,jdbcType=VARCHAR}
@@ -2192,7 +2192,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
     where a.order_no =#{orderNo}
   </select>
   <select id="selectDepByOrderNo" resultType="com.goafanti.common.model.Department">
-    select a.id,a.name,a.province,a.finance_id financeId
+    select a.id,a.name,a.province,a.finance_id financeId,a.approval ,a.approval_aid approvalAid,
     from department a left join t_order_new b on a.id =b.order_dep
     where b.order_no= #{orderNo}
   </select>

+ 20 - 0
src/main/java/com/goafanti/common/model/Department.java

@@ -118,9 +118,29 @@ public class Department implements Serializable {
      * 复审财务id
      */
     private String retrialFinanceId;
+    private Integer approval;
+    private String approvalAid;
+
+
 
     private static final long serialVersionUID = 1L;
 
+    public Integer getApproval() {
+        return approval;
+    }
+
+    public void setApproval(Integer approval) {
+        this.approval = approval;
+    }
+
+    public String getApprovalAid() {
+        return approvalAid;
+    }
+
+    public void setApprovalAid(String approvalAid) {
+        this.approvalAid = approvalAid;
+    }
+
     public String getId() {
         return id;
     }

+ 1 - 1
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -569,7 +569,7 @@ public class AsyncUtils {
 			}
 			if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
 
-		}else if (noc.getProcessState()== OrderChangeProcess.ZC.getCode()||noc.getProcessState()== OrderChangeProcess.DSZ.getCode()){
+		}else if (noc.getProcessState()== OrderChangeProcess.TPSH.getCode()||noc.getProcessState()== OrderChangeProcess.DSZ.getCode()){
 			if(noc.getStatus()==2){
 				TOrderNewBo ton = tOrderNewMapper.getSaleIdByOno(noc.getOrderNo());
 				OrganizationListOut dep = departmentMapper.selectAllById(ton.getOrderDep());

+ 15 - 12
src/main/java/com/goafanti/order/bo/OutProcessName.java

@@ -9,7 +9,8 @@ public class OutProcessName {
     private Integer special;
     private Integer processState;
     private Integer isHN;
-    private String fzc;
+    private String approvalName;
+    private String approvalStatus;
     private String yxy;
     private String salesmanId;
     private String yxjl;
@@ -19,7 +20,7 @@ public class OutProcessName {
     private String zxsgly;
     private String cwzy;
     private String cwgly;
-    private String zc;
+
     private String dsz;
 
     public Integer getIsHN() {
@@ -30,12 +31,20 @@ public class OutProcessName {
         this.isHN = isHN;
     }
 
-    public String getFzc() {
-        return fzc;
+    public String getApprovalName() {
+        return approvalName;
+    }
+
+    public void setApprovalName(String approvalName) {
+        this.approvalName = approvalName;
     }
 
-    public void setFzc(String fzc) {
-        this.fzc = fzc;
+    public String getApprovalStatus() {
+        return approvalStatus;
+    }
+
+    public void setApprovalStatus(String approvalStatus) {
+        this.approvalStatus = approvalStatus;
     }
 
     public Integer getSpecial() {
@@ -168,13 +177,7 @@ public class OutProcessName {
         this.cwgly = cwgly;
     }
 
-    public String getZc() {
-        return zc;
-    }
 
-    public void setZc(String zc) {
-        this.zc = zc;
-    }
 
     public String getDsz() {
         return dsz;

+ 22 - 6
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -1,15 +1,14 @@
 package com.goafanti.order.bo;
 
-import java.math.BigDecimal;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
-
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.order.enums.NewOrderDunType;
 import com.goafanti.order.enums.OrderDunSubject;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import java.math.BigDecimal;
+import java.util.List;
 
 public class TOrderNewBo extends TOrderNew{
 	private String id;
@@ -92,7 +91,24 @@ public class TOrderNewBo extends TOrderNew{
 	 * 加计扣除服务其他描述
 	 */
 	private String addDeductionOther;
+	private Integer approvalStatus;
+	private String approvalAid;
 
+	public Integer getApprovalStatus() {
+		return approvalStatus;
+	}
+
+	public void setApprovalStatus(Integer approvalStatus) {
+		this.approvalStatus = approvalStatus;
+	}
+
+	public String getApprovalAid() {
+		return approvalAid;
+	}
+
+	public void setApprovalAid(String approvalAid) {
+		this.approvalAid = approvalAid;
+	}
 
 	public Integer getMyExamine() {
 		return myExamine;

+ 2 - 2
src/main/java/com/goafanti/order/enums/OrderChangeProcess.java

@@ -18,9 +18,9 @@ public enum OrderChangeProcess {
 	JSZJ(5, "技术总监"),
 	CWZY(6, "财务专员"),
 	CWZJ(7, "财务总监 "),
-	ZC(8, "总裁"),
+	TPSH(8, "特批审核"),//修改总裁为特殊审核
 	DSZ(9, "董事长"),
-	FZC(10, "副总裁"),
+	FZC(10, "副总裁"),//已经去掉副总裁
 	INVALID(99, "无效");
 
 	private OrderChangeProcess(Integer code, String desc) {

+ 35 - 33
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -99,6 +99,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 
 
+
 	@Override
 	public int addOrderChange(NewOrderChangeBo t,String startRemarks) {
 		TOrderNew ton=new TOrderNew();
@@ -268,9 +269,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				if(nb.getType()==OrderChangeType.JBGGT.getCode()){
 					//仅合同图片修改:营销-营销总经理
 					if(nb.getProcessState()==OrderChangeProcess.YXGLY.getCode()){
-						nb.setStatus(4);
-						addOrderChangeLog(remarks, 2, orderNo, nb.getId());
-						pushCompleteOrderChange(nb);
+						completeChange(remarks, nb);
 						return 1;
 					}
 				} else {
@@ -309,24 +308,22 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 						nb.setProcessState(OrderChangeProcess.CWZY.getCode());
 					}else if (nb.getProcessState()==OrderChangeProcess.CWZY.getCode()){
 						if (nb.getType()==OrderChangeType.ZS.getCode()){
-							pushCED(nb, dep);
+							boolean flag=pushApproval(nb, dep,remarks);
+							if (flag) return 1;
 						}if (nb.getType()==OrderChangeType.KJXY.getCode()){
-							nb.setStatus(4);
-							addOrderChangeLog(remarks, 2, orderNo, nb.getId());
-							pushCompleteOrderChange(nb);
+							completeChange(remarks, nb);
 							return 1;
 						}else {
 							nb.setProcessState(OrderChangeProcess.CWZJ.getCode());
 						}
 					}else if (nb.getProcessState()==OrderChangeProcess.CWZJ.getCode()){
-						pushCED(nb,dep);
-					}else if(nb.getProcessState()==OrderChangeProcess.ZC.getCode()) {
+						boolean flag=pushApproval(nb, dep,remarks);
+						if (flag) return 1;
+					}else if(nb.getProcessState()==OrderChangeProcess.TPSH.getCode()) {
 						if (nb.getType()==OrderChangeType.TDTK.getCode()||nb.getType()==OrderChangeType.TDBTK.getCode()) {
 							nb.setStatus(2);
 						}else {
-							nb.setStatus(4);
-							addOrderChangeLog(remarks, 2, orderNo, nb.getId());
-							pushCompleteOrderChange(nb);
+							completeChange(remarks, nb);
 							return 1;
 						}
 					}else if (nb.getProcessState()==OrderChangeProcess.FZC.getCode()){
@@ -340,9 +337,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 							}else if (nb.getType()==OrderChangeType.TDBTK.getCode()){
 								nb.setStatus(2);
 							}else {
-								nb.setStatus(4);
-								addOrderChangeLog(remarks, 2, orderNo, nb.getId());
-								pushCompleteOrderChange(nb);
+								completeChange(remarks, nb);
 								return 1;
 							}
 
@@ -388,17 +383,28 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		return 1;
 	}
 
-	private void pushCED(NewOrderChangeBo nb, Department dep) {
+	private void completeChange(String remarks, NewOrderChangeBo nb ) {
+		nb.setStatus(4);
+		addOrderChangeLog(remarks, 2, nb.getOrderNo(), nb.getId());
+
+		pushCompleteOrderChange(nb);
+	}
+
+	private boolean pushApproval(NewOrderChangeBo nb, Department dep,String remarks) {
 		TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
 		if (tOrderNew.getSalesmanId().equals(AFTConstants.CAOJIN_AID)) {
 			nb.setProcessState(OrderChangeProcess.DSZ.getCode());
 		}else {
-			if (dep.getProvince()==11){
-				nb.setProcessState(OrderChangeProcess.FZC.getCode());
+			if (dep.getApproval()==1){
+				nb.setProcessState(OrderChangeProcess.TPSH.getCode());
 			}else {
-				nb.setProcessState(OrderChangeProcess.ZC.getCode());
+				addOrderChangeLog("部门特批审核人未设置,跳过特批审核", 2, nb.getOrderNo(), nb.getId());
+				completeChange(remarks,nb);
+				return true;
 			}
+
 		}
+		return false;
 	}
 
 	/**
@@ -518,9 +524,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			if(nb.getStatus()==2) {
 				alist.add(o.getFinanceId());
 			}else {
-				for (Admin admin : adminMapper.selectAdminByRoleType(AFTConstants.CED)) {
-					alist.add(admin.getId());
-				}
+				alist.add(o.getApprovalAid());
 			}
 			break;
 		case 9:
@@ -841,22 +845,20 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			}
 			if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
 
-		}else if (noc.getProcessState()== OrderChangeProcess.ZC.getCode()
+		}else if (noc.getProcessState()== OrderChangeProcess.TPSH.getCode()
 				||noc.getProcessState()== OrderChangeProcess.DSZ.getCode()
 				||noc.getProcessState()== OrderChangeProcess.FZC.getCode()){
 			if(noc.getStatus()==1){
-				String roleType="";
-				if (noc.getProcessState()== OrderChangeProcess.ZC.getCode()){
-					roleType=AFTConstants.CED;
-				}else if(noc.getProcessState()== OrderChangeProcess.DSZ.getCode()){
-					roleType=AFTConstants.APPROVAL_DECISION;
-				}else if(noc.getProcessState()== OrderChangeProcess.FZC.getCode()){
-					roleType=AFTConstants.VICE_CED;
-				}
 				StringBuffer str=new StringBuffer();
-				List<Admin> admins = adminMapper.getAdminRoleTypeList(roleType);
-				for (Admin a : admins) {
+				if (noc.getProcessState()== OrderChangeProcess.TPSH.getCode()){
+					Department department = tOrderNewMapper.selectDepByOrderNo(noc.getOrderNo());
+					Admin a = adminMapper.selectByPrimaryKey(department.getApprovalAid());
 					str=str.append(a.getName()).append(",");
+				}else if(noc.getProcessState()== OrderChangeProcess.DSZ.getCode()){
+					List<Admin> admins = adminMapper.getAdminRoleTypeList(AFTConstants.APPROVAL_DECISION);
+					for (Admin a : admins) {
+						str=str.append(a.getName()).append(",");
+					}
 				}
 				if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
 			} else if(noc.getStatus()==2){