提交

ruoyi-yiqi/src/main/resources/mapper/YqGOrderMapper.xml

@@ -177,7 +177,7 @@
         a.whether as whether,
         a.version as version,
         CONCAT(f.dict_label,'-',e.name,'-',d.name,'-',c.name,'-',b.name) as house
-        from yq_yq_g_order a
+        from yq_g_order a
         left join yq_g_house b on ( a.house_id = b.id and b.del_flag = '0')
         left join yq_g_unit c on ( b.unit_id = c.id and c.del_flag = '0')
         left join yq_g_building d on ( c.building_id = d.id and d.del_flag = '0')
@@ -232,7 +232,7 @@
     <select id="getExaminePipeType" resultType="com.ruoyi.yiqi.entity.YqGCensusVo">
         select count(DISTINCT o.id) as value,
             o.pipe_type as name
-        from yq_yq_g_order o
+        from yq_g_order o
                 left join yq_g_house a on ( o.house_id = a.id and a.del_flag = '0')
                 left join yq_g_unit b on ( a.unit_id = b.id and b.del_flag = '0')
                 left join yq_g_building c on ( b.building_id = c.id and c.del_flag = '0')
@@ -247,7 +247,7 @@
     <select id="getExaminePipeLength" resultType="com.ruoyi.yiqi.entity.YqGCensusVo">
         select count(DISTINCT o.id) as value,
             o.pipe_length as name
-        from yq_yq_g_order o
+        from yq_g_order o
                 left join yq_g_house a on ( o.house_id = a.id and a.del_flag = '0')
                 left join yq_g_unit b on ( a.unit_id = b.id  and b.del_flag = '0')
                 left join yq_g_building c on ( b.building_id = c.id  and c.del_flag = '0')
@@ -302,7 +302,7 @@
         a.whether as whether,
         a.version as version,
         CONCAT(f.dict_label,'-',e.name,'-',d.name,'-',c.name,'-',b.name) as house
-        from yq_yq_g_order a
+        from yq_g_order a
         left join yq_g_house b on a.house_id = b.id
         left join yq_g_unit c on b.unit_id = c.id
         left join yq_g_building d on c.building_id = d.id
@@ -379,7 +379,7 @@
         a.update_time as updateTime,
         CONCAT(f.dict_label,'-',e.name,'-',d.name,'-',c.name,'-',b.name) as house,
         a.whether as whether
-        from yq_yq_g_order a
+        from yq_g_order a
         left join yq_g_house b on ( a.house_id = b.id and b.del_flag = '0')
         left join yq_g_unit c on ( b.unit_id = c.id and c.del_flag = '0')
         left join yq_g_building d on ( c.building_id = d.id and d.del_flag = '0')

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

@@ -222,7 +222,6 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
 
 
     }
-
     @Override
     @DynamicName(spel = "#bo.createTime")
     @Transactional(rollbackFor = Exception.class)
@@ -240,10 +239,9 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
         });
         int flag = 0;
         if (IdList.size() > 0) {
-            obsService.deleteFiles(UrlList);
+//            obsService.deleteFiles(UrlList);
             flag = baseMapper.deleteBatchIds(IdList);
         }
-        ;
         return flag > 0;
     }
 

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

@@ -419,7 +419,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 if ("立杠".equals(zEngineeringCivilExportVo.getType())) {
                     zEngineeringCivilExportVos.setLGmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
                     zEngineeringCivilExportVos.setLGspecifications(zEngineeringCivilExportVo.getSpecifications());
-                    zEngineeringCivilExportVos.setLGnumber(zEngineeringCivilExportVo.getNumber().toString());
+                    zEngineeringCivilExportVos.setLGnumber(ObjectUtils.isEmpty(zEngineeringCivilExportVo.getNumber())?"":zEngineeringCivilExportVo.getNumber().toString());
                     zEngineeringCivilExportVos.setNickNameB(zEngineeringCivilExportVo.getNickName().toString());
                     zEngineeringCivilExportVos.setPhonenumber(zEngineeringCivilExportVo.getPhonenumber().toString());
                 }

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

@@ -238,9 +238,9 @@ public class ZEngineeringGasOpeningServiceImpl implements IZEngineeringGasOpenin
         return flag;
     }
 
-        /**
-         * 本故事根据管道厚度功能模块改编
-         */
+    /**
+     * 本故事根据管道厚度功能模块改编
+     */
     private void batchUpdatePic(List<String> picList, String parentId, String type, Date createTime){
 //            if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo().getzEngineeringInfoBo().getIronPipelineThickness())) {
 //        if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo().getzEngineeringInfoBoList().get(0).getIronPipelineThickness())) {

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

@@ -742,7 +742,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                     String date = new SimpleDateFormat("yyyy_MM").format(item.getCreateTime());
                     MonthTableNameHandler.setData(date);
                     LambdaQueryWrapper<ZEngineeringInfo> lqw = Wrappers.lambdaQuery();
-                    lqw.eq(StringUtils.isNotBlank(item.getId()), ZEngineeringInfo::getEngInfoId, item.getId());
+                    lqw.eq(StringUtils.isNotBlank(item.getId()), ZEngineeringInfo::getId, item.getId());
                     lqw.like(StringUtils.isNotEmpty(bo.getCreateBy()),ZEngineeringInfo::getCreateBy, bo.getCreateBy());
                     if (!"".equals(bo.getBeginTime()) && !ObjectUtils.isEmpty(bo.getBeginTime())) {
                         String startTime = bo.getBeginTime().get(0).toString()+" 00:00:00";

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

@@ -717,6 +717,9 @@
         <if test="p.enginType != null and p.enginType != ''">
             and a.engin_type = #{p.enginType}
         </if>
+        <if test="p.type != null and p.type != ''">
+            and b.type = #{p.type}
+        </if>
         <if test="p.enginClassification != null and p.enginClassification != ''">
             and a.engin_classification = #{p.enginClassification}
         </if>

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

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectNodeListByMonth" resultMap="ZEngineeringNodeResult">
         <foreach collection="monthList" item="month" open="" separator=" union all " close="">
             <if test="state != 99" >
-                SELECT DISTINCT a.civli_id,b.id
+                SELECT DISTINCT a.civli_id,b.id,a.create_time
                 FROM
                 z_engineering_node_${month} a
                 left join z_engineering_info_${month} b on a.id=b.eng_info_id and b.del_flag=0
@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             <if test="state == 99" >
                 select DISTINCT
-                a.civli_id
+                a.civli_id,a.create_time
                 from
                 z_engineering_node_${month} a
                 left join z_engineering_civil c on a.civli_id = c.id