计划排期显示该计划所有工单是否完成

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/mapper/ItdmGongdanMasterMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
 import org.jeecg.modules.itdmGongDan.vo.ShijiDate;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -35,4 +36,11 @@ public interface ItdmGongdanMasterMapper extends BaseMapper<ItdmGongdanMaster> {
             "where jihua_shiyan_id = #{testPlanId}")
     public ShijiDate getShijiDateByTestPlanId(@Param("testPlanId") String testPlanId);
 
+    /**
+     * 根据计划试验id查所有实绩结束日期为空的工单master
+     */
+    @Select("select * from itdm_gongdan_master " +
+            "where jihua_shiyan_id = #{testPlanId} and shiji_end_date IS NULL")
+    public List<ItdmGongdanMaster> getShijiEndDateListByTestPlanId(@Param("testPlanId") String testPlanId);
+
 }

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

@@ -155,7 +155,7 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
                 List<ItdmTestPlan> testPlanList = itdmTestPlanMapper.selectByMap(testPlanMap);
                 if(testPlanList == null || testPlanList.isEmpty() || testPlanList.get(0)==null){ //都已确认
                     Map<String, Object> columnMap = new HashMap<>();
-                    columnMap.put("task_role","项目经理");
+                    columnMap.put("task_role",GlobalVariables.xmjl);//"项目经理"
                     columnMap.put("weituo_id",dto.getWeituoId());
                     columnMap.put("task_user",dto.getPm());
                     List<ItdmTask> taskList = taskMapper.selectByMap(columnMap);
@@ -208,7 +208,7 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
                     List<ItdmTestPlan> testPlanList = itdmTestPlanMapper.selectByMap(testPlanMap);
                     if(testPlanList == null || testPlanList.isEmpty() || testPlanList.get(0)==null){ //都已确认
                         Map<String, Object> map = new HashMap<>();
-                        map.put("task_role","项目经理");
+                        map.put("task_role",GlobalVariables.xmjl);//"项目经理"
                         map.put("weituo_id",dto.getWeituoId());
                         map.put("task_user",dto.getPm());
                         List<ItdmTask> tList = taskMapper.selectByMap(map);
@@ -280,7 +280,7 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
             }
             //新增该pm的项目经理拆解工单的task
             ItdmTask itdmTask = new ItdmTask();
-            itdmTask.setTaskRole("项目经理");
+            itdmTask.setTaskRole(GlobalVariables.xmjl);//"项目经理"
             itdmTask.setTaskUser(dto.getPm());
             itdmTask.setWeituoId(dto.getWeituoId());
             itdmTask.setTaskContent("拆解工单");
@@ -290,7 +290,7 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
 
             //修改计划员计划排期task状态为1进行中
             Map<String, Object> columnMap = new HashMap<>();
-            columnMap.put("task_role","计划员");
+            columnMap.put("task_role",GlobalVariables.jhy);//"计划员"
             columnMap.put("weituo_id",dto.getWeituoId());
             columnMap.put("task_user",realName);
             List<ItdmTask> taskList = taskMapper.selectByMap(columnMap);
@@ -324,7 +324,7 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
                 ItdmTask nItdmTask = new ItdmTask();
                 nItdmTask.setTaskUser(pmVO);
                 nItdmTask.setWeituoId(dto.getWeituoId());
-                nItdmTask.setTaskRole("项目经理");
+                nItdmTask.setTaskRole(GlobalVariables.xmjl);//"项目经理"
                 nItdmTask.setTaskContent("拆解工单");
                 nItdmTask.setTaskStatus(0);
                 taskService.insertTaskAfterJudge(nItdmTask);
@@ -337,7 +337,7 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
                     //该委托id、原pm对应试验计划列表若为空删除原pm、项目经理、委托id对应的task
                     QueryWrapper<ItdmTask> taskWrapper = new QueryWrapper<>();
                     taskWrapper.eq("weituo_id",dto.getWeituoId());
-                    taskWrapper.eq("task_role","项目经理");
+                    taskWrapper.eq("task_role",GlobalVariables.xmjl);//"项目经理"
                     taskWrapper.eq("task_user",plan.getPm());
                     taskMapper.delete(taskWrapper);
                 }
@@ -346,7 +346,7 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
                 ItdmTask nItdmTask = new ItdmTask();
                 nItdmTask.setTaskUser(dto.getPm());
                 nItdmTask.setWeituoId(dto.getWeituoId());
-                nItdmTask.setTaskRole("项目经理");
+                nItdmTask.setTaskRole(GlobalVariables.xmjl);//"项目经理"
                 nItdmTask.setTaskContent("拆解工单");
                 nItdmTask.setTaskStatus(0);
                 taskService.insertTaskAfterJudge(nItdmTask);
@@ -403,7 +403,12 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
             List<ItdmJHYQueryListVO> list1 = list.stream().map(i -> {
                 String testPlanId = i.getTestPlanId();
                 ShijiDate shijiDate = itdmGongdanMasterMapper.getShijiDateByTestPlanId(testPlanId);
-                return ItdmJHYQueryListVO.toItdmJHYQueryListVO3(i,weituoNo,shijiDate);
+
+                String jhpqStatus = "0"; //0未完成1已完成
+                List<ItdmGongdanMaster> shijiEndList = itdmGongdanMasterMapper.getShijiEndDateListByTestPlanId(testPlanId);
+                if(shijiEndList==null || shijiEndList.isEmpty()) jhpqStatus="1"; //已完成
+
+                return ItdmJHYQueryListVO.toItdmJHYQueryListVO3(i,weituoNo,shijiDate,jhpqStatus);
             }).collect(Collectors.toList());
             return list1;
         }else {
@@ -412,7 +417,12 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
                 String weituoNo1 = itdmWeituoInfoMapper.selectById(i.getWeituoId()).getWeituoNo();
                 String testPlanId = i.getTestPlanId();
                 ShijiDate shijiDate = itdmGongdanMasterMapper.getShijiDateByTestPlanId(testPlanId);
-                return ItdmJHYQueryListVO.toItdmJHYQueryListVO3(i,weituoNo1,shijiDate);
+
+                String jhpqStatus = "0"; //0未完成1已完成
+                List<ItdmGongdanMaster> shijiEndList = itdmGongdanMasterMapper.getShijiEndDateListByTestPlanId(testPlanId);
+                if(shijiEndList==null || shijiEndList.isEmpty()) jhpqStatus="1"; //已完成
+
+                return ItdmJHYQueryListVO.toItdmJHYQueryListVO3(i,weituoNo1,shijiDate,jhpqStatus);
             }).collect(Collectors.toList());
             return list1;
         }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/vo/ItdmJHYQueryListVO.java

@@ -130,6 +130,10 @@ public class ItdmJHYQueryListVO {
     @Excel(name = "规格型号", width = 15)
     @ApiModelProperty(value = "规格型号")
     private java.lang.String sampleModelSpecification;
+    /**该计划是否完成（0未完成1完成）*/
+    @Excel(name = "该计划是否完成（0未完成1完成）", width = 15)
+    @ApiModelProperty(value = "该计划是否完成（0未完成1完成）")
+    private java.lang.String jhpqStatus;
 
 //    /**测试*/
 //    public static ItdmJHYQueryListVO toItdmJHYQueryListVO(ItdmJCXMAndSYJHVO itdmVO, String weituoNo, String sampleName, String deviceName){
@@ -158,7 +162,8 @@ public class ItdmJHYQueryListVO {
 //    }
 
     /**填入委托编号，计算持续时间，状态转化——计划员查询列表对象*/
-    public static ItdmJHYQueryListVO toItdmJHYQueryListVO3(ItdmJHYQueryListVO vo, String weituoNo, ShijiDate shijiDate){
+    public static ItdmJHYQueryListVO toItdmJHYQueryListVO3(ItdmJHYQueryListVO vo, String weituoNo, ShijiDate shijiDate, String jhpqStatus){
+        vo.setJhpqStatus(jhpqStatus);//0未完成1已完成
         vo.setId(vo.getTestItemsId());//用来放检测项目id
         vo.setWeituoNo(weituoNo);
         if(vo.getJihuaEndDate()!=null && vo.getTestItemsId()!=null){