anderx 2 роки тому
батько
коміт
741f885718

+ 6 - 5
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -21,13 +21,15 @@ public class AFTConstants {
 	/**	特批决策者 */
 	public static final String	APPROVAL_DECISION					= "99999";
 	/**	特批决策者审核 */
-	public static final String	APPROVAL_DECISION_ASSISTANT				= "99989";
+	public static final String	APPROVAL_DECISION_ASSISTANT			= "99989";
 	/**	总裁 */
 	public static final String	CED									= "99998";
-	/**	总裁助理 */
-	public static final String	CED_ASSISTANT						= "99988";
+	/** 省内特批 */
+	public static final String  VICE_CED	 	             	    = "99996";
 	/**	集团副总 */
 	public static final String	VICE_CEO							= "99997";
+	/**	总裁助理 */
+	public static final String	CED_ASSISTANT						= "99988";
 	/** 技术管理员 */
 	public static final String  TECH_ADMIN                          = "9998";
 	/**	财务管理员*/
@@ -48,8 +50,7 @@ public class AFTConstants {
 	public static final String  PERSONNEL_AUDITOR              	  	= "9990";
 	/** 运营管理 */
 	public static final String  OPERATION_MANAGER		            = "9989";
-	/** 省内特批 */
-	public static final String  HN_APPROVAL 	             	    = "9988";
+
 	/**	湖南特批开票*/
 	public static final String  HN_APPROVED							= "9987";
 	/** 渠道总监 */

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

@@ -1041,9 +1041,12 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
             <if test="manageType ==0">
             (1)
             </if>
-          <if test="manageType ==1">
-            (4)
-          </if>
+        <if test="manageType ==1">
+          (4)
+        </if>
+        <if test="manageType ==1">
+          (7)
+        </if>
       </if>
       <if test="approval ==2">
         and a.approval in
@@ -1053,6 +1056,9 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
         <if test="manageType ==1">
           (5)
         </if>
+        <if test="manageType ==1">
+          (8)
+        </if>
       </if>
     </if>
   	  <if test="specially !=3 ">
@@ -1060,13 +1066,13 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
           and a.approval = 0
         </if>
         <if test="approval ==1">
-          and a.approval in (1,4)
+          and a.approval in (1,4,7)
         </if>
         <if test="approval ==2">
-          and a.approval in (2,5)
+          and a.approval in (2,5,8)
         </if>
         <if test="approval ==4">
-          and a.approval in (1,2,4,5)
+          and a.approval in (1,2,4,5,7,8)
         </if>
       </if>
   	<if test="specially == 4">
@@ -1216,6 +1222,9 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
          <if test="manageType ==1">
            (4)
          </if>
+         <if test="manageType ==1">
+           (7)
+         </if>
        </if>
        <if test="approval ==2">
          and a.approval in
@@ -1225,20 +1234,23 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
          <if test="manageType ==1">
            (5)
          </if>
+         <if test="manageType ==1">
+           (8)
+         </if>
        </if>
      </if>
-     <if test="specially !=3">
+     <if test="specially !=3 ">
        <if test="approval ==0">
          and a.approval = 0
        </if>
        <if test="approval ==1">
-         and a.approval in (1,4)
+         and a.approval in (1,4,7)
        </if>
        <if test="approval ==2">
-         and a.approval in (2,5)
+         and a.approval in (2,5,8)
        </if>
        <if test="approval ==4">
-         and a.approval in (1,2,4,5)
+         and a.approval in (1,2,4,5,7,8)
        </if>
      </if>
   	<if test="specially == 4">
@@ -2085,20 +2097,24 @@ 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,tp.name zc, zxsgly.name zxsgly,dsz.name dsz
+        yxgly.name yxgly,d.name cwzy,zc.name zc,fzc.name fzc, zxsgly.name zxsgly,dsz.name dsz
     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 (select a.department_id depId,group_concat(a.name) name
+    left join admin mg on b.manager_id =mg.id left join department c on a.order_dep =c.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
-   left join (select order_no ,group_concat(aname)name from t_order_examine WHERE type=0 group by order_no ) d on a.order_no=d.order_no
-   left join (select a.id,a.province ,if(a.province=11,b.name,c.name)name from department a left join (select 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 in ('9988')
-        and a.status ='0' )b  on 1=1 left join (select 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 in ('9986') and a.status ='0' )c on 1=1 ) tp on 1=1
-   left join (select 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
+     left join (select order_no ,group_concat(aname)name from t_order_examine WHERE type=0 group by order_no ) d on a.order_no=d.order_no
+     left join (select 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 in ('99998','99988') and a.status ='0' ) zc on 1=1
+     left join (select 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 in ('99996') and a.status ='0' ) fzc on 1=1
+     left join (select 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 in ('99999','99989') and a.status ='0' ) dsz on 1=1
-   left join (select 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
+     left join (select 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 in ('9998') and a.status ='0' ) zxsgly on 1=1
     where a.order_no = #{orderNo}
   </select>

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

@@ -10,8 +10,18 @@ public class OrderProcessName {
     private String yxgly;
     private String cwzy;
     private String zc;
+    private String fzc;
     private String zxsgly;
     private String dsz;
+
+    public String getFzc() {
+        return fzc;
+    }
+
+    public void setFzc(String fzc) {
+        this.fzc = fzc;
+    }
+
     public String getYxjl() {
         return yxjl;
     }

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

@@ -12,13 +12,18 @@ public enum ApprovalNewState {
 	ZCTG(2,"总裁通过"),
 	/** 总裁驳回 **/
 	ZCBH(3,"总裁驳回"),
-
 	/** 董事长待审核 **/
 	DSZDSH(4,"董事长待审核"),
 	/** 董事长通过 **/
 	DSZTG(5,"董事长通过"),
 	/** 董事长驳回 **/
 	DSZBH(6,"董事长驳回"),
+	/** 总裁待审核 **/
+	FZCDSH(7,"副总裁待审核"),
+	/** 总裁通过 **/
+	FZCTG(8,"副总裁通过"),
+	/** 总裁驳回 **/
+	FZCBH(9,"副总裁驳回"),
 	/** 无效 **/
 	INVALID(10, "INVALID");
 

+ 11 - 4
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -546,8 +546,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		List<String> aids = new ArrayList<>();
 		StringBuffer str= new StringBuffer();
 		TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
-		if (new1.getApproval()==ApprovalNewState.ZCDSH.getCode()||
-				new1.getApproval()==ApprovalNewState.ZCBH.getCode()) {
+		if (new1.getApproval()==ApprovalNewState.ZCDSH.getCode()|| new1.getApproval()==ApprovalNewState.ZCBH.getCode()) {
 			t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
 			List<String> types=new ArrayList<>();
 			//总裁加助理
@@ -557,8 +556,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 				aids.add(admin.getId());
 				str=str.append(admin.getName()).append(",");
 			}
-		}else if (new1.getApproval()==ApprovalNewState.DSZDSH.getCode()||
-				new1.getApproval()==ApprovalNewState.DSZBH.getCode()) {
+		}else if (new1.getApproval()==ApprovalNewState.DSZDSH.getCode()|| new1.getApproval()==ApprovalNewState.DSZBH.getCode()) {
 			t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
 			List<String> types=new ArrayList<>();
 			//董事长加助理
@@ -568,6 +566,15 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 				aids.add(admin.getId());
 				str=str.append(admin.getName()).append(",");
 			}
+		}else if (new1.getApproval()==ApprovalNewState.FZCDSH.getCode()|| new1.getApproval()==ApprovalNewState.FZCBH.getCode()) {
+			t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
+			List<String> types=new ArrayList<>();
+			//董事长加助理
+			types.add(AFTConstants.VICE_CED);
+			for (Admin admin : adminMapper.getAdminRoleTypesList(types)) {
+				aids.add(admin.getId());
+				str=str.append(admin.getName()).append(",");
+			}
 		}else  {
 			t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
 			//设置发送邮件标识

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

@@ -552,13 +552,20 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				if (a.getId().equals(AFTConstants.CAOJIN_AID)){
 					t.setApproval(ApprovalNewState.DSZDSH.getCode());
 				}else {
-					t.setApproval(ApprovalNewState.ZCDSH.getCode());
+					Department dep = departmentMapper.selectByPrimaryKey(t2.getOrderDep());
+					if(dep.getProvince()==11){
+						t.setApproval(ApprovalNewState.FZCDSH.getCode());
+					}else {
+						t.setApproval(ApprovalNewState.ZCDSH.getCode());
+					}
 				}
 			}
 			if (t2.getApproval()==ApprovalNewState.ZCBH.getCode()){
 				t.setApproval(ApprovalNewState.ZCDSH.getCode());
 			}else if (t2.getApproval()==ApprovalNewState.DSZBH.getCode()){
 				t.setApproval(ApprovalNewState.DSZDSH.getCode());
+			}else if (t2.getApproval()== ApprovalNewState.FZCBH.getCode()){
+				t.setApproval(ApprovalNewState.FZCDSH.getCode());
 			}
 			//生成流转
 			if (StringUtils.isBlank(t2.getContractNo())) {
@@ -937,10 +944,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			}
 		}
 		if (in.getSpecially()==3){
-			if (TokenManager.hasRole(AFTConstants.CED)){
+			if (TokenManager.hasRole(AFTConstants.CED)||TokenManager.hasRole(AFTConstants.CED_ASSISTANT)){
 				params.put("manageType",0);
 			}else if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
 				params.put("manageType",1);
+			}else if (TokenManager.hasRole(AFTConstants.VICE_CED)){
+				params.put("manageType",2);
 			}else {
 				params.put("manageType",0);
 			}