fix: 添加审核判断

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/baogao/service/impl/ItdmBaogaoServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.config.JeecgBaseConfig;
+import org.jeecg.modules.Itdmgongdanshuju.mapper.ItdmGongdanShujuMapper;
 import org.jeecg.modules.baogao.convert.BaogaoConvert;
 import org.jeecg.modules.baogao.dto.ItdmBaogaoCreateDTO;
 import org.jeecg.modules.baogao.entity.ItdmBaogao;
@@ -84,6 +85,10 @@ public class ItdmBaogaoServiceImpl extends ServiceImpl<ItdmBaogaoMapper, ItdmBao
     private ItdmChuanganqiMapper chuangeMapper;
 
 
+    @Autowired
+    private ItdmGongdanShujuMapper itdmGongdanShujuMapper;
+
+
     @Override
     public Page<ItdmBaogaoListVO> pageVO(Page<ItdmBaogao> pageVO, QueryWrapper<ItdmBaogao> queryWrapper) {
 
@@ -195,6 +200,11 @@ public class ItdmBaogaoServiceImpl extends ServiceImpl<ItdmBaogaoMapper, ItdmBao
         map.put("daqiya", dto.getDaqiya());
         map.putAll(PoiTiUtils.getBaogaoImage(getBaogaoImage(dto)));
 
+        map.putAll(PoiTiUtils.getYSdata(getBaogaoShuju(dto)));
+
+
+
+
         return map;
     }
 
@@ -206,6 +216,15 @@ public class ItdmBaogaoServiceImpl extends ServiceImpl<ItdmBaogaoMapper, ItdmBao
                 .stream().distinct().collect(Collectors.toList());
     }
 
+    private List<String> getBaogaoShuju(ItdmBaogaoCreateDTO dto) {
+
+
+        return tdmTestPlanMapper.getImageByShiyanid(dto.getTestItemsIds())
+                .stream().distinct().collect(Collectors.toList());
+    }
+
+
+
     private List<ItdmDevice> getDeviceList(List<String> list) {
 
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/baogao/util/PoiTiUtils.java

@@ -6,6 +6,7 @@ import com.deepoove.poi.config.Configure;
 import com.deepoove.poi.config.ConfigureBuilder;
 import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
 import org.apache.commons.lang3.time.DateUtils;
+import org.jeecg.modules.Itdmgongdanshuju.entity.ItdmGongdanShuju;
 import org.jeecg.modules.baogao.common.BGType;
 import org.jeecg.modules.baogao.common.BGXsType;
 import org.jeecg.modules.baogao.dto.ItdmBaogaoCreateDTO;
@@ -276,6 +277,15 @@ public class PoiTiUtils {
     }
 
 
+    public static Map<String, Object> getYSdata(List<String> shuju) {
+        Map<String, Object> map = new HashMap<>();
+
+        // todo
+
+        return map;
+    }
+
+
 
 
     public static void main(String[] args) throws ParseException, IOException {

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

@@ -24,6 +24,7 @@ public interface ItdmTestPlanMapper extends BaseMapper<ItdmTestPlan> {
     public  List<String> getImageByShiyanid(@Param("list") List<String> list);
 
 
+    public  List<String> getShujuByShiyanid(@Param("list") List<String> list);
 
 
 

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

@@ -54,4 +54,20 @@
         </foreach>
 
     </select>
+    <select id="getShujuByShiyanid" resultType="java.lang.String">
+
+        select c.shiyan_data
+        from itdm_gongdan_master as b
+
+        inner join itdm_gongdan_shuju c on b.id = c.wo_id
+
+        where b.test_items_id in
+
+
+        <foreach item="item" collection="list" separator="," open="(" close=")" index="">
+            #{item}
+        </foreach>
+    </select>
+
+
 </mapper>