Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZTouchOperationEngineeringController.java

@@ -3,8 +3,6 @@ package com.ruoyi.web.controller.zdsz;
 import java.util.List;
 import java.util.Arrays;
 
-import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringPipeJackingBo.java

@@ -57,37 +57,37 @@ public class ZEngineeringPipeJackingBo extends BaseEntity {
     /**
      * 工程地址
      */
-    @NotBlank(message = "工程地址不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "工程地址不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginAddre;
 
     /**
      * 工程编码
      */
-    @NotBlank(message = "工程编码不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "工程编码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginCode;
 
     /**
      * 施工单位
      */
-    @NotBlank(message = "施工单位不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "施工单位不能为空", groups = { AddGroup.class, EditGroup.class })
     private String constructUnit;
 
     /**
      * 工程规模
      */
-    @NotBlank(message = "工程规模不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "工程规模不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginScale;
 
     /**
      * 施工质量
      */
-    @NotBlank(message = "施工质量不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "施工质量不能为空", groups = { AddGroup.class, EditGroup.class })
     private String constructQuality;
 
     /**
      * 施工进度
      */
-    @NotBlank(message = "施工进度不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "施工进度不能为空", groups = { AddGroup.class, EditGroup.class })
     private String constructSchedule;
 
     /**

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZTouchOperationEngineeringBo.java

@@ -44,7 +44,6 @@ public class ZTouchOperationEngineeringBo extends BaseEntity {
     /**
      * 作业方式
      */
-    @NotBlank(message = "作业方式不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modeOperation;
 
     /**

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

@@ -282,4 +282,6 @@ private Date updateInfoTime;
      */
     @ExcelProperty(value = "施工人电话")
     private String constructPhone;
+    private String nickName;
+    private String phonenumber;
 }

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

@@ -91,6 +91,8 @@ public class ZEngineeringCivilExportVos extends BaseEntity implements Serializab
     private String gx6;
     private String gx7;
 
+    private String nickName;
+    private String phonenumber;
 
 
 }

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

@@ -67,6 +67,8 @@ public class ZEngineeringGasOpeningVo extends BaseEntity {
     private String houseId;
     @ExcelProperty(value = "房间")
     private String houseName;
+    @ExcelProperty(value = "现住人电话")
+    private String newPhone;
 
     /**
      * 立杠是否刷涂防腐漆

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

@@ -139,7 +139,9 @@ public class ZAreaServiceImpl implements IZAreaService {
                                     zHouseMapper.insert(house);
                                     successNum++;
                                 } else {
-                                    throw new ServiceException("" + "第" + (n + 1) + "行格式错误,导入失败!");
+                                    if(!"xz99".equals(districtValue)){
+                                        throw new ServiceException("" + "第" + (n + 1) + "行格式错误,导入失败!");
+                                    }
                                 }
                             } else {
                                 throw new ServiceException("" + "第" + (n + 1) + "行格式错误,导入失败!");
@@ -191,7 +193,9 @@ public class ZAreaServiceImpl implements IZAreaService {
                                         zHouseMapper.insert(house);
                                         successNum++;
                                     } else {
-                                        throw new ServiceException("" + "第" + (n + 1) + "行格式错误,导入失败!");
+                                        if(!"xz99".equals(districtValue)){
+                                            throw new ServiceException("" + "第" + (n + 1) + "行格式错误,导入失败!");
+                                        }
                                     }
                                 } else {
                                     throw new ServiceException("" + "第" + (n + 1) + "行格式错误,导入失败!");
@@ -229,7 +233,9 @@ public class ZAreaServiceImpl implements IZAreaService {
                                             zHouseMapper.insert(house);
                                             successNum++;
                                         } else {
-                                            throw new ServiceException("" + "第" + (n + 1) + "行格式错误,导入失败!");
+                                            if(!"xz99".equals(districtValue)){
+                                                throw new ServiceException("" + "第" + (n + 1) + "行格式错误,导入失败!");
+                                            }
                                         }
                                     } else {
                                         //单元
@@ -270,7 +276,9 @@ public class ZAreaServiceImpl implements IZAreaService {
                                                 zHouseMapper.updateById(house);
                                             }
                                         } else {
-                                            throw new ServiceException("" + "第" + (n + 1) + "行格式错误,导入失败!");
+                                            if(!"xz99".equals(districtValue)){
+                                                throw new ServiceException("" + "第" + (n + 1) + "行格式错误,导入失败!");
+                                            }
                                         }
                                     }
                                 } else {

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

@@ -398,9 +398,14 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getCorrosionLevel())) {
                     zEngineeringCivilExportVos.setCorrosionLevel("");
                 }
-                if ("".equals(zEngineeringCivilExportVos.getCorrosionLevel()) && "拆旧管".equals(zEngineeringCivilExportVo.getType()) && zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?"))
+                if ("".equals(zEngineeringCivilExportVos.getCorrosionLevel())
+                    && "拆旧管".equals(zEngineeringCivilExportVo.getType())
+                    && zEngineeringCivilExportVo.getCorrosionLevel() != null
+                    && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?"))
                     zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVo.getCorrosionLevel());
-                else if ("拆旧管".equals(zEngineeringCivilExportVo.getType()) && zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?"))
+                else if ("拆旧管".equals(zEngineeringCivilExportVo.getType())
+                    && zEngineeringCivilExportVo.getCorrosionLevel() != null
+                    && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?"))
                     zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVos.getCorrosionLevel() + "/" + zEngineeringCivilExportVo.getCorrosionLevel());
                 if ("".equals(zEngineeringCivilExportVos.getCorrosionLevel()) && "打孔".equals(zEngineeringCivilExportVo.getType()) && zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?"))
                     zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVo.getCorrosionLevel());
@@ -410,6 +415,8 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                     zEngineeringCivilExportVos.setLGmaterialQuality(zEngineeringCivilExportVo.getMaterialQuality());
                     zEngineeringCivilExportVos.setLGspecifications(zEngineeringCivilExportVo.getSpecifications());
                     zEngineeringCivilExportVos.setLGnumber(zEngineeringCivilExportVo.getNumber().toString());
+                    zEngineeringCivilExportVos.setNickName(zEngineeringCivilExportVo.getNickName().toString());
+                    zEngineeringCivilExportVos.setPhonenumber(zEngineeringCivilExportVo.getPhonenumber().toString());
                 }
                 if ("挂表".equals(zEngineeringCivilExportVo.getType()))
                     zEngineeringCivilExportVos.setBrand(zEngineeringCivilExportVo.getBrand());
@@ -440,10 +447,14 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                         zEngineeringCivilExportVos.setFGnumber(zEngineeringCivilExportVo.getNumber().toString());
                 }
             }
-            arrayList.add(zEngineeringCivilExportVos);
+            if("立杠".equals(bo.getType())){
+                if(!ObjectUtils.isEmpty(zEngineeringCivilExportVos.getLGmaterialQuality())){
+                    arrayList.add(zEngineeringCivilExportVos);
+                }
+            }else{
+                arrayList.add(zEngineeringCivilExportVos);
+            }
         }
-
-
         return arrayList;
     }
     @Override

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

@@ -1,25 +1,23 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.helper.LoginHelper;
-import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.redis.RedisUtils;
 import com.ruoyi.framework.handler.MonthTableNameHandler;
 import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
-import com.ruoyi.zdsz.domain.ZEngineeringGY;
 import com.ruoyi.zdsz.domain.ZEngineeringIndustry;
-import com.ruoyi.zdsz.domain.bo.*;
+import com.ruoyi.zdsz.domain.bo.ZEngiineeringPhotoBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
+import com.ruoyi.zdsz.domain.bo.ZFileBo;
 import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringGYVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryTypeVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
 import com.ruoyi.zdsz.mapper.ZEngineeringCivilMapper;
@@ -29,14 +27,11 @@ import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
 import com.ruoyi.zdsz.service.IZEngineeringNodeService;
 import lombok.RequiredArgsConstructor;
 import org.apache.poi.ss.formula.functions.T;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;

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

@@ -701,52 +701,58 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
 
     @Override
     public List<String> nodeTypeList(List<ZEngineeringCivil> zEngineeringCivilList, String type, String state, ZEngineeringCivilBo bo) {
-        List<ZEngineeringNode> nodeTypeList = new ArrayList<>();
-        List<String> civilIds = zEngineeringCivilList.stream().map(ZEngineeringCivil::getId).collect(Collectors.toList());
-        LocalDate startDate = LocalDate.of(2024, 3, 1); // 指定开始日期
-        LocalDate endDate = LocalDate.now(); // 当前日期
-        List<String> monthsBetween = getMonthsBetween(startDate, endDate);
-        if(!ObjectUtils.isEmpty(civilIds)){
-            if (StringUtils.isNotBlank(state)) {
-                if("99".equals(state)){
-                    List<String> nodeList = baseMapper.selectNodeListByMonth(monthsBetween,type,state,civilIds).stream().map(ZEngineeringNode::getCivliId).collect(Collectors.toList());
-                    return minus(civilIds,nodeList);
+        try {
+            List<ZEngineeringNode> nodeTypeList = new ArrayList<>();
+            List<String> civilIds = zEngineeringCivilList.stream().map(ZEngineeringCivil::getId).collect(Collectors.toList());
+            LocalDate startDate = LocalDate.of(2024, 3, 1); // 指定开始日期
+            LocalDate endDate = LocalDate.now(); // 当前日期
+            List<String> monthsBetween = getMonthsBetween(startDate, endDate);
+            if(!ObjectUtils.isEmpty(civilIds)){
+                if (StringUtils.isNotBlank(state)) {
+                    if("99".equals(state)){
+                        List<String> nodeList = baseMapper.selectNodeListByMonth(monthsBetween,type,state,civilIds).stream().map(ZEngineeringNode::getCivliId).collect(Collectors.toList());
+                        return minus(civilIds,nodeList);
+                    }else{
+                        nodeTypeList.addAll(baseMapper.selectNodeListByMonth(monthsBetween,type,state,civilIds));
+                    }
                 }else{
-                    nodeTypeList.addAll(baseMapper.selectNodeListByMonth(monthsBetween,type,state,civilIds));
+                    for (String date:monthsBetween) {
+                        MonthTableNameHandler.setData(date);
+                        LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
+                        lqw.in(ZEngineeringNode::getCivliId, civilIds);
+                        lqw.eq(StringUtils.isNotBlank(type), ZEngineeringNode::getType, type);
+                        nodeTypeList.addAll(baseMapper.selectList(lqw));
+                        MonthTableNameHandler.removeData();
+                    }
                 }
-            }else{
-                for (String date:monthsBetween) {
+            }
+            if ((!"".equals(bo.getBeginTime()) && !ObjectUtils.isEmpty(bo.getBeginTime())) || (!"".equals(bo.getCreateBy()) && !ObjectUtils.isEmpty(bo.getCreateBy()))) {
+                Iterator<ZEngineeringNode> iterator = nodeTypeList.iterator();
+                while (iterator.hasNext()) {
+                    ZEngineeringNode item = iterator.next();
+                    String date = new SimpleDateFormat("yyyy_MM").format(item.getCreateTime());
                     MonthTableNameHandler.setData(date);
-                    LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
-                    lqw.in(ZEngineeringNode::getCivliId, civilIds);
-                    lqw.eq(StringUtils.isNotBlank(type), ZEngineeringNode::getType, type);
-                    nodeTypeList.addAll(baseMapper.selectList(lqw));
-                    MonthTableNameHandler.removeData();
+                    LambdaQueryWrapper<ZEngineeringInfo> lqw = Wrappers.lambdaQuery();
+                    lqw.eq(StringUtils.isNotBlank(item.getId()), ZEngineeringInfo::getEngInfoId, 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";
+                        String endTime = bo.getBeginTime().get(1).toString()+" 23:59:59";
+                        lqw.between(ZEngineeringInfo::getUpdateInfoTime, startTime, endTime);
+                    }
+                    if (zEngineeringInfoMapper.selectCount(lqw) == 0) {
+                        iterator.remove();
+                    }
                 }
             }
-        }
-        if ((!"".equals(bo.getBeginTime()) && !ObjectUtils.isEmpty(bo.getBeginTime())) || (!"".equals(bo.getCreateBy()) && !ObjectUtils.isEmpty(bo.getCreateBy()))) {
-            Iterator<ZEngineeringNode> iterator = nodeTypeList.iterator();
-            while (iterator.hasNext()) {
-                ZEngineeringNode item = iterator.next();
-                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.like(StringUtils.isNotEmpty(bo.getCreateBy()),ZEngineeringInfo::getCreateBy, bo.getCreateBy());
-                if (!"".equals(bo.getBeginTime()) && !ObjectUtils.isEmpty(bo.getBeginTime())) {
-                    lqw.between(ZEngineeringInfo::getUpdateInfoTime, bo.getBeginTime().get(0), bo.getBeginTime().get(1));
-                }
-                if (zEngineeringInfoMapper.selectCount(lqw) == 0) {
-                    iterator.remove();
-                }
+            List<String> IDList = new ArrayList<>();
+            if (!ObjectUtils.isEmpty(nodeTypeList)) {
+                IDList = nodeTypeList.stream().map(ZEngineeringNode::getCivliId).collect(Collectors.toList());
             }
+            return IDList;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
         }
-        List<String> IDList = new ArrayList<>();
-        if (!ObjectUtils.isEmpty(nodeTypeList)) {
-            IDList = nodeTypeList.stream().map(ZEngineeringNode::getCivliId).collect(Collectors.toList());
-        }
-        return IDList;
     }
 
     private static List<String> minus(List<String> list1, List<String> list2) {

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

@@ -1,36 +1,31 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.zdsz.domain.ZTouchOperationEngineering;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringPipeJackingVo;
-import com.ruoyi.zdsz.service.IZEngineeringNodeService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZTouchOperationEngineeringBo;
 import com.ruoyi.zdsz.domain.vo.ZTouchOperationEngineeringVo;
-import com.ruoyi.zdsz.domain.ZTouchOperationEngineering;
 import com.ruoyi.zdsz.mapper.ZTouchOperationEngineeringMapper;
+import com.ruoyi.zdsz.service.IZEngineeringNodeService;
 import com.ruoyi.zdsz.service.IZTouchOperationEngineeringService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 import java.util.stream.Collectors;
 
 /**
@@ -171,6 +166,7 @@ public class ZTouchOperationEngineeringServiceImpl implements IZTouchOperationEn
             return flag;
         }else {
             try {
+                add = baseMapper.selectById(add.getId());
                 for (ZEngineeringNodeBo zEngineeringNodeBo : bo.getzEngineeringNodeBoList()) {
                     zEngineeringNodeBo.setCivliId(add.getId().toString());
                     zEngineeringNodeBo.setCreateTime(add.getCreateTime());

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

@@ -576,7 +576,7 @@
         WHERE
         1=1
         <if test="createTime != null and createTime != ''">
-            and update_info_time between #{createTime[0]} and #{createTime[1]}
+            AND update_info_time BETWEEN concat( #{createTime[0]}, ' 00:00:00' ) AND concat( #{createTime[1]}, ' 23:59:59' )
         </if>
         <if test="UserName != null and UserName != ''">
             and create_by like CONCAT('%',#{UserName},'%')
@@ -590,7 +590,7 @@
             WHERE
             1=1
             <if test="createTime != null and createTime != ''">
-                and update_info_time between #{createTime[0]} and #{createTime[1]}
+                AND update_info_time BETWEEN concat( #{createTime[0]}, ' 00:00:00' ) AND concat( #{createTime[1]}, ' 23:59:59' )
             </if>
             <if test="UserName != null and UserName != ''">
                 and create_by like CONCAT('%',#{UserName},'%')
@@ -626,7 +626,7 @@
         c.head_name,
         c.head_phone,
         d.visit_type,
-        d.corrosion_level AS corrosion_level,
+        l.name AS corrosion_level,
         n.name as self_closing_valve_type,
         m.name as brand,
         e.`name` AS material_quality,
@@ -635,11 +635,14 @@
         c.update_info_time as updateInfoTime,
         c.create_by as createBy,
         c.remark,
-        d.remark as remarkd
+        d.remark as remarkd,
+        us.nick_name as nickName,
+        us.phonenumber
         FROM
         z_engineering_civil a
         LEFT JOIN z_engineering_node b ON a.id = b.civli_id
         LEFT JOIN z_engineering_info c ON b.id = c.eng_info_id
+        LEFT JOIN sys_user us ON us.user_name = c.create_by
         LEFT JOIN z_engineering_material d ON c.id = d.details_id
         LEFT JOIN z_engin_material_quality e ON e.id = d.material_quality
         LEFT JOIN z_engin_specifications f ON f.id = d.specifications
@@ -653,7 +656,14 @@
         LEFT JOIN z_engin_material_quality m ON m.id = d.brand
         LEFT JOIN z_engin_material_quality n ON n.id = d.self_closing_valve_type
         WHERE
-        a.create_time LIKE CONCAT(REPLACE(#{createTime}, '_', '-'),'%')
+         a.del_flag = '0'
+        and b.del_flag = '0'
+        and c.del_flag = '0'
+        and d.del_flag = '0'
+        and g.del_flag = '0'
+        and h.del_flag = '0'
+        and i.del_flag = '0'
+        and j.del_flag = '0'
         <if test="p.district != null and p.district != ''">
             and a.district = #{p.district}
         </if>
@@ -676,7 +686,7 @@
             and a.engin_cycle = 0
         </if>
         <if test="p.beginTime != null and p.beginTime != ''">
-            and c.update_info_time between #{p.beginTime[0]} and #{p.beginTime[1]}
+            AND c.update_info_time BETWEEN concat( #{p.beginTime[0]}, ' 00:00:00' ) AND concat( #{p.beginTime[1]}, ' 23:59:59' )
         </if>
         <if test="p.createBy != null and p.createBy != ''">
             and c.create_by like CONCAT(#{p.createBy},'%')
@@ -710,7 +720,7 @@
             c.head_name,
             c.head_phone,
             d.visit_type,
-            d.corrosion_level AS corrosion_level,
+            l.name AS corrosion_level,
             n.name as self_closing_valve_type,
             m.name as brand,
             e.`name` AS material_quality,
@@ -719,11 +729,14 @@
             c.update_info_time as updateInfoTime,
             c.create_by as createBy,
             c.remark,
-            d.remark as remarkd
+            d.remark as remarkd,
+            us.nick_name as nickName,
+            us.phonenumber
             FROM
             z_engineering_civil a
             LEFT JOIN z_engineering_node_${name} b ON a.id = b.civli_id
             LEFT JOIN z_engineering_info_${name} c ON b.id = c.eng_info_id
+            LEFT JOIN sys_user us ON us.user_name = c.create_by
             LEFT JOIN z_engineering_material_${name} d ON c.id = d.details_id
             LEFT JOIN z_engin_material_quality e ON e.id = d.material_quality
             LEFT JOIN z_engin_specifications f ON f.id = d.specifications
@@ -733,11 +746,18 @@
             LEFT JOIN z_house j ON j.id = a.house_id
             LEFT JOIN sys_dict_data k ON k.dict_type = a.engin_type
             AND k.dict_value = a.engin_classification
-            LEFT JOIN z_engin_specifications l ON l.id = d.corrosion_level
+            LEFT JOIN z_engin_material_quality l ON l.id = d.corrosion_level
             LEFT JOIN z_engin_material_quality m ON m.id = d.brand
             LEFT JOIN z_engin_material_quality n ON n.id = d.self_closing_valve_type
             WHERE
-            a.create_time LIKE CONCAT(REPLACE(#{name}, '_', '-'),'%')
+             a.del_flag = '0'
+            and b.del_flag = '0'
+            and c.del_flag = '0'
+            and d.del_flag = '0'
+            and g.del_flag = '0'
+            and h.del_flag = '0'
+            and i.del_flag = '0'
+            and j.del_flag = '0'
             <if test="p.district != null and p.district != ''">
                 and a.district = #{p.district}
             </if>
@@ -760,7 +780,7 @@
                 and a.engin_cycle = 0
             </if>
             <if test="p.beginTime != null and p.beginTime != ''">
-                and c.update_info_time between #{p.beginTime[0]} and #{p.beginTime[1]}
+                AND c.update_info_time BETWEEN concat( #{p.beginTime[0]}, ' 00:00:00' ) AND concat( #{p.beginTime[1]}, ' 23:59:59' )
             </if>
             <if test="p.createBy != null and p.createBy != ''">
                 and c.create_by like CONCAT(#{p.createBy},'%')
@@ -800,7 +820,9 @@
         null AS updateInfoTime,
         null AS createBy,
         null AS remark,
-        null AS remarkd
+        null AS remarkd,
+        null as nickName,
+        null as phonenumber
         FROM
         z_engin_not_installed a
         LEFT JOIN sys_dict_data b ON a.district = b.dict_value AND b.dict_type = 'district'
@@ -828,7 +850,7 @@
             and a.engin_type = #{p.enginType}
         </if>
         <if test="p.beginTime != null and p.beginTime != ''">
-            and a.create_time between #{p.beginTime[0]} and #{p.beginTime[1]}
+            AND a.create_time BETWEEN concat( #{p.beginTime[0]}, ' 00:00:00' ) AND concat( #{p.beginTime[1]}, ' 23:59:59' )
         </if>
         <if test="p.createBy != null and p.createBy != ''">
             and a.create_by like CONCAT(#{p.createBy},'%')
@@ -871,7 +893,12 @@
         LEFT JOIN sys_dict_data k ON k.dict_type = a.engin_type
         AND k.dict_value = a.engin_classification
         WHERE
-        a.create_time LIKE CONCAT(REPLACE(#{createTime}, '_', '-'),'%')
+         a.del_flag = '0'
+        and b.del_flag = '0'
+        and g.del_flag = '0'
+        and h.del_flag = '0'
+        and i.del_flag = '0'
+        and j.del_flag = '0'
         <if test="p.district != null and p.district != ''">
             and a.district = #{p.district}
         </if>
@@ -928,7 +955,12 @@
             LEFT JOIN sys_dict_data k ON k.dict_type = a.engin_type
             AND k.dict_value = a.engin_classification
             WHERE
-            a.create_time LIKE CONCAT(REPLACE(#{name}, '_', '-'),'%')
+             a.del_flag = '0'
+            and b.del_flag = '0'
+            and g.del_flag = '0'
+            and h.del_flag = '0'
+            and i.del_flag = '0'
+            and j.del_flag = '0'
             <if test="p.district != null and p.district != ''">
                 and a.district = #{p.district}
             </if>
@@ -994,7 +1026,7 @@
             and a.engin_cycle = 0
         </if>
         <if test="p.beginTime != null and p.beginTime != ''">
-            and a.update_info_time between #{p.beginTime[0]} and #{p.beginTime[1]}
+            AND a.update_info_time BETWEEN concat( #{p.beginTime[0]}, ' 00:00:00' ) AND concat( #{p.beginTime[1]}, ' 23:59:59' )
         </if>
         <if test="p.type != null and p.type != ''">
             and b.type =#{p.type}
@@ -1029,7 +1061,7 @@
                 and a.engin_cycle = 0
             </if>
             <if test="p.beginTime != null and p.beginTime != ''">
-                and a.update_info_time between #{p.beginTime[0]} and #{p.beginTime[1]}
+                AND a.update_info_time BETWEEN concat( #{p.beginTime[0]}, ' 00:00:00' ) AND concat( #{p.beginTime[1]}, ' 23:59:59' )
             </if>
             <if test="p.type != null and p.type != ''">
                 and b.type =#{p.type}

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

@@ -18,7 +18,8 @@
             if(a.name is null , '未知' ,a.NAME) AS areaName,
             if(b.name is null , '未知' ,b.NAME) AS buildingName,
             if(c.name is null , '未知' ,c.NAME) AS unitName,
-            if(d.name is null , '未知' ,d.NAME) AS houseName
+            if(d.name is null , '未知' ,d.NAME) AS houseName,
+            d.new_phone as newPhone
         FROM
             z_engineering_gas_opening z
             LEFT JOIN z_area a ON z.area_id = a.id

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

@@ -4,8 +4,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.zdsz.mapper.ZdszBigscreenMapper">
     <insert id="setConstructionProgress">
-        delete from z_bigscreen_constructionProgress where time = #{time};
-        insert into z_bigscreen_constructionProgress (time, iron, pe, stainless_steel_bellow, spiral_welded_pipe, seamless_steel_tube, galvanized_steel_pipe, polyethylene_pipe)
+        delete from z_bigscreen_constructionprogress where time = #{time};
+        insert into z_bigscreen_constructionprogress (time, iron, pe, stainless_steel_bellow, spiral_welded_pipe, seamless_steel_tube, galvanized_steel_pipe, polyethylene_pipe)
         values (#{time}, #{iron}, #{pe}, #{stainless_steel_bellow}, #{spiral_welded_pipe}, #{seamless_steel_tube}, #{galvanized_steel_pipe}, #{polyethylene_pipe})
     </insert>
     <select id="pipeNum" resultType="java.lang.Double">
@@ -32,10 +32,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getConstructionProgress" resultType="java.util.LinkedHashMap">
         <if test="time != null and time != ''">
-            select * from z_bigscreen_constructionProgress where time = #{time}
+            select * from z_bigscreen_constructionprogress where time = #{time}
         </if>
         <if test="time == null or time == ''">
-            select * from z_bigscreen_constructionProgress
+            select * from z_bigscreen_constructionprogress
             <where>
                 <if test="beginTime != null and beginTime != ''">
                     time >= #{beginTime}
@@ -48,8 +48,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <insert id="setProjectStatus">
-        delete from z_bigscreen_projectStatus where time = #{time};
-        insert into z_bigscreen_projectStatus (time, todo, doing, done)
+        delete from z_bigscreen_projectstatus where time = #{time};
+        insert into z_bigscreen_projectstatus (time, todo, doing, done)
         values (#{time}, #{todo}, #{doing}, #{done})
     </insert>
     <select id="todoNum" resultType="java.lang.Long">
@@ -78,10 +78,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getProjectStatus" resultType="java.util.LinkedHashMap">
         <if test="time != null and time != ''">
-            select * from z_bigscreen_projectStatus where time = #{time}
+            select * from z_bigscreen_projectstatus where time = #{time}
         </if>
         <if test="time == null or time == ''">
-            select * from z_bigscreen_projectStatus
+            select * from z_bigscreen_projectstatus
             <where>
                 <if test="beginTime != null and beginTime != ''">
                     time >= #{beginTime}