Merge branch 'master' of http://47.100.37.243:10080/wutt/childrenLibraryBMS

bms/src/main/java/com/hssx/bms/controller/InstitutionalInformationController.java

@@ -63,7 +63,7 @@ public class InstitutionalInformationController {
      * 教育机构信息的修改
      * 参数：id 机构信息id，name 名称，address 地址，lng 经度 lat 纬度
      *      phone 电话,amTime 上午上课时间,pmTime 下午上课时间，briefIntroductionPic 简介图片
-     *      classAdvantages 课程特色，briefIntroduction 机构简介说明,file 简介图片文件
+     *      classAdvantages 课程特色，briefIntroduction 机构简介说明,file 简介图片文件,chargingStandard 收费标准
      * @return
      */
     @ApiOperation(value = "教育机构信息的修改", notes = "教育机构信息的修改")

bms/src/main/java/com/hssx/bms/entity/InstitutionalInformation.java

@@ -96,9 +96,9 @@ public class InstitutionalInformation extends Model<InstitutionalInformation> {
     /**
      * 时间
      */
-    @TableField("indat")
+    @TableField("indate")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime indat;
+    private LocalDateTime indate;
 
     /**
      * 头部图片处说明
@@ -112,6 +112,12 @@ public class InstitutionalInformation extends Model<InstitutionalInformation> {
     @TableField("is_delete")
     private Integer isDelete;
 
+    /**
+     * 收费标准
+     */
+    @TableField("charging_standard")
+    private String chargingStandard;
+
 
     public Integer getId() {
         return id;
@@ -209,12 +215,12 @@ public class InstitutionalInformation extends Model<InstitutionalInformation> {
         this.classAdvantages = classAdvantages;
     }
 
-    public LocalDateTime getIndat() {
-        return indat;
+    public LocalDateTime getIndate() {
+        return indate;
     }
 
-    public void setIndat(LocalDateTime indat) {
-        this.indat = indat;
+    public void setIndate(LocalDateTime indate) {
+        this.indate = indate;
     }
 
     public String getHeadIntroduction() {
@@ -233,6 +239,14 @@ public class InstitutionalInformation extends Model<InstitutionalInformation> {
         this.isDelete = isDelete;
     }
 
+    public String getChargingStandard() {
+        return chargingStandard;
+    }
+
+    public void setChargingStandard(String chargingStandard) {
+        this.chargingStandard = chargingStandard;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -253,9 +267,10 @@ public class InstitutionalInformation extends Model<InstitutionalInformation> {
         ", briefIntroductionPic=" + briefIntroductionPic +
         ", briefIntroduction=" + briefIntroduction +
         ", classAdvantages=" + classAdvantages +
-        ", indat=" + indat +
+        ", indate=" + indate +
         ", headIntroduction=" + headIntroduction +
         ", isDelete=" + isDelete +
+        ", chargingStandard=" + chargingStandard +
         "}";
     }
 }

bms/src/main/resources/mapper/InstitutionalInformationMapper.xml

@@ -16,15 +16,17 @@
         <result column="brief_introduction_pic" property="briefIntroductionPic" />
         <result column="brief_introduction" property="briefIntroduction" />
         <result column="class_advantages" property="classAdvantages" />
-        <result column="indat" property="indat" />
+        <result column="indate" property="indate" />
         <result column="head_introduction" property="headIntroduction" />
         <result column="is_delete" property="isDelete" />
+        <result column="charging_standard" property="chargingStandard" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, phone, address, sys_id, lng, lat, am_time, pm_time, brief_introduction_pic, brief_introduction, class_advantages, indat, head_introduction
+        id, name, phone, address, sys_id, lng, lat, am_time, pm_time, brief_introduction_pic, brief_introduction, class_advantages, indate, head_introduction, is_delete, charging_standard
     </sql>
+
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMapVO" type="com.hssx.bms.entity.vo.InstitutionalInformationVO">
         <id column="id" property="id" />
@@ -39,8 +41,9 @@
         <result column="brief_introduction_pic" property="briefIntroductionPic" />
         <result column="brief_introduction" property="briefIntroduction" />
         <result column="class_advantages" property="classAdvantages" />
-        <result column="indat" property="indat" />
+        <result column="indate" property="indate" />
         <result column="head_introduction" property="headIntroduction" />
+        <result column="charging_standard" property="chargingStandard" />
         <collection property="pics" ofType="com.hssx.bms.entity.InstitutionalPic">
             <result column="pid" property="id" />
             <result column="information_id" property="informationId" />
@@ -53,7 +56,7 @@
     <!--培训机构账号登录后看到的详情-->
     <select id="selectDetail" resultMap="BaseResultMapVO">
         select
-          ii.id, ii.name, phone, ii.address, ii.sys_id, ii.lng, ii.lat, ii.am_time, ii.pm_time, ii.brief_introduction_pic,
+          ii.id, ii.name, phone, ii.address, ii.sys_id, ii.lng, ii.lat, ii.am_time, ii.pm_time, ii.brief_introduction_pic,ii.charging_standard,
           ii.brief_introduction, ii.class_advantages, ii.indat, ii.head_introduction,ip.id pid,ip.information_id,ip.indate,ip.pic_url
         from
           institutional_information ii
@@ -67,7 +70,7 @@
     <!--培训机构根据id看到的详情-->
     <select id="selectDetailById" resultMap="BaseResultMapVO">
         select
-          ii.id, ii.name, phone, ii.address, ii.sys_id, ii.lng, ii.lat, ii.am_time, ii.pm_time, ii.brief_introduction_pic,
+          ii.id, ii.name, phone, ii.address, ii.sys_id, ii.lng, ii.lat, ii.am_time, ii.pm_time, ii.brief_introduction_pic,ii.charging_standard,
           ii.brief_introduction, ii.class_advantages, ii.indat, ii.head_introduction,ip.id pid,ip.information_id,ip.indate,ip.pic_url
         from
           institutional_information ii