Merge branch 'main' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/Suzhouyingji3Java into zhangtao

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

@@ -237,7 +237,7 @@ public class BPlanEnterprise {
     /**
      * 检查时间
      */
-    @ApiModelProperty(value = "上次检查时间")
+    @ApiModelProperty(value = "检查时间")
     private Date checkTime;
 
 

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseZhifaResponse.java

@@ -219,4 +219,20 @@ public class BPlanEnterpriseZhifaResponse {
     private Date examineEndTime;
 
 
+    /**
+     * 检查时间
+     */
+    @ApiModelProperty(value = "检查时间")
+    private Date checkTime;
+
+
+
+
+    /**
+     * 企业信用代码
+     */
+    @ApiModelProperty(value = "企业信用代码")
+    private String uuto;
+
+
 }

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

@@ -92,7 +92,12 @@
             <if test="supervisionLarge != null  and supervisionLarge != ''">and s.SUPERVISION_LARGE =
                 #{supervisionLarge}
             </if>
-            <if test="riskLevel != null  and riskLevel != ''">and s.RISK_LEVEL = #{riskLevel}</if>
+            <if test="riskLevel != null  and riskLevel != ''">
+                and s.RISK_LEVEL in
+                <foreach item="item" index="index" collection="riskLevel.split(',')" open="(" separator="," close=")">
+                    #{riskLevel}
+                </foreach>
+      </if>
             <if test="standLevel != null  and standLevel != ''">and s.STAND_LEVEL = #{standLevel}</if>
             <if test="examineEndTime != null ">and s.EXAMINE_END_TIME = #{examineEndTime}</if>
             <if test="createId != null ">and s.create_id = #{createId}</if>