20220907_sun#1398门户养老机构根据生存状态显示

ruoyi-modules/mz-portal/src/main/java/com/ruoyi/portal/controller/YljgJcxxController.java

@@ -7,6 +7,7 @@ import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.ext.api.enums.StateStatus;
+import com.ruoyi.ext.api.enums.SurvivalStatus;
 import com.ruoyi.ext.api.utils.SubCodeUtil;
 import com.ruoyi.organization.domain.YljgJcxx;
 import com.ruoyi.organization.domain.YljgsqJcxx;
@@ -44,6 +45,7 @@ public class YljgJcxxController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(YljgJcxx yljgJcxx)
     {
+        yljgJcxx.setSczt(SurvivalStatus.NORMAL.getCode());
         if (StringUtils.isNotEmpty(yljgJcxx.getSzxzqh())) {
             yljgJcxx.setSzxzqh(unitHandler(yljgJcxx.getSzxzqh()));
         }
@@ -69,6 +71,7 @@ public class YljgJcxxController extends BaseController
     @GetMapping("/map/list")
     public AjaxResult mapList(YljgJcxx yljgJcxx)
     {
+        yljgJcxx.setSczt(SurvivalStatus.NORMAL.getCode());
         if (StringUtils.isNotEmpty(yljgJcxx.getSzxzqh())) {
             yljgJcxx.setSzxzqh(unitHandler(yljgJcxx.getSzxzqh()));
         }

ruoyi-modules/mz-portal/src/main/resources/mapper/portal/YljgJcxxMapper.xml

@@ -215,6 +215,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             state = '0'
             <if test="id != null  and id != ''"> and id = #{id} </if>
+            <if test="sczt != null  and sczt != ''"> and sczt = #{sczt} </if>
             <if test="xzqhId != null  and xzqhId != ''"> and szxzqh like concat( #{xzqhId}, '%')</if>
             <if test="jgmc != null  and jgmc != ''"> and jgmc like concat('%', #{jgmc}, '%')</if>
             <if test="pddj != null  and pddj != ''"> and IFNULL((select pddj from zwyw_djpd_sq where jg_id = yljg_jcxx.id limit 1), '00') = #{pddj}</if>
@@ -241,6 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             state = '0'
             <if test="id != null  and id != ''"> and id = #{id} </if>
+            <if test="sczt != null  and sczt != ''"> and sczt = #{sczt} </if>
             <if test="xzqhId != null  and xzqhId != ''"> and szxzqh like concat( #{xzqhId}, '%')</if>
             <if test="jgmc != null  and jgmc != ''"> and jgmc like concat('%', #{jgmc}, '%')</if>
             <if test="pddj != null  and pddj != ''"> and IFNULL((select pddj from zwyw_djpd_sq where jg_id = yljg_jcxx.id limit 1), '00') = #{pddj}</if>
@@ -265,6 +267,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             state = '0'
             <if test="id != null  and id != ''"> and id = #{id} </if>
+            <if test="sczt != null  and sczt != ''"> and sczt = #{sczt} </if>
             <if test="xzqhId != null  and xzqhId != ''"> and szxzqh like concat( #{xzqhId}, '%')</if>
             <if test="jgmc != null  and jgmc != ''"> and jgmc like concat('%', #{jgmc}, '%')</if>
             <if test="pddj != null  and pddj != ''"> and IFNULL((select pddj from zwyw_djpd_sq where jg_id = yljgsq_jcxx.id limit 1), '00') = #{pddj}</if>

ruoyi-modules/mz-portal/src/main/resources/mapper/portal/YljgsqJcxxMapper.xml

@@ -142,6 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             yljgsq_jcxx
         <where>
             <if test="id != null  and id != ''"> and id = #{id} </if>
+            <if test="sczt != null  and sczt != ''"> and sczt = #{sczt} </if>
             <if test="xzqhId != null  and xzqhId != ''"> and szxzqh like concat( #{xzqhId}, '%')</if>
             <if test="jgmc != null  and jgmc != ''"> and jgmc like concat('%', #{jgmc}, '%')</if>
             <if test="pddj != null  and pddj != ''"> and IFNULL((select pddj from zwyw_djpd_sq where jg_id = yljgsq_jcxx.id limit 1), '00') = #{pddj}</if>