From 58464093c4d4ec79d23a9cd2ade9a58d842ffe78 Mon Sep 17 00:00:00 2001 From: liupopo Date: Thu, 25 Apr 2024 18:09:32 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gf/api/inventory/InventoryQuery.java | 3 + .../gf/biz/inventory/InventoryMapper.java | 4 + .../gf/biz/inventory/InventoryMapper.xml | 8 ++ .../gf/biz/inventory/InventoryRest.java | 8 ++ .../gf/biz/inventory/InventoryService.java | 38 ++++++ .../gf/biz/orderindex/OrderIndexMapper.java | 5 + ...exIndexMapper.xml => OrderIndexMapper.xml} | 4 + .../gf/biz/orderindex/OrderIndexQuery.java | 3 +- .../gf/biz/orderindex/OrderIndexRest.java | 4 +- .../gf/biz/orderindex/OrderIndexService.java | 87 ++++++++++++- .../yxt/supervise/gf/report/ProjectDaily.java | 115 ++++++++++++++++++ .../gf/report/ProjectDailyMapper.java | 8 ++ .../gf/report/ProjectDailyQuery.java | 29 +++++ .../supervise/gf/report/ProjectDailyRest.java | 29 +++++ .../gf/report/ProjectDailyService.java | 36 ++++++ .../src/main/resources/application-devv.yml | 4 +- 16 files changed, 375 insertions(+), 10 deletions(-) rename yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/{OrdexIndexMapper.xml => OrderIndexMapper.xml} (55%) create mode 100644 yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/report/ProjectDaily.java create mode 100644 yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/report/ProjectDailyMapper.java create mode 100644 yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/report/ProjectDailyQuery.java create mode 100644 yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/report/ProjectDailyRest.java create mode 100644 yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/report/ProjectDailyService.java diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/api/inventory/InventoryQuery.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/api/inventory/InventoryQuery.java index 03b1219..01bbc01 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/api/inventory/InventoryQuery.java +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/api/inventory/InventoryQuery.java @@ -14,6 +14,9 @@ public class InventoryQuery implements Query { private String storehouse_name; private String endDate; private String startDate; + private String dataDate; private String brand_name; private String materiel_group; + + private String[] storehouses; } diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryMapper.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryMapper.java index bdb5d32..20d9331 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryMapper.java +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryMapper.java @@ -1,16 +1,19 @@ package com.yxt.supervise.gf.biz.inventory; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.supervise.gf.api.inventory.Inventory; import com.yxt.supervise.gf.api.inventory.InventoryVo; +import com.yxt.supervise.gf.api.orderindex.OrderIndexDb; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** * @author feikefei @@ -25,4 +28,5 @@ public interface InventoryMapper extends BaseMapper { List getInventoryByTime(@Param(Constants.WRAPPER) Wrapper qw); List getDayReportSh(@Param(Constants.WRAPPER) Wrapper qw); + Map countall(@Param(Constants.WRAPPER) QueryWrapper qw); } diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryMapper.xml b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryMapper.xml index bdc269b..281b79c 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryMapper.xml +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryMapper.xml @@ -30,4 +30,12 @@ group by storehouse_code ,time + + \ No newline at end of file diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryRest.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryRest.java index a4f10ef..b02b600 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryRest.java +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryRest.java @@ -89,4 +89,12 @@ public class InventoryRest { Map inventoryVos = inventoryService.getDayReportShMap(pq); return rb.success().setData(inventoryVos); } + + @PostMapping("/kcrbpage") + @ApiOperation("分页查询") + public ResultBean kcrbpage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + Map pagerVo = inventoryService.kcrbpage(pq); + return rb.success().setData(pagerVo); + } } \ No newline at end of file diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryService.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryService.java index 8d89e06..33c530c 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryService.java +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryService.java @@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import cn.hutool.core.thread.ThreadUtil; +import cn.hutool.core.util.NumberUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSON; @@ -704,4 +706,40 @@ public class InventoryService extends ServiceImpl { return m; } + + public Map kcrbpage(PagerQuery pq) { + + Map map = new HashMap<>(); + + InventoryQuery params = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + + String[] wlz = new String[]{"组件", "逆变器"}; + qw.in("materiel_group_text", wlz); + + String dataDate = DateUtil.format(new Date(), "yyyy-MM-dd"); + if(StrUtil.isNotBlank(params.getDataDate())){ + dataDate = params.getDataDate(); + } + qw.eq("time", dataDate); + + if(params.getStorehouses()!=null&¶ms.getStorehouses().length>0){ + qw.in("storehouse_name", params.getStorehouses()); + } + + + Map countall = baseMapper.countall(qw); + map.put("countall", countall); + + + qw.orderByAsc("storehouse_name"); + + IPage page = PagerUtil.queryToPage(pq); + IPage inventoryVoIPage = baseMapper.selectPageVo(page, qw); + PagerVo vo = PagerUtil.pageToVo(inventoryVoIPage, null); + + map.put("pagging", vo); + + return map; + } } diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexMapper.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexMapper.java index 846e4cf..156e5e2 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexMapper.java +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexMapper.java @@ -1,9 +1,12 @@ package com.yxt.supervise.gf.biz.orderindex; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.supervise.gf.api.orderindex.OrderIndexDb; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * @author feikefei @@ -13,4 +16,6 @@ import org.apache.ibatis.annotations.Mapper; public interface OrderIndexMapper extends BaseMapper { @Delete("delete from sh_order_index where 1=1 ") void clearAll(); + + double sumallpower(@Param(Constants.WRAPPER) QueryWrapper qw); } diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrdexIndexMapper.xml b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexMapper.xml similarity index 55% rename from yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrdexIndexMapper.xml rename to yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexMapper.xml index 099969b..254c3df 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrdexIndexMapper.xml +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexMapper.xml @@ -1,4 +1,8 @@ + \ No newline at end of file diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexQuery.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexQuery.java index 046f974..da86c3e 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexQuery.java +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexQuery.java @@ -11,6 +11,7 @@ public class OrderIndexQuery implements Query { private String agent_id; private String witch_data; private String workflow; + private String phase; private String[] search_time; - private String[] search_time_end; + private String[] witch_group; } diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexRest.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexRest.java index 722dce3..2441cea 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexRest.java +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexRest.java @@ -106,9 +106,9 @@ public class OrderIndexRest { } @PostMapping("/listPageDzlb") - public ResultBean> listPageDzlb(@RequestBody PagerQuery pq) { + public ResultBean> listPageDzlb(@RequestBody PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - IPage pv = orderIndexService.listPageDzlb(pq); + Map pv = orderIndexService.listPageDzlb(pq); return rb.success().setData(pv); } diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexService.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexService.java index 16530de..7cc9ea8 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexService.java +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexService.java @@ -3,12 +3,12 @@ package com.yxt.supervise.gf.biz.orderindex; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.yxt.common.base.utils.DateUtils; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -17,7 +17,6 @@ import com.yxt.supervise.gf.shanhai.ShRequester; import com.yxt.supervise.gf.shanhai.req.Order_Index; import com.yxt.supervise.gf.shanhai.resp.*; import org.apache.poi.ss.usermodel.*; -import org.apache.poi.ss.util.CellAddress; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; @@ -27,9 +26,9 @@ import org.springframework.stereotype.Service; import java.io.File; import java.io.FileOutputStream; import java.io.OutputStream; -import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.util.*; +import java.util.function.Consumer; import java.util.stream.Collectors; /** @@ -45,6 +44,49 @@ public class OrderIndexService extends ServiceImpl 0) { + qw.and(new Consumer>() { + @Override + public void accept(QueryWrapper qwo) { + for (int i = 0; i < query.getWitch_group().length; i++) { + if (i == 0) { + qwo.like("data_id", query.getWitch_group()[i]); + } else { + qwo.or().like("data_id", query.getWitch_group()[i]); + } + } + } + }); + } + if (StrUtil.isNotBlank(query.getPhase())) { + if ("1".equals(query.getPhase())) { //'进件' + qw.ne("workflow_name", "开始(创建订单)"); + } else if ("2".equals(query.getPhase())) { //'签约' + qw.eq("sign", "1"); + } else if ("3".equals(query.getPhase())) { //'交货' + qw.in("workflow_name", WORKFLOW_JH); + } else if ("4".equals(query.getPhase())) { //'完工' + qw.in("workflow_name", WORKFLOW_WG); + } else if ("5".equals(query.getPhase())) { //'并网' + qw.in("workflow_name", WORKFLOW_BW); + } + } return qw; } @@ -580,14 +649,22 @@ public class OrderIndexService extends ServiceImpl listPageDzlb(PagerQuery pq) { + public Map listPageDzlb(PagerQuery pq) { + + Map map = new HashMap<>(); OrderIndexQuery query = pq.getParams(); QueryWrapper qw = queryWarpYxdz(query); + double all_power = baseMapper.sumallpower(qw); + String power = NumberUtil.decimalFormat("0.00", all_power / 1000); + map.put("power", power + "kw"); + + qw.orderByDesc("id"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPage(page, qw); - return pagging; + map.put("pagging", pagging); + return map; } } diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/report/ProjectDaily.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/report/ProjectDaily.java new file mode 100644 index 0000000..a4f7bb0 --- /dev/null +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/report/ProjectDaily.java @@ -0,0 +1,115 @@ +package com.yxt.supervise.gf.report; + +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.NumberUtil; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.EntityWithId; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@TableName("supervise_report.project_daily") +public class ProjectDaily extends EntityWithId { + private String sid = IdUtil.fastSimpleUUID(); // sid + @JsonFormat( + pattern = "yyyy-MM-dd HH:mm:ss", + timezone = "GMT+8" + ) + private Date createTime = new Date(); // 记录创建时间 + private String remarks; // 备注说明', + private String orderDate; // 单据日期', + + private String reportTime; // 汇总时间', + + private String projectSid; // 项目Sid', + private String projectName; // 项目名称', + + private double totalLoan = 0; // 贷款总额', + private double accountsBalance = 0; // 帐户余额', + private double accountsReceivable = 0; // 应收账款', + private double stockAmount = 0; // 库存货值', + private double transitAmount = 0; // 在途货值', + private double advancePayment = 0; // 预付款', + // private double pledgeRate = 0; // 质押率=（贷款金额-帐户余额）/（库存总价值+应收帐款+在途商品+预付款）', + private double pledgeRate = 0; // 质押率=（贷款金额）/（库存总价值+应收帐款+在途商品+预付款+帐户余额）', + + private int messState = 0; // 消息发送状态: 0=未发送;1=已发送', + private int messNum = 0; // 消息发送次数', + + + private String userSid; // 用户(报告人)Sid', + private String userMobile; // 用户(报告人)手机号', + private String userName; // 用户(报告人)姓名', + private int userType = 1; // 用户(报告人)类型:1监管、2客户、3银行', + private String userStaffSid; // 关联人员的Sid', + @TableField(exist = false) + private double bankPledgeRate;//银行规定质押率 + @TableField(exist = false) + private String state="2";//质押状态 + @TableField(exist = false) + private double creditLimit;//授信额度 + + private double useLimit;//用信额度 + + + /** + * 计算出的质押率 + * + * @return + */ + public String getPledgeRateNormal() { +// double a = totalLoan - accountsBalance; +// double b = stockAmount + accountsReceivable + transitAmount + advancePayment; + double a=this.useLimit; + double b=stockAmount+accountsReceivable+transitAmount+advancePayment+accountsBalance; + if (b == 0) + return "0"; + double v = a / b; + return NumberUtil.roundStr(v, 2); + } + + /** + * 计算出的质押率(百分数值) + * + * @return + */ + public String getPledgeRatePercent() { +// double a = totalLoan - accountsBalance; +// double b = stockAmount + accountsReceivable + transitAmount + advancePayment; + double a=this.useLimit; + double b=stockAmount+accountsReceivable+transitAmount+advancePayment+accountsBalance; + if (b == 0) + return "0"; + double v = (a / b) * 100; + return NumberUtil.roundStr(v, 2); + } + + public String getTotalLoanWan() { + return NumberUtil.roundStr(this.totalLoan / 10000, 2); + } + + public String getAccountsBalanceWan() { + return NumberUtil.roundStr(this.accountsBalance / 10000, 2); + } + + public String getAccountsReceivableWan() { + return NumberUtil.roundStr(this.accountsReceivable / 10000, 2); + } + + public String getStockAmountWan() { + return NumberUtil.roundStr(this.stockAmount / 10000, 2); + } + + public String getTransitAmountWan() { + return NumberUtil.roundStr(this.transitAmount / 10000, 2); + } + + public String getAdvancePaymentWan() { + return NumberUtil.roundStr(this.advancePayment / 10000, 2); + } + +} diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/report/ProjectDailyMapper.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/report/ProjectDailyMapper.java new file mode 100644 index 0000000..3bbcddb --- /dev/null +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/report/ProjectDailyMapper.java @@ -0,0 +1,8 @@ +package com.yxt.supervise.gf.report; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ProjectDailyMapper extends BaseMapper { +} diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/report/ProjectDailyQuery.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/report/ProjectDailyQuery.java new file mode 100644 index 0000000..e3b5edc --- /dev/null +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/report/ProjectDailyQuery.java @@ -0,0 +1,29 @@ +package com.yxt.supervise.gf.report; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +@Data +public class ProjectDailyQuery implements Query { + private String sid; + private String orderDate; // 单据日期', + + private String reportTime; // 汇总时间', + + private String projectSid; // 项目Sid', + private String projectName; // 项目名称', + + private double totalLoan = 0; // 贷款总额', + private double accountsBalance = 0; // 帐户余额', + private double accountsReceivable = 0; // 应收账款', + private double stockAmount = 0; // 库存货值', + private double transitAmount = 0; // 在途货值', + private double advancePayment = 0; // 预付款', + private double pledgeRate = 0; // 质押率=（贷款金额-帐户余额）/（库存总价值+应收帐款+在途商品+预付款）', + + private String dataDateStart; // 数据日期 + private String dataDateEnd; // 数据日期 + private String userSid; + //时间间隔 + private String intervalTime; +} diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/report/ProjectDailyRest.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/report/ProjectDailyRest.java new file mode 100644 index 0000000..7aea99b --- /dev/null +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/report/ProjectDailyRest.java @@ -0,0 +1,29 @@ +package com.yxt.supervise.gf.report; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController("com.yxt.supervise.gf.report.ProjectDailyRest") +@RequestMapping("/gf/projectdaily") +public class ProjectDailyRest { + + @Autowired + private ProjectDailyService projectDailyService; + + + @ApiOperation("查询项目监管报表信息") + @PostMapping("/listPage") + public ResultBean> selectListPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); +// PagerVo projectDailyVoPagerVo = projectDailyService.selectListPage(pq); + IPage iPage = projectDailyService.listPage(pq); + return rb.success().setData(iPage); + } +} diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/report/ProjectDailyService.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/report/ProjectDailyService.java new file mode 100644 index 0000000..632e60e --- /dev/null +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/report/ProjectDailyService.java @@ -0,0 +1,36 @@ +package com.yxt.supervise.gf.report; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class ProjectDailyService extends ServiceImpl { + + public IPage listPage(PagerQuery pq) { + ProjectDailyQuery params = pq.getParams(); + + QueryWrapper qw = new QueryWrapper<>(); + qw.gt("id", 0); + if (StrUtil.isNotBlank(params.getDataDateStart())) { + qw.ge("orderDate", params.getDataDateStart()); + } + if (StrUtil.isNotBlank(params.getDataDateEnd())) { + qw.le("orderDate", params.getDataDateEnd()); + } + + qw.eq("projectSid", "d8bf7556-6db4-46b1-87eb-f3e9f93d330f"); // 山海项目Sid + + qw.orderByDesc("orderDate", "createTime"); + + IPage iPage = PagerUtil.queryToPage(pq); + IPage page = baseMapper.selectPage(iPage, qw); + return page; + } +} diff --git a/yxt-supervise-gf-biz/src/main/resources/application-devv.yml b/yxt-supervise-gf-biz/src/main/resources/application-devv.yml index db36045..222daaf 100644 --- a/yxt-supervise-gf-biz/src/main/resources/application-devv.yml +++ b/yxt-supervise-gf-biz/src/main/resources/application-devv.yml @@ -4,8 +4,8 @@ spring: max-lifetime: 500000 driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://39.104.100.138:3306/yxt_supervise_gf?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true - username: shxngf - password: shxngf + username: root + password: yxt_mysql_138 cloud: nacos: discovery: