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

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

@@ -783,8 +783,8 @@
       a.other_cost_actual otherCostActual , a.expect_profit expectProfit ,a.actual_profit  actualProfit,a.service_type serviceType,
       a.service_project serviceProject,o.examine_name examineName
     from t_order_new o left join department d on o.order_dep = d.id left join `user` u on o.buyer_id = u.id left join t_order_mid a on o.order_no=a.order_no
-    left join (select * from  t_order_outsource where type=0) too on o.order_no=too.order_no where delete_sign in(0,2) and approval in(0,1,2,4,5,7,8)
-    where delete_sign in(0,2) and approval in(0,1,2,4,5,7,8) and outsource=  #{o.outsource,jdbcType=INTEGER}
+    left join (select * from  t_order_outsource where type=0) too on o.order_no=too.order_no where delete_sign in(0,2) and o.approval in(0,1,2,4,5,7,8)
+    and outsource=  #{o.outsource,jdbcType=INTEGER}
     <if test="o.processStatus == 3">
       and o.process_status = #{o.processStatus,jdbcType=INTEGER}
     </if>
@@ -871,7 +871,7 @@
   <select id="financeCount" parameterType="Map" resultType="java.lang.Integer">
  select count(*) from t_order_new o left join `user` u on o.buyer_id = u.id
 left join department d on o.order_dep = d.id   left join t_order_mid a on o.order_no=a.order_no
- where delete_sign in(0,2) and approval in(0,1,2,4,5,7,8) and outsource=  #{o.outsource,jdbcType=INTEGER}
+ where delete_sign in(0,2) and o.approval in(0,1,2,4,5,7,8) and outsource=  #{o.outsource,jdbcType=INTEGER}
     <if test="o.processStatus == 3">
       and o.process_status = #{o.processStatus,jdbcType=INTEGER}
     </if>

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

@@ -10,7 +10,7 @@ public class OutProcessName {
     private Integer processState;
     private Integer isHN;
     private String approvalName;
-    private String approvalStatus;
+    private Integer approvalStatus;
     private String yxy;
     private String salesmanId;
     private String yxjl;
@@ -39,11 +39,11 @@ public class OutProcessName {
         this.approvalName = approvalName;
     }
 
-    public String getApprovalStatus() {
+    public Integer getApprovalStatus() {
         return approvalStatus;
     }
 
-    public void setApprovalStatus(String approvalStatus) {
+    public void setApprovalStatus(Integer approvalStatus) {
         this.approvalStatus = approvalStatus;
     }
 

+ 1 - 1
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -506,7 +506,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单编号和审批","订单编号和审批"));
 			return res;
 		}
-		if (confirm==ApprovalNewState.ZCBH.getCode()&&StringUtils.isBlank(reason)) {
+		if (confirm==ApprovalNewState.TPBH.getCode()&&StringUtils.isBlank(reason)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"驳回原因", "驳回原因"));
 			return res;
 		}

+ 3 - 3
src/main/java/com/goafanti/order/enums/ApprovalNewState.java

@@ -7,11 +7,11 @@ public enum ApprovalNewState {
 	/** 非特批 **/
 	FTP(0,"非特批"),
 	/** 总裁待审核 **/
-	ZCDSH(1,"特批待审核"),
+	TPDSH(1,"特批待审核"),
 	/** 总裁通过 **/
-	ZCTG(2,"特批通过"),
+	TPTG(2,"特批通过"),
 	/** 总裁驳回 **/
-	ZCBH(3,"特批驳回"),
+	TPBH(3,"特批驳回"),
 	/** 董事长待审核 **/
 	DSZDSH(4,"董事长待审核"),
 	/** 董事长通过 **/

+ 3 - 2
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -95,7 +95,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	public Integer updateDistributionFinance(String orderNo, String financeId, Integer approval) {
 		// 先判断订单id和财务专员是否存在或者能够使用
 		//判断是不是特批的数据
-		if(approval != ApprovalNewState.ZCTG.getCode() && approval != ApprovalNewState.FTP.getCode()){//特批未通过 2 0
+		if(approval != ApprovalNewState.TPTG.getCode() && approval != ApprovalNewState.FTP.getCode()){//特批未通过 2 0
 			return -1;
 		}
 
@@ -547,9 +547,10 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		StringBuffer str= new StringBuffer();
 		boolean flag= false;
 		TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
-		if (new1.getApproval()==ApprovalNewState.ZCDSH.getCode()|| new1.getApproval()==ApprovalNewState.ZCBH.getCode()) {
+		if (new1.getApproval()==ApprovalNewState.TPDSH.getCode()|| new1.getApproval()==ApprovalNewState.TPBH.getCode()) {
 			if (order.getApprovalStatus()==0){
 				t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
+				t.setApproval(ApprovalNewState.TPTG.getCode());
 				flag=true;
 			}else {
 				aids.add(order.getApprovalAid());

+ 5 - 1
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -400,7 +400,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			if (dep.getApproval()==1){
 				nb.setProcessState(OrderChangeProcess.TPSH.getCode());
 			}else {
-				addOrderChangeLog("部门特批审核人未设置,系统自动通过", 2, nb.getOrderNo(), nb.getId(),date,AFTConstants.SUPERADMIN_ID);
+				addOrderChangeLog("公司/部门管理审核人员未设置,系统自动通过", 2, nb.getOrderNo(), nb.getId(),date,AFTConstants.SUPERADMIN_ID);
 				completeChange(remarks,nb);
 				return true;
 			}
@@ -1636,6 +1636,10 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		OutProcessName processName = newOrderChangeMapper.getProcessName(id, newOrderChange.getOrderNo());
 		if (processName.getSalesmanId().equals(AFTConstants.CAOJIN_AID)){
 			processName.setSpecial(1);
+		}else {
+			if (processName.getApprovalStatus()==0){
+				processName.setApprovalName("未设置特批审核人员");
+			}
 		}
 		return processName;
 	}

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

@@ -549,13 +549,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 			}
 			//特批逻辑处理
-			if (t2.getApproval()==ApprovalNewState.ZCBH.getCode()||
+			if (t2.getApproval()==ApprovalNewState.TPBH.getCode()||
 					t2.getApproval()==ApprovalNewState.DSZBH.getCode()||
-					t2.getApproval()==ApprovalNewState.ZCDSH.getCode()){
+					t2.getApproval()==ApprovalNewState.TPDSH.getCode()){
 				if (a.getId().equals(AFTConstants.CAOJIN_AID)){
 					t.setApproval(ApprovalNewState.DSZDSH.getCode());
 				}else {
-					t.setApproval(ApprovalNewState.ZCDSH.getCode());
+					t.setApproval(ApprovalNewState.TPDSH.getCode());
 				}
 			}
 			//生成流转
@@ -601,7 +601,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 		//驳回重新发起,需要刷新当天和今天
 		boolean newOrderFlag=false;
-		if (t2.getApproval().equals(ApprovalNewState.ZCBH.getCode()) ||
+		if (t2.getApproval().equals(ApprovalNewState.TPBH.getCode()) ||
 				t2.getApproval().equals(ApprovalNewState.DSZBH.getCode()) ||
 				t2.getOrderStatus().equals(OrderNewState.QDSHJJ.getCode()) ||
 				t2.getOrderStatus().equals(OrderNewState.YBH.getCode())) {
@@ -1469,7 +1469,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		tl.setOrderNo(orderNo);
 
 		if (confirm==2) {
-			if (t2.getApproval()==ApprovalNewState.ZCDSH.getCode())t.setApproval(ApprovalNewState.ZCTG.getCode());
+			if (t2.getApproval()==ApprovalNewState.TPDSH.getCode())t.setApproval(ApprovalNewState.TPTG.getCode());
 			else if (t2.getApproval()==ApprovalNewState.DSZDSH.getCode())t.setApproval(ApprovalNewState.DSZTG.getCode());
 				t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
 				OrganizationListOut oo=departmentMapper.selectAllById(t2.getOrderDep());
@@ -1484,7 +1484,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			tl.setProcess(OrderLogProcess.TP.getCode());
 			addOrderLog(tl,reason);
 		} else {
-			if (t2.getApproval()==ApprovalNewState.ZCDSH.getCode())t.setApproval(ApprovalNewState.ZCBH.getCode());
+			if (t2.getApproval()==ApprovalNewState.TPDSH.getCode())t.setApproval(ApprovalNewState.TPBH.getCode());
 			else if (t2.getApproval()==ApprovalNewState.DSZDSH.getCode())t.setApproval(ApprovalNewState.DSZBH.getCode());
 			t.setOrderStatus(OrderNewState.YBH.getCode());
 			t.setProcessStatus(ProcessStatus.YPYXY.getCode());

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/PushOrderService.java

@@ -31,7 +31,7 @@ public class PushOrderService {
         //流程状态 0-已派营销员,1-已派营销员管理员,2-已派财务管理员,3-已派财务专员,4-已派咨询师管理员,5-已部分派咨询师经理,6-已部全部派咨询师经理
         if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION) ){
             return t.getContractPictureUrl();
-        }else if(t.getApproval()==ApprovalNewState.ZCDSH.getCode()){
+        }else if(t.getApproval()==ApprovalNewState.TPDSH.getCode()){
             Department department = departmentMapper.selectByPrimaryKey(t.getOrderDep());
             if (department.getApproval()==1&&department.getApprovalAid().equals(TokenManager.getAdminId())){
                 return  t.getContractPictureUrl();