Merge remote-tracking branch 'origin/master'

shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqjdxxController.java

@@ -1,6 +1,10 @@
 package com.kms.yg.df.controller;
 
+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.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.common.utils.BaseEntityUtils;
 import com.kms.system.service.SysDeptService;
 import com.kms.system.service.SysXzqhService;
@@ -15,12 +19,14 @@ import com.shuili.common.core.controller.BaseController;
 import com.shuili.common.core.domain.AjaxResult;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.enums.BusinessType;
+import com.shuili.common.utils.StringUtils;
 import com.shuili.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -59,6 +65,18 @@ public class BsSgcDfAqjdxxController extends BaseController
     @ApiOperation("水闸安全鉴定信息列表")
     public IPage list(@RequestBody SearchParam<BsSgcDfAqjdxx> sp)
     {
+
+        BsSgcDfAqjdxx data = sp.getData();
+        if (StringUtils.isNotEmpty(data.getDikeCode())){
+            LambdaQueryWrapper<BsSgcDfAqjdxx>lw=new LambdaQueryWrapper<>();
+            lw.eq(BsSgcDfAqjdxx::getRemark,data.getDikeCode());
+            if(ObjectUtil.isNotEmpty(data.getIdentifyTime())){
+                lw.eq(BsSgcDfAqjdxx::getIdentifyTime,data.getIdentifyTime());
+            }
+            Page<BsSgcDfAqjdxx>pa=new Page<>(sp.getPageNum(),sp.getPageSize());
+            Page<BsSgcDfAqjdxx> page = bsSgcSzAqjdxxService.page(pa, lw);
+            return page;
+        }
         return bsSgcSzAqjdxxService.selectPage(sp);
     }
 

shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfAqjdxx.java

@@ -1,5 +1,6 @@
 package com.kms.yg.df.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.shuili.common.annotation.Excel;
@@ -136,4 +137,16 @@ public class BsSgcDfAqjdxx extends BaseEntity
     @ApiModelProperty("安全鉴定意见")
     private String relation;
 
+    private String remark;
+
+
+    @TableField(exist = false)
+    private String dikeCode;
+
+
+    @TableField(exist = false)
+    private Date startTime;
+
+    @TableField(exist = false)
+    private Date endDateTime;
 }

shuili-system/src/main/java/com/kms/yg/df/domain/dto/DfrwDto.java

@@ -15,6 +15,7 @@ public class DfrwDto {
     private String  taskName;
 
     private String dikeName;
+    private String dikeCode;
 
     private String dikeType;
 

shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfrwService.java

@@ -64,6 +64,7 @@ public class BsSgcDfDfrwService extends BaseService<BsSgcDfDfrwMapper, BsSgcDfDf
             szrwDto.setDikeType(bsSgcSzSafeJbxx.getDikeType());
             szrwDto.setAdcd(bsSgcSzSafeJbxx.getAdcd());
             szrwDto.setStatus(record.getStatus());
+            szrwDto.setDikeCode(record.getDikeCode());
             szrwDto.setRemark(record.getRemark());
 
             szrwDto.setPlanTime(record.getPlanTime());

shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqjdxxController.java

@@ -1,9 +1,13 @@
 package com.kms.yg.sz.controller;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.common.utils.BaseEntityUtils;
 import com.kms.system.service.SysDeptService;
 import com.kms.system.service.SysXzqhService;
+import com.kms.yg.df.domain.BsSgcDfAqjdxx;
 import com.kms.yg.sz.domain.BsSgcSzAqjdxx;
 import com.kms.yg.sz.domain.BsSgcSzAqrw;
 import com.kms.yg.sz.domain.BsSgcSzSzrw;
@@ -15,6 +19,7 @@ import com.shuili.common.core.controller.BaseController;
 import com.shuili.common.core.domain.AjaxResult;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.enums.BusinessType;
+import com.shuili.common.utils.StringUtils;
 import com.shuili.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -59,6 +64,18 @@ public class BsSgcSzAqjdxxController extends BaseController
     @ApiOperation("水闸安全鉴定信息列表")
     public IPage list(@RequestBody SearchParam<BsSgcSzAqjdxx> sp)
     {
+
+        BsSgcSzAqjdxx data = sp.getData();
+        if (StringUtils.isNotEmpty(data.getWagaCode())){
+            LambdaQueryWrapper<BsSgcSzAqjdxx> lw=new LambdaQueryWrapper<>();
+            if(ObjectUtil.isNotEmpty(data.getIdentifyTime())){
+                lw.eq(BsSgcSzAqjdxx::getIdentifyTime,data.getIdentifyTime());
+            }
+            lw.eq(BsSgcSzAqjdxx::getRemark,data.getWagaCode());
+            Page<BsSgcSzAqjdxx> pa=new Page<>(sp.getPageNum(),sp.getPageSize());
+            Page<BsSgcSzAqjdxx> page = bsSgcSzAqjdxxService.page(pa, lw);
+            return page;
+        }
         return bsSgcSzAqjdxxService.selectPage(sp);
     }
 

shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqjdxx.java

@@ -1,6 +1,8 @@
 package com.kms.yg.sz.domain;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.shuili.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -138,4 +140,15 @@ public class BsSgcSzAqjdxx extends BaseEntity
     @ApiModelProperty("安全鉴定意见")
     private String relation;
 
+    private String remark;
+
+    @TableField(exist = false)
+    private String wagaCode;
+
+    @TableField(exist = false)
+    private Date startTime;
+
+    @TableField(exist = false)
+    private Date endDateTime;
+
 }

shuili-system/src/main/java/com/kms/yg/sz/domain/dto/SzrwDto.java

@@ -16,6 +16,8 @@ public class SzrwDto {
 
     private String wagaName;
 
+    private String wagaCode;
+
     private String wagaType;
 
     private String adcd;

shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java

@@ -62,6 +62,7 @@ public class BsSgcSzSzrwService extends BaseService<BsSgcSzSzrwMapper, BsSgcSzSz
             szrwDto.setWagaName(bsSgcSzSafeJbxx.getWagaName());
             szrwDto.setWagaType(bsSgcSzSafeJbxx.getWagaType());
             szrwDto.setAdcd(bsSgcSzSafeJbxx.getAdcd());
+            szrwDto.setWagaCode(bsSgcSzSafeJbxx.getWagaCode());
             szrwDto.setStatus(record.getStatus());
             szrwDto.setRemark(record.getRemark());
 

shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml

@@ -43,7 +43,7 @@
     <select id="getStatistics" resultType="java.util.Map">
         SELECT qh.NAME as name,count(1) as num
         FROM bs_sgc_df_bzbp bp
-        inner join sys_xzqh qh on bp.adcd= LEFT(qh.XZQHDM,6) AND RIGHT(qh.XZQHDM, 6) = '000000'
+        inner join sys_xzqh qh on bp.adcd= LEFT(qh.XZQHDM,4) AND RIGHT(qh.XZQHDM, 4) = '00000000'
         <where>
             <if test="embankmentName != null and embankmentName != ''">
                 embankment_name like concat('%', #{embankmentName}, '%')

shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml

@@ -43,7 +43,7 @@
     <select id="getStatistics" resultType="java.util.Map">
         SELECT qh.NAME as name,count(1) as num
         FROM bs_sgc_sz_bzbp bp
-        inner join sys_xzqh qh on bp.adcd= LEFT(qh.XZQHDM,6) AND RIGHT(qh.XZQHDM, 6) = '000000'
+        inner join sys_xzqh qh on bp.adcd= LEFT(qh.XZQHDM,4) AND RIGHT(qh.XZQHDM, 4) = '00000000'
         <where>
             <if test="wagaName != null and wagaName != ''">
                 waga_name like concat('%', #{wagaName}, '%')