Merge branch 'master' into 20230116_sun#431#432查询功能新增

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

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

@@ -284,6 +284,13 @@ public class YljgJcxx extends BaseEntity
     @DictV(type = "CH010",message = "{兴办主体}")
     private String xbzt;
 
+    /** 是否公办民营（CZ035） */
+    @Excel(name = "是否公办民营", dictType = "CZ035")
+    @ApiModelProperty(value = "是否公办民营（CZ035）")
+//    @NotBlank(message = "{是否公办民营字段}",groups = AddGroup.class)
+    @DictV(type = "CZ035",message = "{是否公办民营}")
+    private String isGbmy;
+
     /** 收住老人类型（CH052） */
     @Excel(name = "收住老人类型", dictType = "CH052")
     @ApiModelProperty(value = "收住老人类型（CH052）", required = true)
@@ -671,6 +678,8 @@ public class YljgJcxx extends BaseEntity
     @EncryptionV
     private String frdjhm;
 
+    @TableField(exist = false)
+    private String isGbmb;
 
     @TableField(exist = false)
     private String xzqhId;

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

@@ -236,6 +236,11 @@ public class YljgsqJcxx extends BaseEntity
     @DictV(type = "CH034",message = "{社区养老服务机构类别}")
     private String lb;
 
+    /** 分项类别（CZ030） */
+    @ApiModelProperty(value = "分项类别代码（CZ030）")
+    @DictV(type = "CZ030",message = "{分项类别代码}")
+    private String fxlb;
+
     /** 是否开展医疗服务（CZ035） */
     // @Excel(name = "是否开展医疗服务", dictType = "CZ035")
     @ApiModelProperty(value = "是否开展医疗服务（CZ035）", required = true)
@@ -512,7 +517,6 @@ public class YljgsqJcxx extends BaseEntity
     @Size(max = 2, message = "{提供的服务类型(CZ031)}")
     private String tgfwlx;
 
-
     /** 单位所属行政区划  */
     @TableField(exist = false)
     private String ssxzqhIds;

ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/service/impl/YljgJcxxServiceImpl.java

@@ -446,6 +446,10 @@ public class YljgJcxxServiceImpl implements IYljgJcxxService
             }
         }
 
+        // 如果兴办主体，是 04,05 (民办)，则是否公办民营给`否`
+        if(!("04".equals(yljgJcxx.getXbzt()) || "05".equals(yljgJcxx.getXbzt()))){
+            yljgJcxx.setIsGbmy("0");
+        }
     }
 
     /**

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

@@ -83,7 +83,9 @@ public class YljgYgJbxx extends BaseEntity
     @DateV(pattern = "yyyyMMdd", message = "{出生日期}")
     private String csrq;
 
+    /** 从业日期 */
     @ApiModelProperty(value = "从业日期", required = true)
+    @NotBlank(message = "{从业日期}",groups = AddGroup.class)
     @DateV(pattern = "yyyyMMdd", message = "{从业日期}")
     private String cyrq;
 
@@ -154,11 +156,11 @@ public class YljgYgJbxx extends BaseEntity
     @DictV(type = "CH020",message = "{原护理员等级}")
     private String gqHlydj;
 
-    /** 是否缴纳社保（CZ035） */
-    @Excel(name = "是否缴纳社保", dictType = "CZ035")
-    @ApiModelProperty(value = "是否缴纳社保（CZ035）", required = true)
+    /** 是否缴纳社保（XZ115） */
+    @Excel(name = "是否缴纳社保", dictType = "XZ115")
+    @ApiModelProperty(value = "是否缴纳社保（XZ115）", required = true)
     @NotBlank(message = "{是否缴纳社保}",groups = AddGroup.class)
-    @DictV(type = "CZ035",message = "{是否缴纳社保}")
+    @DictV(type = "XZ115",message = "{是否缴纳社保}")
     private String isJnsb;
 
     /** 在职状态（CZ001） */
@@ -229,4 +231,9 @@ public class YljgYgJbxx extends BaseEntity
     @TableField(exist = false)
     private String isPx;
 
+    /** 高级查询 - 从业年限*/
+    @ApiModelProperty(value = "从业年限")
+    @TableField(exist = false)
+    private String cyrqCx;
+
 }

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

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sfzhm"    column="sfzhm"    />
         <result property="xb"    column="xb"    />
         <result property="csrq"    column="csrq"    />
+        <result property="cyrq"    column="cyrq"    />
         <result property="whcd"    column="whcd"    />
         <result property="shbn"    column="shbn"    />
         <result property="zw"    column="zw"    />
@@ -43,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectYljgYgJbxxVo">
-        select a.id, xm, a.sfzlx, a.sfzhm, a.csrq, a.xb, a.lxdh, a.whcd, a.shbn, a.zzzt, a.lzsj, a.rzsj, a.zylx, a.zylx_qt, a.gwlx,
+        select a.id, xm, a.sfzlx, a.sfzhm, a.csrq, a.cyrq, a.xb, a.lxdh, a.whcd, a.shbn, a.zzzt, a.lzsj, a.rzsj, a.zylx, a.zylx_qt, a.gwlx,
         a.is_hlyyzs, a.is_jnsb, a.hlydj, a.gq_hlydj, a.jg_id, a.zw,
         a.create_time_str, a.create_user_id, a.create_by, a.create_unit, a.create_unit_name,
         a.update_time_str, a.update_user_id, a.update_by, a.update_unit, a.update_unit_name,
@@ -110,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sfzlx != null">sfzlx,</if>
             <if test="sfzhm != null and sfzhm != ''">sfzhm,</if>
             <if test="csrq != null and csrq != ''">csrq,</if>
+            <if test="cyrq != null">cyrq,</if>
             <if test="xb != null and xb != ''">xb,</if>
             <if test="lxdh != null and lxdh != ''">lxdh,</if>
             <if test="whcd != null and whcd != ''">whcd,</if>
@@ -139,6 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sfzlx != null">#{sfzlx},</if>
             <if test="sfzhm != null and sfzhm != ''">#{sfzhm},</if>
             <if test="csrq != null and csrq != ''">#{csrq},</if>
+            <if test="cyrq != null and cyrq != ''">#{cyrq},</if>
             <if test="xb != null and xb != ''">#{xb},</if>
             <if test="lxdh != null and lxdh != ''">#{lxdh},</if>
             <if test="whcd != null and whcd != ''">#{whcd},</if>
@@ -165,13 +168,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <insert id="insertYljgYgJbxxUpdateHi" parameterType="YljgYgJbxx">
-        INSERT INTO `yljg_yg_jbxx_ls`(`id`, `jg_id`,`xm`,`sfzlx`,`sfzhm`,`xb`,`csrq`,`whcd`,`shbn`,`zw`,`lxdh`,`gwlx`,`zylx`,`zylx_qt`,`is_hlyyzs`,`hlydj`,`gq_hlydj`,`is_jnsb`,`zzzt`,`lzsj`,`create_time_str`, `create_user_id`, `create_by`, `create_user_type`, `create_area_code`,`create_unit`, `create_unit_name`, `update_time_str`, `update_user_id`, `update_by`, `update_unit`, `update_unit_name`,cfrq,cflx,pc)
-            value(#{id}, #{jgId},#{xm},#{sfzlx},#{sfzhm},#{xb},#{csrq},#{whcd},#{shbn},#{zw},#{lxdh},#{gwlx},#{zylx},#{zylxQt},#{isHlyyzs},#{hlydj},#{gqHlydj},#{isJnsb},#{zzzt},#{lzsj},#{createTimeStr},#{createUserId},#{createBy},#{createUserType},#{createAreaCode},#{createUnit},#{createUnitName},#{updateTimeStr},#{updateUserId},#{updateBy},#{updateUnit},#{updateUnitName}, DATE_FORMAT(now(),'%Y%m%d'),'u',getuuid())
+        INSERT INTO `yljg_yg_jbxx_ls`(`id`, `jg_id`,`xm`,`sfzlx`,`sfzhm`,`xb`,`csrq`,`cyrq`,`whcd`,`shbn`,`zw`,`lxdh`,`gwlx`,`zylx`,`zylx_qt`,`is_hlyyzs`,`hlydj`,`gq_hlydj`,`is_jnsb`,`zzzt`,`lzsj`,`create_time_str`, `create_user_id`, `create_by`, `create_user_type`, `create_area_code`,`create_unit`, `create_unit_name`, `update_time_str`, `update_user_id`, `update_by`, `update_unit`, `update_unit_name`,cfrq,cflx,pc)
+            value(#{id}, #{jgId},#{xm},#{sfzlx},#{sfzhm},#{xb},#{csrq},#{cyrq},#{whcd},#{shbn},#{zw},#{lxdh},#{gwlx},#{zylx},#{zylxQt},#{isHlyyzs},#{hlydj},#{gqHlydj},#{isJnsb},#{zzzt},#{lzsj},#{createTimeStr},#{createUserId},#{createBy},#{createUserType},#{createAreaCode},#{createUnit},#{createUnitName},#{updateTimeStr},#{updateUserId},#{updateBy},#{updateUnit},#{updateUnitName}, DATE_FORMAT(now(),'%Y%m%d'),'u',getuuid())
     </insert>
 
     <insert id="insertYljgYgJbxxDeleteHi" parameterType="YljgYgJbxx">
-        INSERT INTO `yljg_yg_jbxx_ls`(`id`, `jg_id`,`xm`,`sfzlx`,`sfzhm`,`xb`,`csrq`,`whcd`,`shbn`,`zw`,`lxdh`,`gwlx`,`zylx`,`zylx_qt`,`is_hlyyzs`,`hlydj`,`gq_hlydj`,`is_jnsb`,`zzzt`,`lzsj`,`create_time_str`, `create_user_id`, `create_by`, `create_user_type`, `create_area_code`,`create_unit`, `create_unit_name`, `update_time_str`, `update_user_id`, `update_by`, `update_unit`, `update_unit_name`,cfrq,cflx,pc)
-            value(#{id}, #{jgId},#{xm},#{sfzlx},#{sfzhm},#{xb},#{csrq},#{whcd},#{shbn},#{zw},#{lxdh},#{gwlx},#{zylx},#{zylxQt},#{isHlyyzs},#{hlydj},#{gqHlydj},#{isJnsb},#{zzzt},#{lzsj},#{createTimeStr},#{createUserId},#{createBy},#{createUserType},#{createAreaCode},#{createUnit},#{createUnitName},#{updateTimeStr},#{updateUserId},#{updateBy},#{updateUnit},#{updateUnitName}, DATE_FORMAT(now(),'%Y%m%d'),'d',getuuid())
+        INSERT INTO `yljg_yg_jbxx_ls`(`id`, `jg_id`,`xm`,`sfzlx`,`sfzhm`,`xb`,`csrq`,`cyrq`,`whcd`,`shbn`,`zw`,`lxdh`,`gwlx`,`zylx`,`zylx_qt`,`is_hlyyzs`,`hlydj`,`gq_hlydj`,`is_jnsb`,`zzzt`,`lzsj`,`create_time_str`, `create_user_id`, `create_by`, `create_user_type`, `create_area_code`,`create_unit`, `create_unit_name`, `update_time_str`, `update_user_id`, `update_by`, `update_unit`, `update_unit_name`,cfrq,cflx,pc)
+            value(#{id}, #{jgId},#{xm},#{sfzlx},#{sfzhm},#{xb},#{csrq},#{cyrq},#{whcd},#{shbn},#{zw},#{lxdh},#{gwlx},#{zylx},#{zylxQt},#{isHlyyzs},#{hlydj},#{gqHlydj},#{isJnsb},#{zzzt},#{lzsj},#{createTimeStr},#{createUserId},#{createBy},#{createUserType},#{createAreaCode},#{createUnit},#{createUnitName},#{updateTimeStr},#{updateUserId},#{updateBy},#{updateUnit},#{updateUnitName}, DATE_FORMAT(now(),'%Y%m%d'),'d',getuuid())
     </insert>
 
     <update id="updateYljgYgJbxx" parameterType="YljgYgJbxx">
@@ -181,6 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sfzlx != null">sfzlx = #{sfzlx},</if>
             <if test="sfzhm != null and sfzhm != ''">sfzhm = #{sfzhm},</if>
             <if test="csrq != null and csrq != ''">csrq = #{csrq},</if>
+            <if test="cyrq != null">cyrq = #{cyrq},</if>
             <if test="xb != null and xb != ''">xb = #{xb},</if>
             <if test="lxdh != null and lxdh != ''">lxdh = #{lxdh},</if>
             <if test="whcd != null and whcd != ''">whcd = #{whcd},</if>
@@ -222,7 +226,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectYljgYgJbxxBussVo">
         select
         b.jgmc, getxzqhmcbycode(b.szxzqh) szxzqh_name,
-        a.id, xm, a.sfzlx, a.sfzhm, a.csrq, a.xb, a.lxdh, a.whcd, a.shbn, a.zzzt, a.lzsj, a.zylx, a.zylx_qt, a.gwlx,
+        a.id, xm, a.sfzlx, a.sfzhm, a.csrq, a.cyrq, a.xb, a.lxdh, a.whcd, a.shbn, a.zzzt, a.lzsj, a.zylx, a.zylx_qt, a.gwlx,
         a.is_hlyyzs, a.is_jnsb, a.hlydj, a.gq_hlydj, a.jg_id, a.zw,
         a.create_time_str, a.create_user_id, a.create_by, a.create_unit, a.create_unit_name,
         a.update_time_str, a.update_user_id, a.update_by, a.update_unit, a.update_unit_name,
@@ -263,7 +267,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectYljgYgJbxxAdvancedList" parameterType="YljgYgJbxx" resultMap="YljgYgJbxxResult">
         select
-        b.jgmc, a.id, xm, a.sfzlx, a.sfzhm, a.csrq, a.xb, a.lxdh, a.whcd, a.shbn, a.zzzt, a.lzsj,
+        b.jgmc, a.id, xm, a.sfzlx, a.sfzhm, a.csrq, a.cyrq, a.xb, a.lxdh, a.whcd, a.shbn, a.zzzt, a.lzsj,
         a.zylx, a.zylx_qt, a.gwlx, a.is_hlyyzs, a.is_jnsb, a.hlydj, a.gq_hlydj, a.jg_id, a.zw,
         a.create_time_str, a.create_user_id, a.create_by, a.create_unit, a.create_unit_name,
         a.update_time_str, a.update_user_id, a.update_by, a.update_unit, a.update_unit_name
@@ -357,7 +361,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSqYljgYgJbxxListBuss" parameterType="YljgYgJbxx" resultMap="YljgYgJbxxResult">
         select
         b.jgmc, getxzqhmcbycode(b.szxzqh) szxzqh_name,
-        a.id, xm, a.sfzlx, a.sfzhm, a.csrq, a.xb, a.lxdh, a.whcd, a.shbn, a.zzzt, a.lzsj, a.zylx, a.zylx_qt, a.gwlx,
+        a.id, xm, a.sfzlx, a.sfzhm, a.csrq, a.cyrq, a.xb, a.lxdh, a.whcd, a.shbn, a.zzzt, a.lzsj, a.zylx, a.zylx_qt, a.gwlx,
         a.is_hlyyzs, a.is_jnsb, a.hlydj, a.gq_hlydj, a.jg_id, a.zw,
         a.create_time_str, a.create_user_id, a.create_by, a.create_unit, a.create_unit_name,
         a.update_time_str, a.update_user_id, a.update_by, a.update_unit, a.update_unit_name, a.state,
@@ -394,7 +398,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectPortalYljgYgJbxxList" parameterType="YljgYgJbxx" resultMap="YljgYgJbxxResult">
         select
         b.jgmc, getxzqhmcbycode(b.szxzqh) szxzqh_name,
-        a.id, xm, a.sfzlx, a.sfzhm, a.csrq, a.xb, a.lxdh, a.whcd, a.shbn, a.zzzt, a.lzsj, a.zylx, a.zylx_qt, a.gwlx,
+        a.id, xm, a.sfzlx, a.sfzhm, a.csrq, a,cyrq, a.xb, a.lxdh, a.whcd, a.shbn, a.zzzt, a.lzsj, a.zylx, a.zylx_qt, a.gwlx,
         a.is_hlyyzs, a.is_jnsb, a.hlydj, a.gq_hlydj, a.jg_id, a.zw,
         a.create_time_str, a.create_user_id, a.create_by, a.create_unit, a.create_unit_name,
         a.update_time_str, a.update_user_id, a.update_by, a.update_unit, a.update_unit_name,
@@ -427,7 +431,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectPortalSqYljgYgJbxxList" parameterType="YljgYgJbxx" resultMap="YljgYgJbxxResult">
         select
         b.jgmc, getxzqhmcbycode(b.szxzqh) szxzqh_name,
-        a.id, xm, a.sfzlx, a.sfzhm, a.csrq, a.xb, a.lxdh, a.whcd, a.shbn, a.zzzt, a.lzsj, a.zylx, a.zylx_qt, a.gwlx,
+        a.id, xm, a.sfzlx, a.sfzhm, a.csrq, a.cyrq, a.xb, a.lxdh, a.whcd, a.shbn, a.zzzt, a.lzsj, a.zylx, a.zylx_qt, a.gwlx,
         a.is_hlyyzs, a.is_jnsb, a.hlydj, a.gq_hlydj, a.jg_id, a.zw,
         a.create_time_str, a.create_user_id, a.create_by, a.create_unit, a.create_unit_name,
         a.update_time_str, a.update_user_id, a.update_by, a.update_unit, a.update_unit_name
@@ -457,7 +461,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectPortalYljgYgJbxxById" parameterType="String" resultMap="YljgYgJbxxResult">
         SELECT
-            a.id, a.xm, a.sfzlx, a.sfzhm, a.csrq, a.xb, a.lxdh, a.whcd, a.shbn, a.zzzt, a.lzsj, a.zylx, a.zylx_qt, a.gwlx,
+            a.id, a.xm, a.sfzlx, a.sfzhm, a.csrq, a.cyrq, a.xb, a.lxdh, a.whcd, a.shbn, a.zzzt, a.lzsj, a.zylx, a.zylx_qt, a.gwlx,
             a.is_hlyyzs, a.is_jnsb, a.hlydj, a.gq_hlydj, a.jg_id, a.zw, d.zzmc
         FROM yljg_yg_jbxx a
                  LEFT JOIN yljg_bmxx d ON a.shbn = d.id
@@ -481,11 +485,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <insert id="batchYgJbxx">
-        insert into yljg_yg_jbxx( id, jg_id,xm, sfzlx, sfzhm,xb,csrq,shbn,zzzt, lxdh, whcd, zylx,zylx_qt,hlydj,is_hlyyzs,gwlx,is_jnsb,zw,create_time_str,
+        insert into yljg_yg_jbxx( id, jg_id,xm, sfzlx, sfzhm,xb,csrq,cyrq,shbn,zzzt, lxdh, whcd, zylx,zylx_qt,hlydj,is_hlyyzs,gwlx,is_jnsb,zw,create_time_str,
         create_user_id,create_by,create_user_type,create_unit,create_unit_name,create_area_code) values
         <foreach item="item" index="index" collection="list" separator=",">
             (
-            (REPLACE( UUID(),"-","")),#{item.jgId},#{item.xm},#{item.sfzlx},#{item.sfzhm},#{item.xb},#{item.csrq},#{item.shbn},#{item.zzzt},
+            (REPLACE( UUID(),"-","")),#{item.jgId},#{item.xm},#{item.sfzlx},#{item.sfzhm},#{item.xb},#{item.csrq},#{item.cyrq},#{item.shbn},#{item.zzzt},
             #{item.lxdh},#{item.whcd},#{item.zylx},#{item.zylxQt},#{item.hlydj},#{item.isHlyyzs},#{item.gwlx},
             #{item.isJnsb},#{item.zw},#{item.createTimeStr},#{item.createUserId},
             #{item.createBy},#{item.createUserType},#{item.createUnit},#{item.createUnitName},

ruoyi-ui/src/views/organization/yggl/ygJbxx/index.vue

@@ -284,7 +284,7 @@
           <el-form-item label="是否缴纳社保" prop="isJnsb" class="formWidth">
             <el-select v-model="form.isJnsb" placeholder="请选择是否缴纳社保">
               <el-option
-                v-for="dict in dict.type.CZ035"
+                v-for="dict in dict.type.XZ115"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
@@ -405,7 +405,7 @@
         <td>离职/退休日期：</td>
         <td>{{dataDetails.lzsj?special(dataDetails.lzsj):''}}</td>
         <td>是否缴纳社保：</td>
-        <td>{{translateDict('CZ035',dataDetails.isJnsb)}}</td>
+        <td>{{translateDict('XZ115',dataDetails.isJnsb)}}</td>
       </tr>
     </table>
         </el-tab-pane>
@@ -459,7 +459,7 @@ import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
 export default {
     name: "YgJbxx",
-    dicts: ['XZ113', 'CZ035', 'CH062', 'C0015', 'C0007', 'CZ001', 'CH061', 'CH020'],
+    dicts: ['XZ113', 'CZ035', 'CH062', 'C0015', 'C0007', 'CZ001', 'CH061', 'CH020', 'XZ115'],
     data() {
       return {
         decodeStr:{},

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

@@ -227,7 +227,7 @@
           </el-form-item>
           <el-form-item label="是否缴纳社保" prop="isJnsb">
             <el-radio-group v-model="advancedQueryParams.isJnsb" placeholder="请选择" clearable>
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
+              <el-radio v-for="dict in dict.type.XZ115" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
@@ -322,7 +322,7 @@
           </el-form-item>
           <el-form-item label="是否缴纳社保" prop="isJnsb" class="formWidth">
             <el-select v-model="form.isJnsb" placeholder="请选择是否缴纳社保">
-              <el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label" :value="dict.value">
+              <el-option v-for="dict in dict.type.XZ115" :key="dict.value" :label="dict.label" :value="dict.value">
               </el-option>
             </el-select>
           </el-form-item>
@@ -396,7 +396,7 @@
               <td>离职/退休日期：</td>
               <td>{{ dataDetails.lzsj ? special(dataDetails.lzsj) : '' }}</td>
               <td>是否缴纳社保：</td>
-              <td>{{ translateDict('CZ035', dataDetails.isJnsb) }}</td>
+              <td>{{ translateDict('XZ115', dataDetails.isJnsb) }}</td>
             </tr>
           </table>
         </el-tab-pane>
@@ -449,7 +449,7 @@ import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
 export default {
   name: 'YgJbxx',
-  dicts: ['C0008', 'CZ035', 'CH062', 'C0015', 'C0007', 'CZ001', 'CH061', 'CH020','XZ114'],
+  dicts: ['C0008', 'CZ035', 'CH062', 'C0015', 'C0007', 'CZ001', 'CH061', 'CH020','XZ114', 'XZ115'],
   data() {
     return {
       // 楼宇

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

@@ -38,6 +38,12 @@
             </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>
@@ -142,6 +148,11 @@
               <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-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
 
           <h3>法定代表人或负责人信息</h3>
           <el-form-item label="法人类型" prop="frlx">
@@ -683,6 +694,7 @@ export default {
       queryParams: {
         isBa: null,
         isGbmb: null,
+        isGbmy: null,
         sczt: null,
         tyshxydm: null,
         jgmc: null,
@@ -701,6 +713,7 @@ export default {
         jgmc: null,
         isBa: null,
         isGbmb: null,
+        isGbmy: null,
         sczt:  [],
         frlx:  [],
         frxm: null,