parent
3ff3e9426b
commit
658e7e6349
13 changed files with 1589 additions and 1351 deletions
File diff suppressed because it is too large
Load Diff
@ -1,23 +1,29 @@ |
|||||||
package org.jeecg.modules.demo.zyorders.mapper; |
package org.jeecg.modules.demo.zyorders.mapper; |
||||||
|
|
||||||
import java.util.List; |
import java.util.List; |
||||||
|
|
||||||
import org.apache.ibatis.annotations.Param; |
import org.apache.ibatis.annotations.Param; |
||||||
import org.jeecg.modules.demo.zyorders.entity.ZyOrders; |
import org.jeecg.modules.demo.zyorders.entity.ZyOrders; |
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||||
import org.jeecg.modules.orderbymakeclothplan.vo.TodayOrderAndQIriVo; |
import org.jeecg.modules.demo.zyorders.vo.ZyNameAndPayMoney; |
||||||
|
import org.jeecg.modules.demo.zyorders.vo.ZyOrderPayAndTime; |
||||||
/** |
import org.jeecg.modules.orderbymakeclothplan.vo.TodayOrderAndQIriVo; |
||||||
* @Description: 订单基本信息管理 |
|
||||||
* @Author: jeecg-boot |
/** |
||||||
* @Date: 2022-12-26 |
* @Description: 订单基本信息管理 |
||||||
* @Version: V1.0 |
* @Author: jeecg-boot |
||||||
*/ |
* @Date: 2022-12-26 |
||||||
public interface ZyOrdersMapper extends BaseMapper<ZyOrders> { |
* @Version: V1.0 |
||||||
|
*/ |
||||||
/** |
public interface ZyOrdersMapper extends BaseMapper<ZyOrders> { |
||||||
* 获取今日订单及七日订单 |
|
||||||
* @return |
/** |
||||||
*/ |
* 获取今日订单及七日订单 |
||||||
TodayOrderAndQIriVo getTotalOrderAndWeek(); |
* @return |
||||||
} |
*/ |
||||||
|
TodayOrderAndQIriVo getTotalOrderAndWeek(); |
||||||
|
|
||||||
|
List<ZyNameAndPayMoney> selectAllShopSalesVolumeByLastM( @Param("start_time") String start_time,@Param("end_time") String end_time,@Param("org_code") String org_code); |
||||||
|
|
||||||
|
List<ZyOrderPayAndTime> selectCurrentSales(@Param("id")String id, @Param("start_time")String start_time, @Param("end_time")String end_time); |
||||||
|
} |
||||||
|
@ -1,34 +1,49 @@ |
|||||||
package org.jeecg.modules.demo.zyorders.service; |
package org.jeecg.modules.demo.zyorders.service; |
||||||
|
|
||||||
import org.jeecg.common.api.vo.Result; |
import org.jeecg.common.api.vo.Result; |
||||||
import org.jeecg.modules.demo.ordergoods.entity.OrderGoodsJk; |
import org.jeecg.modules.demo.ordergoods.entity.OrderGoodsJk; |
||||||
import org.jeecg.modules.demo.zyorders.entity.ZyOrders; |
import org.jeecg.modules.demo.zyorders.entity.ZyOrders; |
||||||
import com.baomidou.mybatisplus.extension.service.IService; |
import com.baomidou.mybatisplus.extension.service.IService; |
||||||
import org.jeecg.modules.demo.zyorders.entity.ZyOrdersJk; |
import org.jeecg.modules.demo.zyorders.entity.ZyOrdersJk; |
||||||
import org.jeecg.modules.orderbymakeclothplan.vo.TodayOrderAndQIriVo; |
import org.jeecg.modules.largeScreen.vo.Type; |
||||||
|
import org.jeecg.modules.orderbymakeclothplan.vo.TodayOrderAndQIriVo; |
||||||
import java.util.List; |
|
||||||
|
import java.util.List; |
||||||
/** |
import java.util.Map; |
||||||
* @Description: 订单基本信息管理 |
|
||||||
* @Author: jeecg-boot |
/** |
||||||
* @Date: 2022-12-26 |
* @Description: 订单基本信息管理 |
||||||
* @Version: V1.0 |
* @Author: jeecg-boot |
||||||
*/ |
* @Date: 2022-12-26 |
||||||
public interface IZyOrdersService extends IService<ZyOrders> { |
* @Version: V1.0 |
||||||
|
*/ |
||||||
//大屏数据-获取订单的状态
|
public interface IZyOrdersService extends IService<ZyOrders> { |
||||||
List<ZyOrders> getOrderStatus(); |
|
||||||
//大屏数据-获取历史订单
|
//大屏数据-获取订单的状态
|
||||||
List<ZyOrders> getOldOrder(); |
List<ZyOrders> getOrderStatus(); |
||||||
//大屏数据-获取今日订单及七日订单
|
//大屏数据-获取历史订单
|
||||||
TodayOrderAndQIriVo getOrder(); |
List<ZyOrders> getOldOrder(); |
||||||
|
//大屏数据-获取今日订单及七日订单
|
||||||
/** |
TodayOrderAndQIriVo getOrder(); |
||||||
*订单和订单商品接口 |
|
||||||
* @param ordersJk |
/** |
||||||
* @param ogjkList |
*订单和订单商品接口 |
||||||
* @return |
* @param ordersJk |
||||||
*/ |
* @param ogjkList |
||||||
List<String> orderJk(ZyOrdersJk ordersJk, List<OrderGoodsJk> ogjkList); |
* @return |
||||||
} |
*/ |
||||||
|
List<String> orderJk(ZyOrdersJk ordersJk, List<OrderGoodsJk> ogjkList); |
||||||
|
|
||||||
|
/** |
||||||
|
* |
||||||
|
* @param org_code 店铺类型 |
||||||
|
* @return |
||||||
|
*/ |
||||||
|
List<Map.Entry<String, Integer>> selectAllShopSalesVolumeByLastM(String org_code); |
||||||
|
|
||||||
|
/** |
||||||
|
*查询所有店铺前十二个月的月销售额 |
||||||
|
* @return |
||||||
|
*/ |
||||||
|
List<Type> getsales12Month(); |
||||||
|
} |
||||||
|
@ -0,0 +1,24 @@ |
|||||||
|
package org.jeecg.modules.demo.zyorders.vo; |
||||||
|
|
||||||
|
import io.swagger.annotations.ApiModel; |
||||||
|
import io.swagger.annotations.ApiModelProperty; |
||||||
|
import lombok.Data; |
||||||
|
import lombok.EqualsAndHashCode; |
||||||
|
import lombok.experimental.Accessors; |
||||||
|
import org.jeecgframework.poi.excel.annotation.Excel; |
||||||
|
|
||||||
|
@Data |
||||||
|
@Accessors(chain = true) |
||||||
|
@EqualsAndHashCode(callSuper = false) |
||||||
|
@ApiModel(value="ZyShopNameAndPayMoney对象", description="ZyShopNameAndPayMoney对象") |
||||||
|
public class ZyNameAndPayMoney { |
||||||
|
/**店名*/ |
||||||
|
@Excel(name = "店名", width = 15) |
||||||
|
@ApiModelProperty(value = "店名") |
||||||
|
private String name; |
||||||
|
//金额
|
||||||
|
@Excel(name = "金额", width = 15) |
||||||
|
@ApiModelProperty(value = "金额") |
||||||
|
private Integer totalMoney; |
||||||
|
|
||||||
|
} |
@ -0,0 +1,13 @@ |
|||||||
|
package org.jeecg.modules.demo.zyorders.vo; |
||||||
|
|
||||||
|
import lombok.Data; |
||||||
|
|
||||||
|
import java.util.Date; |
||||||
|
|
||||||
|
@Data |
||||||
|
public class ZyOrderPayAndTime { |
||||||
|
|
||||||
|
private Integer totalMoney; |
||||||
|
|
||||||
|
private Date payTime; |
||||||
|
} |
@ -0,0 +1,11 @@ |
|||||||
|
package org.jeecg.modules.largeScreen.vo; |
||||||
|
|
||||||
|
import lombok.Data; |
||||||
|
|
||||||
|
import java.util.List; |
||||||
|
|
||||||
|
@Data |
||||||
|
public class Type { |
||||||
|
private String name; |
||||||
|
List<ZyShopSales> ls; |
||||||
|
} |
@ -0,0 +1,12 @@ |
|||||||
|
package org.jeecg.modules.largeScreen.vo; |
||||||
|
|
||||||
|
import lombok.Data; |
||||||
|
|
||||||
|
@Data |
||||||
|
public class ZyShopSales { |
||||||
|
|
||||||
|
private Integer monthDay; |
||||||
|
|
||||||
|
private Integer money; |
||||||
|
|
||||||
|
} |
@ -1,145 +1,146 @@ |
|||||||
package org.jeecg.modules.system.service; |
package org.jeecg.modules.system.service; |
||||||
|
|
||||||
import com.alibaba.fastjson.JSONObject; |
import com.alibaba.fastjson.JSONObject; |
||||||
import com.baomidou.mybatisplus.extension.service.IService; |
import com.baomidou.mybatisplus.extension.service.IService; |
||||||
import org.jeecg.modules.system.entity.SysDepart; |
import org.jeecg.modules.system.entity.SysDepart; |
||||||
import org.jeecg.modules.system.model.DepartIdModel; |
import org.jeecg.modules.system.model.DepartIdModel; |
||||||
import org.jeecg.modules.system.model.SysDepartTreeModel; |
import org.jeecg.modules.system.model.SysDepartTreeModel; |
||||||
import java.util.List; |
import java.util.List; |
||||||
|
|
||||||
/** |
/** |
||||||
* <p> |
* <p> |
||||||
* 部门表 服务实现类 |
* 部门表 服务实现类 |
||||||
* <p> |
* <p> |
||||||
* |
* |
||||||
* @Author:Steve |
* @Author:Steve |
||||||
* @Since: 2019-01-22 |
* @Since: 2019-01-22 |
||||||
*/ |
*/ |
||||||
public interface ISysDepartService extends IService<SysDepart>{ |
public interface ISysDepartService extends IService<SysDepart>{ |
||||||
|
|
||||||
/** |
/** |
||||||
* 查询我的部门信息,并分节点进行显示 |
* 查询我的部门信息,并分节点进行显示 |
||||||
* @return |
* @return |
||||||
*/ |
*/ |
||||||
List<SysDepartTreeModel> queryMyDeptTreeList(String departIds); |
List<SysDepartTreeModel> queryMyDeptTreeList(String departIds); |
||||||
|
|
||||||
/** |
/** |
||||||
* 查询所有部门信息,并分节点进行显示 |
* 查询所有部门信息,并分节点进行显示 |
||||||
* @return |
* @return |
||||||
*/ |
*/ |
||||||
List<SysDepartTreeModel> queryTreeList(); |
List<SysDepartTreeModel> queryTreeList(); |
||||||
/** |
/** |
||||||
* 查询所有部门信息,并分节点进行显示 |
* 查询所有部门信息,并分节点进行显示 |
||||||
* @return |
* @return |
||||||
*/ |
*/ |
||||||
List<SysDepartTreeModel> queryTreeList1(); |
List<SysDepartTreeModel> queryTreeList1(); |
||||||
|
|
||||||
/** |
/** |
||||||
* 查询所有部门DepartId信息,并分节点进行显示 |
* 查询所有部门DepartId信息,并分节点进行显示 |
||||||
* @return |
* @return |
||||||
*/ |
*/ |
||||||
public List<DepartIdModel> queryDepartIdTreeList(); |
public List<DepartIdModel> queryDepartIdTreeList(); |
||||||
|
|
||||||
/** |
/** |
||||||
* 保存部门数据 |
* 保存部门数据 |
||||||
* @param sysDepart |
* @param sysDepart |
||||||
*/ |
*/ |
||||||
void saveDepartData(SysDepart sysDepart,String username); |
void saveDepartData(SysDepart sysDepart,String username); |
||||||
|
|
||||||
/** |
/** |
||||||
* 更新depart数据 |
* 更新depart数据 |
||||||
* @param sysDepart |
* @param sysDepart |
||||||
* @return |
* @return |
||||||
*/ |
*/ |
||||||
Boolean updateDepartDataById(SysDepart sysDepart,String username); |
Boolean updateDepartDataById(SysDepart sysDepart,String username); |
||||||
|
|
||||||
/** |
/** |
||||||
* 删除depart数据 |
* 删除depart数据 |
||||||
* @param id |
* @param id |
||||||
* @return |
* @return |
||||||
*/ |
*/ |
||||||
/* boolean removeDepartDataById(String id); */ |
/* boolean removeDepartDataById(String id); */ |
||||||
|
|
||||||
/** |
/** |
||||||
* 根据关键字搜索相关的部门数据 |
* 根据关键字搜索相关的部门数据 |
||||||
* @param keyWord |
* @param keyWord |
||||||
* @return |
* @return |
||||||
*/ |
*/ |
||||||
List<SysDepartTreeModel> searhBy(String keyWord,String myDeptSearch,String departIds); |
List<SysDepartTreeModel> searhBy(String keyWord,String myDeptSearch,String departIds); |
||||||
|
|
||||||
/** |
/** |
||||||
* 根据部门id删除并删除其可能存在的子级部门 |
* 根据部门id删除并删除其可能存在的子级部门 |
||||||
* @param id |
* @param id |
||||||
* @return |
* @return |
||||||
*/ |
*/ |
||||||
boolean delete(String id); |
boolean delete(String id); |
||||||
|
|
||||||
/** |
/** |
||||||
* 查询SysDepart集合 |
* 查询SysDepart集合 |
||||||
* @param userId |
* @param userId |
||||||
* @return |
* @return |
||||||
*/ |
*/ |
||||||
public List<SysDepart> queryUserDeparts(String userId); |
public List<SysDepart> queryUserDeparts(String userId); |
||||||
|
|
||||||
/** |
/** |
||||||
* 根据用户名查询部门 |
* 根据用户名查询部门 |
||||||
* |
* |
||||||
* @param username |
* @param username |
||||||
* @return |
* @return |
||||||
*/ |
*/ |
||||||
List<SysDepart> queryDepartsByUsername(String username); |
List<SysDepart> queryDepartsByUsername(String username); |
||||||
|
|
||||||
/** |
/** |
||||||
* 根据部门id批量删除并删除其可能存在的子级部门 |
* 根据部门id批量删除并删除其可能存在的子级部门 |
||||||
* @param id |
* @param id |
||||||
* @return |
* @return |
||||||
*/ |
*/ |
||||||
void deleteBatchWithChildren(List<String> ids); |
void deleteBatchWithChildren(List<String> ids); |
||||||
|
|
||||||
/** |
/** |
||||||
* 根据部门Id查询,当前和下级所有部门IDS |
* 根据部门Id查询,当前和下级所有部门IDS |
||||||
* @param departId |
* @param departId |
||||||
* @return |
* @return |
||||||
*/ |
*/ |
||||||
List<String> getSubDepIdsByDepId(String departId); |
List<String> getSubDepIdsByDepId(String departId); |
||||||
|
|
||||||
/** |
/** |
||||||
* 获取我的部门下级所有部门IDS |
* 获取我的部门下级所有部门IDS |
||||||
* @return |
* @return |
||||||
*/ |
*/ |
||||||
List<String> getMySubDepIdsByDepId(String departIds); |
List<String> getMySubDepIdsByDepId(String departIds); |
||||||
/** |
/** |
||||||
* 根据关键字获取部门信息(通讯录) |
* 根据关键字获取部门信息(通讯录) |
||||||
* @return |
* @return |
||||||
*/ |
*/ |
||||||
List<SysDepartTreeModel> queryTreeByKeyWord(String keyWord); |
List<SysDepartTreeModel> queryTreeByKeyWord(String keyWord); |
||||||
/** |
/** |
||||||
* 获取我的部门下级所有部门 |
* 获取我的部门下级所有部门 |
||||||
* @return |
* @return |
||||||
*/ |
*/ |
||||||
List<SysDepartTreeModel> queryTreeListByPid(String parentId); |
List<SysDepartTreeModel> queryTreeListByPid(String parentId); |
||||||
|
|
||||||
/** |
/** |
||||||
* 获取某个部门的所有父级部门的ID |
* 获取某个部门的所有父级部门的ID |
||||||
* |
* |
||||||
* @param departId 根据departId查 |
* @param departId 根据departId查 |
||||||
*/ |
*/ |
||||||
JSONObject queryAllParentIdByDepartId(String departId); |
JSONObject queryAllParentIdByDepartId(String departId); |
||||||
|
|
||||||
/** |
/** |
||||||
* 获取某个部门的所有父级部门的ID |
* 获取某个部门的所有父级部门的ID |
||||||
* |
* |
||||||
* @param orgCode 根据orgCode查 |
* @param orgCode 根据orgCode查 |
||||||
*/ |
*/ |
||||||
JSONObject queryAllParentIdByOrgCode(String orgCode); |
JSONObject queryAllParentIdByOrgCode(String orgCode); |
||||||
/** |
/** |
||||||
* 获取公司信息 |
* 获取公司信息 |
||||||
* @return |
* @return |
||||||
*/ |
*/ |
||||||
SysDepart queryCompByOrgCode(String orgCode); |
SysDepart queryCompByOrgCode(String orgCode); |
||||||
/** |
/** |
||||||
* 获取下级部门 |
* 获取下级部门 |
||||||
* @return |
* @return |
||||||
*/ |
*/ |
||||||
List<SysDepart> queryDeptByPid(String pid); |
List<SysDepart> queryDeptByPid(String pid); |
||||||
} |
|
||||||
|
} |
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue