Skip to content

G
gdtel-gztel-school-center
Commit 052cef2d by 黄森林
Options

报表提交

parent 85962ea4
Showing with 109 additions and 5 deletions
common/src/main/java/com/winsun/bean/SalesOrder.java
package com.winsun.bean; package com.winsun.bean;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.annotations.TableName;
import lombok.Data; import lombok.Data;
...@@ -149,5 +150,14 @@ public class SalesOrder { ...@@ -149,5 +150,14 @@ public class SalesOrder {
* 本金激励 * 本金激励
*/ */
private Double capitalBonus; private Double capitalBonus;
@TableField(exist = false)
private String positionZW;
@TableField(exist = false)
private String positionZJL;
@TableField(exist = false)
private String positionSJ;
} }
service-manager/src/main/java/com/winsun/controller/HhrSalesOrderController.java 0 → 100644
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.common.model.ResponseData;
import com.winsun.bean.HhrUser;
import com.winsun.bean.SalesOrder;
import com.winsun.bean.SysUser;
import com.winsun.mapper.HhrUserMapper;
import com.winsun.mapper.SalesOrderMapper;
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.ArrayList;
import java.util.List;
/**
* @Author: hsl
* @Date: 2020/5/13 15:41
*/
@RestController
@Slf4j
@RequestMapping("salesOrder")
public class HhrSalesOrderController {
private static SalesOrderMapper salesOrderMapper;
private static SysUserMapper sysUserMapper;
private static HhrUserMapper hhrUserMapper;
@Autowired
public HhrSalesOrderController(SalesOrderMapper 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,
@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 ,
@RequestParam(name = "positionZJL",required = false) String positionZJL , @RequestParam(name = "activateTimeStart",required = false) String activateTimeStart ,
@RequestParam(name = "activateTimeEnd",required = false) String activateTimeEnd ){
/* ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}*/
Wrapper<SalesOrder> wrapper = new EntityWrapper<>();
wrapper.ge("recently_amount",50);
wrapper.eq(StringUtils.isNotBlank(name),"name",name);
wrapper.eq(StringUtils.isNotBlank(name),"account",account);
wrapper.eq(StringUtils.isNotBlank(name),"sales_subst",salesSubst);
wrapper.eq(StringUtils.isNotBlank(name),"sales_school",salesSchool);
if(StringUtils.isNotBlank(activateTimeEnd)&&StringUtils.isNotBlank(activateTimeStart)){
activateTimeEnd=activateTimeEnd.substring(0,activateTimeEnd.length())+" 23:59:59";
activateTimeStart=activateTimeStart.substring(0,activateTimeStart.length())+" 00:00:00";
}
wrapper.le(StringUtils.isNotBlank(activateTimeEnd),"activate_time",activateTimeEnd);
wrapper.ge(StringUtils.isNotBlank(activateTimeStart),"activate_time",activateTimeStart);
if(StringUtils.isNotBlank(positionZJL)){
wrapper.eq(StringUtils.isNotBlank(name),"name",name);
}
Page<SalesOrder> page = new Page<>(pageIndex, pageSize);
List<SalesOrder> hhrSalesOrders = salesOrderMapper.selectPage(page, wrapper);
List<SalesOrder> hos = new ArrayList<>();
for (SalesOrder value:hhrSalesOrders){
HhrUser hhrUser = hhrUserMapper.selectById(value.getUserId());
if("总经理".equals(hhrUser.getPosition())){
value.setPositionZJL(hhrUser.getPosition());
}else {
value.setPositionZW(hhrUser.getPosition());
SysUser sysUser = sysUserMapper.selectById(hhrUser.getParentId());
value.setPositionSJ(sysUser.getName());
}
hos.add(value);
}
page.setRecords(hos);
return ResponseData.success(page, "查询成功！");
}
}
service-manager/src/main/java/com/winsun/controller/supervisorController.java
...@@ -4,6 +4,7 @@ package com.winsun.controller; ...@@ -4,6 +4,7 @@ package com.winsun.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
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.winsun.auth.core.annotion.Permission;
import com.winsun.auth.core.base.controller.BaseController; import com.winsun.auth.core.base.controller.BaseController;
import com.winsun.auth.core.common.model.ResponseData; import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.auth.core.shiro.ShiroUser; import com.winsun.auth.core.shiro.ShiroUser;
...@@ -55,7 +56,7 @@ public class supervisorController extends BaseController { ...@@ -55,7 +56,7 @@ public class supervisorController extends BaseController {
* @param orderId * @param orderId
* @return * @return
*/ */
@RequestMapping(value = "selectOrderInfo", method = RequestMethod.POST) @Permission(menuname = "督导订单详情查询",value = "selectOrderInfo", method = RequestMethod.POST)
public ResponseData<Map<String, Object>> selectOrderInfo(@RequestParam("orderId") String orderId) { public ResponseData<Map<String, Object>> selectOrderInfo(@RequestParam("orderId") String orderId) {
/* ShiroUser user = getShiroUser(); /* ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) { if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
...@@ -104,7 +105,7 @@ public class supervisorController extends BaseController { ...@@ -104,7 +105,7 @@ public class supervisorController extends BaseController {
* @param orderId * @param orderId
* @return * @return
*/ */
@RequestMapping(value = "updateOrderState", method = RequestMethod.POST) @Permission(menuname = "督导订单置为异常单",value = "updateOrderState", method = RequestMethod.POST)
public ResponseData<String> updateOrderState(@RequestParam("orderId") String orderId) { public ResponseData<String> updateOrderState(@RequestParam("orderId") String orderId) {
/* ShiroUser user = getShiroUser(); /* ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) { if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
...@@ -140,7 +141,7 @@ public class supervisorController extends BaseController { ...@@ -140,7 +141,7 @@ public class supervisorController extends BaseController {
* @param type 0 是线上 1是线下 * @param type 0 是线上 1是线下
* @return * @return
*/ */
@RequestMapping(value = "daichuliUpdate", method = RequestMethod.POST) @Permission(menuname = "待处理",value = "daichuliUpdate", method = RequestMethod.POST)
public ResponseData<String> daiChuLiUpdate(@RequestParam("orderId") String orderId, @RequestParam("type") String type) { public ResponseData<String> daiChuLiUpdate(@RequestParam("orderId") String orderId, @RequestParam("type") String type) {
/* ShiroUser user = getShiroUser(); /* ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) { if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
...@@ -193,7 +194,7 @@ public class supervisorController extends BaseController { ...@@ -193,7 +194,7 @@ public class supervisorController extends BaseController {
* @param orderId * @param orderId
* @return * @return
*/ */
@RequestMapping(value = "daiXuanHaoUpdate", method = RequestMethod.POST) @Permission(menuname = "待选号",value = "daiXuanHaoUpdate", method = RequestMethod.POST)
public ResponseData<String> daiXuanHaoUpdate(@RequestParam("orderId") String orderId, @RequestParam("businessNumber") String businessNumber, @RequestParam(value = "iccid", required = false) String iccid) { public ResponseData<String> daiXuanHaoUpdate(@RequestParam("orderId") String orderId, @RequestParam("businessNumber") String businessNumber, @RequestParam(value = "iccid", required = false) String iccid) {
/* ShiroUser user = getShiroUser(); /* ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) { if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
...@@ -248,7 +249,7 @@ public class supervisorController extends BaseController { ...@@ -248,7 +249,7 @@ public class supervisorController extends BaseController {
* @param orderId * @param orderId
* @return * @return
*/ */
@RequestMapping(value = "daiPeiSongUpdate", method = RequestMethod.POST) @Permission(menuname = "待配送",value = "daiPeiSongUpdate", method = RequestMethod.POST)
public ResponseData<String> daiPeiSongUpdate(@RequestParam("orderId") String orderId, @RequestParam("kuaidiOrder") String kuaidiOrder, @RequestParam(value = "expressDelivery") String expressDelivery) { public ResponseData<String> daiPeiSongUpdate(@RequestParam("orderId") String orderId, @RequestParam("kuaidiOrder") String kuaidiOrder, @RequestParam(value = "expressDelivery") String expressDelivery) {
/* ShiroUser user = getShiroUser(); /* ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) { if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
......
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