feat: 平安银行下架

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaAgentServiceImpl.java

@@ -247,14 +247,14 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 
 		IPage<WmDaAgent> wmDaAgentIPage = wmDaAgentMapper.selectWmManagementPage(page, wmDaAgent);
 
-		wmDaAgentIPage.getRecords().forEach(agent ->{
-
-			Map<String, Integer> collect = sysDeptSubMapper.selectList(Wrappers.<SysDeptSub>lambdaQuery().eq(SysDeptSub::getDeptId, agent.getDeptId()))
-					.stream().collect(Collectors.toMap(SysDeptSub::getSubjectType, SysDeptSub::getSubjectChannel));
-
-			agent.setSubjectTypeAndChannel(collect);
-
-		});
+		// wmDaAgentIPage.getRecords().forEach(agent ->{
+		//
+		// 	Map<String, Integer> collect = sysDeptSubMapper.selectList(Wrappers.<SysDeptSub>lambdaQuery().eq(SysDeptSub::getDeptId, agent.getDeptId()))
+		// 			.stream().collect(Collectors.toMap(SysDeptSub::getSubjectType, SysDeptSub::getSubjectChannel));
+		//
+		// 	agent.setSubjectTypeAndChannel(collect);
+		//
+		// });
 
 
 
@@ -319,23 +319,23 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 				sysDeptService.save(sysDept);
 			}
 
-			for (Map.Entry<String, Integer> entry : wmDaAgent.getSubjectTypeAndChannel().entrySet()){
-				SysDeptSub deptSub = new SysDeptSub();
-				deptSub.setDeptId(sysDept.getDeptId());
-				deptSub.setSubjectType(entry.getKey());
-				deptSub.setSubjectChannel(entry.getValue());
-				deptSub.setUpdateTime(LocalDateTime.now());
-				deptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
-				sysDeptSubMapper.insert(deptSub);
-			}
-
-			// for (String subType : wmDaAgent.getSubjectType()) {
+			// for (Map.Entry<String, Integer> entry : wmDaAgent.getSubjectTypeAndChannel().entrySet()){
 			// 	SysDeptSub deptSub = new SysDeptSub();
 			// 	deptSub.setDeptId(sysDept.getDeptId());
-			// 	deptSub.setSubjectType(subType);
+			// 	deptSub.setSubjectType(entry.getKey());
+			// 	deptSub.setSubjectChannel(entry.getValue());
+			// 	deptSub.setUpdateTime(LocalDateTime.now());
 			// 	deptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
 			// 	sysDeptSubMapper.insert(deptSub);
 			// }
+
+			for (String subType : wmDaAgent.getSubjectType()) {
+				SysDeptSub deptSub = new SysDeptSub();
+				deptSub.setDeptId(sysDept.getDeptId());
+				deptSub.setSubjectType(subType);
+				deptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
+				sysDeptSubMapper.insert(deptSub);
+			}
 			/**
 			 * @Modify: end
 			*/

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaDrugEntServiceImpl.java

@@ -81,17 +81,25 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 			 */
 			if(sysDeptService.saveDept(sysDept) > 0){
 
-				Map<String, Integer> subjectTypeAndChannel = entity.getSubjectTypeAndChannel();
-
-				for (Map.Entry<String, Integer> entry : subjectTypeAndChannel.entrySet()){
+				// Map<String, Integer> subjectTypeAndChannel = entity.getSubjectTypeAndChannel();
+
+				// for (Map.Entry<String, Integer> entry : subjectTypeAndChannel.entrySet()){
+				// 	SysDeptSub deptSub = new SysDeptSub();
+				// 	deptSub.setDeptId(sysDept.getDeptId());
+				// 	deptSub.setSubjectChannel(entry.getValue());
+				// 	deptSub.setSubjectType(entry.getKey());
+				// 	deptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
+				// 	deptSub.setUpdateTime(sysDept.getCreateTime());
+				// 	sysDeptSubMapper.insert(deptSub);
+				//
+				// }
+
+				for (String subType : entity.getSubjectType()) {
 					SysDeptSub deptSub = new SysDeptSub();
 					deptSub.setDeptId(sysDept.getDeptId());
-					deptSub.setSubjectChannel(entry.getValue());
-					deptSub.setSubjectType(entry.getKey());
+					deptSub.setSubjectType(subType);
 					deptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
-					deptSub.setUpdateTime(sysDept.getCreateTime());
 					sysDeptSubMapper.insert(deptSub);
-
 				}
 
 				return true;
@@ -203,15 +211,15 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 	public IPage<List<WmDaDrugEnt>> selectPage(Page page, WmDaDrugEnt wmDaDrugEnt) {
 		IPage<List<WmDaDrugEnt>> listIPage = wmDaDrugEntMapper.selectPage(page, wmDaDrugEnt);
 
-		listIPage.getRecords().forEach(entList -> {
-
-			entList.forEach( ent -> {
-				Map<String, Integer> collect = sysDeptSubMapper.selectList(Wrappers.<SysDeptSub>lambdaQuery().eq(SysDeptSub::getDeptId, ent.getDeptId()))
-						.stream()
-						.collect(Collectors.toMap(SysDeptSub::getSubjectType, SysDeptSub::getSubjectChannel));
-				ent.setSubjectTypeAndChannel(collect);
-			});
-		});
+		// listIPage.getRecords().forEach(entList -> {
+		//
+		// 	entList.forEach( ent -> {
+		// 		Map<String, Integer> collect = sysDeptSubMapper.selectList(Wrappers.<SysDeptSub>lambdaQuery().eq(SysDeptSub::getDeptId, ent.getDeptId()))
+		// 				.stream()
+		// 				.collect(Collectors.toMap(SysDeptSub::getSubjectType, SysDeptSub::getSubjectChannel));
+		// 		ent.setSubjectTypeAndChannel(collect);
+		// 	});
+		// });
 
 		return listIPage;
 	}