zwq 2 anni fa
parent
commit
e1f0ed8758

+ 2 - 2
nngkxxdp/src/main/java/com/example/nngkxxdp/entity/NazwSchoolDO.java

@@ -54,12 +54,12 @@ public class NazwSchoolDO implements Serializable {
     /**
      * 餐食情况【0:堂食】
      */
-    private Integer canteenType;
+    private String canteenType;
 
     /**
      * 招生方式【0:统一招生 、1:自主招生】
      */
-    private Integer recruitType;
+    private String recruitType;
 
     /**
      * 上级主管部门

+ 2 - 2
nngkxxdp/src/main/java/com/example/nngkxxdp/entity/NazwSchoolVO.java

@@ -54,12 +54,12 @@ public class NazwSchoolVO implements Serializable {
     /**
      * 餐食情况【0:堂食】
      */
-    private Integer canteenType;
+    private String canteenType;
 
     /**
      * 招生方式【0:统一招生 、1:自主招生】
      */
-    private Integer recruitType;
+    private String recruitType;
 
     /**
      * 上级主管部门

+ 6 - 6
nngkxxdp/src/main/resources/mapper/NazwSchoolDao.xml

@@ -11,8 +11,8 @@
         <result property="postal" column="postal" jdbcType="INTEGER"/>
         <result property="natureType" column="nature_type" jdbcType="INTEGER"/>
         <result property="schoolType" column="school_type" jdbcType="INTEGER"/>
-        <result property="canteenType" column="canteen_type" jdbcType="INTEGER"/>
-        <result property="recruitType" column="recruit_type" jdbcType="INTEGER"/>
+        <result property="canteenType" column="canteen_type" jdbcType="VARCHAR"/>
+        <result property="recruitType" column="recruit_type" jdbcType="VARCHAR"/>
         <result property="competentDepartment" column="competent_department" jdbcType="VARCHAR"/>
         <result property="superviseTel" column="supervise_tel" jdbcType="VARCHAR"/>
         <result property="contactTel" column="contact_tel" jdbcType="VARCHAR"/>
@@ -44,8 +44,8 @@
         <result property="postal" column="postal" jdbcType="INTEGER"/>
         <result property="natureType" column="nature_type" jdbcType="INTEGER"/>
         <result property="schoolType" column="school_type" jdbcType="INTEGER"/>
-        <result property="canteenType" column="canteen_type" jdbcType="INTEGER"/>
-        <result property="recruitType" column="recruit_type" jdbcType="INTEGER"/>
+        <result property="canteenType" column="canteen_type" jdbcType="VARCHAR"/>
+        <result property="recruitType" column="recruit_type" jdbcType="VARCHAR"/>
         <result property="competentDepartment" column="competent_department" jdbcType="VARCHAR"/>
         <result property="superviseTel" column="supervise_tel" jdbcType="VARCHAR"/>
         <result property="contactTel" column="contact_tel" jdbcType="VARCHAR"/>
@@ -173,10 +173,10 @@
             <if test="schoolType != null">
                 school_type = #{schoolType},
             </if>
-            <if test="canteenType != null">
+            <if test="canteenType != null and canteenType !=''">
                 canteen_type = #{canteenType},
             </if>
-            <if test="recruitType != null">
+            <if test="recruitType != null and recruitType !=''">
                 recruit_type = #{recruitType},
             </if>
             <if test="competentDepartment != null">