Skip to content

G
gdtel-gztel-school-center
Commit d7bf4c56 by 罗承锋
Options

修改单移产品、细节调整

parent 4dc9c334
Showing with 170 additions and 59 deletions
common/src/main/java/com/winsun/bean/HhrSupervisorSchool.java 0 → 100644
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;
/**
* 督导管理学校表
*/
@Data
@TableName("hhr_supervisor_school")
public class HhrSupervisorSchool {
@TableId(type = IdType.AUTO)
private Integer id;
@TableField(value = "user_id")
private Integer userId;
@TableField(value = "school")
private String school;
}
common/src/main/java/com/winsun/mapper/HhrSupervisorSchoolMapper.java 0 → 100644
package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.HhrSupervisorSchool;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
/**
* 督导管理学校关联表
*/
@Mapper
@Component
public interface HhrSupervisorSchoolMapper extends BaseMapper<HhrSupervisorSchool> {
}
common/src/main/java/com/winsun/mapper/PackageMapper.java
......@@ -17,4 +17,12 @@ public interface PackageMapper extends BaseMapper<Package> {
@Select("SELECT cdma_disc_desc as cdmaDiscDesc FROM hhr_xyzx_yd_yrym_list GROUP BY cdma_disc_desc")
List<Map<String,Object>> packageAll();
@Delete("<script>" +
"delete from hhr_school_package where package_id in" +
"<foreach item='id' collection='ids' separator=',' open='(' close=')'>" +
"#{id}" +
"</foreach>" +
"</script>")
Integer delSchoolPackageByPackageId(@Param("ids") String[] ids);
}
common/src/main/java/com/winsun/mapper/SchoolMapper.java
......@@ -47,4 +47,7 @@ public interface SchoolMapper extends BaseMapper<School> {
@Delete(" delete from hhr_supervisor_school where id = #{id} ")
int deleteSupervisorSchool(@Param("id") String id);
@Delete("delete from hhr_supervisor_school where user_id = #{userId}")
int deleteSupervisorSchoolByUserId(@Param("userId") String userId);
}
service-manager/src/main/java/com/winsun/controller/PackageController.java
......@@ -162,10 +162,17 @@ public class PackageController extends BaseController {
}
@Permission(menuname = "查询套餐信息", value = "list", method = RequestMethod.POST)
public ResponseData<Page<Package>> listPackage(@RequestParam("name") String name, @RequestParam(name = "pageNo", required = false) int pageIndex,
public ResponseData<Page<Package>> listPackage(@RequestParam("name") String name,
@RequestParam("monthFee") String monthFee,
@RequestParam("flow") String flow,
@RequestParam("voice") String voice,
@RequestParam(name = "pageNo", required = false) int pageIndex,
@RequestParam(name = "pageSize", required = false) int pageSize) {
Wrapper<Package> wrapper = new EntityWrapper();
wrapper.like(StringUtils.isNotBlank(name), "package_name", name, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(monthFee), "month_fee", monthFee, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(flow), "flow", flow, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(voice), "voice", voice, SqlLike.DEFAULT);
Page<Package> page = new Page<>(pageIndex, pageSize);
List<Package> aPackage = packageMapper.selectPage(page, wrapper);
page.setRecords(aPackage);
......@@ -273,4 +280,15 @@ public class PackageController extends BaseController {
}
}
}
/**
* 批量下架
* @param ids
* @return
*/
@Permission(menuname = "批量下架", value = "batchUpdate", method = RequestMethod.POST)
public ResponseData<String> batchUpdate(@RequestParam("ids") String ids) {
Integer integer = packageMapper.delSchoolPackageByPackageId(ids.split(","));
return ResponseData.success("已批量下架：" + integer + "个学校产品");
}
}
service-manager/src/main/java/com/winsun/controller/PartnerController.java
package com.winsun.controller;
import java.io.IOException;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
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;
......@@ -29,22 +9,28 @@ 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.auth.model.user.Role;
import com.winsun.bean.Bill;
import com.winsun.bean.HhrSupervisorSchool;
import com.winsun.bean.HhrUser;
import com.winsun.bean.Partner;
import com.winsun.bean.School;
import com.winsun.bean.SysUser;
import com.winsun.mapper.HhrUserMapper;
import com.winsun.mapper.PartnerMapper;
import com.winsun.mapper.SchoolMapper;
import com.winsun.mapper.SysUserMapper;
import com.winsun.mapper.*;
import com.winsun.utils.DataAuthUtil;
import com.winsun.utils.ExcelDealUtils;
import com.winsun.utils.MD5Utils;
import com.winsun.utils.MapUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
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 javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
/**
* @Author: chancy
......@@ -59,16 +45,20 @@ public class PartnerController extends BaseController {
private static SysUserMapper sysUserMapper;
private static HhrUserMapper hhrUserMapper;
private static SchoolMapper schoolMapper;
private static HhrSupervisorSchoolMapper hhrSupervisorSchoolMapper;
@Autowired
private DataAuthUtil dataAuthUtil;
@Autowired
public PartnerController(PartnerMapper partnerMapper,SysUserMapper sysUserMapper,HhrUserMapper hhrUserMapper,SchoolMapper schoolMapper) {
public PartnerController(PartnerMapper partnerMapper,SysUserMapper sysUserMapper,
HhrUserMapper hhrUserMapper,SchoolMapper schoolMapper,
HhrSupervisorSchoolMapper hhrSupervisorSchoolMapper) {
PartnerController.partnerMapper = partnerMapper;
PartnerController.sysUserMapper = sysUserMapper;
PartnerController.hhrUserMapper = hhrUserMapper;
PartnerController.schoolMapper = schoolMapper;
PartnerController.hhrSupervisorSchoolMapper = hhrSupervisorSchoolMapper;
}
@Permission(menuname = "修改合伙人信息", value = "update", method = RequestMethod.POST)
......@@ -78,6 +68,7 @@ public class PartnerController extends BaseController {
@RequestParam("idCard") String idCard,@RequestParam("sex") String sex,
@RequestParam("grade") String grade, @RequestParam("schoolId") String schoolId,
@RequestParam("roleId") String roleId,@RequestParam("ysm") String ysm,
@RequestParam("schools") Integer[] schools, @RequestParam("subNames") String[] subNames,
@RequestParam(name = "position",required = false) String position,
@RequestParam(name = "parentId", required = false) String parentId,
@RequestParam(name = "parentIds", required = false) String parentIds
......@@ -86,9 +77,44 @@ public class PartnerController extends BaseController {
password = StringUtils.isNotBlank(password) ? MD5Utils.md5(password, user.getSalt()) : user.getPassword();
parentId = !"null".equals(parentId) ? parentId : "";
parentIds = !"null".equals(parentIds) ? parentIds : "";
int updateSysUse = partnerMapper.updateSysUser(phone, name, account, sex, password,roleId, id);
int updateHhUser = partnerMapper.updateHhUser(ysm, grade, idCard,position,parentId,parentIds,id);
int updateSchoolRef = partnerMapper.updateSchoolRef(schoolId, id);
// 获取县分下的学校
if (subNames != null && subNames.length > 0) {
Integer[] subNamesSchool = null;
Wrapper<School> schoolWrapper = new EntityWrapper<>();
schoolWrapper.in(subNames != null && subNames.length > 0,"sub_name",subNames);
schoolWrapper.groupBy("school_name");
List<School> list = schoolMapper.selectList(schoolWrapper);
if (list != null && list.size() != 0) {
subNamesSchool = new Integer[list.size()];
}else{
subNamesSchool = new Integer[0];
}
for(int i = 0; i < list.size(); ++i) {
subNamesSchool[i] = list.get(i).getId();
}
Integer[] temp = schools;
schools = new Integer[subNamesSchool.length + temp.length];
System.arraycopy(temp, 0, schools, 0, temp.length);
System.arraycopy(subNamesSchool, 0, schools, temp.length, subNamesSchool.length);
}
// 删除当前用户院校配置的 hhr_supervisor_school
schoolMapper.deleteSupervisorSchoolByUserId(id);
HhrSupervisorSchool hhrSupervisorSchool = null;
// 更新当前院校配置
for(Integer sId : schools) {
hhrSupervisorSchool = new HhrSupervisorSchool();
hhrSupervisorSchool.setUserId(Integer.parseInt(id));
hhrSupervisorSchool.setSchool(sId + "");
hhrSupervisorSchoolMapper.insert(hhrSupervisorSchool);
}
if (updateSysUse == 1 && updateHhUser == 1 && updateSchoolRef == 1) {
return ResponseData.success("修改完毕！");
}
......@@ -116,7 +142,13 @@ public class PartnerController extends BaseController {
}
List<HhrUser> hhrUserList = hhrUserMapper.selectList(wrapperHhr);
// 查询用户学校关联表赋值进去 只要id列表
Wrapper<HhrSupervisorSchool> wrapper = new EntityWrapper<>();
wrapper.setSqlSelect("user_id as userId, group_concat(school) as school");
wrapper.groupBy("user_id");
List<HhrSupervisorSchool> hhrSupervisorSchools = hhrSupervisorSchoolMapper.selectList(wrapper);
Wrapper<SysUser> wrapperSys = new EntityWrapper<SysUser>();
wrapperSys.like(StringUtils.isNotBlank(name), "name", name, SqlLike.DEFAULT);
wrapperSys.eq(StringUtils.isNotBlank(roleid), "roleid", roleid);
......@@ -145,7 +177,8 @@ public class PartnerController extends BaseController {
String schoolRefId = (String)refMap.get(sysUserId);
Map<String, Object> dataMap = new HashMap<String, Object>();
// 添加合伙人基础数据
for(HhrUser hhrUser : hhrUserList) {
String hhrUserId = hhrUser.getId();
if(sysUserId.equals(hhrUserId)) {
......@@ -161,7 +194,16 @@ public class PartnerController extends BaseController {
break;
}
}
// 添加院校配置数据
for(HhrSupervisorSchool hhrSupervisorSchool : hhrSupervisorSchools) {
if (sysUserId.equals(hhrSupervisorSchool.getUserId() + "")) {
dataMap.put("schools", hhrSupervisorSchool.getSchool());
break;
}
}
// 添加用户所属学校数据
for(School schoolEntity : schoolList) {
String schoolId = Integer.toString(schoolEntity.getId());
if(null != schoolRefId && schoolRefId.equals(schoolId)) {
......@@ -172,8 +214,9 @@ public class PartnerController extends BaseController {
break;
}
}
// 需要两个数据表都匹配到，才添加
// 需要两个数据表都匹配到，才添加 添加系统用户数据
if(null != dataMap.get("id") && null != dataMap.get("hasHhr")) {
dataMap.put("name", sysUser.getName());
dataMap.put("account", sysUser.getAccount());
......
service-manager/src/main/java/com/winsun/controller/SalesListController.java
......@@ -57,7 +57,7 @@ public class SalesListController extends BaseController{
@Autowired
private RedisTemplate redisTemplate;
/**
* 放号上传模板列名
*/
......@@ -123,6 +123,7 @@ public class SalesListController extends BaseController{
@RequestParam("salesSubst") String salesSubst,@RequestParam("salesSchool") String salesSchool,
@RequestParam("preType") String preType,@RequestParam("lockState") String lockState,
@RequestParam(name = "pageNo", required = false) int pageIndex,
@RequestParam(name = "remark", required = false) String remark,
@RequestParam(name = "pageSize", required = false) int pageSize){
Page<SalesList> page = new Page<>(pageIndex, pageSize);
Wrapper<SalesList> wrapperOrder = new EntityWrapper<SalesList>();
......@@ -140,6 +141,7 @@ public class SalesListController extends BaseController{
wrapperOrder.lt(StringUtils.isNotBlank(activateTimeEnd), "activate_time", activateTimeEnd);
wrapperOrder.eq(StringUtils.isNotBlank(lockState), "lock_state", lockState);
wrapperOrder.eq("del_flag", 0);
wrapperOrder.like(StringUtils.isNotBlank(remark), "remark", remark);
wrapperOrder.orderBy("create_time", false);
List<SalesList> orderList = salesListMapper.selectPage(page, wrapperOrder);
......@@ -601,7 +603,7 @@ public class SalesListController extends BaseController{
List<Map<String, Object>> schoolList = schoolMapper.selectMaps(wrapperSchool);
Map<String, Map<String,Object>> schoolMaps = MapUtil.listToMap(schoolList, "schoolName");
List<Map<String, Object>> updateList = new ArrayList<Map<String,Object>>();
List<Map<String, Object>> updateList = new ArrayList<>();
for(Map<String, Object> map : list) {
String orderPhone = (String)map.get("a");
......@@ -616,7 +618,10 @@ public class SalesListController extends BaseController{
if(null != orderMaps.get(orderPhone)) {
Map<String, Object> orderMap = (Map<String, Object>)orderMaps.get(orderPhone);
// 锁定跳过
if (orderMap.get("lock_state") != null && "是".equals(orderMap.get("lock_state"))) {
continue;
}
String remark = "激活号码所属学校与上报学校不一致";
if(null == networkName) {
......@@ -937,9 +942,6 @@ public class SalesListController extends BaseController{
if (StringUtils.isBlank(temp.get("e").toString())) {
return ResponseData.error("第" + (i + 1) + "行的销售账号不能为空");
}
if (StringUtils.isBlank(temp.get("f").toString())) {
return ResponseData.error("第" + (i + 1) + "行的上传时间不能为空");
}
if (StringUtils.isBlank(temp.get("g").toString())) {
return ResponseData.error("第" + (i + 1) + "行的订单类型不能为空");
}
......@@ -976,6 +978,7 @@ public class SalesListController extends BaseController{
for(SalesList salesList : salesLists) {
wrapper = new EntityWrapper<>();
wrapper.eq("order_phone", salesList.getOrderPhone());
wrapper.eq("del_flag", 0);
Integer update = salesListMapper.update(salesList, wrapper);
updateCount += update;
}
......@@ -994,40 +997,40 @@ public class SalesListController extends BaseController{
salesList.setOrderPhone(map.get("c").toString());
salesList.setName(map.get("d").toString());
salesList.setAccount(map.get("e").toString());
if (map.get("f") != null) {
if (map.get("f") != null && StringUtils.isNotBlank(map.get("f").toString())) {
salesList.setCreateTime(simpleDateFormat.parse(map.get("f").toString()));
}
if (map.get("g") != null) {
if (map.get("g") != null && StringUtils.isNotBlank(map.get("g").toString())) {
salesList.setOrderType(OrderType.getCodeByName(map.get("g").toString()));
}
if (map.get("h") != null) {
if (map.get("h") != null && StringUtils.isNotBlank(map.get("h").toString())) {
salesList.setLockState(map.get("h").toString());
}
if (map.get("i") != null) {
if (map.get("i") != null && StringUtils.isNotBlank(map.get("i").toString())) {
salesList.setAuditTime(simpleDateFormat.parse(map.get("i").toString()));
}
if (map.get("j") != null) {
if (map.get("j") != null && StringUtils.isNotBlank(map.get("j").toString())) {
salesList.setNetworkCode(map.get("j").toString());
}
if (map.get("k") != null) {
if (map.get("k") != null && StringUtils.isNotBlank(map.get("k").toString())) {
salesList.setNetworkName(map.get("k").toString());
}
if (map.get("l") != null) {
if (map.get("l") != null && StringUtils.isNotBlank(map.get("l").toString())) {
salesList.setActivateTime(simpleDateFormat.parse(map.get("l").toString()));
}
if (map.get("m") != null) {
if (map.get("m") != null && StringUtils.isNotBlank(map.get("m").toString())) {
salesList.setRecentlyAmount(Double.parseDouble(map.get("m").toString()));
}
if (map.get("n") != null) {
if (map.get("n") != null && StringUtils.isNotBlank(map.get("n").toString())) {
salesList.setRecentlyBonus(Double.parseDouble(map.get("n").toString()));
}
if (map.get("o") != null) {
if (map.get("o") != null && StringUtils.isNotBlank(map.get("o").toString())) {
salesList.setAllBonus(Double.parseDouble(map.get("o").toString()));
}
if (map.get("p") != null) {
if (map.get("p") != null && StringUtils.isNotBlank(map.get("p").toString())) {
salesList.setSendBonus(Double.parseDouble(map.get("p").toString()));
}
if (map.get("q") != null) {
if (map.get("q") != null && StringUtils.isNotBlank(map.get("q").toString())) {
salesList.setNonSendBonus(Double.parseDouble(map.get("q").toString()));
}
list.add(salesList);
......@@ -1144,8 +1147,6 @@ public class SalesListController extends BaseController{
columns.add("应发总激励");
columns.add("已发激励");
columns.add("未发激励");
columns.add("销售员学校");
columns.add("销售员县分");
ServletOutputStream os = null;
XSSFWorkbook workbook = new XSSFWorkbook();
try {
......@@ -1168,8 +1169,6 @@ public class SalesListController extends BaseController{
sheet.setColumnWidth(15, 2000);
sheet.setColumnWidth(16, 2000);
sheet.setColumnWidth(17, 2000);
sheet.setColumnWidth(18, 6500);
sheet.setColumnWidth(19, 6500);
//添加表头
final XSSFRow row = sheet.createRow(0);
......
service-manager/src/main/java/com/winsun/controller/StudentCardVerifyController.java
......@@ -218,7 +218,7 @@ public class StudentCardVerifyController extends BaseController {
* @param pageSize
* @return
*/
@Permission(menuname = "查询学生不限量证件信息", value = "list", method = RequestMethod.POST)
@Permission(menuname = "查询学生证件信息", value = "list", method = RequestMethod.POST)
public ResponseData<Page<StudentCard>> listProduct(
@RequestParam(name = "userName", required = false) String userName,
@RequestParam(name = "orderPhone", required = false) String orderPhone,
......
service-manager/src/main/resources/com/winsun/mapper/mapping/OrderMapper.xml
......@@ -157,6 +157,7 @@
) ho,order_view ov
where
ho.kd_order_id = ov.orderSeq
order by create_time desc
limit #{pageStart},#{pageSize}
</select>
......
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