工业市政基建碰口查询条件及审核

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringInfrastructure.java

@@ -29,6 +29,12 @@ public class ZEngineeringInfrastructure extends BaseEntity {
      */
     @TableId(value = "id")
     private String id;
+
+    /**
+     * 行政区
+     */
+    private String district;
+
     /**
      * 工程名称
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringPipeJacking.java

@@ -32,6 +32,11 @@ public class ZEngineeringPipeJacking extends BaseEntity {
      */
     private String enginId;
 
+    /**
+     * 行政区
+     */
+    private String district;
+
     private String enginName;
     /**
      * 工程地址

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZTouchOperationEngineering.java

@@ -25,10 +25,16 @@ public class ZTouchOperationEngineering extends BaseEntity {
     private static final long serialVersionUID=1L;
 
     /**
-     * 
+     *
      */
     @TableId(value = "id")
     private Long id;
+
+    /**
+     * 行政区
+     */
+    private String district;
+
     /**
      * 作业方式
      */

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

@@ -35,6 +35,11 @@ public class ZEngineeringInfrastructureBo extends BaseEntity {
     private String id;
 
     /**
+     * 行政区
+     */
+    private String district;
+
+    /**
      * 工程名称
      */
     @NotBlank(message = "工程名称不能为空", groups = { AddGroup.class, EditGroup.class })

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

@@ -38,6 +38,10 @@ public class ZEngineeringPipeJackingBo extends BaseEntity {
     @NotBlank(message = "工程id不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginId;
 
+    /**
+     * 行政区
+     */
+    private String district;
 
     private String enginName;
     /**

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

@@ -32,6 +32,11 @@ public class ZTouchOperationEngineeringBo extends BaseEntity {
     private Long id;
 
     /**
+     * 行政区
+     */
+    private String district;
+
+    /**
      * 作业方式
      */
     @NotBlank(message = "作业方式不能为空", groups = { AddGroup.class, EditGroup.class })

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

@@ -129,7 +129,7 @@ public class ZEngineeringGYVo extends BaseEntity {
     private Date beCompletedTime; // 竣工时间
     @ExcelProperty(value = "通气时间")
     private String airTimeStr; // 通气时间
-//    private Date airTime; // 通气时间
+    private Date airTime; // 通气时间
     @ExcelProperty(value = "完工百分比")
     private String donePercent; // 完工百分比
 

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

@@ -30,6 +30,11 @@ public class ZEngineeringInfrastructureSelectVo implements Serializable {
     private String id;
 
     /**
+     * 行政区
+     */
+    private String district;
+
+    /**
      * 工程名称
      */
     @ExcelProperty(value = "工程名称")

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

@@ -44,6 +44,11 @@ public class ZEngineeringInfrastructureVo extends BaseEntity implements Serializ
     private String id;
 
     /**
+     * 行政区
+     */
+    private String district;
+
+    /**
      * 工程名称
      */
     @ExcelProperty(value = "工程名称")

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

@@ -37,6 +37,11 @@ public class ZEngineeringPipeJackingVo extends BaseEntity implements Serializabl
 //    @ExcelProperty(value = "工程id")
     private String enginId;
 
+    /**
+     * 行政区
+     */
+    private String district;
+
     @ExcelProperty(value = "序号")
     private int rowNumber;
 

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

@@ -32,6 +32,11 @@ public class ZTouchOperationEngineeringVo extends BaseEntity implements Serializ
 //    @ExcelProperty(value = "")
     private Long id;
 
+    /**
+     * 行政区
+     */
+    private String district;
+
     @ExcelProperty(value = "序号")
     private int rowNumber;
 

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

@@ -208,7 +208,8 @@ public class ZEngineeringGYServiceImpl implements IZEngineeringGYService {
             List<ZEngineeringNodeBo> zEngineeringNodeBosEnd = nodeService.queryListDetails(zEngineeringNodeBoEnd);
             vo.setBeCompletedTime(zEngineeringNodeBosEnd!=null && zEngineeringNodeBosEnd.size()>0 ? zEngineeringNodeBosEnd.get(0).getUpdateTime():null);
             vo.setBeCompletedTimeStr(vo.getBeCompletedTime() == null ? null : simpleDateFormat.format(vo.getBeCompletedTime())); // 竣工时间 beCompletedTime
-            vo.setAirTimeStr(vo.getBeCompletedTimeStr()); // 通气时间 airTime
+            vo.setAirTime(zEngineeringNodeBosEnd!=null && zEngineeringNodeBosEnd.size()>0 ? (zEngineeringNodeBosEnd.get(0).getReviewStatus() == null || zEngineeringNodeBosEnd.get(0).getReviewStatus().equals("0")) ? null : zEngineeringNodeBosEnd.get(0).getUpdateTime():null); // 通气时间 airTime
+            vo.setAirTimeStr(vo.getAirTime() == null ? null : simpleDateFormat.format(vo.getAirTime())); // 通气时间 airTime
             List<Map> nodeReViewStateList = (List)vo.getNodeReViewStateList();
             int size = nodeReViewStateList.size();
             long done = nodeReViewStateList.stream().filter(item -> item.get("state").equals("1")).count();
@@ -224,6 +225,7 @@ public class ZEngineeringGYServiceImpl implements IZEngineeringGYService {
     private LambdaQueryWrapper<ZEngineeringGY> buildQueryWrapper(ZEngineeringIndustryGYBo bo) {
         LambdaQueryWrapper<ZEngineeringGY> lqw = Wrappers.lambdaQuery();
         lqw.orderByDesc(ZEngineeringGY::getCreateTime);
+        lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), ZEngineeringGY::getDistrict, bo.getDistrict());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringGY::getEnginType, bo.getEnginType());
         lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringGY::getEnginName, bo.getEnginName());
         lqw.like(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringGY::getEnginClassification, bo.getEnginClassification());

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

@@ -467,6 +467,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     private LambdaQueryWrapper<ZEngineeringIndustry> buildQueryWrapper(ZEngineeringIndustryBo bo) {
         LambdaQueryWrapper<ZEngineeringIndustry> lqw = Wrappers.lambdaQuery();
         lqw.orderByDesc(ZEngineeringIndustry::getCreateTime);
+        lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), ZEngineeringIndustry::getDistrict, bo.getDistrict());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringIndustry::getEnginType, bo.getEnginType());
         lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringIndustry::getEnginName, bo.getEnginName());
         lqw.like(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringIndustry::getEnginClassification, bo.getEnginClassification());

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

@@ -124,6 +124,7 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZEngineeringInfrastructure> lqw = Wrappers.lambdaQuery();
         lqw.orderByDesc(ZEngineeringInfrastructure::getCreateTime);
+        lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), ZEngineeringInfrastructure::getDistrict, bo.getDistrict());
         lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringInfrastructure::getEnginName, bo.getEnginName());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginAddre()), ZEngineeringInfrastructure::getEnginAddre, bo.getEnginAddre());
         lqw.eq(StringUtils.isNotBlank(bo.getConstructUnit()), ZEngineeringInfrastructure::getConstructUnit, bo.getConstructUnit());

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

@@ -172,6 +172,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZEngineeringPipeJacking> lqw = Wrappers.lambdaQuery();
         lqw.orderByDesc(ZEngineeringPipeJacking::getCreateTime);
+        lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), ZEngineeringPipeJacking::getDistrict, bo.getDistrict());
         lqw.like(StringUtils.isNotBlank(bo.getEnginId()), ZEngineeringPipeJacking::getEnginId, bo.getEnginId());
         lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringPipeJacking::getEnginName, bo.getEnginName());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginAddre()), ZEngineeringPipeJacking::getEnginAddre, bo.getEnginAddre());

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

@@ -147,6 +147,7 @@ public class ZTouchOperationEngineeringServiceImpl implements IZTouchOperationEn
     private LambdaQueryWrapper<ZTouchOperationEngineering> buildQueryWrapper(ZTouchOperationEngineeringBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZTouchOperationEngineering> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), ZTouchOperationEngineering::getDistrict, bo.getDistrict());
         lqw.eq(StringUtils.isNotBlank(bo.getModeOperation()), ZTouchOperationEngineering::getModeOperation, bo.getModeOperation());
         lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZTouchOperationEngineering::getEnginName, bo.getEnginName());
         lqw.like(StringUtils.isNotBlank(bo.getLocations()), ZTouchOperationEngineering::getLocations, bo.getLocations());