fix 数据确认

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/gongdandetail/controller/ItdmGongdanQuerenController.java

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 工单detail
@@ -73,8 +74,6 @@ public class ItdmGongdanQuerenController extends JeecgController<ItdmGongdanDeta
     }
 
 
-
-
     @GetMapping(value = "/gongdanIdList")
     public Result<List<String>> gongdanIdList(String weituoId) {
         return Result.OK(itdmGongdanDetailService.getByweituoId(weituoId));
@@ -88,14 +87,23 @@ public class ItdmGongdanQuerenController extends JeecgController<ItdmGongdanDeta
 
     @GetMapping(value = "/gongdanWoIdList")
     public Result<List<String>> getWoIdByWeituoIdAndWordDate(String weituoId, String riqi) {
-        return Result.OK(itdmGongdanDetailService.getWoIdByWeituoIdAndWordDate(weituoId,riqi));
+        return Result.OK(itdmGongdanDetailService.getWoIdByWeituoIdAndWordDate(weituoId, riqi));
     }
 
 
-
     @GetMapping(value = "/gongdanDateListByWoId")
-    public Result<ItdmGongdanDetail> gongdanDateList(String woId, String riqi) {
-        ItdmGongdanDetail detailListByWoId = itdmGongdanDetailService.getDetailListByWoId(woId,riqi);
+    @ApiOperation(value = "工单detail-获取试验类型", notes = "工单detail-获取试验类型")
+
+    public Result<List<Map<String,String>>> gongdanDateList(String woId, String riqi) {
+        List<Map<String,String>> detailListByWoId = itdmGongdanDetailService.getDetailListByWoId(woId, riqi);
+        return Result.OK(detailListByWoId);
+    }
+
+    @GetMapping(value = "/gongdanDateListByWoId1")
+    @ApiOperation(value = "工单detail-获取试验时间", notes = "工单detail-获取试验时间")
+
+    public Result<Map<String, String>> gongdanDateList1(String woId, String riqi,String shiyanType) {
+        Map<String, String> detailListByWoId = itdmGongdanDetailService.getDetailListByWoId1(woId, riqi, shiyanType);
         return Result.OK(detailListByWoId);
     }
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/gongdandetail/service/IItdmGongdanQuerenService.java

@@ -6,6 +6,7 @@ import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 
 import java.text.ParseException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 工单detail
@@ -22,8 +23,9 @@ public interface IItdmGongdanQuerenService extends IService<ItdmGongdanDetail> {
 
     public List<String> getByweituoId(String weituoId);
 
-    public   ItdmGongdanDetail getDetailListByWoId(String woId, String riqi);
+    public  List<Map<String,String>> getDetailListByWoId(String woId, String riqi);
 
+    public Map<String, String> getDetailListByWoId1(String woId, String riqi, String shiyanType);
     public  List<String> getWorkDateByWeituoNO(String weituoNo);
 
     public  List<String> getWoIdByWeituoIdAndWordDate(String weituoNo,String work_date);

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/gongdandetail/service/impl/ItdmGongdanQuerenServiceImpl.java

@@ -2,24 +2,23 @@ package org.jeecg.modules.gongdandetail.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.gongdandetail.convert.GongdanDetailConvert;
 import org.jeecg.modules.gongdandetail.dto.ItdmGongdanDetailEditDTO;
 import org.jeecg.modules.gongdandetail.service.IItdmGongdanQuerenService;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
-import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanDetailMapper;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanDetailMapper;
 import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanMasterMapper;
 import org.jeecg.modules.itdmGongDan.mapper.ItdmTestPlanMapper;
+import org.jeecg.modules.system.mapper.SysDictItemMapper;
+import org.jeecg.modules.system.mapper.SysDictMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.function.Supplier;
 
 /**
@@ -44,6 +43,11 @@ public class ItdmGongdanQuerenServiceImpl extends ServiceImpl<ItdmGongdanDetailM
     @SuppressWarnings("all")
     private ItdmGongdanDetailMapper itdmGongdanDetailMapper;
 
+    @Autowired
+    @SuppressWarnings("all")
+
+    private SysDictMapper sysDictItemMapper;
+
     @Override
     public void queren(ItdmGongdanDetailEditDTO itdmGongdanDetail) throws ParseException {
 
@@ -91,18 +95,49 @@ public class ItdmGongdanQuerenServiceImpl extends ServiceImpl<ItdmGongdanDetailM
     }
 
     @Override
-    public ItdmGongdanDetail getDetailListByWoId(String woId, String riqi) {
+    public List<Map<String, String>> getDetailListByWoId(String woId, String riqi) {
 
         QueryWrapper<ItdmGongdanDetail> queryWrapper = new QueryWrapper<ItdmGongdanDetail>();
         queryWrapper.eq("wo_id", woId);
         queryWrapper.eq("shiji_work_date", riqi);
-        queryWrapper.apply("limit 1");
+        List<ItdmGongdanDetail> list = itdmGongdanDetailMapper.selectList(queryWrapper);
+        Set<String> stringSet = new HashSet<>();
+        List<Map<String, String>> mapList = new ArrayList<>();
+        for (ItdmGongdanDetail item : list) {
+            stringSet.addAll(Arrays.asList(item.getShijiShiiyanType().split(",")));
+        }
 
-        return itdmGongdanDetailMapper.selectOne(queryWrapper);
+
+        for (String string : stringSet) {
+            Map<String, String> map = new HashMap<>();
+            map.put("type", string);
+            map.put("name", sysDictItemMapper.queryDictTextByKey("shiiyan_type", string));
+
+
+            mapList.add(map);
+        }
+        return mapList;
     }
 
 
     @Override
+    public Map<String, String> getDetailListByWoId1(String woId, String riqi, String shiyanType) {
+        QueryWrapper<ItdmGongdanDetail> queryWrapper = new QueryWrapper<ItdmGongdanDetail>();
+        queryWrapper.eq("wo_id", woId);
+        queryWrapper.eq("shiji_work_date", riqi);
+        queryWrapper.apply("FIND_IN_SET('" + shiyanType + "',shiji_shiiyan_type)");
+        List<ItdmGongdanDetail> list = itdmGongdanDetailMapper.selectList(queryWrapper);
+        Map<String, String> map = new HashMap<>();
+        map.put("shiyanKaishitime","00:00");
+        map.put("shiyanJieshutime", "23:59");
+                if (list.size() <= 1) {
+            map.put("shiyanKaishitime", list.get(0).getShijiStartTime());
+            map.put("shiyanJieshutime", list.get(0).getShijiEndTime());
+        }
+        return map;
+    }
+
+    @Override
     public List<String> getWorkDateByWeituoNO(String weituoNo) {
         return itdmTestPlanMapper.getWorkDateByWeituoNO(weituoNo);
     }

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

@@ -90,6 +90,7 @@
                                   on t.id = m.jihua_shiyan_id
               where t.weituo_id = #{weituoId}) as a
                  inner join itdm_gongdan_detail as d on d.wo_id = a.id
+        where d.shiji_work_date is not null order by d.shiji_work_date
     </select>
     <select id="getWoIdByWeituoIdAndWordDate" resultType="java.lang.String">