20230115_sun#431

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

@@ -678,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/resources/mapper/organization/YljgJcxxMapper.xml

@@ -94,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="czsj"    column="czsj"    />
         <result property="jglb"    column="jglb"    />
         <result property="zyrq"    column="zyrq"    />
+        <result property="isGbmy"    column="is_gbmy"    />
         <result property="yljgzyxkzh"    column="yljgzyxkzh"    />
         <result property="chxpfrq"    column="chxpfrq"    />
         <result property="ffssmj"    column="ffssmj"    />
@@ -166,6 +167,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="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="sczt != null  and sczt != ''"> and sczt = #{sczt}</if>
         </where>
     </select>
@@ -176,6 +180,9 @@ 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="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 != ''">

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,