bug fix

ruoyi-admin/src/main/resources/application.yml

@@ -123,7 +123,7 @@ pagehelper:
 
 # Swagger配置
 knife4j:
-  enable: true
+  enable: false
 
 
 # 防止XSS攻击

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

@@ -73,8 +73,7 @@
         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 like concat('%',#{req.plannedYear}, '%')
             </if>
         </where>
         GROUP BY SUBSTRING(a.county, 1, 8) )s

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

@@ -23,7 +23,7 @@
         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 like concat('%',#{req.year},'%')
             </if>
             <if test=" req.entCode !=null">
                 and ent_code = #{req.entCode}
@@ -40,6 +40,6 @@
         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 * from b_key_enterprise  where district =#{district}
     </select>
 </mapper>

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

@@ -88,15 +88,28 @@
         a.*,
         d.ENTPR_NAME AS entprName,
         a.planned_year AS plannedYear,
-        b.id as longId,
+        b.id AS longId,
+        b.EXAMINE_START_TIME,
+        b.EXAMINE_END_TIME,
         CASE
-        WHEN b.USC_CODE IS NOT NULL THEN
-        1 ELSE 2
+        WHEN b.USC_CODE IS NOT NULL 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) s
+        LEFT JOIN sz_ent_basic_info d ON a.enterprise_id = d.USC_CODE
+        where (
+        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>
             <if test="req.plannedYear !=null and req.plannedYear !=''">
                 and s.plannedYear =#{req.plannedYear}