大屏接口编写

ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcCy.java

@@ -35,8 +35,8 @@ public class TcCy extends BaseEntity
     private Long cyCount;
 
     /** 区域id */
-    //
-    @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
+    ////,readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城
+    @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     private String areaId;
 }

ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqzs.java

@@ -28,8 +28,8 @@ public class TcYqzs extends BaseEntity
     private Long id;
 
     /** 区域id */
-
-    @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
+//,readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城"
+    @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     private Long areaId;
 

ruoyi-admin/src/main/resources/mapper/tcZz/networkEcology/TcWldvMapper.xml

@@ -29,7 +29,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="id != null "> and id = #{id}</if>
             <if test="areaId != null  and areaId != ''"> and area_id = #{areaId}</if>
-            <if test="isStatus != null "> and isStatus = #{isStatus}</if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
             <if test="zhName != null  and zhName != ''"> and zh_name like concat('%', #{zhName}, '%')</if>
             <if test="property != null  and property != ''"> and property = #{property}</if>
@@ -40,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
             <if test="params.beginUpdateTime != null and params.beginUpdateTime != '' and params.endUpdateTime != null and params.endUpdateTime != ''"> and update_time between #{params.beginUpdateTime} and #{params.endUpdateTime}</if>
             <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
+            <if test="isStatus != null and isStatus !='' "> and isStatus = #{isStatus}</if>
         </where>
         order by create_time desc
     </select>

ruoyi-admin/src/main/resources/mapper/tcZz/networkEcology/TcWlmqfzrMapper.xml

@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="id != null "> and id = #{id}</if>
             <if test="areaId != null  and areaId != ''"> and area_id = #{areaId}</if>
-            <if test="isStatus != null">isStatus = #{isStatus},</if>
+            <if test="isStatus != null">isStatus = #{isStatus}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
             <if test="mqFzr != null  and mqFzr != ''"> and mq_fzr = #{mqFzr}</if>
             <if test="duty != null  and duty != ''"> and duty = #{duty}</if>