Merge branch '20230115_sun#431#432' of sckj/mz-cloud into master

ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/domain/YljgsqJcxx.java

@@ -318,10 +318,6 @@ public class YljgsqJcxx extends BaseEntity
     @DictV(type = "CZ035",message = "{是否提供居家养老上门服务}")
     private String isTgjjylsmfw;
 
-    @ApiModelProperty(value = "分项类别（CZ030）", required = true)
-    @DictV(type = "CZ030",message = "{分项类别}")
-    private String fxlb;
-
     /** 全托服务人次 */
     // @Excel(name = "全托服务人次")
     @ApiModelProperty(value = "全托服务人次", required = true)

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

@@ -168,8 +168,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tyshxydm != null  and tyshxydm != ''"> and tyshxydm like concat('%', #{tyshxydm}, '%')</if>
             <if test="isBa != null  and isBa != ''"> and is_ba = #{isBa}</if>
             <if test="isGbmy != null  and isGbmy != ''"> and is_gbmy = #{isGbmy}</if>
-            <if test='isGbmb == "01"'> and xbzt in ('01','02','03','06','07','08','09','10') </if>
-            <if test='isGbmb == "00"'> and xbzt in ('04','05') </if>
+            <if test='isGbmb == "01"'> and dwxz in ('30','31','32','33','40','41','42','43') </if>
+            <if test='isGbmb == "00"'> and dwxz in ('10','20','21','22','23') </if>
             <if test="sczt != null  and sczt != ''"> and sczt = #{sczt}</if>
         </where>
     </select>
@@ -180,9 +180,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xzqhId != null  and xzqhId != ''"> and ssxzqh like concat( #{xzqhId}, '%')</if>
             <if test="jgmc != null  and jgmc != ''"> and jgmc like concat('%', #{jgmc}, '%')</if>
             <if test="tyshxydm != null and tyshxydm != ''"> and tyshxydm like concat( '%',#{tyshxydm},'%' ) </if>
-            <if test="isGbmy != null  and isGbmy != ''"> and is_gbmy = #{isGbmy}</if>
-            <if test='isGbmb == "01"'> and xbzt in ('01','02','03','06','07','08','09','10') </if>
-            <if test='isGbmb == "00"'> and xbzt in ('04','05') </if>
+            <if test="isGbmb!= null and isGbmb != ''">
+                <if test='isGbmb.contains("01") and isGbmb.contains("00")'> and dwxz in ('10','20','21','22','23','30','31','32','33','40','41','42','43') </if>
+                <if test='isGbmb == "00"'> and dwxz in ('10','20','21','22','23') </if>
+                <if test='isGbmb == "01"'> and dwxz in ('30','31','32','33','40','41','42','43') </if>
+            </if>
+            <if test="isGbmy != null  and isGbmy != ''"> and is_gbmy in
+                <foreach item="isGbmy" index="index" collection="isGbmy.split(',')" open="(" separator="," close=")">
+                    #{isGbmy}
+                </foreach>
+            </if>
             <if test="params.beginBasj != null and params.beginBasj != '' and params.endBasj != null and params.endBasj != ''"> and basj between #{params.beginBasj} and #{params.endBasj}</if>
             <if test="params.beginDwjlrq != null and params.beginDwjlrq != '' and params.endDwjlrq != null and params.endDwjlrq != ''"> and jlrq between #{params.beginDwjlrq} and #{params.endDwjlrq}</if>
             <if test="sczt != null  and sczt != ''">
@@ -226,12 +233,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     #{xbzt}
                 </foreach>
             </if>
-            <if test="isGbmy != null  and isGbmy != ''">
-                AND is_gbmy in
-                <foreach item="isGbmy" index="index" collection="isGbmy.split(',')" open="(" separator="," close=")">
-                    #{isGbmy}
-                </foreach>
-            </if>
             <if test="szlrlxCx != null  and szlrlxCx != ''">
                 AND
                 <foreach item="item" index="index" collection="szlrlxCx" open="(" close=")" separator="or">

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/domain/YljgKhJbxx.java

@@ -345,4 +345,13 @@ public class YljgKhJbxx extends BaseEntity
 
     @TableField(exist = false)
     private String isPresent;
+
+    @TableField(exist = false)
+    private String isGbmb;
+
+    @TableField(exist = false)
+    private String isGbmy;
+
+    @TableField(exist = false)
+    private String fxlb;
 }

ruoyi-modules/mz-organization-khgl/src/main/resources/mapper/organization/YljgKhJbxxMapper.xml

@@ -689,6 +689,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nlpg != null  and nlpg != ''"> and nlpg = #{nlpg}</if>
             <if test='isPresent == "1"'> AND jg_id IN (select id from yljg_jcxx where ssxzqh = #{xzqhId})</if>
             <if test="isCj != null  and isCj != ''"> and is_cj = #{isCj}</if>
+            <if test='isGbmb == "01"'> and jg_id in (select id from yljg_jcxx where dwxz in ('30','31','32','33','40','41','42','43')) </if>
+            <if test='isGbmb == "00"'> and jg_id in (select id from yljg_jcxx where dwxz in ('10','20','21','22','23')) </if>
+            <if test="isGbmy != null  and isGbmy != ''"> and jg_id in (select id from yljg_jcxx where is_gbmy = #{isGbmy})</if>
         </where>
     </select>
 
@@ -769,6 +772,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nlpg != null  and nlpg != ''"> and nlpg = #{nlpg}</if>
             <if test='isPresent == "1"'> AND jg_id IN (select id from yljg_jcxx where ssxzqh = #{xzqhId})</if>
             <if test="isCj != null  and isCj != ''"> and is_cj = #{isCj}</if>
+            <if test='isGbmb == "01"'> and jg_id in (select id from yljg_jcxx where dwxz in ('30','31','32','33','40','41','42','43')) </if>
+            <if test='isGbmb == "00"'> and jg_id in (select id from yljg_jcxx where dwxz in ('10','20','21','22','23')) </if>
+            <if test="isGbmy != null  and isGbmy != ''"> and jg_id in (select id from yljg_jcxx where is_gbmy = #{isGbmy})</if>
         </where>
         LIMIT #{params.pageNum}, #{params.pageSize}
     </select>
@@ -970,6 +976,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     #{ryzt}
                 </foreach>
             </if>
+            <if test="isGbmb!= null and isGbmb != ''">
+                <if test='isGbmb.contains("01") and isGbmb.contains("00")'> and b.dwxz in ('10','20','21','22','23','30','31','32','33','40','41','42','43') </if>
+                <if test='isGbmb == "00"'> and b.dwxz in ('10','20','21','22','23') </if>
+                <if test='isGbmb == "01"'> and b.dwxz in ('30','31','32','33','40','41','42','43') </if>
+            </if>
+            <if test="isGbmy != null  and isGbmy != ''"> and b.is_gbmy in
+                <foreach item="isGbmy" index="index" collection="isGbmy.split(',')" open="(" separator="," close=")">
+                    #{isGbmy}
+                </foreach>
+            </if>
         </where>
     </select>
 

ruoyi-modules/mz-organization-yggl/src/main/java/com/ruoyi/organization/domain/YljgYgJbxx.java

@@ -236,4 +236,10 @@ public class YljgYgJbxx extends BaseEntity
     @TableField(exist = false)
     private String cyrqCx;
 
+    @TableField(exist = false)
+    private String isGbmb;
+
+    @TableField(exist = false)
+    private String isGbmy;
+
 }

ruoyi-modules/mz-organization-yggl/src/main/resources/mapper/organization/YljgYgJbxxMapper.xml

@@ -248,9 +248,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sfzlx != null  and sfzlx != ''"> and a.sfzlx = #{sfzlx}</if>
             <if test="sfzhm != null  and sfzhm != ''"> and a.sfzhm like concat('%', #{sfzhm}, '%')</if>
             <if test="xb != null  and xb != ''"> and a.xb = #{xb}</if>
+            <if test="whcd != null  and whcd != ''"> and a.whcd = #{whcd}</if>
+            <if test='isGbmb == "01"'> and b.dwxz in ('30','31','32','33','40','41','42','43') </if>
+            <if test='isGbmb == "00"'> and b.dwxz in ('10','20','21','22','23') </if>
+            <if test="isGbmy != null  and isGbmy != ''"> and b.is_gbmy = #{isGbmy}</if>
             <if test="lxdh != null  and lxdh != ''"> and a.lxdh like concat('%', #{lxdh}, '%')</if>
             <if test="shbn != null  and shbn != ''"> and a.shbn = #{shbn}</if>
-            <if test="cyrq != null  and cyrq != ''"> and a.cyrq &gt;= #{cyrq}</if>
+            <if test="cyrq != null  and cyrq != ''"> and a.cyrq &lt;= #{cyrq}</if>
             <if test="zzzt != null  and zzzt != ''"> and a.zzzt = #{zzzt}</if>
             <if test="zylx != null  and zylx != ''"> and a.zylx = #{zylx}</if>
             <if test="gwlx != null  and gwlx != ''"> and a.gwlx = #{gwlx}</if>
@@ -280,6 +284,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xm != null  and xm != ''"> and a.xm like concat('%', #{xm}, '%')</if>
             <if test="sfzhm != null  and sfzhm != ''"> and a.sfzhm like concat('%', #{sfzhm}, '%')</if>
             <if test="jgmc != null  and jgmc != ''"> and b.jgmc like concat('%', #{jgmc}, '%')</if>
+
+            <if test="isGbmb!= null and isGbmb != ''">
+                <if test='isGbmb.contains("01") and isGbmb.contains("00")'> and b.dwxz in ('10','20','21','22','23','30','31','32','33','40','41','42','43') </if>
+                <if test='isGbmb == "00"'> and b.dwxz in ('10','20','21','22','23') </if>
+                <if test='isGbmb == "01"'> and b.dwxz in ('30','31','32','33','40','41','42','43') </if>
+            </if>
+            <if test="isGbmy != null  and isGbmy != ''"> and b.is_gbmy in
+                <foreach item="isGbmy" index="index" collection="isGbmy.split(',')" open="(" separator="," close=")">
+                    #{isGbmy}
+                </foreach>
+            </if>
+
             <if test="zylx != null  and zylx != ''">
                 AND a.zylx in
                 <foreach item="zylx" index="index" collection="zylx.split(',')" open="(" separator="," close=")">
@@ -299,7 +315,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
             </if>
             <if test="lxdh != null  and lxdh != ''"> and a.lxdh like concat('%', #{lxdh}, '%')</if>
-            <if test="cyrq != null  and cyrq != ''"> and a.cyrq &gt;= #{cyrq}</if>
+            <if test="cyrq != null  and cyrq != ''"> and a.cyrq &lt;= #{cyrq}</if>
             <if test="params.beginLzsj != null and params.beginLzsj != '' and params.endLzsj != null and params.endLzsj != ''"> and a.lzsj between #{params.beginLzsj} and #{params.endLzsj}</if>
             <if test="hlydj != null  and hlydj != ''"> and a.hlydj = #{hlydj}</if>
 
@@ -331,12 +347,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.beginAge != null and params.beginAge != '' and params.endAge != null and params.endAge != ''"> and substring(a.sfzhm, 7, 8) between #{params.beginAge} and #{params.endAge}</if>
             <if test="params.beginAge != null and params.beginAge != '' and (params.endAge == null or params.endAge == '')"> and substring(a.sfzhm, 7, 8) &gt;= #{params.beginAge}</if>
             <if test="(params.beginAge == null or params.beginAge == '') and params.endAge != null and params.endAge != ''"> and substring(a.sfzhm, 7, 8) &lt;= #{params.endAge}</if>
-            <if test="whcd != null  and whcd != ''">
-                AND a.whcd in
-                <foreach item="whcd" index="index" collection="whcd.split(',')" open="(" separator="," close=")">
-                    #{whcd}
-                </foreach>
-            </if>
             <if test="shbn != null  and shbn != ''"> and a.shbn = #{shbn}</if>
             <if test="zw != null  and zw != ''"> and a.zw like concat('%', #{zw}, '%')</if>
             <if test="gwlx != null  and gwlx != ''">
@@ -379,7 +389,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sfzhm != null  and sfzhm != ''"> and a.sfzhm like concat('%', #{sfzhm}, '%')</if>
             <if test="xb != null  and xb != ''"> and a.xb = #{xb}</if>
             <if test="whcd != null  and whcd != ''"> and a.whcd = #{whcd}</if>
-            <if test="cyrq != null  and cyrq != ''"> and a.cyrq &gt;= #{cyrq}</if>
+            <if test="cyrq != null  and cyrq != ''"> and a.cyrq &lt;= #{cyrq}</if>
             <if test="lxdh != null  and lxdh != ''"> and a.lxdh like concat('%', #{lxdh}, '%')</if>
             <if test="shbn != null  and shbn != ''"> and a.shbn = #{shbn}</if>
             <if test="zzzt != null  and zzzt != ''"> and a.zzzt = #{zzzt}</if>

ruoyi-ui/src/views/search/xxcx/fwjg/sqyljg/cyry/commonality/index.vue

@@ -36,6 +36,19 @@
               <el-option v-for="dict in dict.type.CH061" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
+
+          <el-form-item v-if="isJg" label="养老机构类别" prop="isGbmb">
+            <el-select v-model="queryParams.isGbmb" placeholder="请选择" clearable>
+              <el-option v-for="dict in dict.type.XZ114" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item v-if="isJg" label="是否公办民营" prop="isGbmy">
+            <el-select v-model="queryParams.isGbmy" placeholder="请选择" clearable>
+              <el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+
           <el-form-item label="文化程度" prop="whcd">
             <el-select v-model="queryParams.whcd" placeholder="请选择文化程度" clearable>
               <el-option v-for="dict in dict.type.C0008" :key="dict.value" :label="dict.label" :value="dict.value" />
@@ -45,13 +58,14 @@
             <el-date-picker clearable v-model="queryParams.cyrq" type="date" value-format="yyyyMMdd" placeholder="请选择从业日期">
             </el-date-picker>
           </el-form-item>
+          
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
             <el-button v-if="isJg" type="primary" size="mini" @click="showDrawer = !showDrawer"
               v-hasPermi="['search:ygJbxx:advancedList']">高级查询</el-button>
-            <el-button v-else type="primary" size="mini" @click="showDrawer = !showDrawer"
-              v-hasPermi="['search:ygJbxxSq:advancedList']">高级查询</el-button>
+            <!-- <el-button v-else type="primary" size="mini" @click="showDrawer = !showDrawer"
+              v-hasPermi="['search:ygJbxxSq:advancedList']">高级查询</el-button> -->
           </el-form-item>
         </el-form>
 
@@ -146,6 +160,19 @@
             ~
             <number placeholder="请输入年龄最大值" v-model="endAge" :min="0" style="display: inline-block" />
           </el-form-item>
+
+          <el-form-item v-if="isJg" label="养老机构类别" prop="isGbmb">
+            <el-select v-model="advancedQueryParams.isGbmb" multiple collapse-tags placeholder="请选择" clearable>
+              <el-option v-for="dict in dict.type.XZ114" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item v-if="isJg" label="是否公办民营" prop="isGbmy">
+            <el-select v-model="advancedQueryParams.isGbmy" multiple collapse-tags placeholder="请选择" clearable>
+              <el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+
           <el-form-item label="从业日期" prop="cyrq">
             <el-date-picker clearable v-model="advancedQueryParams.cyrq" type="date" value-format="yyyyMMdd" placeholder="请选择从业日期">
             </el-date-picker>
@@ -171,11 +198,6 @@
               <el-option v-for="dict in dict.type.CH061" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="机构类型" prop="isGbmb">
-            <el-select v-model="advancedQueryParams.isGbmb" multiple collapse-tags placeholder="请选择" clearable>
-              <el-option v-for="dict in dict.type.XZ114" :key="dict.value" :label="dict.label" :value="dict.value" />
-            </el-select>
-          </el-form-item>
           <el-form-item v-show="advancedQueryParams.zylx == '99'" label="其它职业类型" prop="zylxQt">
             <el-input v-model="advancedQueryParams.zylxQt" placeholder="请输入其它职业类型" clearable />
           </el-form-item>
@@ -496,6 +518,7 @@ export default {
         zzzt: null,
         zylx: null,
         isGbmb: null,
+        isGbmy: null,
         gwlx: null,
         isHlyyzs: null,
         hlydj: null,
@@ -518,6 +541,7 @@ export default {
         jgmc: null,
         zylx: null,
         isGbmb: null,
+        isGbmy: null,
         gwlx: null,
         whcd: null,
         cyrq: null,
@@ -786,6 +810,10 @@ export default {
       copyParams.hlydj.length > 0 && (copyParams.hlydj = copyParams.hlydj.join(','))
       copyParams.zzzt.length > 0 && (copyParams.zzzt = copyParams.zzzt.join(','))
       copyParams.xb.length > 0 && (copyParams.xb = copyParams.xb.join(','))
+      if (this.isJg) {
+        copyParams.isGbmb.length > 0 && (copyParams.isGbmb = copyParams.isGbmb.join(','))
+        copyParams.isGbmy.length > 0 && (copyParams.isGbmy = copyParams.isGbmy.join(','))
+      }
 
       advancedListYgJbxx({ ...copyParams, jgId: this.yljgId }).then(response => {
         this.ygJbxxList = decryptRowData_ECB(response.rows, ["xm", "sfzhm","lxdh"], [1, 2, 3]);

ruoyi-ui/src/views/search/xxcx/fwjg/yljg/jbxx/index.vue

@@ -144,12 +144,12 @@
             </RegionCascaderSelect>
           </el-form-item>
           <el-form-item label="养老机构类别" prop="isGbmb">
-            <el-select v-model="advancedQueryParams.isGbmb" placeholder="请选择" clearable>
+            <el-select v-model="advancedQueryParams.isGbmb" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.XZ114" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="是否公办民营" prop="isGbmy">
-            <el-select v-model="advancedQueryParams.isGbmy" placeholder="请选择" clearable>
+            <el-select v-model="advancedQueryParams.isGbmy" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
@@ -968,6 +968,8 @@ export default {
       copyParams.frzjlx.length > 0 && (copyParams.frzjlx = copyParams.frzjlx.join(','))
       copyParams.scwz.length > 0 && (copyParams.scwz = copyParams.scwz.join(','))
       copyParams.sffs.length > 0 && (copyParams.sffs = copyParams.sffs.join(','))
+      copyParams.isGbmb.length > 0 && (copyParams.isGbmb = copyParams.isGbmb.join(','))
+      copyParams.isGbmy.length > 0 && (copyParams.isGbmy = copyParams.isGbmy.join(','))
 
       advancedListJcxx(copyParams).then(response => {
         this.jcxxList = response.rows;

ruoyi-ui/src/views/search/xxcx/lrxx/rzjg/index.vue

@@ -34,11 +34,19 @@
             <RegionCascaderSelect :isJl="false" v-model="xzqh" style="width: 100%" valueProp="code">
             </RegionCascaderSelect>
           </el-form-item>
+
           <el-form-item label="养老机构类别" prop="isGbmb">
-            <el-select v-model="queryParams.isGbmb" placeholder="请选择养老机构类别" clearable>
+            <el-select v-model="queryParams.isGbmb" placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.XZ114" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
+
+          <el-form-item label="是否公办民营" prop="isGbmy">
+            <el-select v-model="queryParams.isGbmy" placeholder="请选择" clearable>
+              <el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -274,11 +282,19 @@
               <el-option v-for="dict in dict.type.C0032" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
+
           <el-form-item label="养老机构类别" prop="isGbmb">
             <el-select v-model="advancedQueryParams.isGbmb" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.XZ114" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
+
+          <el-form-item label="是否公办民营" prop="isGbmy">
+            <el-select v-model="advancedQueryParams.isGbmy" multiple collapse-tags placeholder="请选择" clearable>
+              <el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+
         </el-scrollbar>
         <el-form-item class="advanced-btns">
           <el-button type="primary" icon="el-icon-search" size="mini" @click="advancedHandleQuery"
@@ -635,7 +651,8 @@ export default {
         zjhm: null,
         nlpg: null,
         isCj: null,
-        isGbmb: null
+        isGbmb: null,
+        isGbmy: null,
       },
       beginAge: null,
       endAge: null,
@@ -669,6 +686,7 @@ export default {
         sjhm: null, // 联系电话
 
         isGbmb: null,
+        isGbmy: null,
 
         pageNum: 1,
         pageSize:10,
@@ -720,6 +738,8 @@ export default {
       copyParams.cjlx.length > 0 && (copyParams.cjlx = copyParams.cjlx.join(','))
       copyParams.zjlx.length > 0 && (copyParams.zjlx = copyParams.zjlx.join(','))
       copyParams.jhrgx.length > 0 && (copyParams.jhrgx = copyParams.jhrgx.join(','))
+      copyParams.isGbmb.length > 0 && (copyParams.isGbmb = copyParams.isGbmb.join(','))
+      copyParams.isGbmy.length > 0 && (copyParams.isGbmy = copyParams.isGbmy.join(','))
 
       advancedListKhxxBySqJg(copyParams).then((response) => {
         this.khjbxxList = decryptRowData_ECB(response.rows, ['xm', 'zjhm'], [1, 2]);