fix 计划排期、首页task

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmFirstPage/service/impl/ItdmTaskServiceImpl.java

@@ -25,16 +25,18 @@ public class ItdmTaskServiceImpl extends ServiceImpl<ItdmTaskMapper, ItdmTask> i
     private ItdmTaskMapper taskMapper;
 
     public boolean insertTaskAfterJudge(ItdmTask task) {
-        ItdmTask queryTask = new ItdmTask();
-        queryTask.setTaskRole(task.getTaskRole());
-        queryTask.setTaskUser(task.getTaskUser());
-        queryTask.setTaskContent(task.getTaskContent());
-        queryTask.setWeituoId(task.getTaskContent());
-        QueryWrapper<ItdmTask> taskQueryWrapper = new QueryWrapper<>(task);
-        List<ItdmTask> list = taskMapper.selectList(taskQueryWrapper);
-        if(list.isEmpty()){
-            task.setTaskStatus(0);
-            return SqlHelper.retBool(this.getBaseMapper().insert(task));
-        }else return false;
+        if(task.getTaskUser()!=null){
+            ItdmTask queryTask = new ItdmTask();
+            queryTask.setTaskRole(task.getTaskRole());
+            queryTask.setTaskUser(task.getTaskUser());
+            queryTask.setTaskContent(task.getTaskContent());
+            queryTask.setWeituoId(task.getTaskContent());
+            QueryWrapper<ItdmTask> taskQueryWrapper = new QueryWrapper<>(task);
+            List<ItdmTask> list = taskMapper.selectList(taskQueryWrapper);
+            if(list.isEmpty()){
+                task.setTaskStatus(0);
+                return SqlHelper.retBool(this.getBaseMapper().insert(task));
+            }else return false;
+        }else return true;
     }
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/controller/ItdmJCXMSHJHController.java

@@ -117,8 +117,21 @@ public class ItdmJCXMSHJHController {
 
             Date shijiStartDate = vo.getShijiStartDate();
             Date shijiEndDate = vo.getShijiEndDate();
+
+            int lasTime = -1;
+            if(shijiStartDate!=null && shijiEndDate!=null){
+                int days = (int) ((shijiStartDate.getTime() - shijiEndDate.getTime()) / (1000*3600*24));
+                lasTime = days+1;
+            }else if(shijiStartDate!=null && shijiEndDate==null) {
+                //如果有开始时间,没有结束时间，不设置持续时间
+            }else if(shijiStartDate==null){
+                //如果没有开始时间和结束时间，初始化开始时间为今天，不设置持续时间
+                shijiStartDate = new Date();
+            }
+
             String izShiji ="实绩";  //实绩
             ItdmJHYQueryListVO shijiVO = ItdmJHYQueryConvert.INSTANCE.convert(vo,shijiStartDate,shijiEndDate,i++,izShiji);
+            shijiVO.setLastTime(lasTime);
             totalList.add(shijiVO);
         }
         return Result.OK(totalList);

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/service/impl/ItdmJCXMSHJHServiceImpl.java

@@ -338,20 +338,6 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
                 itdmTask.setTaskContent("拆解工单");
                 itdmTask.setTaskStatus(0);//待办
                 taskService.insertTaskAfterJudge(itdmTask);
-//                ItdmTask i = new ItdmTask();
-//                i.setTaskRole("项目经理");
-//                i.setTaskUser(vo.getPm());
-//                QueryWrapper<ItdmTask> queryWrapper = new QueryWrapper<>(i);
-//                List<ItdmTask> tList= taskMapper.selectList(queryWrapper);
-//                if(tList == null || tList.isEmpty() || tList.get(0)==null){ //原来没有,新增一条
-//                    ItdmTask itdmTask = new ItdmTask();
-//                    itdmTask.setTaskRole("项目经理");
-//                    itdmTask.setTaskUser(vo.getPm());
-//                    itdmTask.setTaskStatus(0);//待办
-//                    itdmTask.setWeituoId(vo.getWeituoId());
-//                    itdmTask.setTaskContent("拆解工单");
-//                    taskMapper.insert(itdmTask);
-//                }
 
                 //修改计划员计划排期task状态为1进行中
                 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){ //原来的为空，此次不为空
+                    //查原来该委托id，项目经理，新pm的task
+                    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()){
                         //该委托id、原pm对应试验计划列表若为空删除原pm、项目经理、委托id对应的task
                         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);
-
-//                    ItdmTask iTask = new ItdmTask();
-//                    iTask.setTaskRole("项目经理");
-//                    iTask.setTaskUser(vo.getPm());
-//                    iTask.setWeituoId(vo.getWeituoId());
-//                    QueryWrapper<ItdmTask> queryWrapper = new QueryWrapper<>(iTask);
-//                    List<ItdmTask> tList= taskMapper.selectList(queryWrapper);
-//                    if(tList == null || tList.isEmpty() || tList.get(0)==null){ //没有的话新增该委托id的项目经理task
-//                        ItdmTask nItdmTask = new ItdmTask();
-//                        nItdmTask.setTaskUser(vo.getPm());
-//                        nItdmTask.setWeituoId(vo.getWeituoId());
-//                        nItdmTask.setTaskRole("项目经理");
-//                        nItdmTask.setTaskContent("拆解工单");
-//                        nItdmTask.setTaskStatus(0);
-//                        taskMapper.insert(nItdmTask);
-//                    }
                 }
 
                 //查原来的工单master