Skip to content

G
gdtel-gztel-school-center
Commit 3ca0fb71 by 黄森林
Options

学校，合伙人，套餐信息管理

parent a8b3130c
Showing with 115 additions and 31 deletions
common/src/main/java/com/winsun/bean/Salesperson.java → common/src/main/java/com/winsun/bean/Partner.java
......@@ -12,7 +12,7 @@ import java.io.Serializable;
*/
@Data
@TableName("hhr_user")
public class Salesperson implements Serializable {
public class Partner implements Serializable {
/**
* 主键
......@@ -87,6 +87,10 @@ public class Salesperson implements Serializable {
*/
private String leaderId;
/**
* 学校id
*/
private int schoolId;
}
common/src/main/java/com/winsun/bean/School.java
......@@ -2,6 +2,7 @@ package com.winsun.bean;
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;
......@@ -16,7 +17,7 @@ public class School implements Serializable {
/**
* 主键
*/
@TableId
@TableId(value = "id", type = IdType.AUTO)
private int id;
......@@ -106,4 +107,6 @@ public class School implements Serializable {
private String isShowrh;
}
common/src/main/java/com/winsun/bean/SchoolPackage.java 0 → 100644
package com.winsun.bean;
import com.baomidou.mybatisplus.annotations.TableName;
import lombok.Data;
/**
* 学校和套餐的中间表
* @Author: chancy
* @Date: 2020/2/13 17:22
*/
@Data
@TableName("hhr_school_package")
public class SchoolPackage {
private String schoolId;
private String packageId;
}
common/src/main/java/com/winsun/mapper/PackageMapper.java
......@@ -2,10 +2,14 @@ package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.Package;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Component;
@Mapper
@Component
public interface PackageMapper extends BaseMapper<Package> {
}
common/src/main/java/com/winsun/mapper/SalespersonMapper.java → common/src/main/java/com/winsun/mapper/PartnerMapper.java
package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.Salesperson;
import com.winsun.bean.Partner;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
@Mapper
@Component
public interface SalespersonMapper extends BaseMapper<Salesperson> {
public interface PartnerMapper extends BaseMapper<Partner> {
}
common/src/main/java/com/winsun/mapper/SchoolMapper.java
......@@ -2,10 +2,13 @@ package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.School;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Component;
@Mapper
@Component
public interface SchoolMapper extends BaseMapper<School> {
}
common/src/main/java/com/winsun/mapper/SchoolPackageMapper.java 0 → 100644
package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.SchoolPackage;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Component;
/**
* @Author: chancy
* @Date: 2020/2/13 17:24
*/
@Mapper
@Component
public interface SchoolPackageMapper extends BaseMapper<SchoolPackage> {
/**
* 删除相应学校对套餐的中间表信息
* @return
*/
@Delete("delete from hhr_school_package where school_id = #{id}")
Integer deleteIntermediateTableBySchool(@Param("id") String id);
/**
* 删除相应套餐对学校的中间表信息
* @return
*/
@Delete("delete from hhr_school_package where package_id = #{id}")
Integer deleteIntermediateTableByPackage(@Param("id") String id);
}
service-manager/src/main/java/com/winsun/controller/PackageController.java
......@@ -11,6 +11,7 @@ import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.auth.core.shiro.ShiroUser;
import com.winsun.bean.Package;
import com.winsun.mapper.PackageMapper;
import com.winsun.mapper.SchoolPackageMapper;
import com.winsun.utils.MyBatisPlusUpdateUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
......@@ -35,9 +36,12 @@ public class PackageController extends BaseController {
private static PackageMapper packageMapper;
private static SchoolPackageMapper schoolPackageMapper;
@Autowired
public PackageController(PackageMapper packageMapper) {
public PackageController(PackageMapper packageMapper,SchoolPackageMapper schoolPackageMapper) {
PackageController.packageMapper = packageMapper;
PackageController.schoolPackageMapper = schoolPackageMapper;
}
@Permission(menuname = "添加套餐信息", value = "insert", method = RequestMethod.POST)
......@@ -58,6 +62,8 @@ public class PackageController extends BaseController {
return ResponseData.error("无数据权限");
}
packageMapper.deleteById(id);
//删除中间表信息
schoolPackageMapper.deleteIntermediateTableByPackage(id);
return ResponseData.success("删除完毕！");
}
......@@ -79,8 +85,8 @@ public class PackageController extends BaseController {
return ResponseData.success("修改完毕！");
}
@Permission(menuname = "查询套餐信息", value = "select", method = RequestMethod.POST)
public ResponseData<Page<Package>> selectPackage(@RequestParam("name") String name, @RequestParam("type") String type,
@Permission(menuname = "查询套餐信息", value = "list", method = RequestMethod.POST)
public ResponseData<Page<Package>> listPackage(@RequestParam("name") String name, @RequestParam("type") String type,
@RequestParam("packageName") String packageName, @RequestParam("status") String status,
@RequestParam("isXbCard") String isXbCard, @RequestParam(name = "pageIndex", required = false) int pageIndex,
@RequestParam(name = "pageSize", required = false) int pageSize) {
......
service-manager/src/main/java/com/winsun/controller/SalespersonController.java → service-manager/src/main/java/com/winsun/controller/PartnerController.java
......@@ -9,8 +9,8 @@ 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.Salesperson;
import com.winsun.mapper.SalespersonMapper;
import com.winsun.bean.Partner;
import com.winsun.mapper.PartnerMapper;
import com.winsun.utils.MyBatisPlusUpdateUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
......@@ -31,13 +31,13 @@ import java.util.Map;
@Slf4j
@RestController
@RequestMapping("/school/salesperson")
public class SalespersonController extends BaseController {
public class PartnerController extends BaseController {
private static SalespersonMapper salespersonMapper;
private static PartnerMapper salespersonMapper;
@Autowired
public SalespersonController(SalespersonMapper salespersonMapper) {
SalespersonController.salespersonMapper = salespersonMapper;
public PartnerController(PartnerMapper salespersonMapper) {
PartnerController.salespersonMapper = salespersonMapper;
}
@Permission(menuname = "添加合伙人信息", value = "insert", method = RequestMethod.POST)
......@@ -46,7 +46,7 @@ public class SalespersonController extends BaseController {
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Salesperson sale = JSON.parseObject(salesperson, Salesperson.class);
Partner sale = JSON.parseObject(salesperson, Partner.class);
salespersonMapper.insert(sale);
return ResponseData.success("添加完毕！");
}
......@@ -67,7 +67,7 @@ public class SalespersonController extends BaseController {
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Salesperson sale = JSON.parseObject(salesperson, Salesperson.class);
Partner sale = JSON.parseObject(salesperson, Partner.class);
Wrapper wrapper = new EntityWrapper<>();
wrapper.eq("id", sale.getId());
/**
......@@ -79,17 +79,17 @@ public class SalespersonController extends BaseController {
return ResponseData.success("修改完毕！");
}
@Permission(menuname = "查询合伙人信息", value = "select", method = RequestMethod.POST)
public ResponseData<Page<Salesperson>> selectSalesperson(@RequestParam("phoneNum") String phoneNum, @RequestParam("status") String status,
@RequestParam("school") String school, @RequestParam("account") String account,
@RequestParam("name") String name, @RequestParam("gender") String gender, @RequestParam("area") String area,
@RequestParam("grade") String grade,
@RequestParam(name = "pageIndex", required = false) int pageIndex,@RequestParam(name = "pageSize", required = false) int pageSize) {
@Permission(menuname = "查询合伙人信息", value = "list", method = RequestMethod.POST)
public ResponseData<Page<Partner>> listSalesperson(@RequestParam("phoneNum") String phoneNum, @RequestParam("status") String status,
@RequestParam("school") String school, @RequestParam("account") String account,
@RequestParam("name") String name, @RequestParam("gender") String gender, @RequestParam("area") String area,
@RequestParam("grade") String grade,
@RequestParam(name = "pageIndex", required = false) int pageIndex, @RequestParam(name = "pageSize", required = false) int pageSize) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Wrapper<Salesperson> wrapper = new EntityWrapper();
Wrapper<Partner> wrapper = new EntityWrapper();
wrapper.like(StringUtils.isNotBlank(phoneNum), "phone_num", phoneNum, SqlLike.LEFT);
wrapper.like(StringUtils.isNotBlank(school), "school", school, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(account), "account", account, SqlLike.DEFAULT);
......@@ -98,8 +98,8 @@ public class SalespersonController extends BaseController {
wrapper.eq(StringUtils.isNotBlank(grade), "grade", grade);
wrapper.eq(StringUtils.isNotBlank(area), "area", area);
wrapper.eq(StringUtils.isNotBlank(gender), "gender", gender);
Page<Salesperson> page = new Page<>(pageIndex, pageSize);
List<Salesperson> salespeople = salespersonMapper.selectPage(page, wrapper);
Page<Partner> page = new Page<>(pageIndex, pageSize);
List<Partner> salespeople = salespersonMapper.selectPage(page, wrapper);
page.setRecords(salespeople);
return ResponseData.success(page, "查询完毕！");
}
......
service-manager/src/main/java/com/winsun/controller/SchoolController.java
......@@ -9,7 +9,9 @@ import com.winsun.auth.core.annotion.Permission;
import com.winsun.auth.core.base.controller.BaseController;
import com.winsun.auth.core.shiro.ShiroUser;
import com.winsun.bean.School;
import com.winsun.bean.SchoolPackage;
import com.winsun.mapper.SchoolMapper;
import com.winsun.mapper.SchoolPackageMapper;
import com.winsun.utils.MyBatisPlusUpdateUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
......@@ -35,19 +37,30 @@ public class SchoolController extends BaseController {
private static SchoolMapper schoolMapper;
private static SchoolPackageMapper schoolPackageMapper;
@Autowired
public SchoolController(SchoolMapper schoolMapper) {
public SchoolController(SchoolMapper schoolMapper, SchoolPackageMapper schoolPackageMapper) {
SchoolController.schoolMapper = schoolMapper;
SchoolController.schoolPackageMapper = schoolPackageMapper;
}
@Permission(menuname = "添加學校信息", value = "insert", method = RequestMethod.POST)
public ResponseData<String> insertSchool(@RequestParam("school") String school) {
public ResponseData<String> insertSchool(@RequestParam("school") String school, @RequestParam("packages") String packages) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
School school1 = JSON.parseObject(school, School.class);
schoolMapper.insert(school1);
String[] split = packages.split(",");
//中间表
SchoolPackage schoolPackage = new SchoolPackage();
schoolPackage.setSchoolId(String.valueOf(school1.getId()));
for (String packageId : split) {
schoolPackage.setPackageId(packageId);
schoolPackageMapper.insert(schoolPackage);
}
return ResponseData.success("添加完毕！");
}
......@@ -58,6 +71,8 @@ public class SchoolController extends BaseController {
return ResponseData.error("无数据权限");
}
schoolMapper.deleteById(id);
//删除中间表信息
schoolPackageMapper.deleteIntermediateTableBySchool(id);
return ResponseData.success("删除完毕！");
}
......@@ -79,11 +94,11 @@ public class SchoolController extends BaseController {
return ResponseData.success("修改完毕！");
}
@Permission(menuname = "查询學校信息", value = "select", method = RequestMethod.POST)
public ResponseData<Page<School>> selectSchool(@RequestParam("subName") String subName, @RequestParam("status") String status,
@RequestParam("schoolName") String schoolName, @RequestParam("isXb") String isXb,
@RequestParam("netType") String netType, @RequestParam(name = "pageIndex", required = false) int pageIndex,
@RequestParam(name = "pageSize", required = false) int pageSize) {
@Permission(menuname = "查询學校信息", value = "list", method = RequestMethod.POST)
public ResponseData<Page<School>> listSchool(@RequestParam("subName") String subName, @RequestParam("status") String status,
@RequestParam("schoolName") String schoolName, @RequestParam("isXb") String isXb,
@RequestParam("netType") String netType, @RequestParam(name = "pageIndex", required = false) int pageIndex,
@RequestParam(name = "pageSize", required = false) int pageSize) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
......@@ -100,4 +115,5 @@ public class SchoolController extends BaseController {
return ResponseData.success(page, "查询完毕！");
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment