|
@@ -338,20 +338,6 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
|
|
|
itdmTask.setTaskContent("拆解工单");
|
|
|
itdmTask.setTaskStatus(0);
|
|
|
taskService.insertTaskAfterJudge(itdmTask);
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
|
|
|
|
|
|
Map<String, Object> columnMap = new HashMap<>();
|
|
@@ -373,18 +359,27 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
|
|
|
itdmTestPlanMapper.updateById(itdmTestPlan);
|
|
|
|
|
|
|
|
|
- String pmplan = plan.getPm();
|
|
|
- String pmVO = vo.getPm();
|
|
|
- if(!pmplan.equals(pmVO)){
|
|
|
+ String pmplan = plan.getPm();
|
|
|
+ String pmVO = vo.getPm();
|
|
|
+ if(pmplan==null){
|
|
|
+
|
|
|
+ ItdmTask nItdmTask = new ItdmTask();
|
|
|
+ nItdmTask.setTaskUser(pmVO);
|
|
|
+ nItdmTask.setWeituoId(vo.getWeituoId());
|
|
|
+ nItdmTask.setTaskRole("项目经理");
|
|
|
+ nItdmTask.setTaskContent("拆解工单");
|
|
|
+ nItdmTask.setTaskStatus(0);
|
|
|
+ taskService.insertTaskAfterJudge(nItdmTask);
|
|
|
+ }else if(pmplan!=null && !pmplan.equals(pmVO)){
|
|
|
QueryWrapper<ItdmTestPlan> planWrapper1 = new QueryWrapper<>();
|
|
|
planWrapper1.eq("weituo_id",vo.getWeituoId());
|
|
|
planWrapper1.eq("pm",pmplan);
|
|
|
List<ItdmTestPlan> testPlanList = itdmTestPlanMapper.selectList(planWrapper1);
|
|
|
- if(testPlanList == null || testPlanList.isEmpty() || testPlanList.get(0)==null){
|
|
|
+ if(testPlanList.isEmpty()){
|
|
|
|
|
|
QueryWrapper<ItdmTask> taskWrapper = new QueryWrapper<>();
|
|
|
taskWrapper.eq("weituo_id",vo.getWeituoId());
|
|
|
- taskWrapper.eq("taskRole","项目经理");
|
|
|
+ taskWrapper.eq("task_role","项目经理");
|
|
|
taskWrapper.eq("task_user",plan.getPm());
|
|
|
taskMapper.delete(taskWrapper);
|
|
|
}
|
|
@@ -397,22 +392,6 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
|
|
|
nItdmTask.setTaskContent("拆解工单");
|
|
|
nItdmTask.setTaskStatus(0);
|
|
|
taskService.insertTaskAfterJudge(nItdmTask);
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
|
|
|
|