Browse Source

通知修改

anderx 3 years ago
parent
commit
45887109fa

+ 1 - 1
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -303,7 +303,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 
 	@Override
 	public List<Admin> getAdminRoleList(String roleName) {
-		return adminMapper.getAdminRoleList(roleName);
+		return adminMapper.getAdminRoleNameList(roleName);
 	}
 
 	@Override

+ 4 - 1
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -119,7 +119,8 @@ public interface AdminMapper {
     List<Admin> getAdminRoleNameList(String roleName);
     List<Admin> getAdminRoleNamesList(List<String> list);
 
-    List<Admin> getAdminRoleList(String roleName);
+    List<Admin> getAdminRoleTypesList(List<String> list);
+    List<Admin> getAdminRoleTypeList(String roleType);
 
     int addAdminContacts(AdminContacts a);
 
@@ -147,4 +148,6 @@ public interface AdminMapper {
     List<String> getFinanceDep(String aid);
 
     List<String> getLowerFinanceDep(String aid);
+
+
 }

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

@@ -783,10 +783,20 @@
     </foreach>
   </select>
 
-  <select id="getAdminRoleList" parameterType="java.lang.String" resultMap="BaseResultMap">
+  <select id="getAdminRoleTypeList" 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='正常'
+    where c.role_type  = #{roleType} and a.status='正常'
+  </select>
+
+  <select id="getAdminRoleTypesList" 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_type  in
+    <foreach close=")" collection="list" item="type" open="(" separator=",">
+      #{type}
+    </foreach>
   </select>
 
 

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

@@ -491,26 +491,28 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		if (new1.getApproval()==ApprovalNewState.ZCDSH.getCode()||
 				new1.getApproval()==ApprovalNewState.ZCBH.getCode()) {
 			t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
-			List<String> names=new ArrayList<>();
-			names.add("总裁");
-			names.add("总裁助理");
-			for (Admin admin : adminMapper.getAdminRoleNamesList(names)) {
+			List<String> types=new ArrayList<>();
+			//总裁加助理
+			types.add(AFTConstants.CED);
+			types.add(AFTConstants.CED_ASSISTANT);
+			for (Admin admin : adminMapper.getAdminRoleTypesList(types)) {
 				aids.add(admin.getId());
 			}
 		}else if (new1.getApproval()==ApprovalNewState.DSZDSH.getCode()||
 				new1.getApproval()==ApprovalNewState.DSZBH.getCode()) {
 			t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
-			List<String> names=new ArrayList<>();
-			names.add("董事长");
-			names.add("董事长助理");
-			for (Admin admin : adminMapper.getAdminRoleNamesList(names)) {
+			List<String> types=new ArrayList<>();
+			//董事长加助理
+			types.add(AFTConstants.APPROVAL_DECISION);
+			types.add(AFTConstants.APPROVAL_DECISION_AUDITOR);
+			for (Admin admin : adminMapper.getAdminRoleTypesList(types)) {
 				aids.add(admin.getId());
 			}
 		}else  {
 			t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
 			OrganizationListOut oo=departmentMapper.selectAllById(new1.getOrderDep());
 			t.setFinanceId(oo.getFinanceId());
-			for (Admin admin : adminMapper.getAdminRoleNameList("咨询师管理员")) {
+			for (Admin admin : adminMapper.getAdminRoleTypeList(AFTConstants.TECH_ADMIN)) {
 				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.getAdminRoleNameList("咨询师管理员")) {
+			for (Admin admin : adminMapper.getAdminRoleTypeList(AFTConstants.TECH_ADMIN)) {
 				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.getAdminRoleNameList("财务管理员")) {
+			for (Admin admin : adminMapper.getAdminRoleTypeList(AFTConstants.FINANCE_ADMIN)) {
 				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.getAdminRoleNameList("总裁")) {
+				for (Admin admin : adminMapper.getAdminRoleTypeList(AFTConstants.CED)) {
 					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.getAdminRoleNameList("运营决策者")) {
+				for (Admin admin : adminMapper.getAdminRoleTypeList(AFTConstants.APPROVAL_DECISION)) {
 					alist.add(admin.getId());
 				}
 			}

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

@@ -1219,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.getAdminRoleNameList("咨询师管理员")) {
+				for (Admin admin : adminMapper.getAdminRoleTypeList(AFTConstants.TECH_ADMIN)) {
 					aids.add(admin.getId());
 				}
 			type=NoticeStatus.ORDER_APPROVA_YES.getCode();

+ 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.getAdminRoleNameList("总裁");
+					admins=adminMapper.getAdminRoleTypeList(AFTConstants.CED);
 				}
 			} 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.getAdminRoleNameList("咨询师管理员");
+		admins=adminMapper.getAdminRoleTypeList(AFTConstants.TECH_ADMIN);
 		Admin admin = new Admin();
 		admin.setId(b.getSalesmanId());
 		admins.add(admin);