Merge branch 'feature-cso1tocso2-210706' of googol/YY_BE_2 into develop

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

@@ -318,6 +318,35 @@ public class WmDaAgentController {
 						newOne.setBaseId(wmTaskType2.getId());
 						wmTaskTypeMapper.insert(newOne);
 					}
+				} else if (3 == sysDept.getLevel()) {
+					// 一级cso给二级cso配置积分规则
+					WmDaAgent level1DaAgent = wmDaAgentService.getOne(Wrappers.<WmDaAgent>lambdaQuery()
+							.eq(WmDaAgent::getDeptId, SecurityUtils.getUser().getDeptId()));
+					WmTaskTypeEntRef wmTaskTypeEntRef1 = new WmTaskTypeEntRef();
+					wmTaskTypeEntRef1.setDrugentId("");
+					wmTaskTypeEntRef1.setAgentId(wmDaAgent.getId());
+					wmTaskTypeEntRef1.setDeptId(wmDaAgent.getDeptId());
+					wmTaskTypeEntRefMapper.insert(wmTaskTypeEntRef1);
+
+					WmTaskType wmTaskTypeQ = new WmTaskType();
+					wmTaskTypeQ.setTaskTypeLevel("1");
+					wmTaskTypeQ.setStatus("0");
+					wmTaskTypeQ.setDelFlag("0");
+					List<WmTaskType> tempList = wmTaskTypeMapper.selectList(Wrappers.query(wmTaskTypeQ));
+
+					for (WmTaskType wmTaskType2 : tempList) {
+						WmTaskType newOne = wmTaskType2;
+						newOne.setId(null);
+						newOne.setLevel1Id(level1DaAgent.getId());
+						newOne.setTaskTypeLevel("2");
+						newOne.setTaskEntId(wmDaAgent.getId());
+						newOne.setRuleId(wmDaAgent.getId());
+						newOne.setDeptId(String.valueOf(wmDaAgent.getDeptId()));
+						newOne.setCreateTime(LocalDateTime.now());
+						newOne.setStatus("0");
+						newOne.setBaseId(wmTaskType2.getId());
+						wmTaskTypeMapper.insert(newOne);
+					}
 				}
 			}
 		}

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

@@ -246,6 +246,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 		SysDept sysDept = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
 		Integer total = 0;
 		if (sysDept.getLevel() == 3) {
+			// 一级CSO
 			if (packageId.contains(",")) {
 				strs1.addAll(Arrays.asList(packageId.split(",")));
 			} else {
@@ -314,6 +315,12 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 				}
 			}
 		} else if (sysDept.getLevel() == 4) {
+			// 二级CSO
+			if (StringUtils.isNotBlank(wmScorePackage.getDrugEntId())) {
+				// 通过drugEntId为空，判断是否为药企发来的包，即药企->一级CSO->二级CSO的包
+				// 药企->一级CSO->二级CSO的大包，只能由一级CSO提交报告审批，二级CSO在任务中心中，点击生成报告按钮应提示没有权限
+				return R.ok(0);
+			}
 			wmTask.setExtIds(strs1);
 			wmTask.setTaskStatus(String.valueOf(3));
 			List<WmTask> taskList = new ArrayList<>();
@@ -377,6 +384,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 				}
 			}
 		} else if (sysDept.getLevel() == 2) {
+			// 药企
 			wmTask.setExtIds(strs1);
 			wmTask.setTaskStatus(String.valueOf(3));
 			List<WmTask> taskList = new ArrayList<>();

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmScorePackageMapper.xml

@@ -298,6 +298,7 @@
 			</if>
 
 		</where>
+		order by id desc
 	</select>