fix: 新增/修改大包恢复代码

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

@@ -1976,69 +1976,69 @@ public class WmScorePackageController {
 		}
 		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) {
@@ -2379,199 +2379,199 @@ 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("")) {
-////						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)) {
+		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("");
-//					} 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()));
-//
-//			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);
-//			}
-//		}
+				//一级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()));
+
+			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 (CollUtil.isNotEmpty(wmScorePackage.getWmScoreTaskTypeList())) {
 			// 如果存在taskTypeId=39 则同时增加应收账款回款-A类、B类、C类任务类型（39/40/41）