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

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

@@ -15,6 +15,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;
@@ -60,11 +61,17 @@ public class BsSgcDfFzrController extends BaseController {
 
     @GetMapping("/getHistogram")
     public HashMap<String, HashMap<String, String>> getHistogram() {
+        BsSgcDfFzr bsSgcDfFzr=new BsSgcDfFzr();
+        HashMap<String, HashMap<String, String>> dto=new HashMap<>();
+        if (StringUtils.isEmpty(bsSgcDfFzr.getDikeCode())&&StringUtils.isEmpty(bsSgcDfFzr.getAdcdQx())){
+            return dto;
+        }
+        if (StringUtils.isNotEmpty(bsSgcDfFzr.getDikeCode())){
+           return bsSgcSzFzrService.getHistogram(null, null,bsSgcDfFzr.getDikeCode());
+        }
         Integer layer = sysXzqhService.getLayer();
         String xzqh = sysXzqhService.getXzqh();
-        HashMap<String, HashMap<String, String>> dto = bsSgcSzFzrService.getHistogram(layer, xzqh);
-
-
+         dto = bsSgcSzFzrService.getHistogram(layer, xzqh,null);
         return dto;
 
     }

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

@@ -146,16 +146,19 @@ public class BsSgcDfSafeJbxxController extends BaseController {
     @PostMapping("/listByStatus")
     public IPage listByStatus(@RequestBody SearchParam<BsSgcDfSafeJbxx> sp) {
         BsSgcDfSafeJbxx data = sp.getData();
-
-        Page<BsSgcDfSafeJbxx> page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
+        Page<BsSgcDfSafeJbxx> page=new Page<>();
+        if (StringUtils.isEmpty(data.getDikeCode())&&StringUtils.isEmpty(data.getAdcdQx())){
+              return page;
+        }
+        page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
                 Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class).apply("1=1").like(data.getDikeName() != null, BsSgcDfSafeJbxx::getDikeName, data.getDikeName())
 //                        .eq(BsSgcDfSafeJbxx::getStatus, "1").or().eq(BsSgcDfSafeJbxx::getStatus, "4").or().eq(BsSgcDfSafeJbxx::getHzStatus, "0")
 //                        .or().eq(BsSgcDfSafeJbxx::getZxStatus, "0")
-
+                        .eq(StringUtils.isNotEmpty(data.getDikeCode()),BsSgcDfSafeJbxx::getDikeCode,data.getDikeCode())
                         .eq(data.getDikeType() != null, BsSgcDfSafeJbxx::getDikeType, data.getDikeType())
                         .eq(data.getStatus() != null, BsSgcDfSafeJbxx::getStatus, data.getStatus())
                         .isNull(BsSgcDfSafeJbxx::getExprDate)
-                        .likeRight(data.getAdcd() != null, BsSgcDfSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))
+                        .likeRight(StringUtils.isNotEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getDikeCode()), BsSgcDfSafeJbxx::getAdcd, data.getAdcdQx())
                         .apply(" (status='1' || status='4' || hz_status='0' || zx_status='0')")
                         .orderByDesc(BsSgcDfSafeJbxx::getCreateTime));
         return page;

shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java

@@ -43,15 +43,19 @@ public interface BsSgcDfFzrMapper extends BaseMapper<BsSgcDfFzr> {
                              @Param("pageNum") int pageNum,
                              @Param("pageSize") int pageSize,
                              @Param("dikeName")String dikeName);
-    List<Map<String,Object>> getPercent();
+    List<Map<String,Object>> getPercent(@Param("adcd")String adcd,
+                                        @Param("dikeCode")String dikeCode);
 
 
     List<PieDto> getType1(@Param("layer") Integer layer,
-                          @Param("adcd") String adcd);
+                          @Param("adcd") String adcd,
+                          @Param("dikeCode")String dikeCode);
 
     List<PieDto> getType2(@Param("layer") Integer layer,
-                          @Param("adcd") String adcd);
+                          @Param("adcd") String adcd,
+                          @Param("dikeCode")String dikeCode);
 
     List<PieDto> getType3(@Param("layer") Integer layer,
-                          @Param("adcd") String adcd);
+                          @Param("adcd") String adcd,
+                          @Param("dikeCode")String dikeCode);
 }

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

@@ -76,8 +76,15 @@ public class BsSgcDfFzrService extends BaseService<BsSgcDfFzrMapper, BsSgcDfFzr>
     }
 
     public Map<String,BigDecimal>getPercent(){
+        BsSgcDfFzr bsSgcDfFzr=new BsSgcDfFzr();
         Map<String,BigDecimal>percentMap=new HashMap<>();
-        List<Map<String, Object>> percent = bsSgcDfFzrMapper.getPercent();
+        String adcdQx = bsSgcDfFzr.getAdcdQx();
+        String dikeCode = bsSgcDfFzr.getDikeCode();
+        if (StringUtils.isEmpty(bsSgcDfFzr.getDikeCode())&&StringUtils.isEmpty(bsSgcDfFzr.getAdcdQx())){
+            return percentMap;
+        }
+
+        List<Map<String, Object>> percent = bsSgcDfFzrMapper.getPercent(bsSgcDfFzr.getAdcdQx(),bsSgcDfFzr.getDikeCode());
         if (CollectionUtil.isNotEmpty(percent)) {
             for (Map<String, Object> map : percent) {
                 percentMap.put((String) map.get("name"),(BigDecimal) map.get("score"));
@@ -113,15 +120,15 @@ public class BsSgcDfFzrService extends BaseService<BsSgcDfFzrMapper, BsSgcDfFzr>
 
     }
 
-    public HashMap<String, HashMap<String,String>> getHistogram(Integer layer, String xzqh) {
+    public HashMap<String, HashMap<String,String>> getHistogram(Integer layer, String xzqh,String dikeCode) {
         //获取政府责任人
-        List<PieDto> listType1 = bsSgcDfFzrMapper.getType1(layer, sysXzqhService.getSubString(xzqh));
+        List<PieDto> listType1 = bsSgcDfFzrMapper.getType1(layer, sysXzqhService.getSubString(xzqh),dikeCode);
 
         //获取主管部门责任人
-        List<PieDto> listType2 = bsSgcDfFzrMapper.getType2(layer, sysXzqhService.getSubString(xzqh));
+        List<PieDto> listType2 = bsSgcDfFzrMapper.getType2(layer, sysXzqhService.getSubString(xzqh),dikeCode);
 
         //获取管理单位责任人
-        List<PieDto> listType3 = bsSgcDfFzrMapper.getType3(layer, sysXzqhService.getSubString(xzqh));
+        List<PieDto> listType3 = bsSgcDfFzrMapper.getType3(layer, sysXzqhService.getSubString(xzqh),dikeCode);
 
         List<PieDto> pieDtos = new ArrayList<>();
         pieDtos.addAll(listType1);

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

@@ -42,7 +42,7 @@ public class BsSgcDfJfglService extends BaseService<BsSgcDfJfglMapper, BsSgcDfJf
         }
 
         List<BsSgcDfJfgl> list= bsSgcDfJfglMapper.getList(data.getId(), data.getDikeType(), data.getDikeName(),
-                sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize(),data.getDikeCode());
+                data.getAdcdQx(), "create_time", sp.getPageNum(), sp.getPageSize(),data.getDikeCode());
 
         page.setRecords(list);
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.kms.common.utils.BaseEntityUtils;
 import com.kms.system.service.SysDeptService;
 import com.kms.system.service.SysXzqhService;
+import com.kms.yg.df.domain.BsSgcDfFzr;
 import com.kms.yg.sz.domain.BsSgcSzFzr;
 import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
 import com.kms.yg.sz.service.BsSgcSzFzrService;
@@ -14,6 +15,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;
@@ -53,11 +55,20 @@ public class BsSgcSzFzrController extends BaseController
 
     @GetMapping("/getHistogram")
     public HashMap<String, HashMap<String,String>> getHistogram() {
+
+        BsSgcSzFzr bsSgcSzFzr=new BsSgcSzFzr();
+        HashMap<String, HashMap<String, String>> dto=new HashMap<>();
+        if (StringUtils.isEmpty(bsSgcSzFzr.getWagaCode())&&StringUtils.isEmpty(bsSgcSzFzr.getAdcdQx())){
+            return dto;
+        }
+        if (StringUtils.isNotEmpty(bsSgcSzFzr.getWagaCode())){
+            return bsSgcSzFzrService.getHistogram(null, null,bsSgcSzFzr.getWagaCode());
+        }
         Integer layer = sysXzqhService.getLayer();
 
         String xzqh = sysXzqhService.getXzqh();
 
-        HashMap<String, HashMap<String,String>> dto = bsSgcSzFzrService.getHistogram(layer, xzqh);
+        dto = bsSgcSzFzrService.getHistogram(layer, xzqh,null);
 
 
         return dto;

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

@@ -146,14 +146,19 @@ public class BsSgcSzSafeJbxxController extends BaseController {
     @PostMapping("/listByStatus")
     public IPage listByStatus(@RequestBody SearchParam<BsSgcSzSafeJbxx> sp) {
         BsSgcSzSafeJbxx data = sp.getData();
+        Page<BsSgcSzSafeJbxx> page=new Page<>();
+        if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getWagaCode())){
+            return page;
+        }
 
-        Page<BsSgcSzSafeJbxx> page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
+        page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
                 Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class).like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName())
 //                        .eq(BsSgcSzSafeJbxx::getStatus, "1").or().eq(BsSgcSzSafeJbxx::getStatus, "4").or().eq(BsSgcSzSafeJbxx::getHzStatus,"0")
 //                        .or().eq(BsSgcSzSafeJbxx::getZxStatus,"0")
                         .eq(data.getWagaType()!=null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType())
                         .eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus())
-                        .likeRight(data.getAdcd() != null, BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))
+                        .eq(StringUtils.isNotEmpty(data.getWagaCode()),BsSgcSzSafeJbxx::getWagaCode,data.getWagaCode())
+                        .likeRight(StringUtils.isNotEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getWagaCode()), BsSgcSzSafeJbxx::getAdcd, data.getAdcdQx())
                         .apply(" (status='1' || status='4' || hz_status='0' || zx_status='0')")
                         .orderByDesc(BsSgcSzSafeJbxx::getCreateTime));
 

shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java

@@ -42,14 +42,17 @@ public interface BsSgcSzFzrMapper extends BaseMapper<BsSgcSzFzr> {
                              @Param("pageNum") int pageNum,
                              @Param("pageSize") int pageSize);
 
-    List<Map<String,Object>>getPercent();
+    List<Map<String,Object>>getPercent(@Param("wagaCode")String wagaCode,@Param("adcd")String adcd);
 
     List<PieDto> getType1(@Param("layer") Integer layer,
-                          @Param("adcd") String adcd);
+                          @Param("adcd") String adcd,
+                          @Param("wagaCode")String wagaCode);
 
     List<PieDto> getType2(@Param("layer") Integer layer,
-                          @Param("adcd") String adcd);
+                          @Param("adcd") String adcd,
+                          @Param("wagaCode")String wagaCode);
 
     List<PieDto> getType3(@Param("layer") Integer layer,
-                          @Param("adcd") String adcd);
+                          @Param("adcd") String adcd,
+                          @Param("wagaCode")String wagaCode);
 }

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

@@ -5,6 +5,7 @@ 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.system.service.SysXzqhService;
+import com.kms.yg.df.domain.BsSgcDfFzr;
 import com.kms.yg.sz.domain.BsSgcSzFzr;
 import com.kms.yg.sz.domain.dto.PieDto;
 import com.kms.yg.sz.mapper.BsSgcSzFxzzMapper;
@@ -77,7 +78,12 @@ public class BsSgcSzFzrService extends BaseService<BsSgcSzFzrMapper, BsSgcSzFzr>
     }
     public Map<String, BigDecimal>getPercent(){
         Map<String,BigDecimal>percentMap=new HashMap<>();
-        List<Map<String, Object>> percent = bsSgcSzFzrMapper.getPercent();
+        BsSgcSzFzr bsSgcSzFzr=new BsSgcSzFzr();
+        if (StringUtils.isEmpty(bsSgcSzFzr.getWagaCode())&&StringUtils.isEmpty(bsSgcSzFzr.getAdcdQx())){
+            return percentMap;
+        }
+
+        List<Map<String, Object>> percent = bsSgcSzFzrMapper.getPercent(bsSgcSzFzr.getWagaCode(),bsSgcSzFzr.getAdcdQx());
         if (CollectionUtil.isNotEmpty(percent)) {
             for (Map<String, Object> map : percent) {
                 percentMap.put((String) map.get("name"), (BigDecimal) map.get("score"));
@@ -115,15 +121,15 @@ public class BsSgcSzFzrService extends BaseService<BsSgcSzFzrMapper, BsSgcSzFzr>
 
     }
 
-    public HashMap<String, HashMap<String,String>> getHistogram(Integer layer, String xzqh) {
+    public HashMap<String, HashMap<String,String>> getHistogram(Integer layer, String xzqh,String wagaCode) {
         //获取政府责任人
-        List<PieDto> listType1 = bsSgcSzFzrMapper.getType1(layer, sysXzqhService.getSubString(xzqh));
+        List<PieDto> listType1 = bsSgcSzFzrMapper.getType1(layer, sysXzqhService.getSubString(xzqh),wagaCode);
 
         //获取主管部门责任人
-        List<PieDto> listType2 = bsSgcSzFzrMapper.getType2(layer, sysXzqhService.getSubString(xzqh));
+        List<PieDto> listType2 = bsSgcSzFzrMapper.getType2(layer, sysXzqhService.getSubString(xzqh),wagaCode);
 
         //获取管理单位责任人
-        List<PieDto> listType3 = bsSgcSzFzrMapper.getType3(layer, sysXzqhService.getSubString(xzqh));
+        List<PieDto> listType3 = bsSgcSzFzrMapper.getType3(layer, sysXzqhService.getSubString(xzqh),wagaCode);
 
         List<PieDto> pieDtos = new ArrayList<>();
         pieDtos.addAll(listType1);

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

@@ -98,6 +98,15 @@
              ) AS subquery
                  LEFT JOIN
              sys_xzqh xzqh ON LEFT(xzqh.XZQHDM, 6) = subquery.adcd and RIGHT(xzqh.XZQHDM, 6)='000000'
+            <where>
+                1=1
+                <if test="adcd != null and adcd != ''">
+                    and subquery.adcd like concat(#{adcd},'%')
+                </if>
+                <if test="dikeCode != null and dikeCode != ''">
+                    and subquery.dike_CODE=#{dikeCode}
+                </if>
+            </where>
         GROUP BY
             xzqh.NAME;
     </select>
@@ -105,6 +114,7 @@
 
     <select id="getType1" resultMap="pieDto">
         <include refid="getHistogram"></include>
+        <if test="adcd != null and adcd != ''">
         <if test="layer==5">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sf.type='0' GROUP BY LEFT(sj.adcd,4)
@@ -117,10 +127,15 @@
             WHERE
             sj.adcd = #{adcd} and sf.type='0'
         </if>
+        </if>
+        <if test="dikeCode != null and dikeCode != ''">
+            and sj.dike_code=#{dikeCode}
+        </if>
     </select>
 
     <select id="getType2" resultMap="pieDto">
         <include refid="getHistogram"></include>
+        <if test="adcd != null and adcd != ''">
         <if test="layer==5">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sf.type='1' GROUP BY LEFT(sj.adcd,4)
@@ -133,10 +148,16 @@
             WHERE
             sj.adcd = #{adcd} and sf.type='1'
         </if>
+        </if>
+
+            <if test="dikeCode != null and dikeCode != ''">
+               and sj.dike_code=#{dikeCode}
+            </if>
     </select>
 
     <select id="getType3" resultMap="pieDto">
         <include refid="getHistogram"></include>
+        <if test="adcd != null and adcd != ''">
         <if test="layer==5">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sf.type='2' GROUP BY LEFT(sj.adcd,4)
@@ -147,7 +168,11 @@
         </if>
         <if test="layer==3">
             WHERE
-            sj.adcd = #{adcd} and sf.type='2'
+            sj.dikeCode = #{adcd} and sf.type='2'
+        </if>
+        </if>
+        <if test="dikeCode != null and dikeCode != ''">
+            and sj.dike_code=#{dikeCode}
         </if>
     </select>
 </mapper>

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

@@ -99,16 +99,26 @@
                  WHERE
                      fzr.type = '0'
                  GROUP BY
-                     db.adcd, fzr.waga_code
+                     db.adcd, waga_code
              ) AS subquery
                  LEFT JOIN
              sys_xzqh xzqh ON LEFT(xzqh.XZQHDM, 6) = subquery.adcd and RIGHT(xzqh.XZQHDM, 6)='000000'
+        <where>
+            1=1
+            <if test="adcd != null and adcd != ''">
+                and subquery.adcd like concat(#{adcd},'%')
+            </if>
+            <if test="wagaCode != null and wagaCode != ''">
+                and subquery.WAGA_CODE=#{wagaCode}
+            </if>
+        </where>
         GROUP BY
             xzqh.NAME;
     </select>
 
     <select id="getType1" resultMap="pieDto">
         <include refid="getHistogram"></include>
+        <if test="adcd != null and adcd != ''">
         <if test="layer==5">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sf.type='0' GROUP BY LEFT(sj.adcd,4)
@@ -121,10 +131,15 @@
             WHERE
             sj.adcd = #{adcd} and sf.type='0'
         </if>
+        </if>
+        <if test="wagaCode != null and wagaCode != ''">
+            and sj.waga_code=#{wagaCode}
+        </if>
     </select>
 
     <select id="getType2" resultMap="pieDto">
         <include refid="getHistogram"></include>
+        <if test="adcd != null and adcd != ''">
         <if test="layer==5">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sf.type='1' GROUP BY LEFT(sj.adcd,4)
@@ -137,10 +152,15 @@
             WHERE
             sj.adcd = #{adcd} and sf.type='1'
         </if>
+        </if>
+        <if test="wagaCode != null and wagaCode != ''">
+            and sj.waga_code=#{wagaCode}
+        </if>
     </select>
 
     <select id="getType3" resultMap="pieDto">
         <include refid="getHistogram"></include>
+        <if test="adcd != null and adcd != ''">
         <if test="layer==5">
             WHERE
             sj.adcd LIKE concat(#{adcd},'%') and sf.type='2' GROUP BY LEFT(sj.adcd,4)
@@ -153,5 +173,9 @@
             WHERE
             sj.adcd = #{adcd} and sf.type='2'
         </if>
+        </if>
+        <if test="wagaCode != null and wagaCode != ''">
+            and sj.waga_code=#{wagaCode}
+        </if>
     </select>
 </mapper>