基地校优化、见习之星列表优化、基地初选优化

ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJdcx.java

@@ -172,6 +172,9 @@ public class TsbzJdcx extends BaseEntity {
     @Excel(name = "面试综合得分", type = Type.IMPORT)
     private BigDecimal zhdf2;
 
+    //基地校id
+    private String jdxid;
+
 
     public String getFaname() {
         return faname;
@@ -421,6 +424,14 @@ public class TsbzJdcx extends BaseEntity {
         return lqzt;
     }
 
+    public String getJdxid() {
+        return jdxid;
+    }
+
+    public void setJdxid(String jdxid) {
+        this.jdxid = jdxid;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -447,8 +458,8 @@ public class TsbzJdcx extends BaseEntity {
                 .append("msjgmnktjxdf", getMsjgmnktjxdf())
                 .append("yjdf", getYjdf())
                 .append("zhdf2", getZhdf2())
-                .append("lqzt", getLqzt()
-                )
+                .append("lqzt", getLqzt())
+                .append("jdxid", getJdxid())
                 .toString();
     }
 }

ruoyi-system/src/main/resources/mapper/jxjs/TsbzJdcxMapper.xml

@@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="yjdf"    column="yjdf"    />
         <result property="zhdf2"    column="zhdf2"    />
         <result property="lqzt"    column="lqzt"    />
+        <result property="jdxid"    column="jdxid"    />
     </resultMap>
 
     <sql id="selectTsbzJdcxVo">
@@ -164,7 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="selectTsbzJdcxExport" parameterType="TsbzJdcx" resultMap="TsbzJdcxResult">
-        select a.id, a.faid, a.jsid, a.dqzt, a.createuserid, a.create_time, a.jdxshr, a.jdxshzt, a.sbly, a.qjshr, a.qjshzt, a.qjshyj, a.jdpx, a.alfxdf, a.jasjdf, a.gbzdf, a.zhdf, a.cjdrcreate_time, a.msqr, a.msqrcreate_time, a.msjgmnktjxdf, a.yjdf, a.zhdf2,a.lqzt, c.name as faname, d.jdxmc,b.name as jsname,b.xb,b.rjxd,b.rjxk,b.phone,b.prdwmc from tsbz_jdcx a LEFT JOIN tsbz_jxjsjbxx b ON a.jsid=b.id LEFT JOIN tsbz_jxzxpxfa c ON a.faid=c.id LEFT JOIN tsbz_jdx d ON b.jdxid=d.id
+        select d.id as jdxid,a.id, a.faid, a.jsid, a.dqzt, a.createuserid, a.create_time, a.jdxshr, a.jdxshzt, a.sbly, a.qjshr, a.qjshzt, a.qjshyj, a.jdpx, a.alfxdf, a.jasjdf, a.gbzdf, a.zhdf, a.cjdrcreate_time, a.msqr, a.msqrcreate_time, a.msjgmnktjxdf, a.yjdf, a.zhdf2,a.lqzt, c.name as faname, d.jdxmc,b.name as jsname,b.xb,b.rjxd,b.rjxk,b.phone,b.prdwmc from tsbz_jdcx a LEFT JOIN tsbz_jxjsjbxx b ON a.jsid=b.id LEFT JOIN tsbz_jxzxpxfa c ON a.faid=c.id LEFT JOIN tsbz_jdx d ON b.jdxid=d.id
         <where>
             <if test="faid != null "> and a.faid = #{faid}</if>
             <if test="jsid != null "> and a.jsid = #{jsid}</if>
@@ -188,6 +189,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yjdf != null "> and a.yjdf = #{yjdf}</if>
             <if test="zhdf2 != null "> and a.zhdf2 = #{zhdf2}</if>
             <if test="lqzt != null  and lqzt != ''"> and lqzt = #{lqzt}</if>
+            <if test="jdxid != null  and jdxid != ''"> and d.id = #{jdxid}</if>
         </where>
     </select>
     <update id="updateTsbzJdcxforjsfa" parameterType="TsbzJdcx">

ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -40,6 +40,9 @@
         <if test="status != null and status != ''">
             AND status = #{status}
         </if>
+        <if test="schoolid != null and schoolid != ''">
+            AND schoolid = #{schoolid}
+        </if>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
         order by d.parent_id, d.order_num