product_platform/yxt-yyth-biz
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

统计报表

Browse Source
This commit is contained in:
wangpengfei
2023-12-28 15:01:46 +08:00
parent 8da1c3a1f5
commit 159d02d8e7
5 changed files with 130 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/yxt/yyth/api/empcardgift/EmpGiftAppletVo.java
View File

@@ -134,7 +134,7 @@ public class EmpGiftAppletVo {
} }
else if(isTransfer.equals("1")){ else if(isTransfer.equals("1")){
state="已转赠"; state="已转赠";
// showBtn=false; showBtn=false;
this.notRese=false; this.notRese=false;
} }
else{ else{

1
src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
View File

@@ -345,7 +345,6 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
if (StringUtils.isBlank(dto.getEmpCardSid())) { if (StringUtils.isBlank(dto.getEmpCardSid())) {
return rb.setMsg("请选择企业卡"); return rb.setMsg("请选择企业卡");
} }
EmpCard empCard=empCardService.fetchBySid(dto.getEmpCardSid()); EmpCard empCard=empCardService.fetchBySid(dto.getEmpCardSid());
if(null==empCard){ if(null==empCard){
return rb.setMsg("请选择正确的企业卡"); return rb.setMsg("请选择正确的企业卡");

4
src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.java
View File

@@ -17,7 +17,7 @@ import java.util.List;
*/ */
@Mapper @Mapper
public interface LpkReserveOrderMapper extends BaseMapper<LpkReserveOrder> { public interface LpkReserveOrderMapper extends BaseMapper<LpkReserveOrder> {
IPage<LpkReserveOrderVo> orderList(IPage<LpkReserveOrder> page, @Param(Constants.WRAPPER) QueryWrapper<LpkReserveOrder> qw); IPage<LpkReserveOrderVo> orderList(IPage<LpkReserveOrder> page,@Param("qw") LpkReserveOrderQuery qw);
IPage<LpkReserveOrderVo> orderListByStore(IPage<LpkReserveOrder> page, @Param(Constants.WRAPPER) QueryWrapper<LpkReserveOrder> qw); IPage<LpkReserveOrderVo> orderListByStore(IPage<LpkReserveOrder> page, @Param(Constants.WRAPPER) QueryWrapper<LpkReserveOrder> qw);
IPage<LpkReserveOrderVo> orderListByBank(IPage<LpkReserveOrder> page, @Param(Constants.WRAPPER) QueryWrapper<LpkReserveOrder> qw); IPage<LpkReserveOrderVo> orderListByBank(IPage<LpkReserveOrder> page, @Param(Constants.WRAPPER) QueryWrapper<LpkReserveOrder> qw);
IPage<LpkReserveOrderVo> orderListByZ(IPage<LpkReserveOrder> page, @Param(Constants.WRAPPER) QueryWrapper<LpkReserveOrder> qw); IPage<LpkReserveOrderVo> orderListByZ(IPage<LpkReserveOrder> page, @Param(Constants.WRAPPER) QueryWrapper<LpkReserveOrder> qw);
@@ -26,7 +26,7 @@ public interface LpkReserveOrderMapper extends BaseMapper<LpkReserveOrder> {
// IPage<LpkReserveOrderCardVo> orderListByUserSid(IPage<LpkReserveOrder> page, @Param(Constants.WRAPPER) QueryWrapper<LpkReserveOrder> qw); // IPage<LpkReserveOrderCardVo> orderListByUserSid(IPage<LpkReserveOrder> page, @Param(Constants.WRAPPER) QueryWrapper<LpkReserveOrder> qw);
IPage<LpkReserveOrderCardVo> orderListByUserSid(IPage<LpkReserveOrder> page, @Param("userSid")String userSid); IPage<LpkReserveOrderCardVo> orderListByUserSid(IPage<LpkReserveOrder> page, @Param("userSid")String userSid);
List<ReserveOrderExport> exportExcel(@Param(Constants.WRAPPER) QueryWrapper<LpkReserveOrderQuery> qw); List<ReserveOrderExport> exportExcel(@Param("qw") LpkReserveOrderQuery qw);
List<ReserveOrderExportByStore> exportExcelByStore(@Param(Constants.WRAPPER) QueryWrapper<LpkReserveOrderQuery> qw); List<ReserveOrderExportByStore> exportExcelByStore(@Param(Constants.WRAPPER) QueryWrapper<LpkReserveOrderQuery> qw);
List<ReserveOrderExportByBank> exportExcelByBank(@Param(Constants.WRAPPER) QueryWrapper<LpkReserveOrderQuery> qw); List<ReserveOrderExportByBank> exportExcelByBank(@Param(Constants.WRAPPER) QueryWrapper<LpkReserveOrderQuery> qw);
List<ReserveOrderExportByZ> exportExcelByZ(@Param(Constants.WRAPPER) QueryWrapper<LpkReserveOrderQuery> qw); List<ReserveOrderExportByZ> exportExcelByZ(@Param(Constants.WRAPPER) QueryWrapper<LpkReserveOrderQuery> qw);

103
src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml
View File

@@ -28,6 +28,8 @@
b.`name` AS bagName, b.`name` AS bagName,
d.NAME AS bankName, d.NAME AS bankName,
c.`code`, c.`code`,
d.sid as dsid,
s.sid as ssid,
c.serialNumber c.serialNumber
FROM FROM
lpk_reserve_order AS o lpk_reserve_order AS o
@@ -36,8 +38,55 @@
LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid
LEFT JOIN lpk_bank AS d ON d.sid = s.bankSid LEFT JOIN lpk_bank AS d ON d.sid = s.bankSid
<where> <where>
${ew.sqlSegment} o.cardType='1'
<if test="qw.bankSid !='' and qw.bankSid!=null">
and s.bankSid=#{qw.bankSid}
</if>
<if test="qw.store !='' and qw.store!=null">
and s.name=#{qw.store}
</if>
<if test="qw.startDate !='' and qw.startDate!=null">
and date_format(o.reserveDate,'%Y-%m-%d')>=date_format(#{qw.startDate},'%Y-%m-%d')
</if>
<if test="qw.endDate !='' and qw.endDate!=null">
and date_format(o.reserveDate,'%Y-%m-%d') &lt; date_format(#{qw.endDate},'%Y-%m-%d')
</if>
</where> </where>
union
SELECT
o.sid,
date_format( o.reserveDate, '%Y-%m-%d' ) AS reserveDate,
o.userName,
o.userPhone,
s.`name` AS store,
b.`name` AS bagName,
d.NAME AS bankName,
c.`code`,
d.sid as dsid,
s.sid as ssid,
c.serialNumber
FROM
lpk_reserve_order AS o
LEFT JOIN lpk_store AS s ON o.storeSid = s.sid
LEFT JOIN emp_card_gift AS c ON o.cardSid = c.sid
LEFT JOIN lpk_giftbag AS b ON c.sid = b.sid
LEFT JOIN lpk_bank AS d ON d.sid = s.bankSid
<where>
o.cardType='2'
<if test="qw.bankSid !='' and qw.bankSid!=null">
and s.bankSid=#{qw.bankSid}
</if>
<if test="qw.store !='' and qw.store!=null">
and s.name=#{qw.store}
</if>
<if test="qw.startDate !='' and qw.startDate!=null">
and date_format(o.reserveDate,'%Y-%m-%d')>=date_format(#{qw.startDate},'%Y-%m-%d')
</if>
<if test="qw.endDate !='' and qw.endDate!=null">
and date_format(o.reserveDate,'%Y-%m-%d') &lt; date_format(#{qw.endDate},'%Y-%m-%d')
</if>
</where>
order by reserveDate asc,dsid desc,ssid desc,serialNumber asc
</select> </select>
<select id="orderListByStore" resultType="com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderVo"> <select id="orderListByStore" resultType="com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderVo">
select select
@@ -176,6 +225,8 @@
date_format(o.reserveDate, '%Y-%m-%d') as reserveDate, date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
o.userName, o.userName,
o.userPhone, o.userPhone,
d.sid as dsid,
s.sid as ssid,
s.`name` as store, s.`name` as store,
b.`name` as bagName, b.`name` as bagName,
d.name as bankName, d.name as bankName,
@@ -189,8 +240,56 @@
LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid
left join lpk_bank as d on d.sid =s.bankSid left join lpk_bank as d on d.sid =s.bankSid
<where> <where>
${ew.sqlSegment} o.cardType='1'
<if test="qw.bankSid !='' and qw.bankSid!=null">
and s.bankSid=#{qw.bankSid}
</if>
<if test="qw.store !='' and qw.store!=null">
and s.name=#{qw.store}
</if>
<if test="qw.startDate !='' and qw.startDate!=null">
and date_format(o.reserveDate,'%Y-%m-%d')>=date_format(#{qw.startDate},'%Y-%m-%d')
</if>
<if test="qw.endDate !='' and qw.endDate!=null">
and date_format(o.reserveDate,'%Y-%m-%d') &lt; date_format(#{qw.endDate},'%Y-%m-%d')
</if>
</where> </where>
union
select
o.sid,
date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
o.userName,
o.userPhone,
d.sid as dsid,
s.sid as ssid,
s.`name` as store,
b.`name` as bagName,
d.name as bankName,
c.`code`,c.serialNumber,
t.goodsSid as goodsSid,
t.goodsNumber as goodsNumber
from lpk_reserve_order as o
LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid
left join lpk_store as s on o.storeSid = s.sid
LEFT JOIN emp_card_gift AS c ON o.cardSid = c.sid
LEFT JOIN lpk_giftbag AS b ON c.sid = b.sid
left join lpk_bank as d on d.sid =s.bankSid
<where>
o.cardType='2'
<if test="qw.bankSid !='' and qw.bankSid!=null">
and s.bankSid=#{qw.bankSid}
</if>
<if test="qw.store !='' and qw.store!=null">
and s.name=#{qw.store}
</if>
<if test="qw.startDate !='' and qw.startDate!=null">
and date_format(o.reserveDate,'%Y-%m-%d')>=date_format(#{qw.startDate},'%Y-%m-%d')
</if>
<if test="qw.endDate !='' and qw.endDate!=null">
and date_format(o.reserveDate,'%Y-%m-%d') &lt; date_format(#{qw.endDate},'%Y-%m-%d')
</if>
</where>
order by reserveDate asc,dsid desc,ssid desc,serialNumber asc
</select> </select>
<select id="exportExcelByStore" resultType="com.yxt.yyth.api.lpkreserveorder.ReserveOrderExportByStore"> <select id="exportExcelByStore" resultType="com.yxt.yyth.api.lpkreserveorder.ReserveOrderExportByStore">
select select

86
src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java
View File

@@ -109,47 +109,11 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
public ResultBean<PagerVo<LpkReserveOrderVo>> orderList(PagerQuery<LpkReserveOrderQuery> pq) { public ResultBean<PagerVo<LpkReserveOrderVo>> orderList(PagerQuery<LpkReserveOrderQuery> pq) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
LpkReserveOrderQuery query = pq.getParams(); LpkReserveOrderQuery query = pq.getParams();
QueryWrapper<LpkReserveOrder> qw = new QueryWrapper<>();
qw.eq("1", "1");
if (StringUtils.isNotBlank(query.getStore())) {
qw.like("s.name", query.getStore());
}
if (StringUtils.isNotBlank(query.getUserName())) {
qw.like("o.userName", query.getUserName());
}
if (StringUtils.isNotBlank(query.getUserSid())) {
qw.like("o.customerSid", query.getUserSid());
}
if (StringUtils.isNotBlank(query.getStartDate())) {
String startDate = query.getStartDate();
qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (o.reserveDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')");
}
if (StringUtils.isNotBlank(query.getEndDate())) {
String endDate = query.getEndDate();
qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(endDate), "date_format (o.reserveDate,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')");
}
if (StringUtils.isNotBlank(query.getBankName())) {
qw.like("d.name", query.getBankName());
}
if (StringUtils.isNotBlank(query.getBankSid())) {
qw.eq("s.bankSid", query.getBankSid());
}
qw.orderByAsc("o.reserveDate");
qw.orderByDesc("d.sid");
qw.orderByDesc("s.sid");
qw.orderByAsc("c.serialNumber");
// qw.groupBy("o.reserveDate");
// qw.groupBy("t.goodsSid");
// qw.groupBy("s.name");
IPage<LpkReserveOrder> page = PagerUtil.queryToPage(pq); IPage<LpkReserveOrder> page = PagerUtil.queryToPage(pq);
IPage<LpkReserveOrderVo> pagging = baseMapper.orderList(page, qw); IPage<LpkReserveOrderVo> pagging = baseMapper.orderList(page, query);
List<LpkReserveOrderVo> records = pagging.getRecords(); List<LpkReserveOrderVo> records = pagging.getRecords();
if (!records.isEmpty()) { if (!records.isEmpty()) {
records.forEach(s -> { records.forEach(s -> {
// LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
// s.setGoodsName(lpkGoods.getName());
List<LpkReserveOrderGoods> orderGoods = lpkReserveOrderGoodsService.selByOrderSid(s.getSid()); List<LpkReserveOrderGoods> orderGoods = lpkReserveOrderGoodsService.selByOrderSid(s.getSid());
List<OrderGoodsVo> goodsVoList = new ArrayList<>(); List<OrderGoodsVo> goodsVoList = new ArrayList<>();
if (!orderGoods.isEmpty()) { if (!orderGoods.isEmpty()) {
@@ -484,31 +448,31 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
} }
public void exportExcel(LpkReserveOrderQuery query) { public void exportExcel(LpkReserveOrderQuery query) {
QueryWrapper<LpkReserveOrderQuery> qw = new QueryWrapper<>(); // QueryWrapper<LpkReserveOrderQuery> qw = new QueryWrapper<>();
qw.eq("1", "1"); // qw.eq("1", "1");
if (StringUtils.isNotBlank(query.getStore())) { // if (StringUtils.isNotBlank(query.getStore())) {
qw.like("s.name", query.getStore()); // qw.like("s.name", query.getStore());
} // }
if (StringUtils.isNotBlank(query.getBankSid())) { // if (StringUtils.isNotBlank(query.getBankSid())) {
qw.eq("s.bankSid", query.getBankSid()); // qw.eq("s.bankSid", query.getBankSid());
} // }
if (StringUtils.isNotBlank(query.getUserName())) { // if (StringUtils.isNotBlank(query.getUserName())) {
qw.like("o.userName", query.getUserName()); // qw.like("o.userName", query.getUserName());
} // }
if (StringUtils.isNotBlank(query.getStartDate())) { // if (StringUtils.isNotBlank(query.getStartDate())) {
String startDate = query.getStartDate(); // String startDate = query.getStartDate();
qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (o.reserveDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')"); // qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (o.reserveDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')");
} // }
if (StringUtils.isNotBlank(query.getEndDate())) { // if (StringUtils.isNotBlank(query.getEndDate())) {
String endDate = query.getEndDate(); // String endDate = query.getEndDate();
qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(endDate), "date_format (o.reserveDate,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')"); // qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(endDate), "date_format (o.reserveDate,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')");
} // }
qw.orderByAsc("o.reserveDate"); // qw.orderByAsc("o.reserveDate");
qw.orderByDesc("d.sid"); // qw.orderByDesc("d.sid");
qw.orderByDesc("s.sid"); // qw.orderByDesc("s.sid");
qw.orderByAsc("c.serialNumber"); // qw.orderByAsc("c.serialNumber");
//得到所有要导出的数据 //得到所有要导出的数据
List<ReserveOrderExport> exportList = baseMapper.exportExcel(qw); List<ReserveOrderExport> exportList = baseMapper.exportExcel(query);
List<ReserveOrderExport> exportList1 = new ArrayList<>(); List<ReserveOrderExport> exportList1 = new ArrayList<>();
if (!exportList.isEmpty()) { if (!exportList.isEmpty()) {
exportList.forEach(s -> { exportList.forEach(s -> {