Merge branch 'feat-20230829-newtasktypes'

db/v2.0/230829.sql

@@ -0,0 +1,8 @@
+alter table wm_task_type_sub_cate2
+    modify sub_cate varchar(50) not null comment '次级分类';
+
+alter table wm_task_sub_percent_rule
+    modify sub_cate varchar(50) not null comment '次级分类';
+
+alter table wm_task_type_sub_cate2
+    add parent_id varchar(10) null comment '对应wm_task_type的parent_id' after sub_cate;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/constant/UpmsType.java

@@ -87,6 +87,7 @@ public final class UpmsType {
 		PRODUCT_PROMOTION("PRODUCT_PROMOTION", TaskCategory.FORWARD, "产品推广"),
 		MARKET_INFO_COLLECTION("MARKET_INFO_COLLECTION", TaskCategory.MARKET_INFO_COLLECTION, "市场信息搜集"),
 		SPECIAL_SERVICE("SPECIAL_SERVICE", null, "专项服务"),
+		BUSINESS_COMPANY_CUSTOMER_MANAGEMENT("BUSINESS_COMPANY_CUSTOMER_MANAGEMENT", null, "商业公司客户管理"),
 		TASK_TYPE_CONFIG("TASK_TYPE_CONFIG", null, "任务类型配置");
 
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -254,6 +254,11 @@ public class ApiController {
 		} else if ("47".equals(taskTypeId) || "48".equals(taskTypeId) || "49".equals(taskTypeId) || "50".equals(taskTypeId)) {
 			// 库存调研、竞品调研、培训、使用情况调查 都取47
 			connfigMap = getTaskContentConfigByTaskTypeId("47");
+		} else if ("56".equals(taskTypeId) || "57".equals(taskTypeId)) {
+			// 56首营管理-诊所
+			connfigMap.put("56", getTaskContentConfigByTaskTypeId("56"));
+			// 57首营管理-药店
+			connfigMap.put("57", getTaskContentConfigByTaskTypeId("57"));
 		} else {
 			connfigMap = getTaskContentConfigByTaskTypeId(taskTypeId);
 		}
@@ -480,6 +485,10 @@ public class ApiController {
 			// 库存调研、竞品调研、培训、使用情况调查
 			taskTypeId = "47";
 		}
+		else if ("51".equals(taskTypeId) || "52".equals(taskTypeId) || "53".equals(taskTypeId)) {
+			// 信用管理A、信用管理B、信用管理C
+			taskTypeId = "51";
+		}
 
 		queryConn.setTaskTypeId(taskTypeId);
 		queryConn.setDelFlag("0");

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -1964,83 +1964,81 @@ public class WmScorePackageController {
 					wmScoreTaskType.setType("1");
 					wmScoreTaskType.setTaskTypeId(wmScoreTaskTypes.getTaskTypeId());
 					wmScoreTaskTypess.add(wmScoreTaskType);
-					wmScoreTaskTypeService.deleteByScoreId(wmScorePackage.getId());
-					wmScoreTaskTypeService.batchInsertType(wmScoreTaskTypess);
 				} else if (!"".equals(wmScorePackage.getRelationScoreId()) && sysDept1.getLevel() == 3) {
 					wmScoreTaskType.setScoreId(wmScorePackage.getId());
 					wmScoreTaskType.setType("1");
 					wmScoreTaskType.setTaskTypeId(wmScoreTaskTypes.getTaskTypeId());
 					wmScoreTaskTypess.add(wmScoreTaskType);
-					wmScoreTaskTypeService.deleteByScoreId(wmScoreTaskType.getScoreId());
-					wmScoreTaskTypeService.batchInsertType(wmScoreTaskTypess);
 				}
 			}
+			wmScoreTaskTypeService.deleteByScoreId(wmScorePackage.getId());
+			wmScoreTaskTypeService.batchInsertType(wmScoreTaskTypess);
 		}
 		if (isAnswer) {
 
-			if (SecurityUtils.getRoles().contains(4) || SecurityUtils.getRoles().contains(3)) {
-
-				//赋值typeid
-//				SysDept sysDept1 = new SysDept();
-//				sysDept1.setDeptId(SecurityUtils.getUser().getDeptId());
-//				SysDept sysDeptTypeId = sysDeptMapper.selectDeptId(sysDept1);
-
-				SysDept sysDeptTypeId = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
-
-				if (sysDeptTypeId.getLevel() == 2 && wmScorePackage.getDeptId()
-						.equals(String.valueOf(sysDeptTypeId.getDeptId()))) {
-					wmScorePackage.setTypeid("0");
-				} else if (sysDeptTypeId.getLevel() == 2) {
-					wmScorePackage.setTypeid("1");
-				} else if (sysDeptTypeId.getLevel() == 3 && wmScorePackage.getDeptId()
-						.equals(String.valueOf(sysDeptTypeId.getDeptId()))) {
-					wmScorePackage.setTypeid("1");
-				} else if (sysDeptTypeId.getLevel() == 3) {
-					wmScorePackage.setTypeid("2");
-				}
-				wmScorePackageService.updateById(wmScorePackage);
-				WmScorePackage queryWm = new WmScorePackage();
-
-//				SysDept sysDept4 = new SysDept();
-//				sysDept4.setDeptId(SecurityUtils.getUser().getDeptId());
-//				SysDept sysDept3 = sysDeptMapper.selectDeptId(sysDept4);
-
-				SysDept sysDept3 = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
-				if (sysDept3.getLevel() == 3) {
-					queryWm.setDeptId(SecurityUtils.getUser().getDeptId() + "");
-				} else {
-					queryWm.setId("-1");
-				}
-
-				List<WmScorePackage> wmScorePackageList = wmScorePackageService.list(Wrappers.query(queryWm));
-				WmScorePackage wmId = wmScorePackageService.getById(wmScorePackage.getId());
-				if (wmScorePackageList.size() > 0) {
-					for (WmScorePackage wms : wmScorePackageList) {
-						if (wms.getId().equals(wmId.getRelationScoreId())) {
-							wms.setKfpjf(new Double(Math.ceil(wms.getKfpjf() - wmId.getScore())).intValue());
-							wmScorePackage.setPackageIsConduct("0");
-							wmScorePackage.setPackageType1(wmScorePackage.getPackageType1());
-							//判断积分包是否被发放
-							List<WmScorePackage> wmScorePackages = wmScorePackageService.selectRelationScoreId(wmScorePackage
-									.getId());
-							if (wmScorePackages.size() > 0) {
-								for (WmScorePackage wmScorePackage1 : wmScorePackages) {
-									if (wmScorePackage1.getId().equals(wmScorePackage.getRelationScoreId())) {
-										wms.setPackageIsConduct("1");
-										break;
-									} else {
-										wms.setPackageIsConduct("0");
-									}
-								}
-							}
-						}
-					}
-				}
-
-				wmScorePackageService.updateBatchById(wmScorePackageList);
-
-
-			}
+//			if (SecurityUtils.getRoles().contains(4) || SecurityUtils.getRoles().contains(3)) {
+//
+//				//赋值typeid
+////				SysDept sysDept1 = new SysDept();
+////				sysDept1.setDeptId(SecurityUtils.getUser().getDeptId());
+////				SysDept sysDeptTypeId = sysDeptMapper.selectDeptId(sysDept1);
+//
+//				SysDept sysDeptTypeId = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
+//
+//				if (sysDeptTypeId.getLevel() == 2 && wmScorePackage.getDeptId()
+//						.equals(String.valueOf(sysDeptTypeId.getDeptId()))) {
+//					wmScorePackage.setTypeid("0");
+//				} else if (sysDeptTypeId.getLevel() == 2) {
+//					wmScorePackage.setTypeid("1");
+//				} else if (sysDeptTypeId.getLevel() == 3 && wmScorePackage.getDeptId()
+//						.equals(String.valueOf(sysDeptTypeId.getDeptId()))) {
+//					wmScorePackage.setTypeid("1");
+//				} else if (sysDeptTypeId.getLevel() == 3) {
+//					wmScorePackage.setTypeid("2");
+//				}
+//				wmScorePackageService.updateById(wmScorePackage);
+//				WmScorePackage queryWm = new WmScorePackage();
+//
+////				SysDept sysDept4 = new SysDept();
+////				sysDept4.setDeptId(SecurityUtils.getUser().getDeptId());
+////				SysDept sysDept3 = sysDeptMapper.selectDeptId(sysDept4);
+//
+//				SysDept sysDept3 = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
+//				if (sysDept3.getLevel() == 3) {
+//					queryWm.setDeptId(SecurityUtils.getUser().getDeptId() + "");
+//				} else {
+//					queryWm.setId("-1");
+//				}
+//
+//				List<WmScorePackage> wmScorePackageList = wmScorePackageService.list(Wrappers.query(queryWm));
+//				WmScorePackage wmId = wmScorePackageService.getById(wmScorePackage.getId());
+//				if (wmScorePackageList.size() > 0) {
+//					for (WmScorePackage wms : wmScorePackageList) {
+//						if (wms.getId().equals(wmId.getRelationScoreId())) {
+//							wms.setKfpjf(new Double(Math.ceil(wms.getKfpjf() - wmId.getScore())).intValue());
+//							wmScorePackage.setPackageIsConduct("0");
+//							wmScorePackage.setPackageType1(wmScorePackage.getPackageType1());
+//							//判断积分包是否被发放
+//							List<WmScorePackage> wmScorePackages = wmScorePackageService.selectRelationScoreId(wmScorePackage
+//									.getId());
+//							if (wmScorePackages.size() > 0) {
+//								for (WmScorePackage wmScorePackage1 : wmScorePackages) {
+//									if (wmScorePackage1.getId().equals(wmScorePackage.getRelationScoreId())) {
+//										wms.setPackageIsConduct("1");
+//										break;
+//									} else {
+//										wms.setPackageIsConduct("0");
+//									}
+//								}
+//							}
+//						}
+//					}
+//				}
+//
+//				wmScorePackageService.updateBatchById(wmScorePackageList);
+//
+//
+//			}
 		}
 
 		if (!relatedScoreId) {
@@ -2068,6 +2066,7 @@ public class WmScorePackageController {
 	 * @param wmScorePackage
 	 * @return
 	 */
+	@SysLog("终止积分包(大包)")
 	@PostMapping("/stopWmScorePackage")
 	@Transactional(rollbackFor = Exception.class)
 	public R stopWmScorePackage(@RequestBody WmScorePackage wmScorePackage) {
@@ -2380,265 +2379,261 @@ public class WmScorePackageController {
 			}
 
 		}
-		if (SecurityUtils.getRoles().contains(3) || SecurityUtils.getRoles().contains(4)) {
-
-			//药企规则ID
-//			SysDept sysDeptRule = new SysDept();
-//			sysDeptRule.setDeptId(SecurityUtils.getUser().getDeptId());
-//			SysDept sysDeptRuleId = sysDeptMapper.selectDeptId(sysDeptRule);
-
-			SysDept sysDeptRuleId = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
-
-			if (sysDeptRuleId.getLevel() == 2) {
-				WmDaDrugEnt wmDaDrugEntRuleId = wmDaDrugEntService.selectByDeptId(sysDeptRuleId.getDeptId());
-				if (wmScorePackage.getAcceptSug().equals(wmDaDrugEntRuleId.getId())) {
-					wmScorePackage.setRuleId(wmScorePackage.getAcceptSug());
-					wmScorePackage.setDrugEntId(wmDaDrugEntRuleId.getId());
-				} else if (!wmScorePackage.getAcceptSug().equals(wmDaDrugEntRuleId.getId())) {
-					wmScorePackage.setRuleId(wmDaDrugEntRuleId.getId() + wmScorePackage.getAcceptSug());
-					wmScorePackage.setDrugEntId(wmDaDrugEntRuleId.getId());
-				}
-			} else if (sysDeptRuleId.getLevel() == 3) {
-				//一级cso规则ID
-//				WmScorePackage wmScorePackageRule = new WmScorePackage();
-//				wmScorePackageRule.setDelFlag("0");
-//				List<WmScorePackage> wmScorePackageRuleList = wmScorePackageService.list(Wrappers.query(wmScorePackageRule));
-//				for (WmScorePackage wm : wmScorePackageRuleList) {
-//					if (wmScorePackage.getRelationScoreId().equals(wm.getId())) {
-//						wmScorePackage.setRuleId(wm.getRuleId());
-//						wmScorePackage.setDrugEntId(wm.getDrugEntId());
-//					} else if (wmScorePackage.getRelationScoreId().equals("")) {
+//		if (SecurityUtils.getRoles().contains(3) || SecurityUtils.getRoles().contains(4)) {
+//
+//			//药企规则ID
+////			SysDept sysDeptRule = new SysDept();
+////			sysDeptRule.setDeptId(SecurityUtils.getUser().getDeptId());
+////			SysDept sysDeptRuleId = sysDeptMapper.selectDeptId(sysDeptRule);
+//
+//			SysDept sysDeptRuleId = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
+//
+//			if (sysDeptRuleId.getLevel() == 2) {
+//				WmDaDrugEnt wmDaDrugEntRuleId = wmDaDrugEntService.selectByDeptId(sysDeptRuleId.getDeptId());
+//				if (wmScorePackage.getAcceptSug().equals(wmDaDrugEntRuleId.getId())) {
+//					wmScorePackage.setRuleId(wmScorePackage.getAcceptSug());
+//					wmScorePackage.setDrugEntId(wmDaDrugEntRuleId.getId());
+//				} else if (!wmScorePackage.getAcceptSug().equals(wmDaDrugEntRuleId.getId())) {
+//					wmScorePackage.setRuleId(wmDaDrugEntRuleId.getId() + wmScorePackage.getAcceptSug());
+//					wmScorePackage.setDrugEntId(wmDaDrugEntRuleId.getId());
+//				}
+//			} else if (sysDeptRuleId.getLevel() == 3) {
+//				//一级cso规则ID
+////				WmScorePackage wmScorePackageRule = new WmScorePackage();
+////				wmScorePackageRule.setDelFlag("0");
+////				List<WmScorePackage> wmScorePackageRuleList = wmScorePackageService.list(Wrappers.query(wmScorePackageRule));
+////				for (WmScorePackage wm : wmScorePackageRuleList) {
+////					if (wmScorePackage.getRelationScoreId().equals(wm.getId())) {
+////						wmScorePackage.setRuleId(wm.getRuleId());
+////						wmScorePackage.setDrugEntId(wm.getDrugEntId());
+////					} else if (wmScorePackage.getRelationScoreId().equals("")) {
+////						wmScorePackage.setRuleId(wmScorePackage.getAcceptSug());
+////						wmScorePackage.setDrugEntId("");
+////					}
+////				}
+//				//一级cso规则ID
+//				WmDaAgent daAgent = wmDaAgentService.getOne(Wrappers.<WmDaAgent>lambdaQuery()
+//						.eq(WmDaAgent::getEnableFlag, EnableEnum.ENABLE.val())
+//						.eq(WmDaAgent::getDelFlag, DelEnum.NOT_DEL.val())
+//						.eq(WmDaAgent::getDeptId, String.valueOf(sysDeptRuleId.getDeptId())));
+//				if (StringUtils.isNotBlank(wmScorePackage.getRelationScoreId())) {
+//					// 关联了积分包的情况
+//					WmScorePackage relationScorePackage = wmScorePackageService.getById(wmScorePackage.getRelationScoreId());
+//					if (relationScorePackage != null) {
+//						wmScorePackage.setRuleId(relationScorePackage.getRuleId());
+//						wmScorePackage.setDrugEntId(relationScorePackage.getDrugEntId());
+//					} else {
+//						return R.failed("cso没有分配积分规则");
+//					}
+//				} else {
+//					// 没有关联积分包的情况
+//					List<WmTaskType> taskTypeList = wmTaskTypeService.list(Wrappers.<WmTaskType>lambdaQuery()
+//							.eq(WmTaskType::getRuleId, daAgent.getId()));
+//					if (CollectionUtil.isNotEmpty(taskTypeList)) {
 //						wmScorePackage.setRuleId(wmScorePackage.getAcceptSug());
 //						wmScorePackage.setDrugEntId("");
+//					} else {
+//						return R.failed("cso没有分配积分规则");
 //					}
 //				}
-				//一级cso规则ID
-				WmDaAgent daAgent = wmDaAgentService.getOne(Wrappers.<WmDaAgent>lambdaQuery()
-						.eq(WmDaAgent::getEnableFlag, EnableEnum.ENABLE.val())
-						.eq(WmDaAgent::getDelFlag, DelEnum.NOT_DEL.val())
-						.eq(WmDaAgent::getDeptId, String.valueOf(sysDeptRuleId.getDeptId())));
-				if (StringUtils.isNotBlank(wmScorePackage.getRelationScoreId())) {
-					// 关联了积分包的情况
-					WmScorePackage relationScorePackage = wmScorePackageService.getById(wmScorePackage.getRelationScoreId());
-					if (relationScorePackage != null) {
-						wmScorePackage.setRuleId(relationScorePackage.getRuleId());
-						wmScorePackage.setDrugEntId(relationScorePackage.getDrugEntId());
-					} else {
-						return R.failed("cso没有分配积分规则");
-					}
-				} else {
-					// 没有关联积分包的情况
-					List<WmTaskType> taskTypeList = wmTaskTypeService.list(Wrappers.<WmTaskType>lambdaQuery()
-							.eq(WmTaskType::getRuleId, daAgent.getId()));
-					if (CollectionUtil.isNotEmpty(taskTypeList)) {
-						wmScorePackage.setRuleId(wmScorePackage.getAcceptSug());
-						wmScorePackage.setDrugEntId("");
-					} else {
-						return R.failed("cso没有分配积分规则");
-					}
-				}
-			}/* else if (sysDeptRuleId.getLevel() == 3 && "".equals(wmScorePackage.getRelationScoreId())) {
-				wmScorePackage.setRuleId(wmScorePackage.getAcceptSug());
-				wmScorePackage.setDrugEntId("");
-			}*/
-
-
-			WmScorePackage queryWm = new WmScorePackage();
-//			SysDept sysDeptUser = new SysDept();
-//			sysDeptUser.setDeptId(SecurityUtils.getUser().getDeptId());
-//			SysDept sysDept = sysDeptMapper.selectDeptId(sysDeptUser);
-
-			SysDept sysDept = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
-
-			if (sysDept.getLevel() == 3) {//判断是cso
-				queryWm.setEnableFlag("0");
-			} else if (sysDept.getLevel() == 2) {//判断是药企
-				WmScorePackage wmId = wmScorePackageService.getById(wmScorePackage.getId());
-				queryWm.setScorePackageName(wmId.getScorePackageName());//获取当前包的scoreId
-			} else {
-				queryWm.setId("-1");
-			}
-
-
-			WmScorePackage wmIds = wmScorePackageService.getById(wmScorePackage.getId());
-			if (wmDaDrugEnt != null) {
-				if (null != wmScorePackage.getAcceptSug() && !wmScorePackage.getAcceptSug()
-						.equals(wmDaDrugEnt.getId())) {
-					WmDaAgent wmDaAgent = wmDaAgentService.getById(wmScorePackage.getAcceptSug());
-					wmScorePackage.setDeptId(wmDaAgent.getDeptId() + "");
-					wmScorePackage.setKfpjf(wmScorePackage.getScore() - wmIds.getScore() + wmIds.getKfpjf());
-				} else if (wmScorePackage.getAcceptSug().equals(wmDaDrugEnt.getId())) {
-					wmScorePackage.setDeptId(String.valueOf(SecurityUtils.getUser().getDeptId()));
-					wmScorePackage.setKfpjf(wmScorePackage.getScore());
-				}
-			} else {
-				WmDaAgent wmDaAgent = wmDaAgentService.getById(wmScorePackage.getAcceptSug());
-//				SysDept sysDeptAgents = new SysDept();
-//				sysDeptAgents.setDeptId(Integer.valueOf(wmDaAgent.getDeptId()));
-//				SysDept sysDeptAgent = sysDeptMapper.selectDeptId(sysDeptAgents);
-
-				SysDept sysDeptAgent = sysDeptService.getById(Integer.valueOf(wmDaAgent.getDeptId()));
-
-				if (null != wmScorePackage.getAcceptSug() && !wmScorePackage.getAcceptSug().equals(wmDaAgent.getId())) {
-					wmScorePackage.setDeptId(wmDaAgent.getDeptId() + "");
-					wmScorePackage.setKfpjf(wmScorePackage.getScore() - wmIds.getScore() + wmIds.getKfpjf());
-				} else if (wmScorePackage.getAcceptSug().equals(wmDaAgent.getId())) {
-					wmScorePackage.setDeptId(String.valueOf(wmDaAgent.getDeptId()));
-					wmScorePackage.setKfpjf(wmScorePackage.getScore());
-				}
-			}
-
-//			SysDept sysDeptAgent1 = new SysDept();
-//			sysDeptAgent1.setDeptId(SecurityUtils.getUser().getDeptId());
-//			SysDept sysDept5 = sysDeptMapper.selectDeptId(sysDeptAgent1);
-
-			SysDept sysDept5 = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
-
-//			SysDept sysDeptAgent2 = new SysDept();
-//			sysDeptAgent2.setDeptId(Integer.valueOf(wmScorePackage.getDeptId()));
-//			SysDept sysDept6 = sysDeptMapper.selectDeptId(sysDeptAgent2);
-
-			SysDept sysDept6 = sysDeptService.getById(Integer.valueOf(wmScorePackage.getDeptId()));
+//			}/* else if (sysDeptRuleId.getLevel() == 3 && "".equals(wmScorePackage.getRelationScoreId())) {
+//				wmScorePackage.setRuleId(wmScorePackage.getAcceptSug());
+//				wmScorePackage.setDrugEntId("");
+//			}*/
+//
+//
+//			WmScorePackage queryWm = new WmScorePackage();
+////			SysDept sysDeptUser = new SysDept();
+////			sysDeptUser.setDeptId(SecurityUtils.getUser().getDeptId());
+////			SysDept sysDept = sysDeptMapper.selectDeptId(sysDeptUser);
+//
+//			SysDept sysDept = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
+//
+//			if (sysDept.getLevel() == 3) {//判断是cso
+//				queryWm.setEnableFlag("0");
+//			} else if (sysDept.getLevel() == 2) {//判断是药企
+//				WmScorePackage wmId = wmScorePackageService.getById(wmScorePackage.getId());
+//				queryWm.setScorePackageName(wmId.getScorePackageName());//获取当前包的scoreId
+//			} else {
+//				queryWm.setId("-1");
+//			}
+//
+//
+//			WmScorePackage wmIds = wmScorePackageService.getById(wmScorePackage.getId());
+//			if (wmDaDrugEnt != null) {
+//				if (null != wmScorePackage.getAcceptSug() && !wmScorePackage.getAcceptSug()
+//						.equals(wmDaDrugEnt.getId())) {
+//					WmDaAgent wmDaAgent = wmDaAgentService.getById(wmScorePackage.getAcceptSug());
+//					wmScorePackage.setDeptId(wmDaAgent.getDeptId() + "");
+//					wmScorePackage.setKfpjf(wmScorePackage.getScore() - wmIds.getScore() + wmIds.getKfpjf());
+//				} else if (wmScorePackage.getAcceptSug().equals(wmDaDrugEnt.getId())) {
+//					wmScorePackage.setDeptId(String.valueOf(SecurityUtils.getUser().getDeptId()));
+//					wmScorePackage.setKfpjf(wmScorePackage.getScore());
+//				}
+//			} else {
+//				WmDaAgent wmDaAgent = wmDaAgentService.getById(wmScorePackage.getAcceptSug());
+////				SysDept sysDeptAgents = new SysDept();
+////				sysDeptAgents.setDeptId(Integer.valueOf(wmDaAgent.getDeptId()));
+////				SysDept sysDeptAgent = sysDeptMapper.selectDeptId(sysDeptAgents);
+//
+//				SysDept sysDeptAgent = sysDeptService.getById(Integer.valueOf(wmDaAgent.getDeptId()));
+//
+//				if (null != wmScorePackage.getAcceptSug() && !wmScorePackage.getAcceptSug().equals(wmDaAgent.getId())) {
+//					wmScorePackage.setDeptId(wmDaAgent.getDeptId() + "");
+//					wmScorePackage.setKfpjf(wmScorePackage.getScore() - wmIds.getScore() + wmIds.getKfpjf());
+//				} else if (wmScorePackage.getAcceptSug().equals(wmDaAgent.getId())) {
+//					wmScorePackage.setDeptId(String.valueOf(wmDaAgent.getDeptId()));
+//					wmScorePackage.setKfpjf(wmScorePackage.getScore());
+//				}
+//			}
+//
+////			SysDept sysDeptAgent1 = new SysDept();
+////			sysDeptAgent1.setDeptId(SecurityUtils.getUser().getDeptId());
+////			SysDept sysDept5 = sysDeptMapper.selectDeptId(sysDeptAgent1);
+//
+//			SysDept sysDept5 = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
+//
+////			SysDept sysDeptAgent2 = new SysDept();
+////			sysDeptAgent2.setDeptId(Integer.valueOf(wmScorePackage.getDeptId()));
+////			SysDept sysDept6 = sysDeptMapper.selectDeptId(sysDeptAgent2);
+//
+//			SysDept sysDept6 = sysDeptService.getById(Integer.valueOf(wmScorePackage.getDeptId()));
+//
+//			if (sysDept5.getLevel() == 2 && sysDept6.getLevel() == 2 && wmScorePackage.getDeptId()
+//					.equals(String.valueOf(sysDept5.getDeptId()))) {
+//				wmScorePackage.setTypeid("0");
+//			} else if (sysDept5.getLevel() == 2) {
+//				wmScorePackage.setTypeid("1");
+//			} else if (sysDept5.getLevel() == 3 && sysDept6.getLevel() == 3 && wmScorePackage.getDeptId()
+//					.equals(String.valueOf(sysDept5.getDeptId()))) {
+//				wmScorePackage.setTypeid("1");
+//			} else if (sysDept5.getLevel() == 3) {
+//				wmScorePackage.setTypeid("2");
+//			}
+//			List<WmScorePackage> wmScorePackageList = wmScorePackageService.list(Wrappers.query(queryWm));
+//			WmScorePackage wmId = wmScorePackageService.getById(wmScorePackage.getId());
+//			if (wmScorePackageList.size() > 0) {
+//				for (WmScorePackage wms : wmScorePackageList) {
+//					if (wmScorePackageList.size() > 0) {
+//						if (wms.getId().equals(wmScorePackage.getRelationScoreId())) {//判断是否有scoreId与当前关联积分包匹配
+//							List<WmScorePackage> wmScorePackagess = wmScorePackageService.selectRelationScoreId(wmId.getId());
+//							if (wmScorePackagess.size() > 0) {
+//								for (WmScorePackage wmScorePackage13 : wmScorePackagess) {
+//									if (wmScorePackage.getRelationScoreId().equals(wmScorePackage13.getId())) {
+//										wms.setPackageIsConduct("1");
+//										break;
+//									} else {
+//										wms.setPackageIsConduct("0");
+//									}
+//								}
+//							}
+//							if (!wmScorePackage.getRelationScoreId().equals(wmId.getRelationScoreId())) {
+//								if (wmScorePackage.getScore() < wms.getKfpjf() + wmId.getScore()) {
+//									wms.setKfpjf(new Double(Math.ceil(wms.getKfpjf() - wmScorePackage.getScore())).intValue());
+//								} else {
+//									wms.setKfpjf(new Double(Math.ceil(wms.getKfpjf() - wmScorePackage.getScore())).intValue());
+//								}
+//							} else if (wmScorePackage.getScore() > wms.getKfpjf() + wmId.getScore()) {
+//								return R.failed("可分配积分不足");
+//							} else if (wmScorePackage.getScore() < wms.getKfpjf() + wmId.getScore()) {
+//								wms.setKfpjf(new Double(Math.ceil(wms.getKfpjf() + wmId.getScore() - wmScorePackage.getScore()))
+//										.intValue());
+//								wmId.setScore(wmScorePackage.getScore());
+//							} else {
+//								wms.setKfpjf(new Double(Math.ceil(wms.getKfpjf() + wmId.getScore() - wmScorePackage.getScore()))
+//										.intValue());
+//								wmId.setScore(wmScorePackage.getScore());
+//							}
+//						} else if (wms.getKfpjf() != null && !wmScorePackage.getRelationScoreId()
+//								.equals("") && wmScorePackage.getScore() > wms.getKfpjf() + wmId.getScore()) {
+//							return R.failed("可分配积分不足");
+//						} else if ("".equals(wmScorePackage.getRelationScoreId()) && wms.getId()
+//								.equals(wmId.getRelationScoreId())) {//判断关联积分包是否为无
+//							wms.setKfpjf(wmId.getScore() + wms.getKfpjf());
+//						} else if (wms.getId().equals(wmId.getRelationScoreId())) {
+//							wms.setKfpjf(new Double(Math.ceil(wms.getKfpjf() + wmId.getScore())).intValue());
+//							//判断是否进行中
+//							List<WmScorePackage> wmScorePackages = wmScorePackageService.selectRelationScoreId(wmId.getId());
+//							if (wmScorePackages.size() > 0) {
+//								for (WmScorePackage wmScorePackage1 : wmScorePackages) {
+//									if (null != wmScorePackage1.getRelationScoreId() && wmScorePackage1.getRelationScoreId()
+//											.equals(wmId.getRelationScoreId())) {
+//										wms.setPackageIsConduct("1");
+//										break;
+//									} else {
+//										wms.setPackageIsConduct("0");
+//									}
+//								}
+//							}
+//
+//						}
+//					}
+//				}
+//				wmScorePackageService.updateBatchById(wmScorePackageList);
+//			}
+//		}
 
-			if (sysDept5.getLevel() == 2 && sysDept6.getLevel() == 2 && wmScorePackage.getDeptId()
-					.equals(String.valueOf(sysDept5.getDeptId()))) {
-				wmScorePackage.setTypeid("0");
-			} else if (sysDept5.getLevel() == 2) {
-				wmScorePackage.setTypeid("1");
-			} else if (sysDept5.getLevel() == 3 && sysDept6.getLevel() == 3 && wmScorePackage.getDeptId()
-					.equals(String.valueOf(sysDept5.getDeptId()))) {
-				wmScorePackage.setTypeid("1");
-			} else if (sysDept5.getLevel() == 3) {
-				wmScorePackage.setTypeid("2");
+		if (CollUtil.isNotEmpty(wmScorePackage.getWmScoreTaskTypeList())) {
+			// 如果存在taskTypeId=39 则同时增加应收账款回款-A类、B类、C类任务类型（39/40/41）
+			if (wmScorePackage.getWmScoreTaskTypeList().stream().anyMatch(wmTaskTypeTree -> "39".equals(wmTaskTypeTree.getTaskTypeId()))) {
+				WmScoreTaskType addTaskType40 = new WmScoreTaskType();
+				addTaskType40.setScoreId(wmScorePackage.getId());
+				addTaskType40.setType("1");
+				addTaskType40.setTaskTypeId("40");
+				WmScoreTaskType addTaskType41 = new WmScoreTaskType();
+				addTaskType41.setScoreId(wmScorePackage.getId());
+				addTaskType41.setType("1");
+				addTaskType41.setTaskTypeId("41");
+				wmScorePackage.getWmScoreTaskTypeList().add(addTaskType40);
+				wmScorePackage.getWmScoreTaskTypeList().add(addTaskType41);
+			}
+			// 如果存在taskTypeId=42 则同时增加手术跟台-一级/手术跟台-二级/手术跟台-三级任务类型（42/43/44）
+			if (wmScorePackage.getWmScoreTaskTypeList().stream().anyMatch(wmTaskTypeTree -> "42".equals(wmTaskTypeTree.getTaskTypeId()))) {
+				WmScoreTaskType addTaskType43 = new WmScoreTaskType();
+				addTaskType43.setScoreId(wmScorePackage.getId());
+				addTaskType43.setType("1");
+				addTaskType43.setTaskTypeId("43");
+				WmScoreTaskType addTaskType44 = new WmScoreTaskType();
+				addTaskType44.setScoreId(wmScorePackage.getId());
+				addTaskType44.setType("1");
+				addTaskType44.setTaskTypeId("44");
+				wmScorePackage.getWmScoreTaskTypeList().add(addTaskType43);
+				wmScorePackage.getWmScoreTaskTypeList().add(addTaskType44);
+			}
+			// 如果存在taskTypeId=47 47,库存调研 48,竞品调研  49,培训 50,使用情况调查
+			if (wmScorePackage.getWmScoreTaskTypeList().stream().anyMatch(wmTaskTypeTree -> "47".equals(wmTaskTypeTree.getTaskTypeId()))) {
+				WmScoreTaskType addTaskTypeTree48 = new WmScoreTaskType();
+				addTaskTypeTree48.setTaskTypeId("48");
+				addTaskTypeTree48.setType("1");
+				WmScoreTaskType addTaskTypeTree49 = new WmScoreTaskType();
+				addTaskTypeTree49.setTaskTypeId("49");
+				addTaskTypeTree49.setType("1");
+				WmScoreTaskType addTaskTypeTree50 = new WmScoreTaskType();
+				addTaskTypeTree50.setTaskTypeId("50");
+				addTaskTypeTree50.setType("1");
+				wmScorePackage.getWmScoreTaskTypeList().add(addTaskTypeTree48);
+				wmScorePackage.getWmScoreTaskTypeList().add(addTaskTypeTree49);
+				wmScorePackage.getWmScoreTaskTypeList().add(addTaskTypeTree50);
 			}
-			List<WmScorePackage> wmScorePackageList = wmScorePackageService.list(Wrappers.query(queryWm));
-			WmScorePackage wmId = wmScorePackageService.getById(wmScorePackage.getId());
-			if (wmScorePackageList.size() > 0) {
-				for (WmScorePackage wms : wmScorePackageList) {
-					if (wmScorePackageList.size() > 0) {
-						if (wms.getId().equals(wmScorePackage.getRelationScoreId())) {//判断是否有scoreId与当前关联积分包匹配
-							List<WmScorePackage> wmScorePackagess = wmScorePackageService.selectRelationScoreId(wmId.getId());
-							if (wmScorePackagess.size() > 0) {
-								for (WmScorePackage wmScorePackage13 : wmScorePackagess) {
-									if (wmScorePackage.getRelationScoreId().equals(wmScorePackage13.getId())) {
-										wms.setPackageIsConduct("1");
-										break;
-									} else {
-										wms.setPackageIsConduct("0");
-									}
-								}
-							}
-							if (!wmScorePackage.getRelationScoreId().equals(wmId.getRelationScoreId())) {
-								if (wmScorePackage.getScore() < wms.getKfpjf() + wmId.getScore()) {
-									wms.setKfpjf(new Double(Math.ceil(wms.getKfpjf() - wmScorePackage.getScore())).intValue());
-								} else {
-									wms.setKfpjf(new Double(Math.ceil(wms.getKfpjf() - wmScorePackage.getScore())).intValue());
-								}
-							} else if (wmScorePackage.getScore() > wms.getKfpjf() + wmId.getScore()) {
-								return R.failed("可分配积分不足");
-							} else if (wmScorePackage.getScore() < wms.getKfpjf() + wmId.getScore()) {
-								wms.setKfpjf(new Double(Math.ceil(wms.getKfpjf() + wmId.getScore() - wmScorePackage.getScore()))
-										.intValue());
-								wmId.setScore(wmScorePackage.getScore());
-							} else {
-								wms.setKfpjf(new Double(Math.ceil(wms.getKfpjf() + wmId.getScore() - wmScorePackage.getScore()))
-										.intValue());
-								wmId.setScore(wmScorePackage.getScore());
-							}
-						} else if (wms.getKfpjf() != null && !wmScorePackage.getRelationScoreId()
-								.equals("") && wmScorePackage.getScore() > wms.getKfpjf() + wmId.getScore()) {
-							return R.failed("可分配积分不足");
-						} else if ("".equals(wmScorePackage.getRelationScoreId()) && wms.getId()
-								.equals(wmId.getRelationScoreId())) {//判断关联积分包是否为无
-							wms.setKfpjf(wmId.getScore() + wms.getKfpjf());
-						} else if (wms.getId().equals(wmId.getRelationScoreId())) {
-							wms.setKfpjf(new Double(Math.ceil(wms.getKfpjf() + wmId.getScore())).intValue());
-							//判断是否进行中
-							List<WmScorePackage> wmScorePackages = wmScorePackageService.selectRelationScoreId(wmId.getId());
-							if (wmScorePackages.size() > 0) {
-								for (WmScorePackage wmScorePackage1 : wmScorePackages) {
-									if (null != wmScorePackage1.getRelationScoreId() && wmScorePackage1.getRelationScoreId()
-											.equals(wmId.getRelationScoreId())) {
-										wms.setPackageIsConduct("1");
-										break;
-									} else {
-										wms.setPackageIsConduct("0");
-									}
-								}
-							}
-
-						}
-					}
-				}
-				if (null != wmScorePackage.getWmScoreTaskTypeList() && wmScorePackage.getWmScoreTaskTypeList()
-						.size() > 0) {
-
-					// 如果存在taskTypeId=39 则同时增加应收账款回款-A类、B类、C类任务类型（39/40/41）
-					if (wmScorePackage.getWmScoreTaskTypeList().stream().anyMatch(wmTaskTypeTree -> "39".equals(wmTaskTypeTree.getTaskTypeId()))) {
-						WmScoreTaskType addTaskType40 = new WmScoreTaskType();
-						addTaskType40.setScoreId(wmScorePackage.getId());
-						addTaskType40.setType("1");
-						addTaskType40.setTaskTypeId("40");
-						WmScoreTaskType addTaskType41 = new WmScoreTaskType();
-						addTaskType41.setScoreId(wmScorePackage.getId());
-						addTaskType41.setType("1");
-						addTaskType41.setTaskTypeId("41");
-						wmScorePackage.getWmScoreTaskTypeList().add(addTaskType40);
-						wmScorePackage.getWmScoreTaskTypeList().add(addTaskType41);
-					}
-					// 如果存在taskTypeId=42 则同时增加手术跟台-一级/手术跟台-二级/手术跟台-三级任务类型（42/43/44）
-					if (wmScorePackage.getWmScoreTaskTypeList().stream().anyMatch(wmTaskTypeTree -> "42".equals(wmTaskTypeTree.getTaskTypeId()))) {
-						WmScoreTaskType addTaskType43 = new WmScoreTaskType();
-						addTaskType43.setScoreId(wmScorePackage.getId());
-						addTaskType43.setType("1");
-						addTaskType43.setTaskTypeId("43");
-						WmScoreTaskType addTaskType44 = new WmScoreTaskType();
-						addTaskType44.setScoreId(wmScorePackage.getId());
-						addTaskType44.setType("1");
-						addTaskType44.setTaskTypeId("44");
-						wmScorePackage.getWmScoreTaskTypeList().add(addTaskType43);
-						wmScorePackage.getWmScoreTaskTypeList().add(addTaskType44);
-					}
-					// 如果存在taskTypeId=47 47,库存调研 48,竞品调研  49,培训 50,使用情况调查
-					if (wmScorePackage.getWmScoreTaskTypeList().stream().anyMatch(wmTaskTypeTree -> "47".equals(wmTaskTypeTree.getTaskTypeId()))) {
-						WmScoreTaskType addTaskTypeTree48 = new WmScoreTaskType();
-						addTaskTypeTree48.setTaskTypeId("48");
-						addTaskTypeTree48.setType("1");
-						WmScoreTaskType addTaskTypeTree49 = new WmScoreTaskType();
-						addTaskTypeTree49.setTaskTypeId("49");
-						addTaskTypeTree49.setType("1");
-						WmScoreTaskType addTaskTypeTree50 = new WmScoreTaskType();
-						addTaskTypeTree50.setTaskTypeId("50");
-						addTaskTypeTree50.setType("1");
-						wmScorePackage.getWmScoreTaskTypeList().add(addTaskTypeTree48);
-						wmScorePackage.getWmScoreTaskTypeList().add(addTaskTypeTree49);
-						wmScorePackage.getWmScoreTaskTypeList().add(addTaskTypeTree50);
-					}
-
-					List<WmScoreTaskType> wmScoreTaskTypess = new ArrayList<>();
-					for (WmScoreTaskType wmScoreTaskTypes : wmScorePackage.getWmScoreTaskTypeList()) {
-						WmScoreTaskType wmScoreTaskType = new WmScoreTaskType();
-						//将积分表id和前端传的tasktypeId赋值给wmScoreTaskTypess
-						if ("".equals(wmScorePackage.getRelationScoreId())) {
-							wmScoreTaskType.setScoreId(wmScorePackage.getId());
-							wmScoreTaskType.setType("1");
-							wmScoreTaskType.setTaskTypeId(wmScoreTaskTypes.getTaskTypeId());
-							wmScoreTaskTypess.add(wmScoreTaskType);
-							wmScoreTaskTypeService.deleteByScoreId(wmScorePackage.getId());
-							wmScoreTaskTypeService.batchInsertType(wmScoreTaskTypess);
-						} else {
-							wmScoreTaskType.setScoreId(wmScorePackage.getId());
-							wmScoreTaskType.setType("1");
-							wmScoreTaskType.setTaskTypeId(wmScoreTaskTypes.getTaskTypeId());
-							wmScoreTaskTypess.add(wmScoreTaskType);
-							wmScoreTaskTypeService.deleteByScoreId(wmScoreTaskType.getScoreId());
-							wmScoreTaskTypeService.batchInsertType(wmScoreTaskTypess);
-						}
-					}
 
+			List<WmScoreTaskType> wmScoreTaskTypess = new ArrayList<>();
+			for (WmScoreTaskType wmScoreTaskTypes : wmScorePackage.getWmScoreTaskTypeList()) {
+				WmScoreTaskType wmScoreTaskType = new WmScoreTaskType();
+				//将积分表id和前端传的tasktypeId赋值给wmScoreTaskTypess
+				if ("".equals(wmScorePackage.getRelationScoreId())) {
+					wmScoreTaskType.setScoreId(wmScorePackage.getId());
+					wmScoreTaskType.setType("1");
+					wmScoreTaskType.setTaskTypeId(wmScoreTaskTypes.getTaskTypeId());
+					wmScoreTaskTypess.add(wmScoreTaskType);
+				} else {
+					wmScoreTaskType.setScoreId(wmScorePackage.getId());
+					wmScoreTaskType.setType("1");
+					wmScoreTaskType.setTaskTypeId(wmScoreTaskTypes.getTaskTypeId());
+					wmScoreTaskTypess.add(wmScoreTaskType);
 				}
-				wmScorePackageService.updateBatchById(wmScorePackageList);
 			}
+			wmScoreTaskTypeService.deleteByScoreId(wmScorePackage.getId());
+			wmScoreTaskTypeService.batchInsertType(wmScoreTaskTypess);
 		}
 
 		// 查询原积分包值

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

@@ -838,6 +838,15 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 					tasktypeList.add(addTaskTypeTree49);
 					tasktypeList.add(addTaskTypeTree50);
 				}
+				// 如果存在taskTypeId=51 51,信用管理A  52,信用管理B 53,信用管理C
+//				if (tasktypeList.stream().anyMatch(wmTaskTypeTree -> "51".equals(wmTaskTypeTree.getTaskTypeId()))) {
+//					WmTaskTypeTree addTaskTypeTree51 = new WmTaskTypeTree();
+//					addTaskTypeTree51.setTaskTypeId("52");
+//					WmTaskTypeTree addTaskTypeTree52 = new WmTaskTypeTree();
+//					addTaskTypeTree52.setTaskTypeId("53");
+//					tasktypeList.add(addTaskTypeTree51);
+//					tasktypeList.add(addTaskTypeTree52);
+//				}
 
 				for (WmTaskTypeTree type : tasktypeList) {
 					WmScoreTaskType wmScoreTaskType = new WmScoreTaskType();
@@ -1585,6 +1594,15 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 					tasktypeList.add(addTaskTypeTree49);
 					tasktypeList.add(addTaskTypeTree50);
 				}
+				// 如果存在taskTypeId=51 51,信用管理A  52,信用管理B 53,信用管理C
+//				if (tasktypeList.stream().anyMatch(wmTaskTypeTree -> "51".equals(wmTaskTypeTree.getTaskTypeId()))) {
+//					WmTaskTypeTree addTaskTypeTree51 = new WmTaskTypeTree();
+//					addTaskTypeTree51.setTaskTypeId("52");
+//					WmTaskTypeTree addTaskTypeTree52 = new WmTaskTypeTree();
+//					addTaskTypeTree52.setTaskTypeId("53");
+//					tasktypeList.add(addTaskTypeTree51);
+//					tasktypeList.add(addTaskTypeTree52);
+//				}
 
 				for (WmTaskTypeTree type : tasktypeList) {
 					WmScoreTaskType wmScoreTaskType = new WmScoreTaskType();

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

@@ -683,6 +683,37 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 					wmTask.setTaskTypeId(wmTaskContent.getTemp23());
 				}
 
+				// 信用管理A/B/C 积分值设置
+				if ("51".equals(wmTaskContent.getTemp30())) {
+					// 根据选择的信用等级 查任务类型模板
+					WmTaskType baseTaskType = wmTaskTypeService.getById(wmTaskContent.getTemp23());
+					// 查询当前企业的任务类型积分
+					WmScorePackage wmScorePackage1 = wmScorePackageService.getById(wmTaskContent.getTemp32());
+					WmTaskType queryTaskType = new WmTaskType();
+					queryTaskType.setRuleId(wmScorePackage1.getRuleId());
+					queryTaskType.setTaskTypeName(baseTaskType.getTaskTypeName());
+					queryTaskType.setRuleId(wmScorePackage1.getRuleId());
+					score = wmTaskTypeService.getWmTaskTypeByEnt(queryTaskType);
+					// 设置实际的任务类型
+					wmTaskContent.setTemp30(wmTaskContent.getTemp23());
+					wmTask.setTaskTypeId(wmTaskContent.getTemp23());
+				}
+				// 首营管理-诊所/药店
+				if ("56".equals(wmTaskContent.getTemp30())) {
+					// 根据选择的终端类型 查任务类型模板
+					WmTaskType baseTaskType = wmTaskTypeService.getById(wmTaskContent.getTemp3());
+					// 查询当前企业的任务类型积分
+					WmScorePackage wmScorePackage1 = wmScorePackageService.getById(wmTaskContent.getTemp32());
+					WmTaskType queryTaskType = new WmTaskType();
+					queryTaskType.setRuleId(wmScorePackage1.getRuleId());
+					queryTaskType.setTaskTypeName(baseTaskType.getTaskTypeName());
+					queryTaskType.setRuleId(wmScorePackage1.getRuleId());
+					score = wmTaskTypeService.getWmTaskTypeByEnt(queryTaskType);
+					// 设置实际的任务类型
+					wmTaskContent.setTemp30(wmTaskContent.getTemp3());
+					wmTask.setTaskTypeId(wmTaskContent.getTemp3());
+				}
+
 				// 校验任务类型是否启用
 				WmTaskType _baseTaskType = wmTaskTypeService.getById(wmTaskContent.getTemp30());
 				WmTaskType queryTaskType = new WmTaskType();