顶管工程校验

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEnginMaterialQualityVo.java

@@ -50,5 +50,7 @@ public class ZEnginMaterialQualityVo implements Serializable {
     private String materialType;
 
     private String createBy;
+    private String enginNodeName;
+    private String enginSortName;
 
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringCivilVo.java

@@ -151,4 +151,6 @@ public class ZEngineeringCivilVo extends BaseEntity implements Serializable {
     private String gx5;
     private String gx6;
     private String gx7;
+
+    private List<String> allPicUrl;
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringNodeMapper.java

@@ -17,4 +17,5 @@ public interface ZEngineeringNodeMapper extends BaseMapperPlus<ZEngineeringNodeM
 
     List<ZEngineeringNode> selectNodeListByMonth(@Param("monthList") List<String> monthList, @Param("type")String type, @Param("state")String state,@Param("civilIds")List<String> civilIds);
     List<String> selectNodeCivliIdListByMonth(@Param("monthList") List<String> monthList, @Param("nodeIds")List<String> nodeIds);
+    List<String> queryPhotoList(String civliId);
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringNodeService.java

@@ -36,6 +36,13 @@ public interface IZEngineeringNodeService {
      * @return
      */
     ZEngineeringNodeBo query(ZEngineeringNodeBo bo) ;
+
+    /**
+     * 根据工程id查询所有照片集合
+     * @param bo
+     * @return
+     */
+    List<String> queryPhotoList(ZEngineeringNodeBo bo) ;
     ZEngineeringNodeBo queryInsert(ZEngineeringNodeBo bo) ;
     ZEngineeringNodeBo Userquery(ZEngineeringNodeBo bo,String username);
     /**

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringCivilServiceImpl.java

@@ -141,6 +141,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());
         zEngineeringNodeBo.setType(type);
         zEngineeringCivilVo.setzEngineeringNodeBo(izEngineeringNodeService.query(zEngineeringNodeBo));
+        zEngineeringCivilVo.setAllPicUrl(izEngineeringNodeService.queryPhotoList(zEngineeringNodeBo));
         return zEngineeringCivilVo;
     }
     @Override

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringNodeServiceImpl.java

@@ -88,6 +88,12 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     public ZEngineeringNodeVo queryById(String id) {
         return baseMapper.selectVoById(id);
     }
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    public List<String> queryPhotoList(ZEngineeringNodeBo bo) {
+        return baseMapper.queryPhotoList(bo.getCivliId());
+    }
+
 
     @Override
     @DynamicName(spel = "#bo.createTime")

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEnginMaterialQualityMapper.xml

@@ -17,7 +17,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="getEnginMaterialQualityList" resultType="com.ruoyi.zdsz.domain.vo.ZEnginMaterialQualityVo">
-        select * from z_engin_material_quality zc
+        select DISTINCT zc.*,
+        da.dict_label as enginSortName,
+        db.dict_label as enginNodeName
+        FROM
+        z_engin_material_quality zc
+        left join sys_dict_data da on zc.engin_sort=da.dict_value
+        left join sys_dict_data db on zc.engin_node=db.dict_value
         <where>
             zc.del_flag = '0'
             <if test="enginType != null and enginType != ''">

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEngineeringNodeMapper.xml

@@ -61,4 +61,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </foreach>
         </foreach>
     </select>
+    <select id="queryPhotoList" resultType="String">
+        SELECT
+            c.pic_url
+        FROM
+            z_engineering_node a
+                left join z_engineering_info b on a.id=b.eng_info_id
+                left join z_engiineering_photo c on c.parent_id=b.id
+        WHERE
+            civli_id = #{civliId}
+          and a.del_flag = '0'
+          and b.del_flag = '0'
+          and c.del_flag = '0'
+
+    </select>
+
 </mapper>