From e69345c81150863c4a716819984693fd0487b419 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 07 二月 2026 11:52:25 +0800
Subject: [PATCH] 客户问题优化调整6-出入库详单取消入库重量，监管下出入库报表查询数据一样问题
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java | 151 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 100 insertions(+), 51 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
index b4463ec..b99a3f8 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
@@ -1,15 +1,22 @@
package com.fzzy.igds.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fzzy.igds.data.BaseResp;
+import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.Patrol;
+import com.fzzy.igds.domain.PatrolConf;
+import com.fzzy.igds.domain.PatrolRecord;
+import com.fzzy.igds.mapper.PatrolConfMapper;
import com.fzzy.igds.mapper.PatrolMapper;
+import com.fzzy.igds.mapper.PatrolRecordMapper;
import com.fzzy.igds.utils.ContextUtil;
-import com.ruoyi.common.core.text.Convert;
+import com.fzzy.igds.utils.DateUtil;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-
import javax.annotation.Resource;
+import java.util.Date;
import java.util.List;
@Slf4j
@@ -18,79 +25,121 @@
@Resource
private PatrolMapper patrolMapper;
+ @Resource
+ private PatrolRecordMapper patrolRecordMapper;
+ @Resource
+ private PatrolConfMapper patrolConfMapper;
- public List<Patrol> selectList(Patrol param) {
- QueryWrapper<Patrol> queryWrapper = getQueryWrapper(param);
+
+ /*--------------------宸℃洿涓昏〃绠＄悊------------------*/
+ /**
+ * 鏌ヨ7澶╁唴鐨勬墍鏈夊贰鏇磋褰曚俊鎭�
+ *
+ * @return
+ */
+ public List<Patrol> getWeekList() {
+
+ Date end = new Date();
+ Date start = DateUtil.getNewByDay(end, -6);
+
+ QueryWrapper<Patrol> queryWrapper = new QueryWrapper<>();
+
+ queryWrapper.ge("create_time", DateUtil.getCurZero(start));
+
+ queryWrapper.le("create_time", DateUtil.getNextZero(end));
+
return patrolMapper.selectList(queryWrapper);
}
/**
- * 灏佽鏌ヨ鏉′欢
- *
+ * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏁版嵁
+ * @param page
* @param param
*/
- public QueryWrapper<Patrol> getQueryWrapper(Patrol param) {
+ public void pagePatrolData(Page<Patrol> page, IgdsBaseParam param) {
QueryWrapper<Patrol> queryWrapper = new QueryWrapper<>();
-
- param.setCompanyId(ContextUtil.getCompanyId());
- queryWrapper.eq("company_id", param.getCompanyId());
-
- if (StringUtils.isNotBlank(param.getDeptId())) {
- queryWrapper.eq("dept_id", param.getDeptId());
+ if(StringUtils.isNotBlank(param.getDeptId())){
+ queryWrapper.like("dept_id", param.getDeptId());
+ }else {
+ if(StringUtils.isNotBlank(param.getCompanyId())){
+ queryWrapper.likeRight("dept_id", param.getCompanyId());
+ }
}
- queryWrapper.orderByDesc("create_time");
+ if(null != param.getStart()){
+ queryWrapper.ge("create_time", DateUtil.getCurZero(param.getStart()));
+ }
+ if(null != param.getEnd()){
+ queryWrapper.le("create_time", DateUtil.getCurZero(param.getEnd()));
+ }
- return queryWrapper;
+ patrolMapper.selectPage(page, queryWrapper);
}
+ /*--------------------宸℃洿杞ㄨ抗琛ㄧ鐞�------------------*/
/**
- * 閫氳繃id鏌ヨ鍗曟潯鏁版嵁
- *
- * @param id
- * @author sgj
- * @date 2025/12/10
+ * 鏍规嵁宸℃洿ID鏌ヨ鍏蜂綋鐐逛綅淇℃伅
+ * @param patrolId
+ * @return
*/
- public Patrol selectById(String id) {
- return patrolMapper.selectById(id);
+ public List<PatrolRecord> getRecordByPatrolId(String patrolId) {
+
+ if(StringUtils.isBlank(patrolId)){
+ return null;
+ }
+
+ QueryWrapper<PatrolRecord> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("patrol_id", patrolId);
+ queryWrapper.orderByDesc("id");
+
+ return patrolRecordMapper.selectList(queryWrapper);
}
+
+ /*--------------------宸℃洿閰嶇疆琛ㄧ鐞�------------------*/
/**
- * 鏂板鏁版嵁
- *
+ * 鏌ヨ搴撳尯涓嬫墍鏈夐厤缃俊鎭�
* @param param
- * @author sgj
- * @date 2025/12/10
+ * @return
*/
- public int insertData(Patrol param) {
- if (StringUtils.isEmpty(param.getId())) {
- param.setId(ContextUtil.generateId());
+ public List<PatrolConf> listPatrolConf(IgdsBaseParam param) {
+
+ if(null == param){
+ param = new IgdsBaseParam();
}
- return patrolMapper.insert(param);
+ QueryWrapper<PatrolConf> queryWrapper = new QueryWrapper<>();
+ if(StringUtils.isNotEmpty(param.getName())){
+ queryWrapper.like("name", param.getName());
+ }
+ if(StringUtils.isNotBlank(param.getDeptId())){
+ queryWrapper.like("dept_id", param.getDeptId());
+ }else {
+ if(StringUtils.isNotBlank(param.getCompanyId())){
+ queryWrapper.likeRight("dept_id", param.getCompanyId());
+ }
+ }
+ return patrolConfMapper.selectList(queryWrapper);
}
- /**
- * 鏇存柊鏁版嵁
- *
- * @param param
- * @author sgj
- * @date 2025/12/10
- */
- public int updateData(Patrol param) {
- return patrolMapper.updateById(param);
+ public BaseResp addPatrolConf(PatrolConf conf) {
+ conf.setId(ContextUtil.generateId());
+ conf.setCompanyId(ContextUtil.getCompanyId());
+ conf.setUpdateBy(ContextUtil.getLoginUserName());
+ conf.setUpdateTime(new Date());
+ conf.setCreateBy(ContextUtil.getLoginUserName());
+ conf.setCreateTime(new Date());
+
+ return patrolConfMapper.insert(conf) > 0 ? BaseResp.success() : BaseResp.error("娣诲姞澶辫触");
}
- /**
- * 閫氳繃id鍒犻櫎涓�鏉℃暟鎹�
- *
- * @param ids
- * @author sgj
- * @date 2025/12/10
- */
- public void deleteDataById(String ids) {
- String[] recordIds = Convert.toStrArray(ids);
- for (String recordId : recordIds) {
- patrolMapper.deleteById(recordId);
- }
+ public BaseResp updatePatrolConf(PatrolConf conf) {
+ conf.setUpdateBy(ContextUtil.getLoginUserName());
+ conf.setUpdateTime(new Date());
+ return patrolConfMapper.updateById(conf) > 0 ? BaseResp.success() : BaseResp.error("鏇存柊澶辫触");
}
+ public BaseResp deletePatrolConf(PatrolConf conf) {
+ return patrolConfMapper.deleteById(conf) > 0 ? BaseResp.success() : BaseResp.error("鍒犻櫎澶辫触");
+ }
+
+
}
--
Gitblit v1.9.3