bug fix

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

@@ -98,7 +98,7 @@ public class BAdministrativeController extends BaseController {
             BAdministrativeTreeRequest parentDto = new BAdministrativeTreeRequest(item1.getCounty(), item1.getSubdistrict(), item1.getInstitutionName());
             for (BAdministrativeTreeRequest item2 : listsub) {
                 if (item2.getSubdistrict()!=null && !item2.getSubdistrict().equals("")){
-                    if (item2.getSubdistrict().substring(0, 10).equals(item1.getCounty().substring(0, 10))) {
+                    if (item2.getSubdistrict().substring(0, 7).equals(item1.getCounty().substring(0, 7))) {
                         BAdministrativeTreeRequest childDto = new BAdministrativeTreeRequest(item2.getCounty(), item2.getSubdistrict(), item2.getInstitutionName());
                         parentDto.addChild(childDto);
                     }

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

@@ -25,10 +25,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 计划企业表(BPlanEnterprise)表控制层
@@ -68,12 +65,12 @@ public class BPlanEnterpriseController extends BaseController {
     @GetMapping("/list")
     public AjaxResult list(BPlanEnterprise bPlanEnterprise) {
         List<BPlanEnterprise> list = bPlanEnterpriseService.selectBPlanEnterpriseList(bPlanEnterprise);
-        for (BPlanEnterprise a :list){
+        for (BPlanEnterprise a : list) {
             String enterPriseId = String.valueOf(a.getEnterpriseId());
             BKeyEnterprise count = bKeyEnterpriseService.getByentCode(enterPriseId);
             if (count != null) {
                 a.setIsPoint(1);
-            }else{
+            } else {
                 a.setIsPoint(2);
             }
 
@@ -85,7 +82,7 @@ public class BPlanEnterpriseController extends BaseController {
     /**
      * 查询首页
      */
-    @ApiOperation(value = "查询首页",response =BPlanEnterPriseTreeResponse.class )
+    @ApiOperation(value = "查询首页", response = BPlanEnterPriseTreeResponse.class)
     @GetMapping("/tree")
     public TableDataInfo tree(BPlanEnterprisePageRequest req) {
 
@@ -96,7 +93,7 @@ public class BPlanEnterpriseController extends BaseController {
         int checkEnterpriseCountSum = list.stream()
                 .mapToInt(BPlanEnterPriseTreeResponse::getCheckEnterpriseCount)
                 .sum();
-        double ptSum = (double) checkEnterpriseCountSum /plannedEnterpriseCountSum;
+        double ptSum = (double) checkEnterpriseCountSum / plannedEnterpriseCountSum;
         BPlanEnterPriseTreeResponse resultObject = new BPlanEnterPriseTreeResponse();
         resultObject.setInstitutionName("苏州市");
         resultObject.setPlannedEnterpriseCount(plannedEnterpriseCountSum);
@@ -229,12 +226,20 @@ public class BPlanEnterpriseController extends BaseController {
      */
     @ApiOperation(value = "导出计划管理")
     @PostMapping("/exportplan")
-    public void exportplan(HttpServletResponse response, BPlanEnterprise bPlanEnterprise)
+    public void exportplan(HttpServletResponse response, BPlanEnterprise bPlanEnterprise) {
-    {
         List<BPlanEnterprise> list = bPlanEnterpriseService.selectBPlanEnterpriseList(bPlanEnterprise);
+        for (BPlanEnterprise a : list) {
+            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);
+            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/entity/BKeyEnterprise.java

@@ -110,6 +110,12 @@ public class BKeyEnterprise implements Serializable {
     @Excel(name = "企业名称")
     private String enterpriseName;
 
+    /**
+     * 行政区划
+     */
+    @ApiModelProperty(value = "行政区划")
+    @Excel(name = "行政区划")
+    private String district;
 
 
 }

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

@@ -54,9 +54,9 @@ public class BPlanEnterprise implements Serializable {
     /**
      * 创建时间
      */
-    @Excel(name = "年份", dateFormat = "yyyy/MM/dd HH:mm:ss")
+    @Excel(name = "年份", dateFormat = "yyyy-MM-dd")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd ", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 

ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BAdministrativeMapper.java

@@ -82,5 +82,12 @@ public interface BAdministrativeMapper {
 
     List<BPlanEnterPriseTreeResponse> selectBPlanEnterPriseTreeRequestRequestList(@Param("req") BPlanEnterprisePageRequest req);
 
-
+    /**
+     * 根据乡村，市区查询数据
+     *
+     * @param district     乡村
+     * @param paddedString 市区
+     * @return
+     */
+    List<String> getBydistinct(@Param("district") String district, @Param("paddedString") String paddedString);
 }

ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/SzEntBasicInfoMapper.java

@@ -70,4 +70,13 @@ public interface SzEntBasicInfoMapper extends BaseMapper<SzEntBasicInfo> {
      */
     List<SzEntBasicInfo> page(@Param("req") SzEntBasicInfoPageRequest req);
 
+
+
+    /**
+     * 根据entcode获取行政区划代码
+     * @param entCode 企业信用代码
+     * @return
+     */
+    String getDistrict(@Param("entCode") String entCode);
+
 }

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

@@ -82,5 +82,12 @@ public interface IBAdministrativeService {
      */
     List<BAdministrativeTreeRequest> selectcascadingSelectDataList();
 
-
+    /**
+     * 根据乡村，市区查询数据
+     *
+     * @param district     乡村
+     * @param paddedString 市区
+     * @return
+     */
+    List<String> getBydistinct(String district, String paddedString);
 }

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

@@ -1,9 +1,7 @@
 package com.ruoyi.programManagement.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.programManagement.entity.SzEntBasicInfo;
 import com.ruoyi.programManagement.entity.request.SzEntBasicInfoPageRequest;
-import com.ruoyi.programManagement.entity.response.SzEntBasicInfoPageResponse;
 
 import java.util.List;
 import java.util.Map;
@@ -70,4 +68,11 @@ public interface ISzEntBasicInfoService {
      * @Parm req 请求类
      */
     Map<String, Object> page(SzEntBasicInfoPageRequest req);
+
+    /**
+     * 根据entcode获取行政区划代码
+     * @param entCode 企业信用代码
+     * @return
+     */
+    String getDistrict(String entCode);
 }

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

@@ -104,5 +104,10 @@ public class BAdministrativeServiceImpl implements IBAdministrativeService {
         return bAdministrativeMapper.selectcascadingSelectDataList();
     }
 
+    @Override
+    public List<String> getBydistinct(String district, String paddedString) {
+        return bAdministrativeMapper.getBydistinct(district,paddedString);
+    }
+
 
 }

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

@@ -7,6 +7,7 @@ import com.ruoyi.programManagement.entity.BKeyEnterprise;
 import com.ruoyi.programManagement.entity.request.BKeyEnterprisePageRequest;
 import com.ruoyi.programManagement.mapper.BKeyEnterpriseMapper;
 import com.ruoyi.programManagement.service.BKeyEnterpriseService;
+import com.ruoyi.programManagement.service.ISzEntBasicInfoService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -25,11 +26,17 @@ public class BKeyEnterpriseServiceImpl extends ServiceImpl<BKeyEnterpriseMapper,
     @Resource
     private BKeyEnterpriseMapper bKeyEnterpriseMapper;
 
+    @Resource
+    private ISzEntBasicInfoService iSzEntBasicInfoService;
+
     @Override
     public String importUser(List<BKeyEnterprise> bKeyEnterpriseList) {
         StringBuilder successMsg = new StringBuilder();
         if (!bKeyEnterpriseList.isEmpty()) {
             for (BKeyEnterprise bKeyEnterprise : bKeyEnterpriseList) {
+                //根据entcode获取行政区划代码
+                String entCode = bKeyEnterprise.getEntCode();
+                bKeyEnterprise.setDistrict(iSzEntBasicInfoService.getDistrict(entCode));
                 baseMapper.bKeyEnterpriseAdd(bKeyEnterprise);
             }
             successMsg.append("导入成功");

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

@@ -112,5 +112,10 @@ public class SzEntBasicInfoServiceImpl implements ISzEntBasicInfoService
         return result;
     }
 
+    @Override
+    public String getDistrict(String entCode) {
+        return szEntBasicInfoMapper.getDistrict(entCode);
+    }
+
 
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -2,6 +2,9 @@ package com.ruoyi.web.controller.system;
 
 import java.util.List;
 import java.util.Set;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,6 +26,7 @@ import com.ruoyi.system.service.ISysMenuService;
  * @author ruoyi
  */
 @RestController
+@Api("登录验证")
 public class SysLoginController
 {
     @Autowired
@@ -57,6 +61,7 @@ public class SysLoginController
      * @param loginBody 登录信息
      * @return 结果
      */
+    @ApiOperation("不带校验码登录方法")
     @PostMapping("/loginNoCaptcha")
     public AjaxResult loginNoCaptcha(@RequestBody LoginBody loginBody)
     {

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage").permitAll()
+                .antMatchers("/login", "/register", "/captchaImage","/loginNoCaptcha").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/pharmaceuticals/**/**").permitAll()

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

@@ -52,32 +52,65 @@
     <select id="selectBPlanEnterPriseTreeRequestRequestList"
             resultType="com.ruoyi.programManagement.entity.request.BPlanEnterPriseTreeResponse">
 
-        -- SELECT a.subdistrict AS subdistrict,a.county,c.id,a.institution_name as institutionName,
+        SELECT
-        -- COUNT(b.subdistrict) AS enterpriseCount,
+        s.institutionName,
-        -- COUNT(DISTINCT k.ent_code) - COUNT(DISTINCT c.enterprise_id) AS remainingKeyEnterpriseCount,
+        s.county,
-        -- COUNT(DISTINCT c.enterprise_id) AS plannedEnterpriseCount,
+        s.plannedEnterpriseCount,
-        -- COUNT(DISTINCT CASE WHEN k.ent_code IS NOT NULL THEN c.enterprise_id END) AS planneKeyEnterpriseCount
+        IFNULL( s.checkEnterpriseCount, 0 ) AS checkEnterpriseCount,
-        -- FROM b_administrative a
+        IFNULL( s.pt, 0 ) AS pt
-        -- 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,
-        COUNT(DISTINCT c.USC_CODE) AS checkEnterpriseCount,
-        COUNT(DISTINCT c.USC_CODE) / COUNT(DISTINCT b.enterprise_id) AS pt
         FROM
-        b_administrative a
+        (
-        LEFT JOIN b_plan_enterprise b ON SUBSTRING(a.county, 1, 8) = SUBSTRING(b.district, 1, 8)
+        SELECT
-        LEFT JOIN sz_enfor_examine c ON b.enterprise_id = c.USC_CODE
+        institution_name AS institutionName,
+        county,
+        COUNT( enterprise_id ) AS plannedEnterpriseCount,
+        SUM( checkStatus ) AS checkEnterpriseCount,
+        SUM( checkStatus ) / COUNT( enterprise_id ) AS pt
+        FROM
+        ( SELECT institution_name, county FROM b_administrative WHERE SUBDISTRICT = '' AND institution_name != '苏州市'
+        ) a
+        LEFT JOIN (
+        SELECT
+        enterprise_id,
+        district,
+        max( checkStatus ) AS checkStatus
+        FROM
+        (
+        SELECT
+        e.enterprise_id,
+        SUBSTRING( e.district, 1, 8 ) AS district,
+        CASE
+
+        WHEN f.USC_CODE IS NOT NULL
+        AND SUBSTRING( e.planned_year, 1, 7 ) = SUBSTRING( f.EXAMINE_START_TIME, 1, 7 ) THEN
+        1 ELSE 0
+        END AS checkStatus
+        FROM
+        b_plan_enterprise e
+        LEFT JOIN sz_enfor_examine f ON e.enterprise_id = f.USC_CODE
         <where>
             <if test="req.plannedYear!=null and req.plannedYear!=''">
-                b.planned_year like concat('%',#{req.plannedYear}, '%')
+                e.planned_year like concat('%',#{req.plannedYear}, '%')
             </if>
         </where>
-        GROUP BY SUBSTRING(a.county, 1, 8) )s
+        ) t
-        where s.institutionName!='苏州市'
+        GROUP BY
+        enterprise_id
+        ) p ON SUBSTRING( a.county, 1, 8 ) = p.district
+        GROUP BY
+        a.county
+        ORDER BY
+        a.county
+        ) s
+    </select>
+    <select id="getBydistinct" resultType="java.lang.String">
+        select institution_name
+        from b_administrative
+        where county = #{paddedString} and  subdistrict =''
+        union all
+        select institution_name
+        from b_administrative
+        where subdistrict = #{district}
     </select>
 
 

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

@@ -39,6 +39,9 @@
     <select id="getBydistrict" resultType="java.lang.Integer">
         select count(*) as count from b_key_enterprise  where district  like concat('%',#{district},'%')
     </select>
+
+
+
     <select id="getByentCode" resultType="com.ruoyi.programManagement.entity.BKeyEnterprise">
         select * from b_key_enterprise  where ent_code =#{entCode}
     </select>

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

@@ -73,7 +73,7 @@
                    END AS is_point
         FROM (SELECT b.*, a.plan_id
               FROM b_plan_enterprise a
-                       LEFT JOIN sz_ent_basic_info b ON a.enterprise_id = b.USC_CODE) s
+                       LEFT JOIN sz_ent_basic_info_new b ON a.enterprise_id = b.USC_CODE) s
                  LEFT JOIN b_key_enterprise c ON s.USC_CODE = c.ent_code
         WHERE s.plan_id = #{planId}
         GROUP BY s.ENTPR_ID
@@ -86,28 +86,22 @@
         (
         SELECT
         a.*,
-        d.ENTPR_NAME AS entprName,
         a.planned_year AS plannedYear,
         b.id AS longId,
         b.EXAMINE_START_TIME,
         b.EXAMINE_END_TIME,
+        b.ENTPR_NAME as entprName,
         CASE
-        WHEN b.USC_CODE IS NOT NULL THEN 1
+        WHEN b.USC_CODE IS NOT NULL
+        AND SUBSTRING( a.planned_year, 1, 7 ) = SUBSTRING( b.EXAMINE_START_TIME, 1, 7 )
+        THEN 1
         ELSE 2
         END AS checkStatus
         FROM
         b_plan_enterprise a
         LEFT JOIN sz_enfor_examine b ON a.enterprise_id = b.USC_CODE
-        LEFT JOIN sz_ent_basic_info d ON a.enterprise_id = d.USC_CODE
+        WHERE
-        where (
+        b.USC_CODE IS NOT NULL
-        SUBSTRING(a.planned_year, 1, 4) >= EXTRACT(YEAR FROM b.EXAMINE_START_TIME)
-        AND SUBSTRING(a.planned_year, 6, 2) >= EXTRACT(MONTH FROM b.EXAMINE_START_TIME)
-        )
-        AND
-        (
-        SUBSTRING(a.planned_year, 1, 4) <= EXTRACT(YEAR FROM b.EXAMINE_END_TIME)
-        AND SUBSTRING(a.planned_year, 6, 2) <= EXTRACT(MONTH FROM b.EXAMINE_END_TIME)
-        )
         ) s
 
         <where>
@@ -122,6 +116,7 @@
             </if>
         </where>
 
+
     </select>
     <select id="page" resultType="com.ruoyi.programManagement.entity.BPlanEnterprise">
         select * from b_plan_enterprise
@@ -178,7 +173,7 @@
         FROM
         b_plan_enterprise a
         LEFT JOIN b_administrative b ON a.district = b.subdistrict
-        LEFT JOIN sz_ent_basic_info c ON a.enterprise_id = c.USC_CODE
+        LEFT JOIN sz_ent_basic_info_new c ON a.enterprise_id = c.USC_CODE
         <where>
             <if test="req.district !=null and req.district!='' ">
                 AND a.district like concat('%', #{req.district}, '%')
@@ -187,7 +182,7 @@
                 and a.planned_year =#{req.plannedYear}
             </if>
         </where>
-        order by a.id desc
+        group by a.id   order by a.id desc
     </select>
     <select id="selectById" resultType="com.ruoyi.programManagement.entity.BPlanEnterprise">
         select a.id,
@@ -207,7 +202,7 @@
                a.plan_content,
                a.is_point,
                b.ENTPR_NAME as entprName
-        from b_plan_enterprise  a left join  sz_ent_basic_info b on a.enterprise_id=b.usc_code
+        from b_plan_enterprise  a left join  sz_ent_basic_info_new b on a.enterprise_id=b.usc_code
         where a.id=#{id}
     </select>
 

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

@@ -322,10 +322,9 @@
         a.*,
         CASE WHEN b.ent_code IS NOT NULL THEN 1 ELSE 2 END AS is_point
         FROM
-        sz_ent_basic_info a
+        sz_ent_basic_info_new  a
         LEFT JOIN
-        b_key_enterprise b ON a.USC_CODE = b.ent_code where a.SUBDISTRICT like '%013205%' or a.SUBDISTRICT like
+        b_key_enterprise b ON a.USC_CODE = b.ent_code )s
-        '%13205%')s
         <where>
             <if test="req.uscCode != null  and req.uscCode != ''">and s.USC_CODE=#{req.uscCode}</if>
             <if test="req.entprColor != null  and req.entprColor != ''">and s.ENTPRCOLOR=#{req.entprColor}</if>
@@ -345,6 +344,11 @@
         </where>
         order by is_point asc
     </select>
+    <select id="getDistrict" resultType="java.lang.String">
+        SELECT SUBDISTRICT
+        FROM `sz_ent_basic_info_new a`
+        where USC_CODE = #{entCode}
+    </select>
 
     <insert id="insertSzEntBasicInfo" parameterType="SzEntBasicInfo">
         insert into sz_ent_basic_info