From 691c261585598adfa0910cf1f867b11eb36dafee Mon Sep 17 00:00:00 2001 From: chuang <994001556@qq.com> Date: Fri, 24 Mar 2023 16:51:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9C=80=E8=BF=91=E4=B8=80?= =?UTF-8?q?=E5=B9=B4=E7=9A=84=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/jnpf/util/DateUtil.java | 11 + .../controller/MessageCenterController.java | 8 + .../mapper/MessageCenterMapper.java | 12 + .../service/MessageCenterService.java | 6 + .../impl/MessageCenterServiceImpl.java | 26 ++ .../messageCenter/MessageCenterMapper.xml | 296 ++++++++++++++++++ 6 files changed, 359 insertions(+) diff --git a/SC-boot/linkage-common/src/main/java/jnpf/util/DateUtil.java b/SC-boot/linkage-common/src/main/java/jnpf/util/DateUtil.java index 171548b1..12de812d 100644 --- a/SC-boot/linkage-common/src/main/java/jnpf/util/DateUtil.java +++ b/SC-boot/linkage-common/src/main/java/jnpf/util/DateUtil.java @@ -312,6 +312,17 @@ public class DateUtil { calendar.set(getNowYear(), getNowMonth() - 2, 1); return getDayStartTime(calendar.getTime()); } + /** + * 获取上月的开始时间 + * + * @return + */ + public static Date getBeginDayOfLastMonth(int i) { + Calendar calendar = Calendar.getInstance(); //得到日历 + calendar.setTime(new Date());//把当前时间赋给日历 + calendar.add(calendar.MONTH, -i); //设置为前2月,可根据需求进行修改 + return calendar.getTime();//获取2个月前的时间 + } /** * 获取上月的结束时间 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/controller/MessageCenterController.java b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/controller/MessageCenterController.java index 8608f713..3518b0f7 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/controller/MessageCenterController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/controller/MessageCenterController.java @@ -50,6 +50,14 @@ public class MessageCenterController { @Autowired private MessageCenterService messageCenterService; + /** + *获取最近一年的统计数据 + */ + @GetMapping(value = "/getOneYearData") + public ActionResult getOneYearData() throws Exception { + Map oneYearData= messageCenterService.getOneYearData(); + return ActionResult.success(oneYearData); + } /** *获取最近七天的销售量 */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/mapper/MessageCenterMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/mapper/MessageCenterMapper.java index be8249ea..112e05ef 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/mapper/MessageCenterMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/mapper/MessageCenterMapper.java @@ -60,4 +60,16 @@ public interface MessageCenterMapper extends BaseMapper { * @return */ List getTadayPoundist(); + + /** + * 获取最近一年的结算量 + * @return + */ + List> getSettAmountOneYearData(); + + /** + * 获取最近一年的上货量 + * @return + */ + List> getQuantityNumOneYearData(); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/MessageCenterService.java b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/MessageCenterService.java index 5441bb12..ec838a69 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/MessageCenterService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/MessageCenterService.java @@ -60,4 +60,10 @@ public interface MessageCenterService extends IService { */ Map getTadayPoundist(); + /** + * 获取一年的统计数据 + * @return + */ + Map getOneYearData(); + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/impl/MessageCenterServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/impl/MessageCenterServiceImpl.java index 8a2159ae..6a4deea6 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/impl/MessageCenterServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/impl/MessageCenterServiceImpl.java @@ -436,6 +436,32 @@ public class MessageCenterServiceImpl extends ServiceImpl yearDate = new ArrayList<>(); + ArrayList settAmountOneYearData = new ArrayList<>(); + ArrayList quantityNumOneYearData = new ArrayList<>(); + ArrayList xData = new ArrayList<>(); + HashMap oneYearDataMap = new HashMap<>(); + for (int i = 11; i >= 0; i--) { + Date beginDayOfLastMonth = DateUtil.getBeginDayOfLastMonth(i); + yearDate.add(dateFormat.format(beginDayOfLastMonth)); + } + List> setList = messageCenterMapper.getSettAmountOneYearData(); + List> quanList = messageCenterMapper.getQuantityNumOneYearData(); + for (int i = 11; i >=0 ; i--) { + settAmountOneYearData.add(BigDecimalUtil.getBigDecimal(setList.get(0).get("settlementAmount"+i))); + quantityNumOneYearData.add(BigDecimalUtil.getBigDecimal(quanList.get(0).get("quantityNum"+i))); + xData.add(BigDecimalUtil.getBigDecimal("0")); + } + oneYearDataMap.put("yearDate",yearDate); + oneYearDataMap.put("settAmountOneYearData",settAmountOneYearData); + oneYearDataMap.put("quantityNumOneYearData",quantityNumOneYearData); + oneYearDataMap.put("xData",xData); + return oneYearDataMap; + } + @Override public void delete(MessageCenterEntity entity) { if (entity != null) { diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml index 189b8276..219ef70e 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml @@ -468,4 +468,300 @@ NOW()) - TO_DAYS( a.creator_time ) = 0 ) aaa + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +