bug fix

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

@@ -98,7 +98,7 @@ public class BPlanEnterpriseController extends BaseController {
                 .sum();
         double ptSum = (double) checkEnterpriseCountSum /plannedEnterpriseCountSum;
         BPlanEnterPriseTreeResponse resultObject = new BPlanEnterPriseTreeResponse();
-        resultObject.setInstitutionName("苏州");
+        resultObject.setInstitutionName("苏州市");
         resultObject.setPlannedEnterpriseCount(plannedEnterpriseCountSum);
         resultObject.setCheckEnterpriseCount(checkEnterpriseCountSum);
         resultObject.setPt(ptSum);
@@ -208,8 +208,9 @@ public class BPlanEnterpriseController extends BaseController {
      */
     @GetMapping("/getZhifa")
     @ApiOperation(value = "执法结果-企业详情")
-    public AjaxResult getZhifa(@Valid checkResultRequest req) {
-        return success(bPlanEnterpriseService.getZhifa(req));
+    public TableDataInfo getZhifa(@Valid checkResultRequest req) {
+        startPage();
+        return getDataTable(bPlanEnterpriseService.getZhifa(req));
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java

@@ -101,6 +101,7 @@ public class BPlanEnterprise implements Serializable {
      * 行政区划
      */
     @ApiModelProperty(value = "行政区划")
+    @Excel(name = "行政区划")
     private String district;
 
 

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/checkResultRequest.java

@@ -29,17 +29,6 @@ public class checkResultRequest {
      */
     @ApiModelProperty(value = "检查状态 1=已检查，2=未检查")
     private  Integer checkStatus;
-    /**
-     * size
-     */
-    @ApiModelProperty("size")
-    private int pageSize;
-
 
-    /**
-     * num
-     */
-    @ApiModelProperty("num")
-    private int pageNum;
 
 }

ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/BPlanEnterpriseService.java

@@ -7,6 +7,7 @@ import com.ruoyi.programManagement.entity.request.BPlanEnterprisePageRequest;
 import com.ruoyi.programManagement.entity.request.PlanMxRequest;
 import com.ruoyi.programManagement.entity.request.checkResultRequest;
 import com.ruoyi.programManagement.entity.request.zhifaRequest;
+import com.ruoyi.programManagement.entity.response.BPlanEnterpriseZhifaResponse;
 import com.ruoyi.programManagement.entity.response.zhifaCountResponse;
 import com.ruoyi.programManagement.entity.response.zhifaPlanResponse;
 
@@ -44,7 +45,7 @@ public interface BPlanEnterpriseService extends IService<BPlanEnterprise> {
      * @param req 请求类
      * @return
      */
-    Map<String, Object> getZhifa(checkResultRequest req);
+      List<BPlanEnterpriseZhifaResponse>getZhifa (checkResultRequest req);
 
 
     /**

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

@@ -52,14 +52,8 @@ public class BPlanEnterpriseServiceImpl extends ServiceImpl<BPlanEnterpriseMappe
     }
 
     @Override
-    public Map<String, Object> getZhifa(checkResultRequest req) {
-        List<BPlanEnterpriseZhifaResponse> getZhifa = bPlanEnterpriseMapper.getZhifa(req);
-        PageHelper.startPage(req.getPageNum(), req.getPageSize());
-        PageInfo<BPlanEnterpriseZhifaResponse> pageInfo = new PageInfo<>(getZhifa);
-        Map<String, Object> result = new HashMap<>();
-        result.put("total", pageInfo.getTotal());
-        result.put("list", pageInfo.getList());
-        return result;
+    public   List<BPlanEnterpriseZhifaResponse> getZhifa(checkResultRequest req) {
+        return bPlanEnterpriseMapper.getZhifa(req);
     }
 
     @Override

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

@@ -52,16 +52,16 @@
     <select id="selectBPlanEnterPriseTreeRequestRequestList"
             resultType="com.ruoyi.programManagement.entity.request.BPlanEnterPriseTreeResponse">
 
---         SELECT a.subdistrict AS subdistrict,a.county,c.id,a.institution_name as institutionName,
---         COUNT(b.subdistrict) AS enterpriseCount,
---         COUNT(DISTINCT k.ent_code) - COUNT(DISTINCT c.enterprise_id) AS remainingKeyEnterpriseCount,
---         COUNT(DISTINCT c.enterprise_id) AS plannedEnterpriseCount,
---         COUNT(DISTINCT CASE WHEN k.ent_code IS NOT NULL THEN c.enterprise_id END) AS planneKeyEnterpriseCount
---         FROM b_administrative a
---         LEFT JOIN sz_ent_basic_info b ON a.subdistrict = LPAD(b.subdistrict, LENGTH(a.subdistrict), '0')
---         LEFT JOIN b_key_enterprise k ON a.subdistrict = k.district
---         LEFT JOIN b_plan_enterprise c ON k.ent_code = c.enterprise_id
---         WHERE a.SUBDISTRICT LIKE '%13205%'
+        -- SELECT a.subdistrict AS subdistrict,a.county,c.id,a.institution_name as institutionName,
+        -- COUNT(b.subdistrict) AS enterpriseCount,
+        -- COUNT(DISTINCT k.ent_code) - COUNT(DISTINCT c.enterprise_id) AS remainingKeyEnterpriseCount,
+        -- COUNT(DISTINCT c.enterprise_id) AS plannedEnterpriseCount,
+        -- COUNT(DISTINCT CASE WHEN k.ent_code IS NOT NULL THEN c.enterprise_id END) AS planneKeyEnterpriseCount
+        -- FROM b_administrative a
+        -- LEFT JOIN sz_ent_basic_info b ON a.subdistrict = LPAD(b.subdistrict, LENGTH(a.subdistrict), '0')
+        -- LEFT JOIN b_key_enterprise k ON a.subdistrict = k.district
+        -- LEFT JOIN b_plan_enterprise c ON k.ent_code = c.enterprise_id
+        -- WHERE a.SUBDISTRICT LIKE '%13205%'
         select s.institutionName ,s.plannedEnterpriseCount,s.checkEnterpriseCount,s.pt from (SELECT
         a. institution_name AS institutionName,
         COUNT(DISTINCT b.enterprise_id) AS plannedEnterpriseCount,
@@ -73,7 +73,8 @@
         LEFT JOIN sz_enfor_examine c ON b.enterprise_id = c.USC_CODE
         <where>
             <if test="req.plannedYear!=null and req.plannedYear!=''">
-               b.planned_year=#{req.plannedYear}
+                b.planned_year =#{req.plannedYear}
+
             </if>
         </where>
         GROUP BY SUBSTRING(a.county, 1, 8) )s

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

@@ -23,13 +23,13 @@
         select id,ent_code as entCode ,year,enterprise_name as enterpriseName from b_key_enterprise
         <where>
             <if test=" req.year !=null">
-                and year = #{req.year}
+                and year =#{req.year}
             </if>
             <if test=" req.entCode !=null">
                 and ent_code = #{req.entCode}
             </if>
             <if test=" req.enterpriseName !=null">
-                and enterprise_name = #{req.enterpriseName}
+                and enterprise_name like concat('%',#{req.enterpriseName},'%')
             </if>
         </where>
         order by id desc