华软教师职工

apply-net/src/main/java/com/winsun/controller/DankuanController.java

@@ -176,6 +176,9 @@ public class DankuanController {
             } else {
             } else {
                 orderView.setOrderCustomerType("学生");   // 用户类别
                 orderView.setOrderCustomerType("学生");   // 用户类别
             }
             }
+            if ("12518".equals(partner)) {
+                orderView.setOrderCustomerType("老师");    // 用户类别
+            }
             ResponseData<Object> res = null;
             ResponseData<Object> res = null;
 
 
             orderView.setSetMealIndex(setMealIndex);
             orderView.setSetMealIndex(setMealIndex);

apply-net/src/main/java/com/winsun/controller/codeManagerController.java

@@ -2,11 +2,8 @@ package com.winsun.controller;
 
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.netflix.discovery.converters.Auto;
-import com.winsun.auth.core.annotion.Permission;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.bean.*;
 import com.winsun.bean.*;
-import com.winsun.constant.OrderStatus;
 import com.winsun.mapper.*;
 import com.winsun.mapper.*;
 import com.winsun.smsUtils.SendSmsAndMail;
 import com.winsun.smsUtils.SendSmsAndMail;
 import com.winsun.utils.MyBatisPlusUpdateUtils;
 import com.winsun.utils.MyBatisPlusUpdateUtils;
@@ -47,6 +44,10 @@ public class codeManagerController {
     private OrderMapper orderMapper;
     private OrderMapper orderMapper;
     @Autowired
     @Autowired
     private OrderViewMapper orderViewMapper;
     private OrderViewMapper orderViewMapper;
+
+    @Autowired
+    private TeacherMapper teacherMapper;
+
     @Autowired
     @Autowired
     private XshInventoryMapper xshInventoryMapper;
     private XshInventoryMapper xshInventoryMapper;
     @Autowired
     @Autowired
@@ -65,6 +66,7 @@ public class codeManagerController {
     @Autowired
     @Autowired
     private SysUserMapper sysUserMapper;
     private SysUserMapper sysUserMapper;
 
 
+
     private static String PATH1 = "StudentCard1";
     private static String PATH1 = "StudentCard1";
     private static String PATH2 = "StudentCard2";
     private static String PATH2 = "StudentCard2";
     private static String PATH3 = "StudentCard3";
     private static String PATH3 = "StudentCard3";
@@ -367,6 +369,26 @@ public class codeManagerController {
             Map<String, Object> mapData = new HashMap<>();
             Map<String, Object> mapData = new HashMap<>();
             String idCard = request.getParameter("idCard"); // 身份证号
             String idCard = request.getParameter("idCard"); // 身份证号
             String accountNumber = request.getParameter("accountNumber");// 多媒体账号
             String accountNumber = request.getParameter("accountNumber");// 多媒体账号
+            String userName = request.getParameter("userName");// 客户名字
+            String orderCustomerAccount = request.getParameter("orderCustomerAccount");// 多媒体账号 去除后缀
+            String partner = request.getParameter("partner");// 合伙人ID
+            if("12518".equals(partner)){ // 特定学校：华软教师办理通道
+                Wrapper<Teacher> wrapperT = new EntityWrapper<>();
+                wrapperT.eq(StringUtils.isNotBlank(orderCustomerAccount),"student_number",orderCustomerAccount);
+                List<Teacher> teacherList = teacherMapper.selectList(wrapperT);
+                // 请输入t+工号
+                // 姓名填写不正确
+                if(teacherList!=null && teacherList.size()>0){
+                    if(!teacherList.get(0).getStuName().equals(userName)){
+                        mapData.put("code", 3);
+                        return ResponseData.error(mapData,"姓名填写不正确");
+                    }
+                }else {
+                    mapData.put("code", 4);
+                    return ResponseData.error(mapData,"教师工号不存在，请输入t+工号");
+                }
+            }
+
             // 判断身份证号是否在清单中
             // 判断身份证号是否在清单中
             Wrapper<Order> orderWrapper = new EntityWrapper<>();
             Wrapper<Order> orderWrapper = new EntityWrapper<>();
             orderWrapper.eq(StringUtils.isNotBlank(idCard), "id_card", idCard);
             orderWrapper.eq(StringUtils.isNotBlank(idCard), "id_card", idCard);

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

+package com.winsun.bean;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 华软教师职工信息
+ */
+@Data
+@TableName("gzy_student")
+public class Teacher implements Serializable {
+
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 姓名
+     */
+    @TableField(value = "student_name")
+    private String stuName;
+    /**
+     *工号
+     */
+    @TableField(value = "student_number")
+    private String stuNumber;
+     /**
+      *专业
+      */
+    private String sex;
+
+}

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

+package com.winsun.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.winsun.bean.Teacher;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+/**
+ * 华软教师通道对应使用表的Mapper
+ */
+@Mapper
+@Component
+public interface TeacherMapper extends BaseMapper<Teacher> {
+}

common/src/main/resources/com/winsun/mapper/mapping/TeacherMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.winsun.mapper.TeacherMapper">
+
+</mapper>
\ No newline at end of file

common/src/main/resources/com/winsun/mapper/mapping/UniversityInfoMapper.xml

@@ -7,7 +7,7 @@
             ui.*, pm.product_title, pm.product_region, pm.product_price, pm.product_meal, pm.product_rate, pm.product_university, pm.product_school_abbreviated, pm.product_state,DATE_FORMAT(product_create_time,'%Y-%m-%d %H:%i:%s') as create_time, GROUP_CONCAT(hs.kdsl) as kdsl, GROUP_CONCAT(hs.kdy_btn) as kdy_btn
             ui.*, pm.product_title, pm.product_region, pm.product_price, pm.product_meal, pm.product_rate, pm.product_university, pm.product_school_abbreviated, pm.product_state,DATE_FORMAT(product_create_time,'%Y-%m-%d %H:%i:%s') as create_time, GROUP_CONCAT(hs.kdsl) as kdsl, GROUP_CONCAT(hs.kdy_btn) as kdy_btn
         from
         from
             university_info ui
             university_info ui
-        left join product_manage pm ON ui.university_id = pm.university_id
+        left join product_manage pm ON ui.university_id = pm.university_id and product_state = '0'
         left join
         left join
             (
             (
                 select
                 select

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

@@ -96,7 +96,7 @@ public class QRCodeController extends BaseController {
     public ResponseData<List<QRCode>> selectPicture(String size) {
     public ResponseData<List<QRCode>> selectPicture(String size) {
         Wrapper<QRCode> wrapper = new EntityWrapper();
         Wrapper<QRCode> wrapper = new EntityWrapper();
         wrapper.eq("enable","1");
         wrapper.eq("enable","1");
-       List<String> objects = new ArrayList<>();
+        List<String> objects = new ArrayList<>();
         objects.add("create_time");
         objects.add("create_time");
         wrapper.orderDesc(objects);
         wrapper.orderDesc(objects);
         String str="limit "+size +","+(Integer.valueOf(size)+1);
         String str="limit "+size +","+(Integer.valueOf(size)+1);

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

+package com.winsun.controller;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+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.bean.Teacher;
+import com.winsun.mapper.TeacherMapper;
+import com.winsun.mapper.TeacherMapper;
+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.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: chenhaojian
+ * @Date: 2021/1/14
+ */
+@RestController
+@RequestMapping("/teacher")
+public class TeacherController extends BaseController {
+
+    @Autowired
+    private TeacherMapper teacherMapper;
+
+
+    @Permission(menuname = "查询信息", value = "list", method = RequestMethod.POST)
+    public Map<String,Object> dataList(@RequestParam(name = "id",required = false)String id,
+                                       @RequestParam(name = "stuNumber",required = false)String stuNumber,
+                                       @RequestParam(name = "stuName",required = false)String stuName,
+                                       @RequestParam(name = "pageNo", required = false) int pageNo,
+                                       @RequestParam(name = "pageSize", required = false) int pageSize
+    ){
+        Map<String,Object> map = new HashMap<>();
+        Wrapper<Teacher> wrapper = new EntityWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), "id",id);
+        wrapper.eq(StringUtils.isNotBlank(stuNumber), "student_number",stuNumber);
+        wrapper.eq(StringUtils.isNotBlank(stuName), "student_name",stuName);
+        List<String> objects = new ArrayList<>();
+        objects.add("id");
+        wrapper.orderDesc(objects);
+        Page<Teacher> page = new Page<>(pageNo, pageSize);
+        List<Teacher> aPackage = teacherMapper.selectPage(page, wrapper);
+        page.setRecords(aPackage);
+        map.put("page",ResponseData.success(page,"查询成功！"));
+        return map;
+    }
+
+    @RequestMapping(value = "addData",method = RequestMethod.POST)
+    public ResponseData<String> addData(@RequestParam(name = "stuNumber") String stuNumber,
+                                        @RequestParam(name = "stuName") String stuName){
+        Wrapper<Teacher> wrapper = new EntityWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(stuNumber), "student_number",stuNumber);
+        List<Teacher> list = teacherMapper.selectList(wrapper);
+        if(list != null && list.size()>0){
+            return ResponseData.error("教师工号已存在！");
+        }
+        Teacher teacher = new Teacher();
+        teacher.setStuNumber(stuNumber);
+        teacher.setStuName(stuName);
+        try {
+            teacherMapper.insert(teacher);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return ResponseData.success();
+    }
+
+    @RequestMapping(value = "deleteData",method = RequestMethod.POST)
+    public ResponseData<String> deleteData(@RequestParam(name = "id") String id){
+        if(StringUtils.isBlank(id)){
+            return ResponseData.error("");
+        };
+        Wrapper<Teacher> wrapper = new EntityWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), "id",id);
+        try {
+            teacherMapper.delete(wrapper);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return ResponseData.success();
+    }
+}