Browse Source

新增董事长特批审核

anderx 3 years ago
parent
commit
166a4f3e52

+ 3 - 0
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -116,6 +116,9 @@ public interface AdminMapper {
     int getCountById(String id);
     AdminListBo getDeptNameByAid(String id);
 
+    List<Admin> getAdminRoleNameList(String roleName);
+    List<Admin> getAdminRoleNamesList(List<String> list);
+
     List<Admin> getAdminRoleList(String roleName);
 
     int addAdminContacts(AdminContacts a);

+ 17 - 1
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -767,12 +767,28 @@
                                inner join user_role ur on a.id=ur.uid
     where a.id= #{_parameter,jdbcType=VARCHAR} and ( a.status != '注销' or a.status is null)
   </select>
-  <select id="getAdminRoleList" parameterType="java.lang.String" resultMap="BaseResultMap">
+  <select id="getAdminRoleNameList" parameterType="java.lang.String" resultMap="BaseResultMap">
     select a.id, a.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_name  = #{name,jdbcType=VARCHAR} and a.status='正常'
   </select>
 
+  <select id="getAdminRoleNamesList" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select a.id, a.name from admin a left join user_role b on a.id=b.uid
+                                     left join `role` c on b.rid=c.id
+    where a.status='正常'
+      and  c.role_name  in
+    <foreach close=")" collection="list" item="name" open="(" separator=",">
+      #{name}
+    </foreach>
+  </select>
+
+  <select id="getAdminRoleList" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select a.id, a.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  = #{type} and a.status='正常'
+  </select>
+
 
   <select id="getDeptNameByAid" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.AdminListBo">
     select a.id,a.name, d.name as departmentName,a.department_id departmentId,a.email,a.superior_id superiorId,a.open_id openId,

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

@@ -977,7 +977,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	and a.salesman_id = #{aid,jdbcType=VARCHAR}
   	</if>
     <if test="specially == 3">
-      and  a.order_status=2 and a.process_status != 99
+      and  a.order_status=2 and a.process_status in(3)
       <if test="approval ==0">
         and a.approval = 0
       </if>
@@ -1134,7 +1134,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	and a.salesman_id = #{aid,jdbcType=VARCHAR}
   	</if>
      <if test="specially == 3">
-       and  a.order_status=2 and a.process_status != 99
+       and  a.order_status=2 and a.process_status in(3)
        <if test="approval ==0">
          and a.approval = 0
        </if>

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

@@ -491,20 +491,26 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		if (new1.getApproval()==ApprovalNewState.ZCDSH.getCode()||
 				new1.getApproval()==ApprovalNewState.ZCBH.getCode()) {
 			t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
-			for (Admin admin : adminMapper.getAdminRoleList("总裁")) {
+			List<String> names=new ArrayList<>();
+			names.add("总裁");
+			names.add("总裁助理");
+			for (Admin admin : adminMapper.getAdminRoleNamesList(names)) {
 				aids.add(admin.getId());
 			}
 		}else if (new1.getApproval()==ApprovalNewState.DSZDSH.getCode()||
 				new1.getApproval()==ApprovalNewState.DSZBH.getCode()) {
 			t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
-			for (Admin admin : adminMapper.getAdminRoleList("董事长")) {
+			List<String> names=new ArrayList<>();
+			names.add("董事长");
+			names.add("董事长助理");
+			for (Admin admin : adminMapper.getAdminRoleNamesList(names)) {
 				aids.add(admin.getId());
 			}
 		}else  {
 			t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
 			OrganizationListOut oo=departmentMapper.selectAllById(new1.getOrderDep());
 			t.setFinanceId(oo.getFinanceId());
-			for (Admin admin : adminMapper.getAdminRoleList("咨询师管理员")) {
+			for (Admin admin : adminMapper.getAdminRoleNameList("咨询师管理员")) {
 				aids.add(admin.getId());
 			}
 		}

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

@@ -389,7 +389,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			alist.addAll(tOrderTaskMapper.listNameByDepAndName(o.getOrderNo(),1));
 			break;
 		case 4:
-			for (Admin admin : adminMapper.getAdminRoleList("咨询师管理员")) {
+			for (Admin admin : adminMapper.getAdminRoleNameList("咨询师管理员")) {
 				alist.add(admin.getId());
 			}
 			break;
@@ -397,7 +397,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			alist.add(o.getFinanceId());
 			break;
 		case 6:
-			for (Admin admin : adminMapper.getAdminRoleList("财务管理员")) {
+			for (Admin admin : adminMapper.getAdminRoleNameList("财务管理员")) {
 				alist.add(admin.getId());
 			}
 			break;
@@ -405,7 +405,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			if(nb.getStatus()==2) {
 				alist.add(o.getFinanceId());
 			}else {
-				for (Admin admin : adminMapper.getAdminRoleList("总裁")) {
+				for (Admin admin : adminMapper.getAdminRoleNameList("总裁")) {
 					alist.add(admin.getId());
 				}
 			}
@@ -414,7 +414,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			if(nb.getStatus()==2) {
 				alist.add(o.getFinanceId());
 			}else {
-				for (Admin admin : adminMapper.getAdminRoleList("运营决策者")) {
+				for (Admin admin : adminMapper.getAdminRoleNameList("运营决策者")) {
 					alist.add(admin.getId());
 				}
 			}

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

@@ -89,7 +89,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 				if(o.getApproval()==0) {
 					aids.add(departmentMapper.selectByPrimaryKey(t.getOrderDep()).getFinanceId());
 				}else {
-					for (Admin admin : adminMapper.getAdminRoleList("湖南特批开票")) {
+					for (Admin admin : adminMapper.getAdminRoleNameList("湖南特批开票")) {
 						aids.add(admin.getId());
 					}
 				}

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

@@ -718,8 +718,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			}
 		}
 		if (in.getSpecially()==3){
-			if (TokenManager.hasRole(AFTConstants.CED))params.put("manageType",0);
-			else if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_AUDITOR))params.put("manageType",1);
+			if (TokenManager.hasRole(AFTConstants.CED)){
+				params.put("manageType",0);
+			}else if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_AUDITOR)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
+				params.put("manageType",1);
+			}else {
+				params.put("manageType",0);
+			}
 		}
 		params.put("specially", in.getSpecially());
 		if (StringUtils.isNotBlank(in.getName())) {
@@ -873,7 +878,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 					//如果是转的暂时不删除外包信息
 					aids.add(departmentMapper.selectByPrimaryKey(t2.getOrderDep()).getFinanceId());
 				} else if(outsource==1) {
-					for (Admin admin : adminMapper.getAdminRoleList("外包审核员")) {
+					for (Admin admin : adminMapper.getAdminRoleNameList("外包审核员")) {
 						aids.add(admin.getId());
 					}
 					t.setProcessStatus(ProcessStatus.YPWBSH.getCode());
@@ -1214,7 +1219,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
 				OrganizationListOut oo=departmentMapper.selectAllById(t2.getOrderDep());
 				t.setFinanceId(oo.getFinanceId());
-				for (Admin admin : adminMapper.getAdminRoleList("咨询师管理员")) {
+				for (Admin admin : adminMapper.getAdminRoleNameList("咨询师管理员")) {
 					aids.add(admin.getId());
 				}
 			type=NoticeStatus.ORDER_APPROVA_YES.getCode();
@@ -1615,7 +1620,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 		if (o.getStartType()==0) {
 			List<String> aids = new ArrayList<>();
-			for (Admin admin : adminMapper.getAdminRoleList("外包审核员")) {
+			for (Admin admin : adminMapper.getAdminRoleNameList("外包审核员")) {
 				aids.add(admin.getId());
 			}
 			TOrderNew t2= checkDeleteSign(o.getOrderNo());

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

@@ -1275,7 +1275,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				if (result==1) {
 					admins = MemberEnd(b);
 				}else{
-					admins=adminMapper.getAdminRoleList("总裁");
+					admins=adminMapper.getAdminRoleNameList("总裁");
 				}
 			} else if(shiroType==1){
 				sb=sb.append("特批已通过。");
@@ -1309,7 +1309,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	 */
 	private List<Admin> MemberEnd(TOrderNewBo b) {
 		List<Admin> admins;
-		admins=adminMapper.getAdminRoleList("咨询师管理员");
+		admins=adminMapper.getAdminRoleNameList("咨询师管理员");
 		Admin admin = new Admin();
 		admin.setId(b.getSalesmanId());
 		admins.add(admin);