自测问题修改

48fee382 · 彭祥礼 · 58e7bb63 · 48fee382 · 48fee382 · 48fee382
Commit 48fee382 authored Jun 01, 2020 by 彭祥礼
7 changed files
--- a/service-manager/src/main/java/com/winsun/controller/LzKpiController.java
+++ b/service-manager/src/main/java/com/winsun/controller/LzKpiController.java
@@ -10,14 +10,8 @@ import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.auth.core.shiro.ShiroUser;
 import com.winsun.auth.core.util.IOUtils;
-import com.winsun.bean.LzKpi;
+import com.winsun.bean.*;
-import com.winsun.bean.School;
+import com.winsun.mapper.*;
-import com.winsun.bean.SysUser;
-import com.winsun.bean.UserSchool;
-import com.winsun.mapper.LzKpiMapper;
-import com.winsun.mapper.SchoolMapper;
-import com.winsun.mapper.SysUserMapper;
-import com.winsun.mapper.UserSchoolMapper;
 import com.winsun.utils.ExcelDealUtils;
 import com.winsun.utils.ImportExcel;
 import com.winsun.utils.MyBatisPlusUpdateUtils;
@@ -79,8 +73,30 @@ public class LzKpiController extends BaseController {
    @Autowired
    private SysUserMapper sysUserMapper;
    @Autowired
+    private HhrUserMapper hhrUserMapper;
+    @Autowired
    @Qualifier("redisStringTemplate")
    private RedisTemplate redisTemplate;
+    /**
+     * 校检账号是否存在
+     *
+     * @param account 添加对象json字符串
+     * @return
+     */
+    @Permission(menuname = "校检账号是否存在", value = "checkAccount", method = RequestMethod.POST)
+    public ResponseData<String> checkAccount(@RequestParam("account") String account) {
+        ShiroUser user = getShiroUser();
+        Wrapper<SysUser> sysWrapper = new EntityWrapper<>();
+        sysWrapper.eq("account",account);
+        List<SysUser> sysUserList = sysUserMapper.selectList(sysWrapper);
+        if(sysUserList.size()>0){
+            return ResponseData.success("账号已存在！");
+        }
+        return ResponseData.error("账号不存在!!!");
+    }
    /**
     * 楼长KPI添加
     *
@@ -114,7 +130,7 @@ public class LzKpiController extends BaseController {
            lzKpiMapper.insert(kpi);
            return ResponseData.success("添加成功！");
        }
-        return ResponseData.error("账号不存在?");
+        return ResponseData.error("账号不存在!!!");
    }
    /**
@@ -192,10 +208,17 @@ public class LzKpiController extends BaseController {
        Page<Map<String,Object>> page = new Page<>(pageNo, pageSize);
        List<Map<String,Object>> dataList = new ArrayList<>();
        List<Map<String,Object>> list = new ArrayList<>();
-        //redisTemplate.opsForValue().set(hcmap, hcmap, 60, TimeUnit.MINUTES);
+        List<String> userIds01 = new ArrayList<>();
+        Wrapper<HhrUser> hhrUserWrapper = new EntityWrapper<>();
+        hhrUserWrapper.eq("position","楼长");
+        List<HhrUser> hhrUserList = hhrUserMapper.selectList(hhrUserWrapper);
+        for (HhrUser hhrUser : hhrUserList) {
+            userIds01.add(hhrUser.getId());
+        }
        List<String> userIds1 = new ArrayList<>();
        Wrapper<SysUser> sysWrapper = new EntityWrapper<>();
+        sysWrapper.in("id",userIds01);
        sysWrapper.like(StringUtils.isNotBlank(userName), "name", userName, SqlLike.DEFAULT);
        List<SysUser> sysUserList = sysUserMapper.selectList(sysWrapper);
        for (SysUser sysUser : sysUserList) {
@@ -219,22 +242,14 @@ public class LzKpiController extends BaseController {
            page.setTotal(0);
            return ResponseData.success(page);
        }
-        List<String> userIds2 = new ArrayList<>();
+        List<String> userIds = new ArrayList<>();
        Wrapper<UserSchool> usWrapper = new EntityWrapper<>();
+        usWrapper.in("user_id",userIds1);
        usWrapper.in("school_id",schoolIds);
        List<UserSchool> userSchoolList = userSchoolMapper.selectList(usWrapper);
-        List<UserSchool> userSchoolsTemp = new ArrayList<>();
        for (UserSchool userSchool : userSchoolList) {
-            userIds2.add(userSchool.getUserId());
+            userIds.add(userSchool.getUserId());
-        }
-        List<String> userIds = new ArrayList<>();
-        for (String s : userIds1) {
-            for (String s1 : userIds2) {
-                if(s.equals(s1)){
-                    userIds.add(s1);
-                    break;
-                }
-            }
        }
        Wrapper<LzKpi> wrapper = new EntityWrapper();
        if(month.length()>7){
@@ -309,10 +324,17 @@ public class LzKpiController extends BaseController {
            @RequestParam(name = "schoolName", required = false) String schoolName,@RequestParam(name = "month", required = false) String month,
            @RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageSize") int pageSize
    )  throws IOException {
-        ShiroUser user = getShiroUser();
+        List<String> userIds01 = new ArrayList<>();
+        Wrapper<HhrUser> hhrUserWrapper = new EntityWrapper<>();
+        hhrUserWrapper.eq("position","楼长");
+        List<HhrUser> hhrUserList = hhrUserMapper.selectList(hhrUserWrapper);
+        for (HhrUser hhrUser : hhrUserList) {
+            userIds01.add(hhrUser.getId());
+        }
        List<String> userIds1 = new ArrayList<>();
        Wrapper<SysUser> sysWrapper = new EntityWrapper<>();
+        sysWrapper.in("id",userIds01);
        sysWrapper.like(StringUtils.isNotBlank(userName), "name", userName, SqlLike.DEFAULT);
        List<SysUser> sysUserList = sysUserMapper.selectList(sysWrapper);
        for (SysUser sysUser : sysUserList) {

--- a/service-manager/src/main/java/com/winsun/controller/LzSalaryController.java
+++ b/service-manager/src/main/java/com/winsun/controller/LzSalaryController.java
@@ -191,13 +191,11 @@ public class LzSalaryController extends BaseController {
        Wrapper<HhrUser> hhrUserWrapper = new EntityWrapper<>();
        hhrUserWrapper.eq("position","楼长");
        List<HhrUser> hhrUserList = hhrUserMapper.selectList(hhrUserWrapper);
        for (HhrUser hhrUser : hhrUserList) {
            LzWage lzWage = new LzWage();
            String userId = hhrUser.getId();
            lzWage.setMonth(month);
            lzWage.setUserId(Integer.valueOf(userId));
            userIds.add(userId);
            lzWageList.add(lzWage);
        }
@@ -208,12 +206,13 @@ public class LzSalaryController extends BaseController {
        List<SalesList> salesOrderList = salesOrderMapper.selectList(salesOrderWrapper);
        Wrapper<LzKpi> lzKpiWrapper =  new EntityWrapper<>();
-        salesOrderWrapper.in("user_id",userIds);
+        lzKpiWrapper.in("user_id",userIds);
-        salesOrderWrapper.eq("month",month);
+        lzKpiWrapper.eq("month",month);
        List<LzKpi> lzKpiList = lzKpiMapper.selectList(lzKpiWrapper);
        Wrapper<LzWage> wrageWrapper =  new EntityWrapper<>();
        wrageWrapper.in("user_id",userIds);
+        wrageWrapper.in("month",month);
        List<LzWage> wrageList = lzWageMpapper.selectList(wrageWrapper);
        List<Integer> wrageIds = new LinkedList<>();
        if(wrageList.size()>0){
@@ -265,11 +264,8 @@ public class LzSalaryController extends BaseController {
                    if(wrageIds.size()>0){
                        Wrapper<LzWage> delWrapper = new EntityWrapper<>();
                        delWrapper.in("id",wrageIds);
-                        delWrapper.in("month",month);
                        lzWageMpapper.delete(delWrapper);
                    }
-                    Wrapper<LzWage> lzWageWrapper = new EntityWrapper<>();
                    insertCount += lzWageMpapper.insert(lzWage);
                }
            }
@@ -297,10 +293,18 @@ public class LzSalaryController extends BaseController {
        Page<Map<String,Object>> page = new Page<>(pageNo, pageSize);
        List<Map<String,Object>> dataList = new ArrayList<>();
        List<Map<String,Object>> list = new ArrayList<>();
-        //redisTemplate.opsForValue().set(hcmap, hcmap, 60, TimeUnit.MINUTES);
+        List<String> userIds01 = new ArrayList<>();
+        Wrapper<HhrUser> hhrUserWrapper = new EntityWrapper<>();
+        hhrUserWrapper.eq("position","楼长");
+        List<HhrUser> hhrUserList = hhrUserMapper.selectList(hhrUserWrapper);
+        for (HhrUser hhrUser : hhrUserList) {
+            userIds01.add(hhrUser.getId());
+        }
        List<String> userIds1 = new ArrayList<>();
        Wrapper<SysUser> sysWrapper = new EntityWrapper<>();
+        sysWrapper.in("id",userIds01);
        sysWrapper.like(StringUtils.isNotBlank(userName), "name", userName, SqlLike.DEFAULT);
        List<SysUser> sysUserList = sysUserMapper.selectList(sysWrapper);
        for (SysUser sysUser : sysUserList) {
@@ -414,8 +418,17 @@ public class LzSalaryController extends BaseController {
    )  throws IOException {
        ShiroUser user = getShiroUser();
+        List<String> userIds01 = new ArrayList<>();
+        Wrapper<HhrUser> hhrUserWrapper = new EntityWrapper<>();
+        hhrUserWrapper.eq("position","楼长");
+        List<HhrUser> hhrUserList = hhrUserMapper.selectList(hhrUserWrapper);
+        for (HhrUser hhrUser : hhrUserList) {
+            userIds01.add(hhrUser.getId());
+        }
        List<String> userIds1 = new ArrayList<>();
        Wrapper<SysUser> sysWrapper = new EntityWrapper<>();
+        sysWrapper.in("id",userIds01);
        sysWrapper.like(StringUtils.isNotBlank(userName), "name", userName, SqlLike.DEFAULT);
        List<SysUser> sysUserList = sysUserMapper.selectList(sysWrapper);
        for (SysUser sysUser : sysUserList) {
@@ -437,22 +450,14 @@ public class LzSalaryController extends BaseController {
            log.error("查询数据为空！");
            return;
        }
-        List<String> userIds2 = new ArrayList<>();
+        List<String> userIds = new ArrayList<>();
        Wrapper<UserSchool> usWrapper = new EntityWrapper<>();
+        usWrapper.in("user_id",userIds1);
        usWrapper.in("school_id",schoolIds);
        List<UserSchool> userSchoolList = userSchoolMapper.selectList(usWrapper);
        List<UserSchool> userSchoolsTemp = new ArrayList<>();
        for (UserSchool userSchool : userSchoolList) {
-            userIds2.add(userSchool.getUserId());
+            userIds.add(userSchool.getUserId());
-        }
-        List<String> userIds = new ArrayList<>();
-        for (String s : userIds1) {
-            for (String s1 : userIds2) {
-                if(s.equals(s1)){
-                    userIds.add(s1);
-                    break;
-                }
-            }
        }
        List<Map<String,Object>> list = new ArrayList<>();
        Wrapper<LzWage> wrapper = new EntityWrapper();
@@ -755,8 +760,6 @@ public class LzSalaryController extends BaseController {
        }
        int number = 0;
-        Date acceptDate = new Date();
-        Date successTime = acceptDate;
        for (int i = 1; i < listMap.size(); i++) {
            Map<String, Object> map = listMap.get(i);
            LzWage lzWage = new LzWage();
@@ -774,6 +777,7 @@ public class LzSalaryController extends BaseController {
            lzWage.setWage(wage);
            Integer userId = Integer.valueOf(map.get("k").toString());
            lzWage.setUserId(userId);
            Integer integer = lzWageMpapper.insert(lzWage);
            if (integer == 1) {
                number++;

--- a/service-manager/src/main/java/com/winsun/controller/NewUserController.java
+++ b/service-manager/src/main/java/com/winsun/controller/NewUserController.java
@@ -243,5 +243,47 @@ public class NewUserController extends BaseController {
        return ResponseData.success(page, "查询成功！");
    }
+    /**
+     *
+     * @return
+     */
+    @Permission(menuname = "初始用户信息", value = "initUsers", method = RequestMethod.POST)
+    public ResponseData<List<SysUser>> initUsers(){
+        List<String> list = new ArrayList<>();
+        list.add("241");
+        list.add("242");
+        Wrapper<SysUser> hhrUserWrapper = new EntityWrapper<>();
+        hhrUserWrapper.in("roleid",list);
+        List<SysUser> hhrUserList = sysUserMapper.selectList(hhrUserWrapper);
+        return ResponseData.success(hhrUserList);
+    }
+    /**
+     * 多个地方公用初始县分
+     * @param substName
+     * @return
+     */
+    @Permission(menuname = "初始县分", value = "initSubstName", method = RequestMethod.POST)
+    public ResponseData<List<School>> initSubstName(@RequestParam(name = "substName", required = false) String substName){
+        Wrapper<School> schoolWrapper = new EntityWrapper<>();
+        schoolWrapper.groupBy("sub_name");
+        List<School> list = schoolMapper.selectList(schoolWrapper);
+        return ResponseData.success(list);
+    }
+    /**
+     * 多个地方公用初始学校
+     * @param substName
+     * @return
+     */
+    @Permission(menuname = "初始学校", value = "getSchoolNames", method = RequestMethod.POST)
+    public ResponseData<List<School>> getSchoolNames(@RequestParam(name = "substName", required = false) String substName){
+        Wrapper<School> schoolWrapper = new EntityWrapper<>();
+        schoolWrapper.eq(StringUtils.isNotBlank(substName),"sub_name",substName);
+        schoolWrapper.groupBy("school_name");
+        List<School> list = schoolMapper.selectList(schoolWrapper);
+        return ResponseData.success(list);
+    }
 }
--- a/service-manager/src/main/java/com/winsun/controller/YsmUserController.java
+++ b/service-manager/src/main/java/com/winsun/controller/YsmUserController.java
@@ -9,7 +9,6 @@ import com.winsun.auth.core.annotion.Permission;
 import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.auth.core.shiro.ShiroUser;
-import com.winsun.bean.School;
 import com.winsun.bean.YsmUser;
 import com.winsun.mapper.SchoolMapper;
 import com.winsun.mapper.YsmUserMapper;
@@ -126,31 +125,4 @@ public class YsmUserController extends BaseController {
        return ResponseData.success(ysmUserMapper.selectMaps(wrapper), "查询成功！");
    }
-    /**
-     * 多个地方公用初始县分
-     * @param substName
-     * @return
-     */
-    @Permission(menuname = "初始县分", value = "initSubstName", method = RequestMethod.POST)
-    public ResponseData<List<School>> initSubstName(@RequestParam(name = "substName", required = false) String substName){
-        Wrapper<School> schoolWrapper = new EntityWrapper<>();
-        schoolWrapper.groupBy("sub_name");
-        List<School> list = schoolMapper.selectList(schoolWrapper);
-        return ResponseData.success(list);
-    }
-    /**
-     * 多个地方公用初始学校
-     * @param substName
-     * @return
-     */
-    @Permission(menuname = "初始学校", value = "getSchoolNames", method = RequestMethod.POST)
-    public ResponseData<List<School>> getSchoolNames(@RequestParam(name = "substName", required = false) String substName){
-        Wrapper<School> schoolWrapper = new EntityWrapper<>();
-        schoolWrapper.eq(StringUtils.isNotBlank(substName),"sub_name",substName);
-        schoolWrapper.groupBy("school_name");
-        List<School> list = schoolMapper.selectList(schoolWrapper);
-        return ResponseData.success(list);
-    }
 }
--- a/service-manager/src/main/java/com/winsun/controller/YxtCouponController.java
+++ b/service-manager/src/main/java/com/winsun/controller/YxtCouponController.java
@@ -83,6 +83,15 @@ public class YxtCouponController extends BaseController {
            return ResponseData.error("无数据权限");
        }
        YxtCoupon yxt = JSON.parseObject(yxtCoupon, YxtCoupon.class);
+        if(StringUtils.isBlank(yxt.getCardNumber())){
+            return ResponseData.error("添加账号不能为空！！！");
+        }
+        Wrapper<YxtCoupon> yxtCouponWrapper = new EntityWrapper<>();
+        yxtCouponWrapper.eq("card_number",yxt.getCardNumber());
+        List<YxtCoupon> list = yxtCouponMapper.selectList(yxtCouponWrapper);
+        if(list.size()>0){
+            return ResponseData.error("账号已存在！！！");
+        }
        yxt.setUpdateDate(new Date());
        yxtCouponMapper.insert(yxt);
        return ResponseData.success("添加成功！");
@@ -216,7 +225,15 @@ public class YxtCouponController extends BaseController {
            list.add(map);
        }
        ServletOutputStream os = null;
-        XSSFWorkbook workbook = ExcelDealUtils.getWorkBook(ExcelDealUtils.exchangeCouponExcel("兑换券清单"), list);
+        List<Integer> list1 = new ArrayList<>();
+        list1.add(4500);
+        list1.add(4500);
+        list1.add(4500);
+        list1.add(4500);
+        list1.add(4500);
+        list1.add(4500);
+        list1.add(4500);
+        XSSFWorkbook workbook = ExcelDealUtils.getWorkBook2(ExcelDealUtils.exchangeCouponExcel("兑换券清单"), list,list1);
        try {
            HttpServletResponse response = getHttpServletResponse();
            response.reset();
@@ -242,11 +259,7 @@ public class YxtCouponController extends BaseController {
        ArrayList<String> columns = new ArrayList<>();
        columns.add(SL_cardNumber);
        columns.add(SL_password);
-        columns.add(SL_state);
-        columns.add(SL_shelfState);
        columns.add(SL_validityPeriod);
-        columns.add(SL_updateDate);
-        columns.add(SL_delFlag);
        ServletOutputStream os = null;
        XSSFWorkbook workbook = new XSSFWorkbook();
        try {
@@ -255,10 +268,6 @@ public class YxtCouponController extends BaseController {
            sheet.setColumnWidth(0, 6000);
            sheet.setColumnWidth(1, 6000);
            sheet.setColumnWidth(2, 6000);
-            sheet.setColumnWidth(3, 6000);
-            sheet.setColumnWidth(4, 6000);
-            sheet.setColumnWidth(5, 6000);
-            sheet.setColumnWidth(6, 6000);
            //下拉选项
            /*List<String> fengju = new ArrayList<>();
            fengju.add("受理不成功");
@@ -339,23 +348,11 @@ public class YxtCouponController extends BaseController {
        if (!listMap.get(0).get("b").toString().equals(SL_password)) {
            return ResponseData.error("模板不对，请选择正确的模板！");
        }
-        if (!listMap.get(0).get("c").toString().equals(SL_state)) {
+        if (!listMap.get(0).get("c").toString().equals(SL_validityPeriod)) {
-            return ResponseData.error("模板不对，请选择正确的模板！");
-        }
-        if (!listMap.get(0).get("d").toString().equals(SL_shelfState)) {
-            return ResponseData.error("模板不对，请选择正确的模板！");
-        }
-        if (!listMap.get(0).get("e").toString().equals(SL_validityPeriod)) {
-            return ResponseData.error("模板不对，请选择正确的模板！");
-        }
-        if (!listMap.get(0).get("f").toString().equals(SL_updateDate)) {
-            return ResponseData.error("模板不对，请选择正确的模板！");
-        }
-        if (!listMap.get(0).get("g").toString().equals(SL_delFlag)) {
            return ResponseData.error("模板不对，请选择正确的模板！");
        }
-        if (listMap.get(0).size() != 7) {
+        if (listMap.get(0).size() != 3) {
            return ResponseData.error("模板不对，请选择正确的模板！");
        }
@@ -378,7 +375,7 @@ public class YxtCouponController extends BaseController {
                if (StringUtils.isBlank(temp.get("b").toString())) {
                    return ResponseData.error("第" + (i + 1) + "行的密码不能为空");
                }
-                if (!temp.containsKey("c")) {
+                /*if (!temp.containsKey("c")) {
                    return ResponseData.error("第" + (i + 1) + "行的出售状态不能为空");
                }
                if (StringUtils.isBlank(temp.get("c").toString())) {
@@ -389,14 +386,14 @@ public class YxtCouponController extends BaseController {
                }
                if (StringUtils.isBlank(temp.get("d").toString())) {
                    return ResponseData.error("第" + (i + 1) + "行的上架状态不能为空");
-                }
+                }*/
-                if (!temp.containsKey("e")) {
+                if (!temp.containsKey("c")) {
                    return ResponseData.error("第" + (i + 1) + "行的有限日期不能为空");
                }
-                if (StringUtils.isBlank(temp.get("e").toString())) {
+                if (StringUtils.isBlank(temp.get("c").toString())) {
                    return ResponseData.error("第" + (i + 1) + "行的有限日期不能为空");
                }
-                if (!temp.containsKey("f")) {
+                /*if (!temp.containsKey("f")) {
                    return ResponseData.error("第" + (i + 1) + "行的上传时间不能为空");
                }
                if (!temp.containsKey("g")) {
@@ -404,7 +401,7 @@ public class YxtCouponController extends BaseController {
                }
                if (StringUtils.isBlank(temp.get("g").toString())) {
                    return ResponseData.error("第" + (i + 1) + "行的是否删除不能为空");
-                }
+                }*/
            }
            //检查excel表中是否有重复人员编号
@@ -431,31 +428,11 @@ public class YxtCouponController extends BaseController {
            yxt.setCardNumber(cardNumber);
            String password = map.get("b").toString();
            yxt.setPassword(password);
-            String state = map.get("c").toString();
+            Date validityPeriod = DateUtil.parse(map.get("c").toString(), "yyyy-mm-dd");
-            if(state.equals("未售出")){
-                yxt.setState(1);
-            }else if(state.equals("已售出")){
-                yxt.setState(2);
-            }else{
-                yxt.setState(3);
-            }
-            String shelfState = map.get("d").toString();
-            if(shelfState.equals("已上架")){
-                yxt.setShelfState(1);
-            }else{
-                yxt.setShelfState(2);
-            }
-            Date validityPeriod = DateUtil.parse(map.get("e").toString(), "yyyy-mm-dd");
            yxt.setValidityPeriod(validityPeriod);
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");// 格式化时间
            Date updateDate = DateUtil.parse(sdf.format(new Date()),"yyyy-mm-dd");
            yxt.setUpdateDate(updateDate);
-            String delFlag = map.get("g").toString();
-            if(delFlag.equals("未删除")){
-                yxt.setDelFlag(0);
-            }else{
-                yxt.setDelFlag(1);
-            }
            boolean isUpdate = false;
            for (YxtCoupon yxtCoupon : yxtCouponList) {
                if(yxtCoupon.getCardNumber().equals(cardNumber)){
@@ -468,15 +445,6 @@ public class YxtCouponController extends BaseController {
                if(isUpdate){
                    Wrapper<YxtCoupon> wrapper = new EntityWrapper<>();
                    wrapper.eq("id", yxt.getId());
-                    /*wrapper11.eq("id", yxt.getId());
-                    Map<String, Object> dataMapping11 = new HashMap<>();
-                    dataMapping11.put("card_number", yxt.getCardNumber());
-                    dataMapping11.put("password", yxt.getPassword());
-                    dataMapping11.put("updateDate", yxt.getUpdateDate());
-                    dataMapping11.put("state", yxt.getState());
-                    dataMapping11.put("validityPeriod", yxt.getValidityPeriod());
-                    dataMapping11.put("shelfState", yxt.getShelfState());
-                    yxtCouponMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping11), wrapper11);*/
                    yxtCouponMapper.update(yxt,wrapper);
                    number++;
                }else{

--- a/service-manager/src/main/java/com/winsun/controller/YxtOrderController.java
+++ b/service-manager/src/main/java/com/winsun/controller/YxtOrderController.java
@@ -390,6 +390,16 @@ public class YxtOrderController extends BaseController {
                list.add(map);
            }
        }
+        List<Integer> list1 = new ArrayList<>();
+        list1.add(4500);
+        list1.add(4500);
+        list1.add(4500);
+        list1.add(4500);
+        list1.add(4500);
+        list1.add(4500);
+        list1.add(4500);
+        list1.add(4500);
+        list1.add(4500);
        ServletOutputStream os = null;
        XSSFWorkbook workbook = ExcelDealUtils.getWorkBook(ExcelDealUtils.yxtOrderExcel("院线通订单清单"), list);
        try {

--- a/service-manager/src/main/java/com/winsun/controller/school/SchoolAllocationController.java
+++ b/service-manager/src/main/java/com/winsun/controller/school/SchoolAllocationController.java
 package com.winsun.controller.school;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 import com.baomidou.mybatisplus.enums.SqlLike;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -23,8 +11,15 @@ import com.winsun.bean.School;
 import com.winsun.bean.SysUser;
 import com.winsun.mapper.SchoolMapper;
 import com.winsun.mapper.SysUserMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import java.util.*;
 /**
 * @Author: chancy
@@ -45,19 +40,24 @@ public class SchoolAllocationController extends BaseController {
    }
    @Permission(menuname = "添加学校分配信息", value = "addSchoolAllocation", method = RequestMethod.POST)
-    public ResponseData<String> insertSchool(@RequestParam("account") String account,@RequestParam("schoolId") String schoolId) {
+    public ResponseData<String> insertSchool(
+            @RequestParam("account") String account,
+            @RequestParam("schoolId") String schoolId) {
+        if(StringUtils.isBlank(account) || "undefined".equals(account)){
+            return ResponseData.error("账号不能为空！！!");
+        }
+        List<String> list = Arrays.asList(account.split(","));
+        for (String acc : list) {
            Wrapper<SysUser> wrapperUser = new EntityWrapper<SysUser>();
-    	wrapperUser.eq("account", account);
+            wrapperUser.eq("account", acc);
            //wrapperUser.eq(column, params);
            List<SysUser> userList = sysUserMapper.selectList(wrapperUser);
            if (userList.size() > 0){
                schoolMapper.addSupervisorSchool(userList.get(0).getId(), schoolId);
                return ResponseData.success("添加成功！");
            }
+        }
        return ResponseData.error("账号不存在！！");
    }
@@ -73,7 +73,6 @@ public class SchoolAllocationController extends BaseController {
    }
    /**
     *
     * @param account