Skip to content

G
gdtel-gztel-school-center
Commit d8ebc5ec by 董有沛
Options

权限修改

parent 5b0e130e
Showing with 202 additions and 67 deletions
service-manager/src/main/java/com/winsun/controller/BillController.java
......@@ -564,7 +564,7 @@ public class BillController extends BaseController{
wrapperSchool.eq("status", "1");
Map<String, Object> schoolMaps = MapUtil.listToMap(schoolMapper.selectMaps(wrapperSchool), "id", "schoolName");
//List<Map<String, Object>> schoolList = schoolMapper.selectMaps(wrapperSchool);
List<Map<String, Object>> schoolRefList = schoolMapper.getSupervisorSchoolRef();
List<Map<String, Object>> schoolRefList = schoolMapper.getSupervisorRef();
//Map<String, Object> schoolRefMap = MapUtil.listToMap(schoolMapper.getSupervisorSchoolRef(), "user_id", "school");
Wrapper<SysUser> wrapperSys = new EntityWrapper<SysUser>();
......
service-manager/src/main/java/com/winsun/controller/BonusController.java
......@@ -39,12 +39,12 @@ import com.winsun.auth.core.util.IOUtils;
import com.winsun.bean.Bill;
import com.winsun.bean.BonusApply;
import com.winsun.bean.HhrUser;
import com.winsun.bean.SalesOrder;
import com.winsun.bean.SalesList;
import com.winsun.bean.School;
import com.winsun.bean.SysUser;
import com.winsun.mapper.BonusMapper;
import com.winsun.mapper.HhrUserMapper;
import com.winsun.mapper.SalesOrderMapper;
import com.winsun.mapper.SalesListMapper;
import com.winsun.mapper.SchoolMapper;
import com.winsun.mapper.SysUserMapper;
import com.winsun.tenpay.CorporatePrepayResponse;
......@@ -74,7 +74,7 @@ public class BonusController extends BaseController {
@Autowired
private HhrUserMapper hhrUserMapper;
@Autowired
private SalesOrderMapper salesOrderMapper;
private SalesListMapper salesOrderMapper;
@Autowired
public BonusController(BonusMapper bonusMapper,SysUserMapper sysUserMapper,SchoolMapper schoolMapper) {
......@@ -90,7 +90,7 @@ public class BonusController extends BaseController {
@RequestParam(name = "isBind", required = false) String isBind,
@RequestParam(name = "pageNo", required = false) int pageIndex,
@RequestParam(name = "pageSize", required = false) int pageSize) {
Wrapper<SalesOrder> wrapperSales = new EntityWrapper<SalesOrder>();
Wrapper<SalesList> wrapperSales = new EntityWrapper<SalesList>();
wrapperSales.setSqlSelect(" user_id userId,sum(non_send_bonus) bonus ");
wrapperSales.eq("status", 3);
wrapperSales.eq("del_flag", 0);
......@@ -169,7 +169,7 @@ public class BonusController extends BaseController {
public ResponseData<String> productOrder(@RequestParam("ids") String ids,
@RequestParam("status") String status){
Wrapper<SalesOrder> wrapperSales = new EntityWrapper<SalesOrder>();
Wrapper<SalesList> wrapperSales = new EntityWrapper<SalesList>();
wrapperSales.setSqlSelect(" user_id userId,non_send_bonus bonus,order_phone orderPhone,id ");
wrapperSales.eq("status", 3);
wrapperSales.eq("del_flag", 0);
......@@ -440,7 +440,7 @@ public class BonusController extends BaseController {
Map<String,Object> schoolRefMap = MapUtil.listToMap(schoolMapper.getSchoolRef(), "user_id", "school_id");
// 提前取出销售清单数据
Wrapper<SalesOrder> wrapperOrder = new EntityWrapper<SalesOrder>();
Wrapper<SalesList> wrapperOrder = new EntityWrapper<SalesList>();
wrapperOrder.ne("non_send_bonus", 0);
wrapperOrder.eq("del_flag", 0);
Map<String, Map<String, Object>> orderMaps = MapUtil.listToMap(salesOrderMapper.selectMaps(wrapperOrder), "id");
......@@ -549,7 +549,7 @@ public class BonusController extends BaseController {
double nonSendBonus = (double)orderMap.get("nonSendBonus") - bonus;
double sendBonus = (double)orderMap.get("SendBonus") + bonus;
SalesOrder salesOrder = new SalesOrder();
SalesList salesOrder = new SalesList();
salesOrder.setId(salesId);
salesOrder.setNonSendBonus(nonSendBonus);
salesOrder.setSendBonus(sendBonus);
......
service-manager/src/main/java/com/winsun/controller/HhrSalesOrderController.java
......@@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.plugins.Page;
import com.winsun.auth.core.annotion.Permission;
import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.HhrUser;
import com.winsun.bean.SalesOrder;
import com.winsun.bean.SalesList;
import com.winsun.bean.SysUser;
import com.winsun.mapper.HhrUserMapper;
import com.winsun.mapper.SalesOrderMapper;
import com.winsun.mapper.SalesListMapper;
import com.winsun.mapper.SysUserMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
......@@ -31,21 +31,21 @@ import java.util.List;
@RequestMapping("salesOrder")
public class HhrSalesOrderController {
private static SalesOrderMapper salesOrderMapper;
private static SalesListMapper salesOrderMapper;
private static SysUserMapper sysUserMapper;
private static HhrUserMapper hhrUserMapper;
@Autowired
public HhrSalesOrderController(SalesOrderMapper salesOrderMapper,SysUserMapper sysUserMapper,HhrUserMapper hhrUserMapper){
public HhrSalesOrderController(SalesListMapper salesOrderMapper,SysUserMapper sysUserMapper,HhrUserMapper hhrUserMapper){
HhrSalesOrderController.salesOrderMapper=salesOrderMapper;
HhrSalesOrderController.sysUserMapper=sysUserMapper;
HhrSalesOrderController.hhrUserMapper=hhrUserMapper;
}
@Permission(menuname = "学子公司销量",value = "salesOrderInfo", method = RequestMethod.POST)
public ResponseData<Page<SalesOrder>> salesList(@RequestParam(name = "pageNo") int pageIndex, @RequestParam(name = "pageSize") int pageSize,
public ResponseData<Page<SalesList>> salesList(@RequestParam(name = "pageNo") int pageIndex, @RequestParam(name = "pageSize") int pageSize,
@RequestParam(name = "name",required = false) String name , @RequestParam(name = "account",required = false) String account ,
@RequestParam(name = "salesSubst",required = false) String salesSubst , @RequestParam(name = "salesSchool",required = false) String salesSchool ,
@RequestParam(name = "position",required = false) String position , @RequestParam(name = "positionSJ",required = false) String positionSJ ,
......@@ -55,7 +55,7 @@ public class HhrSalesOrderController {
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}*/
Wrapper<SalesOrder> wrapper = new EntityWrapper<>();
Wrapper<SalesList> wrapper = new EntityWrapper<>();
wrapper.ge("recently_amount",50);
wrapper.eq(StringUtils.isNotBlank(name),"name",name);
wrapper.eq(StringUtils.isNotBlank(name),"account",account);
......@@ -67,10 +67,10 @@ public class HhrSalesOrderController {
}
wrapper.le(StringUtils.isNotBlank(activateTimeEnd),"activate_time",activateTimeEnd);
wrapper.ge(StringUtils.isNotBlank(activateTimeStart),"activate_time",activateTimeStart);
Page<SalesOrder> page = new Page<>(pageIndex, pageSize);
List<SalesOrder> hhrSalesOrders = salesOrderMapper.selectPage(page, wrapper);
List<SalesOrder> hos = new ArrayList<>();
for (SalesOrder value:hhrSalesOrders){
Page<SalesList> page = new Page<>(pageIndex, pageSize);
List<SalesList> hhrSalesOrders = salesOrderMapper.selectPage(page, wrapper);
List<SalesList> hos = new ArrayList<>();
for (SalesList value:hhrSalesOrders){
HhrUser hhrUser = hhrUserMapper.selectById(value.getUserId());
if("总经理".equals(hhrUser.getPosition())){
value.setPositionZJL(hhrUser.getPosition());
......
service-manager/src/main/java/com/winsun/controller/IntelligentPlatformPushController.java
......@@ -12,6 +12,7 @@ import com.winsun.mapper.OrderMapper;
import com.winsun.mapper.OrderViewMapper;
import com.winsun.smsUtils.SendSmsAndMail;
import com.winsun.utils.MyBatisPlusUpdateUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......
service-manager/src/main/java/com/winsun/controller/LzSalaryController.java
......@@ -72,7 +72,7 @@ public class LzSalaryController extends BaseController {
@Autowired
private HhrUserMapper hhrUserMapper;
@Autowired
private SalesOrderMapper salesOrderMapper;
private SalesListMapper salesOrderMapper;
@Autowired
private SysUserMapper sysUserMapper;
@Autowired
......@@ -202,10 +202,10 @@ public class LzSalaryController extends BaseController {
lzWageList.add(lzWage);
}
Wrapper<SalesOrder> salesOrderWrapper = new EntityWrapper<>();
Wrapper<SalesList> salesOrderWrapper = new EntityWrapper<>();
salesOrderWrapper.in("user_id",userIds);
salesOrderWrapper.like("activate_time",month,SqlLike.RIGHT);
List<SalesOrder> salesOrderList = salesOrderMapper.selectList(salesOrderWrapper);
List<SalesList> salesOrderList = salesOrderMapper.selectList(salesOrderWrapper);
Wrapper<LzKpi> lzKpiWrapper = new EntityWrapper<>();
salesOrderWrapper.in("user_id",userIds);
......@@ -225,7 +225,7 @@ public class LzSalaryController extends BaseController {
Integer insertCount = 0;
for (String userId : userIds) {
Integer count = 0; //充值达标数
for (SalesOrder salesOrder : salesOrderList) {
for (SalesList salesOrder : salesOrderList) {
if(userId.equals(salesOrder.getUserId())){
double recentlyAmount = salesOrder.getRecentlyAmount();
//充值金额50以上算充值达标
......
service-manager/src/main/java/com/winsun/controller/ManagerKpiController.java
......@@ -75,7 +75,7 @@ public class ManagerKpiController extends BaseController {
@Autowired
private HhrUserMapper hhrUserMapper;
@Autowired
private SalesOrderMapper salesOrderMapper;
private SalesListMapper salesOrderMapper;
@Autowired
private SysUserMapper sysUserMapper;
@Autowired
......
service-manager/src/main/java/com/winsun/controller/PartnerController.java
......@@ -29,6 +29,7 @@ import com.winsun.mapper.HhrUserMapper;
import com.winsun.mapper.PartnerMapper;
import com.winsun.mapper.SchoolMapper;
import com.winsun.mapper.SysUserMapper;
import com.winsun.utils.DataAuthUtil;
import com.winsun.utils.MD5Utils;
import com.winsun.utils.MapUtil;
......@@ -47,6 +48,9 @@ public class PartnerController extends BaseController {
private static SysUserMapper sysUserMapper;
private static HhrUserMapper hhrUserMapper;
private static SchoolMapper schoolMapper;
@Autowired
private DataAuthUtil dataAuthUtil;
@Autowired
public PartnerController(PartnerMapper partnerMapper,SysUserMapper sysUserMapper,HhrUserMapper hhrUserMapper,SchoolMapper schoolMapper) {
......@@ -59,6 +63,7 @@ public class PartnerController extends BaseController {
@Permission(menuname = "修改合伙人信息", value = "update", method = RequestMethod.POST)
public ResponseData<String> updatePartner(@RequestParam("id") String id, @RequestParam("phone") String phone,
@RequestParam("account") String account, @RequestParam("name") String name,
@RequestParam("password") String password,
@RequestParam("idCard") String idCard,@RequestParam("sex") String sex,
@RequestParam("grade") String grade, @RequestParam("schoolId") String schoolId,
@RequestParam("roleId") String roleId,@RequestParam("ysm") String ysm,
......@@ -66,7 +71,10 @@ public class PartnerController extends BaseController {
@RequestParam(name = "parentId", required = false) String parentId,
@RequestParam(name = "parentIds", required = false) String parentIds
) {
int updateSysUse = partnerMapper.updateSysUser(phone, name, account, sex, id);
SysUser user = sysUserMapper.selectById(id);
password = StringUtils.isNotBlank(password) ? MD5Utils.md5(password, user.getSalt()) : user.getPassword();
int updateSysUse = partnerMapper.updateSysUser(phone, name, account, sex, password, id);
int updateHhUser = partnerMapper.updateHhUser(ysm, grade, idCard,position,parentId,parentIds,id);
int updateSchoolRef = partnerMapper.updateSchoolRef(schoolId, id);
if (updateSysUse == 1 && updateHhUser == 1 && updateSchoolRef == 1) {
......@@ -78,10 +86,11 @@ public class PartnerController extends BaseController {
@SuppressWarnings("unchecked")
@Permission(menuname = "查询合伙人信息", value = "list", method = RequestMethod.POST)
public ResponseData<Page<Map<String, Object>>> listPartner(@RequestParam("school") String school,
@RequestParam("name") String name, @RequestParam("area") String area,
@RequestParam("name") String name, @RequestParam("substName") String substName,
@RequestParam(name = "pageNo", required = false) int pageIndex,
@RequestParam(name = "pageSize", required = false) int pageSize) {
Page<Map<String, Object>> page = new Page<>(pageIndex, pageSize);
ShiroUser user = getShiroUser();
Wrapper<HhrUser> wrapperHhr = new EntityWrapper<HhrUser>();
// wrapperHhr.like(StringUtils.isNotBlank(name), "name", name, SqlLike.DEFAULT);
......@@ -89,10 +98,12 @@ public class PartnerController extends BaseController {
Wrapper<SysUser> wrapperSys = new EntityWrapper<SysUser>();
wrapperSys.like(StringUtils.isNotBlank(name), "name", name, SqlLike.DEFAULT);
wrapperSys.eq("status", "10");
List<SysUser> sysUserList = sysUserMapper.selectList(wrapperSys);
Wrapper<School> wrapperSchool = new EntityWrapper<School>();
// wrapperSchool.like(StringUtils.isNotBlank(name), "name", name, SqlLike.DEFAULT);
wrapperSchool.eq(StringUtils.isNotBlank(substName), "sub_name", substName);
wrapperSchool.eq(StringUtils.isNotBlank(school), "school_name", school);
List<School> schoolList = schoolMapper.selectList(wrapperSchool);
Map<String, Object> refMap = MapUtil.listToMap(schoolMapper.getSchoolRef(), "user_id", "school_id");
......@@ -125,7 +136,7 @@ public class PartnerController extends BaseController {
for(School schoolEntity : schoolList) {
String schoolId = Integer.toString(schoolEntity.getId());
if(null != schoolRefId && schoolRefId.equals(schoolId)) {
dataMap.put("area",schoolEntity.getSubName());
dataMap.put("substName",schoolEntity.getSubName());
dataMap.put("school",schoolEntity.getSchoolName());
dataMap.put("schoolId",schoolEntity.getId());
dataMap.put("id", sysUserId);
......@@ -146,10 +157,12 @@ public class PartnerController extends BaseController {
}
}
// 数据权限控制
newList = dataAuthUtil.authDeal(newList, user);
List<Map<String, Object>> dataList = new ArrayList<Map<String,Object>>();
if(newList.size() < pageSize) {
dataList = newList;
if(newList.size() < pageIndex*pageSize) {
dataList = newList.subList((pageIndex-1)*pageSize, newList.size());
}else {
dataList = newList.subList((pageIndex-1)*pageSize, pageIndex*pageSize);
}
......
service-manager/src/main/java/com/winsun/controller/PersonalCenterController.java
......@@ -16,6 +16,7 @@ import com.winsun.smsUtils.SendSmsAndMail;
import com.winsun.utils.IDCardUtil;
import com.winsun.utils.MyBatisPlusUpdateUtils;
import com.winsun.utils.PicturesUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......
service-manager/src/main/java/com/winsun/controller/SalesOrderController.java → service-manager/src/main/java/com/winsun/controller/SalesListController.java
......@@ -36,10 +36,10 @@ 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.SalesOrder;
import com.winsun.bean.SalesList;
import com.winsun.bean.School;
import com.winsun.bean.SysUser;
import com.winsun.mapper.SalesOrderMapper;
import com.winsun.mapper.SalesListMapper;
import com.winsun.mapper.SchoolMapper;
import com.winsun.mapper.SysUserMapper;
import com.winsun.utils.ImportExcel;
......@@ -54,8 +54,8 @@ import lombok.extern.slf4j.Slf4j;
*/
@Slf4j
@RestController
@RequestMapping("/salesOrder")
public class SalesOrderController extends BaseController{
@RequestMapping("/salesList")
public class SalesListController extends BaseController{
/**
* 导入
......@@ -82,7 +82,7 @@ public class SalesOrderController extends BaseController{
private static String CZ_NETWORK_NAME = "所属网点";
private static String CZ_AMOUNT = "充值金额";
private static SalesOrderMapper salesOrderMapper;
private static SalesListMapper salesListMapper;
private static SysUserMapper sysUserMapper;
private static SchoolMapper schoolMapper;
......@@ -90,29 +90,29 @@ public class SalesOrderController extends BaseController{
private SimpleDateFormat sFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@Autowired
public SalesOrderController(SalesOrderMapper salesOrderMapper,SysUserMapper sysUserMapper,SchoolMapper schoolMapper) {
SalesOrderController.salesOrderMapper = salesOrderMapper;
SalesOrderController.sysUserMapper = sysUserMapper;
SalesOrderController.schoolMapper = schoolMapper;
public SalesListController(SalesListMapper salesListMapper,SysUserMapper sysUserMapper,SchoolMapper schoolMapper) {
SalesListController.salesListMapper = salesListMapper;
SalesListController.sysUserMapper = sysUserMapper;
SalesListController.schoolMapper = schoolMapper;
}
@Permission(menuname = "获取销售订单列表", value ="/list", method = RequestMethod.POST)
public ResponseData<Page<SalesOrder>> getList(@RequestParam("orderPhone") String orderPhone,
public ResponseData<Page<SalesList>> getList(@RequestParam("orderPhone") String orderPhone,
@RequestParam("name") String name,@RequestParam("account") String account,
@RequestParam("status") String status,@RequestParam("orderType") String orderType,
@RequestParam("createTimeStart") String createTimeStart,@RequestParam("createTimeEnd") String createTimeEnd,
@RequestParam("activateTimeStart") String activateTimeStart,@RequestParam("activateTimeEnd") String activateTimeEnd,
@RequestParam(name = "pageNo", required = false) int pageIndex,
@RequestParam(name = "pageSize", required = false) int pageSize){
Page<SalesOrder> page = new Page<>(pageIndex, pageSize);
Wrapper<SalesOrder> wrapperOrder = new EntityWrapper<SalesOrder>();
Page<SalesList> page = new Page<>(pageIndex, pageSize);
Wrapper<SalesList> wrapperOrder = new EntityWrapper<SalesList>();
wrapperOrder.eq(StringUtils.isNotBlank(orderPhone), "order_phone", orderPhone);
wrapperOrder.eq(StringUtils.isNotBlank(orderType), "order_type", orderType);
wrapperOrder.eq(StringUtils.isNotBlank(status), "status", status);
wrapperOrder.eq(StringUtils.isNotBlank(name), "name", name);
wrapperOrder.eq(StringUtils.isNotBlank(account), "account", account);
wrapperOrder.eq("del_flag", 0);
List<SalesOrder> orderList = salesOrderMapper.selectPage(page, wrapperOrder);
List<SalesList> orderList = salesListMapper.selectPage(page, wrapperOrder);
page.setRecords(orderList);
return ResponseData.success(page, "查询完毕！");
......@@ -121,17 +121,17 @@ public class SalesOrderController extends BaseController{
@Permission(menuname = "删除销售订单", value ="/deleteOrder", method = RequestMethod.POST)
public ResponseData<String> deleteOrder(@RequestParam("id") String id){
SalesOrder salesOrder = salesOrderMapper.selectById(id);
SalesList salesOrder = salesListMapper.selectById(id);
String status = salesOrder.getStatus();
String orderPhone = salesOrder.getOrderPhone();
String salesSchool = salesOrder.getSalesSchool();
salesOrder.setDelFlag("1");
int num = salesOrderMapper.updateById(salesOrder);
int num = salesListMapper.updateById(salesOrder);
if(num > 0) {
if("0".equals(status)) {
// 重复订单删除后，重置对其它重复订单的影响
List<Map<String, Object>> phoneSchoolList = salesOrderMapper.getPhoneSchoolByPhone(orderPhone);
List<Map<String, Object>> phoneSchoolList = salesListMapper.getPhoneSchoolByPhone(orderPhone);
Map<String, Object> phoneSchoolMap = phoneSchoolList.get(0);
String phoneSchool = (String)phoneSchoolMap.get("school");
String remark = "";
......@@ -155,9 +155,9 @@ public class SalesOrderController extends BaseController{
updateSchoolList.add(phoneSchoolMap);
updatePhoneSchool(updateSchoolList);
salesOrderMapper.updateRepealOrder(status,remark,orderPhone);
salesListMapper.updateRepealOrder(status,remark,orderPhone);
}else {
salesOrderMapper.deletePhoneSchool(orderPhone);
salesListMapper.deletePhoneSchool(orderPhone);
}
return ResponseData.success("删除成功");
......@@ -300,7 +300,7 @@ public class SalesOrderController extends BaseController{
Map<String, Object> resultMap = new HashMap<String, Object>();
// 处理放号清单号码的销售学校清单，用于重复判断
Map<String, Object> phoneSchoolMap = MapUtil.listToMap(salesOrderMapper.getPhoneSchool(), "order_phone", "school");
Map<String, Object> phoneSchoolMap = MapUtil.listToMap(salesListMapper.getPhoneSchool(), "order_phone", "school");
// 处理用户清单
Wrapper<SysUser> wrapperUser = new EntityWrapper<SysUser>();
wrapperUser.setSqlSelect(" account,id ");
......@@ -375,7 +375,7 @@ public class SalesOrderController extends BaseController{
int num = 0;
for(Map<String, Object> map : list) {
SalesOrder order = new SalesOrder();
SalesList order = new SalesList();
order.setOrderPhone((String)map.get("orderPhone"));
order.setUserId(Integer.toString((int)map.get("userId")));
order.setCreateTime(new Date());
......@@ -385,7 +385,7 @@ public class SalesOrderController extends BaseController{
order.setName((String)map.get("name"));
order.setAccount((String)map.get("account"));
num += salesOrderMapper.insert(order);
num += salesListMapper.insert(order);
}
return num;
......@@ -394,7 +394,7 @@ public class SalesOrderController extends BaseController{
// 更新号码销售学校表
public void updatePhoneSchool(List<Map<String, Object>> list) {
for(Map<String, Object> map : list) {
salesOrderMapper.updatePhoneSchool((String)map.get("orderPhone"), (String)map.get("phoneSchool"));
salesListMapper.updatePhoneSchool((String)map.get("orderPhone"), (String)map.get("phoneSchool"));
}
}
......@@ -407,7 +407,7 @@ public class SalesOrderController extends BaseController{
String phoneSchool = (String)map.get("phoneSchool");
String remark = "放号号码在"+ phoneSchool + "重复上传";
salesOrderMapper.updateRepealOrder(status,remark,orderPhone);
salesListMapper.updateRepealOrder(status,remark,orderPhone);
}
}
......@@ -502,13 +502,13 @@ public class SalesOrderController extends BaseController{
calendar.add(Calendar.MONTH, -7);
String date = simpleDateFormat.format(calendar.getTime());
// 获取半年上传内的订单
Wrapper<SalesOrder> wrapperOrder = new EntityWrapper<SalesOrder>();
Wrapper<SalesList> wrapperOrder = new EntityWrapper<SalesList>();
wrapperOrder.ge("create_time", date);
wrapperOrder.eq("order_type", 1);
wrapperOrder.eq("del_flag", 0);
wrapperOrder.eq("send_bonus", 0);
wrapperOrder.ne("status", "0");
List<Map<String, Object>> orderList = salesOrderMapper.selectMaps(wrapperOrder);
List<Map<String, Object>> orderList = salesListMapper.selectMaps(wrapperOrder);
Map<String, Map<String,Object>> orderMaps = MapUtil.listToMap(orderList, "orderPhone");
// 获取学校清单比较网点
......@@ -593,7 +593,7 @@ public class SalesOrderController extends BaseController{
try {
for(Map<String, Object> map : list) {
SalesOrder order = new SalesOrder();
SalesList order = new SalesList();
order.setId((int)map.get("id"));
order.setStatus((String)map.get("status"));
order.setRemark((String)map.get("remark"));
......@@ -609,7 +609,7 @@ public class SalesOrderController extends BaseController{
order.setNetworkName((String)map.get("networkName"));
}
num += salesOrderMapper.updateById(order);
num += salesListMapper.updateById(order);
}
}catch (Exception e) {
log.error("更新审核结果到销售订单异常" + e.getMessage(), e);
......@@ -789,13 +789,13 @@ public class SalesOrderController extends BaseController{
@RequestParam("activateTimeStart") String activateTimeStart,@RequestParam("activateTimeEnd") String activateTimeEnd
) throws IOException {
Wrapper<SalesOrder> wrapperOrder = new EntityWrapper<SalesOrder>();
Wrapper<SalesList> wrapperOrder = new EntityWrapper<SalesList>();
wrapperOrder.eq(StringUtils.isNotBlank(orderPhone), "order_phone", orderPhone);
wrapperOrder.eq(StringUtils.isNotBlank(orderType), "order_type", orderType);
wrapperOrder.eq(StringUtils.isNotBlank(status), "status", status);
wrapperOrder.eq(StringUtils.isNotBlank(name), "name", name);
wrapperOrder.eq(StringUtils.isNotBlank(account), "account", account);
List<Map<String, Object>> orderList = salesOrderMapper.selectMaps(wrapperOrder);
List<Map<String, Object>> orderList = salesListMapper.selectMaps(wrapperOrder);
List<String> tops = new ArrayList<>();
tops.add("销售学校");
......
service-manager/src/main/java/com/winsun/controller/hhrUserController.java
......@@ -69,7 +69,7 @@ public class hhrUserController extends BaseController {
}
Page<Order> page = new Page<>(pageNo == null ? 1 : pageNo, pageSize == null ? 10 : pageSize);
Wrapper<Order> wrapper = new EntityWrapper();
Wrapper<Order> wrapper = new EntityWrapper<Order>();
wrapper.in("hehuoren_id", userList);
if (StringUtils.isNotBlank(customer)) {
wrapper.addFilter("(contact_number LIKE '%" + customer + "%' OR customer_name LIKE '%" + customer + "%')");
......
service-manager/src/main/java/com/winsun/controller/school/SchoolAllocationController.java
......@@ -21,12 +21,8 @@ import com.winsun.auth.core.base.controller.BaseController;
import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.School;
import com.winsun.bean.SysUser;
import com.winsun.mapper.PackageMapper;
import com.winsun.mapper.ProductMapper;
import com.winsun.mapper.SchoolMapper;
import com.winsun.mapper.SchoolPackageMapper;
import com.winsun.mapper.SysUserMapper;
import com.winsun.utils.MapUtil;
import lombok.extern.slf4j.Slf4j;
......@@ -94,18 +90,18 @@ public class SchoolAllocationController extends BaseController {
@RequestParam(name = "pageNo", required = false) int pageIndex,
@RequestParam(name = "pageSize", required = false) int pageSize) {
Wrapper<SysUser> wrapperUser = new EntityWrapper();
Wrapper<SysUser> wrapperUser = new EntityWrapper<SysUser>();
wrapperUser.like(StringUtils.isNotBlank(name), "name", name, SqlLike.DEFAULT);
wrapperUser.eq(StringUtils.isNotBlank(account), "account", account);
List<SysUser> userList = sysUserMapper.selectList(wrapperUser);
Wrapper<School> wrapperSchool = new EntityWrapper();
Wrapper<School> wrapperSchool = new EntityWrapper<School>();
wrapperSchool.eq(StringUtils.isNotBlank(schoolName), "school_name", schoolName);
wrapperSchool.like(StringUtils.isNotBlank(substName), "sub_name", substName, SqlLike.DEFAULT);
List<School> schoolList = schoolMapper.selectList(wrapperSchool);
Map<String, Object> schoolMap = MapUtil.listToMap(schoolMapper.getSchoolRef(), "user_id", "school_id");
List<Map<String, Object>> schoolAllocationList = schoolMapper.getSupervisorSchoolRef();
// Map<String, Object> schoolMap = MapUtil.listToMap(schoolMapper.getSchoolRef(), "user_id", "school_id");
List<Map<String, Object>> schoolAllocationList = schoolMapper.getSupervisorRef();
List<Map<String, Object>> dataList = new ArrayList<Map<String,Object>>();
for(Map<String, Object> schoolAllocation : schoolAllocationList) {
......
service-manager/src/main/java/com/winsun/utils/DataAuthUtil.java 0 → 100644
package com.winsun.utils;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.itextpdf.text.pdf.PdfStructTreeController.returnType;
import com.netflix.loadbalancer.ServerListSubsetFilter;
import com.winsun.auth.core.shiro.ShiroUser;
import com.winsun.auth.model.user.User;
import com.winsun.bean.School;
import com.winsun.bean.SysUser;
import com.winsun.mapper.SchoolMapper;
import com.winsun.mapper.SysUserMapper;
/**
* 数据权限控制
* @author 董有沛
*
*/
@Component
public class DataAuthUtil {
@Autowired
private SchoolMapper schoolMapper;
@Autowired
private SysUserMapper sysUserMapper;
public List<Map<String, Object>> authDeal(List<Map<String, Object>> targetList,ShiroUser user){
SysUser sysUser = getSysUser(user);
List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>();
if(user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
resultList = targetList;
}else if(user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "县分"))) {
resultList = authData(targetList,"substName",sysUser.getSubstName());
}else if(user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "督导"))) {
Set<Integer> schoolIdSet = authSchool(sysUser.getId());
resultList = authData(targetList,"schoolId",schoolIdSet);
}else if(user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "合伙人"))) {
resultList = authData(targetList,"userId", sysUser.getId());
}else {
resultList = targetList;
}
return resultList;
}
public Set<Integer> authSchool(String userId){
Set<Integer> schoolIdSets = new HashSet<Integer>();
List<Map<String, Object>> schoolRefList = schoolMapper.getSupervisorByUserId(userId);
// Wrapper<School> wrapperSchool = new EntityWrapper<School>();
// List<School> schoolList = schoolMapper.selectList(wrapperSchool);
for(Map<String, Object> map : schoolRefList) {
schoolIdSets.add((int)map.get("school"));
}
return schoolIdSets;
}
public List<Map<String, Object>> authData(List<Map<String, Object>> list,String authkey, String val){
List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>();
for(Map<String, Object> map : list) {
if(null != map.get(authkey)) {
if(val.equals((String)map.get(authkey))) {
resultList.add(map);
}
}else {
// 数据筛选字段不存在时，默认返回数据
resultList.add(map);
}
}
return resultList;
}
public List<Map<String, Object>> authData(List<Map<String, Object>> list,String authkey, Set<Integer> valSet){
List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>();
for(Map<String, Object> map : list) {
if(null != map.get(authkey)) {
if(valSet.contains((Integer)map.get(authkey))) {
resultList.add(map);
}
}else {
// 数据筛选字段不存在时，默认返回数据
resultList.add(map);
}
}
return resultList;
}
public SysUser getSysUser(ShiroUser user) {
SysUser sysUser = sysUserMapper.selectById(user.getId());
Map<String, Object> schoolRefMaps = MapUtil.listToMap(schoolMapper.getSchoolRef(), "user_id", "school_id");
Wrapper<School> wrapperSchool = new EntityWrapper<School>();
Map<String, Map<String, Object>> schoolMaps = MapUtil.listToMap(schoolMapper.selectMaps(wrapperSchool), "id");
if(null != schoolRefMaps.get(sysUser.getId())) {
String schoolId = schoolRefMaps.get(sysUser.getId()).toString();
Map<String, Object> schoolMap = schoolMaps.get(schoolId);
sysUser.setSubstName(schoolMap.get("sub_name").toString());
}
return sysUser;
}
}
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