Merge remote-tracking branch 'outside/master' into release-sy-v1.0.0

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

@@ -16,6 +16,7 @@ import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.core.domain.entity.SysDept;
 import com.shuili.common.core.domain.entity.SysUser;
 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,15 +60,9 @@ public class BsSgcDfBzbpController extends BaseController
     {
 
         BsSgcDfBzbp projectInfo = sp.getData();
-        String adcd = null;
-        if (projectInfo != null) {
-            adcd = projectInfo.getAdcd();
-        }
+        String infoAdcd = null;
 
-        SysUser sysUser = UserUtils.getUser();
-        if (sysUser.getUserName().equals("admin")) {
-            if (projectInfo != null && projectInfo.getAdcd() != null) {
-                String infoAdcd = projectInfo.getAdcd();
+        if (StringUtils.isNotEmpty(projectInfo.getAdcd())) {
             QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
             sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
             SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
@@ -82,44 +77,9 @@ public class BsSgcDfBzbpController extends BaseController
             }
             return bsSgcDfBzbpService.selectPage(sp, infoAdcd);
         }else {
-                return bsSgcDfBzbpService.selectPage(sp,null);
+            return bsSgcDfBzbpService.selectPage(sp, projectInfo.getAdcdQx());
         }
 
-        }else if (adcd == null) {
-            SysUser user = UserUtils.getUser();
-            String deptId = user.getDeptId();
-            SysDept sysDept = sysDeptService.get(deptId);
-            String xzqhId = sysDept.getXzqhId();
-            SysXzqh xzqh = sysXzqhService.getById(xzqhId);
-            String substring = "";
-            if (xzqh.getLayer()==5) {
-                substring = xzqh.getXzqhdm().substring(0, 2);
-
-            } else if (xzqh.getLayer()==4) {
-                substring = xzqh.getXzqhdm().substring(0, 4);
-
-            }else {
-                substring = xzqh.getXzqhdm();
-            }
-
-            return bsSgcDfBzbpService.selectPage(sp,substring);
-        }else {
-
-            QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
-            sysXzqhQueryWrapper.eq("XZQHDM", adcd);
-
-            SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
-            if (xzqh.getLayer()==5) {
-                adcd = xzqh.getXzqhdm().substring(0, 2);
-
-            } else if (xzqh.getLayer()==4) {
-                adcd = xzqh.getXzqhdm().substring(0, 4);
-
-            }else {
-                adcd = xzqh.getXzqhdm();
-            }
-            return bsSgcDfBzbpService.selectPage(sp, adcd);
-        }
     }
 
 

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

@@ -3,11 +3,14 @@ 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.kms.yxgh.common.dto.IAdcd;
+import com.kms.yxgh.df.service.AuthorityDikeCodeService;
 import com.shuili.common.annotation.Excel;
 import com.shuili.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.util.StringUtils;
 
 import java.util.Date;
 
@@ -21,7 +24,7 @@ import java.util.Date;
 @TableName("bs_sgc_df_bzbp")
 @Data
 @ApiModel("堤防标识标牌")
-public class BsSgcDfBzbp extends BaseEntity
+public class BsSgcDfBzbp extends BaseEntity implements IAdcd
 {
     private static final long serialVersionUID = 1L;
 
@@ -111,4 +114,11 @@ public class BsSgcDfBzbp extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss:SSS",timezone="GMT+8")
     private Date sortTime;
 
+    public String getDikeCode() {
+        if (StringUtils.isEmpty(this.dikeCode)) {
+            this.dikeCode = AuthorityDikeCodeService.getAuthorityDikeCode();
+        }
+        return this.dikeCode;
+    }
+
 }

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

@@ -312,7 +312,7 @@ public class BsSgcSzSafeJbxx extends BaseEntity implements IAdcd {
     private Date checkDate;
     public String getWageCode() {
         if (StringUtils.isEmpty(this.wagaCode)) {
-            this.wagaCode = AuthorityDikeCodeService.getAuthorityDikeCode();
+            this.wagaCode = AuthorityDikeCodeService.getAuthorityWagaCode();
         }
         return this.wagaCode;
     }

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,4) AND RIGHT(qh.XZQHDM, 4) = '00000000'
+        inner join sys_xzqh qh on LEFT(bp.adcd,4)= LEFT(qh.XZQHDM,4) AND RIGHT(qh.XZQHDM, 8) = '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,4) AND RIGHT(qh.XZQHDM, 4) = '00000000'
+        inner join sys_xzqh qh on LEFT(bp.adcd,4)= LEFT(qh.XZQHDM,4) AND RIGHT(qh.XZQHDM, 8) = '00000000'
         <where>
             <if test="wagaName != null and wagaName != ''">
                 waga_name like concat('%', #{wagaName}, '%')