bug fix

ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BPlanEnterpriseController.java

@@ -216,9 +216,13 @@ public class BPlanEnterpriseController extends BaseController {
     @ApiOperation(value = "导出执法结果")
     @PostMapping("/export")
     public void export(HttpServletResponse response, checkResultRequest req) {
+        if (req.getDistrict() != null && req.getDistrict().contains("000000000")) {
+            String result = req.getDistrict().replaceAll("0+$", "");
+            req.setDistrict(result);
+        }
         List<BPlanEnterpriseZhifaResponse> list = bPlanEnterpriseMapper.getZhifa(req);
         ExcelUtil<BPlanEnterpriseZhifaResponse> util = new ExcelUtil<BPlanEnterpriseZhifaResponse>(BPlanEnterpriseZhifaResponse.class);
-        util.exportExcel(response, list, "导出计划管理");
+        util.exportExcel(response, list, "导出执法结果");
     }
 
     /**
@@ -232,12 +236,12 @@ public class BPlanEnterpriseController extends BaseController {
             String district = a.getDistrict();
             String county = district.substring(0, 7);
             String paddedString = String.format("%s%s", county, "000000000");
-           List<String> countyList= bAdministrativeService.getBydistinct(district,paddedString);
+            List<String> countyList = bAdministrativeService.getBydistinct(district, paddedString);
             String formattedData = String.join("-", countyList);
             a.setDistrict(formattedData);
         }
         ExcelUtil<BPlanEnterprise> util = new ExcelUtil<BPlanEnterprise>(BPlanEnterprise.class);
-        util.exportExcel(response,list, "计划管理数据");
+        util.exportExcel(response, list, "计划管理数据");
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BPlanEnterpriseServiceImpl.java

@@ -53,6 +53,11 @@ public class BPlanEnterpriseServiceImpl extends ServiceImpl<BPlanEnterpriseMappe
 
     @Override
     public   List<BPlanEnterpriseZhifaResponse> getZhifa(checkResultRequest req) {
+
+         if(req.getDistrict()!=null && req.getDistrict().contains("000000000")){
+             String result = req.getDistrict().replaceAll("0+$", "");
+             req.setDistrict(result);
+         }
         return bPlanEnterpriseMapper.getZhifa(req);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/UserServiceImpl.java

@@ -36,7 +36,7 @@ public class UserServiceImpl extends ServiceImpl<GeoLayerMapper, GeoLayer> imple
     public Object getUserByCode(String code) {
         RestTemplate restTemplate = new RestTemplate();
         // 先请求accessToken
-        String accessTokenUrl = "http://2.46.4.197:8090/sso-server/oauth2/accessToken";
+        String accessTokenUrl = "http://180.108.205.123:8090/sso-server/oauth2/accessToken";
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.MULTIPART_FORM_DATA);
         MultiValueMap map = new LinkedMultiValueMap();
@@ -53,7 +53,7 @@ public class UserServiceImpl extends ServiceImpl<GeoLayerMapper, GeoLayer> imple
         // 获取accessToken
         String accessToken=data.get("accessToken").toString();
         // 获取用户
-        String userUrl = "http://2.46.4.197:8090/sso-server/oauth2/getUser";
+        String userUrl = "http://180.108.205.123:8090/sso-server/oauth2/getUser";
         headers = new HttpHeaders();
         headers.setContentType(MediaType.MULTIPART_FORM_DATA);
         map = new LinkedMultiValueMap();

ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml

@@ -50,7 +50,7 @@
             <if test="updateId != null ">and update_id = #{updateId}</if>
             <if test="userId != null ">and user_id = #{userId}</if>
             <if test="deptId != null ">and dept_id = #{deptId}</if>
-            <if test="district != null  and district != ''">and district = #{district}</if>
+            <if test="district != null  and district != ''">and district like concat('%', #{district}, '%')</if>
             <if test="plannedYear != null  and plannedYear != ''">and planned_year = #{plannedYear}</if>
             <if test="planName != null  and planName != ''">and plan_name like concat('%', #{planName}, '%')</if>
             <if test="planContent != null  and planContent != ''">and plan_content = #{planContent}</if>
@@ -109,7 +109,7 @@
                 and s.plannedYear =#{req.plannedYear}
             </if>
             <if test="req.district !=null and req.district !=''">
-                and s.district =#{req.district}
+                and s.district like concat('%', #{req.district}, '%')
             </if>
             <if test="req.checkStatus !=null and req.checkStatus !=''">
                 and s.checkStatus =#{req.checkStatus}