修改学校配置

common/src/main/java/com/winsun/bean/Package.java

@@ -97,6 +97,14 @@ public class Package implements Serializable {
      */
      */
     private int isXbCard;
     private int isXbCard;
 
 
+    /**
+     * 创建时间
+     */
+    private String createTime;
 
 
+    /**
+     * 创建用户
+     */
+    private String createUser;
 
 
 }
 }

common/src/main/java/com/winsun/bean/SalesList.java

@@ -163,6 +163,16 @@ public class SalesList {
 	@TableField(exist = false)
 	@TableField(exist = false)
 	private String positionSJ;
 	private String positionSJ;
 
 
+	/**
+	 * 自定义备注
+	 */
+	private String customRemark;
+
+	/**
+	 * 锁定状态
+	 */
+	private String lockState;
+
 
 
 	
 	
 }
 }

common/src/main/java/com/winsun/bean/School.java

@@ -185,4 +185,22 @@ public class School implements Serializable {
 	 */
 	 */
 	@TableField("ud_btn")
 	@TableField("ud_btn")
 	private String udBtn;
 	private String udBtn;
+
+	/**
+	 * 手机卡办理
+	 */
+	@TableField("sjkbl")
+	private String sjkbl;
+
+	/**
+	 * 套餐升级
+	 */
+	@TableField("tcsj")
+	private String tcsj;
+
+	/**
+	 * 手机卡套餐升级
+	 */
+	@TableField("sjktcsj")
+	private String sjktcsj;
 }
 }

common/src/main/java/com/winsun/mapper/SalesListMapper.java

 package com.winsun.mapper;
 package com.winsun.mapper;
 
 
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Delete;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.winsun.bean.SalesList;
 import com.winsun.bean.SalesList;
+import org.apache.ibatis.annotations.*;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
 
 
 @Mapper
 @Mapper
 @Component
 @Component
@@ -33,6 +27,5 @@ public interface SalesListMapper extends BaseMapper<SalesList> {
     
     
     @Delete("delete from hhr_phone_school where order_phone = #{orderPhone} ")
     @Delete("delete from hhr_phone_school where order_phone = #{orderPhone} ")
     int deletePhoneSchool(@Param("orderPhone") String orderPhone);
     int deletePhoneSchool(@Param("orderPhone") String orderPhone);
-    
 
 
 }
 }

service-manager/src/main/java/com/winsun/controller/PackageController.java

@@ -25,10 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.File;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileOutputStream;
 import java.io.OutputStream;
 import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.regex.Pattern;
 import java.util.regex.Pattern;
 
 
 /**
 /**
@@ -152,6 +149,7 @@ public class PackageController extends BaseController {
         dataMapping.put("xb_id", xbId);
         dataMapping.put("xb_id", xbId);
         dataMapping.put("warm_tip", warmTip);
         dataMapping.put("warm_tip", warmTip);
         dataMapping.put("explains", explains);
         dataMapping.put("explains", explains);
+        dataMapping.put("create_time", new Date());
         Integer integer = packageMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
         Integer integer = packageMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
         if (integer == 1) {
         if (integer == 1) {
             log.info("成功修改完毕套餐信息");
             log.info("成功修改完毕套餐信息");

service-manager/src/main/java/com/winsun/controller/SchoolManagementController.java

@@ -198,6 +198,7 @@ public class SchoolManagementController extends BaseController {
         List<Map<String, Object>> selectMaps = schoolMapper.selectMaps(wrapperSubName);
         List<Map<String, Object>> selectMaps = schoolMapper.selectMaps(wrapperSubName);
         EntityWrapper<Package> packagewrapper = new EntityWrapper<>();
         EntityWrapper<Package> packagewrapper = new EntityWrapper<>();
         packagewrapper.setSqlSelect("id,package_name as packageName");
         packagewrapper.setSqlSelect("id,package_name as packageName");
+        packagewrapper.orderBy(true, "create_time", false);
         List<Map<String, Object>> packageselectMaps = packageMapper.selectMaps(packagewrapper);
         List<Map<String, Object>> packageselectMaps = packageMapper.selectMaps(packagewrapper);
         //查询单宽学校名称
         //查询单宽学校名称
         Wrapper<Product> productwrapper = new EntityWrapper();
         Wrapper<Product> productwrapper = new EntityWrapper();

service-manager/src/main/resources/com/winsun/mapper/mapping/UniversityInfoMapper.xml

@@ -12,7 +12,7 @@
             (
             (
                 select
                 select
                     bandproduct_id,
                     bandproduct_id,
-                    concat(school_name, '：', case kdsl when 1 then '已显示' when 0 then '未显示' else '未设置' end) kdsl,
+                    concat(school_name, '：', case is_showband when 1 then '已显示' when 0 then '未显示' else '未设置' end) kdsl,
                     concat(school_name, '：', case kdy_btn when 1 then '已显示' when 0 then '未显示' else  '未设置' end) kdy_btn
                     concat(school_name, '：', case kdy_btn when 1 then '已显示' when 0 then '未显示' else  '未设置' end) kdy_btn
                 from hhr_school where bandproduct_id != '') hs
                 from hhr_school where bandproduct_id != '') hs
             on pm.product_id = hs.bandproduct_id
             on pm.product_id = hs.bandproduct_id