From 501548e49492b4f83f2deee73316fda8abe33210 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 03 三月 2026 16:20:33 +0800
Subject: [PATCH] 数量监测
---
fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/data/ParamPatrol.java | 3 ++-
fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5207.java | 12 +++++++++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/data/ParamPatrol.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/data/ParamPatrol.java
index c51c205..2d06d82 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/data/ParamPatrol.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/data/ParamPatrol.java
@@ -10,7 +10,7 @@
* @DateTime: 2026-1-13 16:20
**/
@Data
-public class ParamPatrol extends ParamCommon{
+public class ParamPatrol extends ParamCommon {
private String id;
private String longitude;
@@ -21,4 +21,5 @@
private Date dateTime;
+ private String dateTime1;
}
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5207.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5207.java
index 4b92d98..f25c6c6 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5207.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5207.java
@@ -21,12 +21,15 @@
import com.fzzy.igds.utils.DateUtil;
import com.ruoyi.common.core.domain.entity.SysDept;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -52,6 +55,9 @@
public PhoneResponse<Object> execute(PhoneRequest<JSONObject> req, AuthUser authUser) throws Exception {
//杞寲瀵硅薄
ParamPatrol param = JSONObject.parseObject(req.getData().toString(), ParamPatrol.class);
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
+ Date dateTime = formatter.parse(param.getDateTime1());
+
if (null == param) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
}
@@ -60,7 +66,7 @@
return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
}
//鍙傛暟楠岃瘉
- if (null == param.getDateTime()) {
+ if (null == param.getDateTime1()) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
}
QueryWrapper<Quantity> queryWrapper = new QueryWrapper<>();
@@ -68,8 +74,8 @@
param.setCompanyId(ContextUtil.getCompanyId());
queryWrapper.eq("company_id", param.getCompanyId());
queryWrapper.likeRight("dept_id", param.getDeptId());
- queryWrapper.ge("receive_date", DateUtil.getCurZero(param.getDateTime()));
- queryWrapper.le("receive_date", DateUtil.getNextZero(param.getDateTime()));
+ queryWrapper.ge("receive_date", DateUtil.getMonthFirst(dateTime));
+ queryWrapper.le("receive_date", DateUtil.getNextMonthFirst(dateTime));
List<Quantity> list = quantityMapper.selectList(queryWrapper);
--
Gitblit v1.9.3