feat: 任务类型百分比限制4

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

@@ -55,24 +55,29 @@ public class WmTaskTypeSubCate2ServiceImpl extends ServiceImpl<WmTaskTypeSubCate
 	@Override
 	public List<Map<String, Object>> listTaskTypeTree(Integer deptId) {
 
-		String durgentId = null;
 		SysDept dept = sysDeptMapper.selectById(deptId);
-		if (DeptLevelEnum.ENT.getVal().equals(dept.getLevel())) {
+
+		// 查询企业对应的任务类型
+		LambdaQueryWrapper<WmTaskType> taskTypeWrapper = Wrappers.lambdaQuery();
+		// 根据企业类型拼接查询条件
+		if (DeptLevelEnum.ADMIN.getVal().equals(dept.getLevel())) {
+			taskTypeWrapper.eq(WmTaskType::getTaskTypeLevel, "1");
+			taskTypeWrapper.eq(WmTaskType::getDelFlag, DelEnum.NOT_DEL.val());
+		} else if (DeptLevelEnum.ENT.getVal().equals(dept.getLevel())) {
 			WmDaDrugEnt wmDaDrugEnt = wmDaDrugEntMapper.selectOne(Wrappers.<WmDaDrugEnt>lambdaQuery()
 					.eq(WmDaDrugEnt::getDeptId, deptId)
 					.eq(WmDaDrugEnt::getDelFlag, DelEnum.NOT_DEL.val()));
-			durgentId = wmDaDrugEnt.getId();
+			taskTypeWrapper.eq(WmTaskType::getDeptId, deptId);
+			taskTypeWrapper.eq(WmTaskType::getRuleId, wmDaDrugEnt.getId());
+			taskTypeWrapper.eq(WmTaskType::getTaskEntId, wmDaDrugEnt.getId());
 		} else {
 			WmDaAgent wmDaAgent = wmDaAgentMapper.selectOne(Wrappers.<WmDaAgent>lambdaQuery()
 					.eq(WmDaAgent::getDeptId, deptId)
 					.eq(WmDaAgent::getDelFlag, DelEnum.NOT_DEL.val()));
-			durgentId = wmDaAgent.getId();
+			taskTypeWrapper.eq(WmTaskType::getDeptId, deptId);
+			taskTypeWrapper.eq(WmTaskType::getRuleId, wmDaAgent.getId());
+			taskTypeWrapper.eq(WmTaskType::getTaskEntId, wmDaAgent.getId());
 		}
-		// 查询企业对应的任务类型
-		LambdaQueryWrapper<WmTaskType> taskTypeWrapper = Wrappers.lambdaQuery();
-		taskTypeWrapper.eq(WmTaskType::getDeptId, deptId);
-		taskTypeWrapper.eq(WmTaskType::getRuleId, durgentId);
-		taskTypeWrapper.eq(WmTaskType::getTaskEntId, durgentId);
 		List<WmTaskType> taskTypeList = wmTaskTypeService.list(taskTypeWrapper);
 
 		// 查询基础任务类型