From 0a71321f86d46ac4a8335a0c38a493fd62664c25 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期一, 04 三月 2024 17:52:25 +0800
Subject: [PATCH] 人车路基础功能

---
 dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsPcrDataServiceImpl.java |   38 ++++++++++++++++++++++++++------------
 1 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsPcrDataServiceImpl.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsPcrDataServiceImpl.java
index ddb6161..c710eac 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsPcrDataServiceImpl.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsPcrDataServiceImpl.java
@@ -1,23 +1,25 @@
 package org.dromara.demo.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.demo.domain.RsPcrData;
 import org.dromara.demo.domain.bo.RsPcrDataBo;
 import org.dromara.demo.domain.vo.RsPcrDataVo;
-import org.dromara.demo.domain.RsPcrData;
 import org.dromara.demo.mapper.RsPcrDataMapper;
 import org.dromara.demo.service.IRsPcrDataService;
+import org.springframework.stereotype.Service;
 
+import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * 浜鸿溅璺熀纭�淇℃伅Service涓氬姟灞傚鐞�
@@ -62,9 +64,8 @@
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<RsPcrData> lqw = Wrappers.lambdaQuery();
         lqw.like(StringUtils.isNotBlank(bo.getModeName()), RsPcrData::getModeName, bo.getModeName());
-        lqw.like(StringUtils.isNotBlank(bo.getPeriodName()), RsPcrData::getPeriodName, bo.getPeriodName());
-        lqw.eq(StringUtils.isNotBlank(bo.getPeriodYear()), RsPcrData::getPeriodYear, bo.getPeriodYear());
-        lqw.eq(bo.getPeriodMonth() != null, RsPcrData::getPeriodMonth, bo.getPeriodMonth());
+        lqw.like(StringUtils.isNotBlank(bo.getPeriod()), RsPcrData::getPeriod, bo.getPeriod());
+        lqw.eq(StringUtils.isNotBlank(bo.getPeriodDate()), RsPcrData::getPeriodDate, bo.getPeriodDate());
         lqw.like(StringUtils.isNotBlank(bo.getIndexOneName()), RsPcrData::getIndexOneName, bo.getIndexOneName());
         lqw.eq(bo.getIndexOneValue() != null, RsPcrData::getIndexOneValue, bo.getIndexOneValue());
         lqw.like(StringUtils.isNotBlank(bo.getIndexTwoName()), RsPcrData::getIndexTwoName, bo.getIndexTwoName());
@@ -74,6 +75,7 @@
         lqw.like(StringUtils.isNotBlank(bo.getIndexFourName()), RsPcrData::getIndexFourName, bo.getIndexFourName());
         lqw.eq(bo.getIndexFourValue() != null, RsPcrData::getIndexFourValue, bo.getIndexFourValue());
         lqw.eq(bo.getStatus() != null, RsPcrData::getStatus, bo.getStatus());
+        lqw.orderByDesc(RsPcrData::getCreateTime);
         return lqw;
     }
 
@@ -88,6 +90,12 @@
         if (flag) {
             bo.setId(add.getId());
         }
+        // 鍚敤鏂版暟鎹皢鍏朵綑鍚岀被鍨嬫暟鎹敼涓虹鐢�
+        if (bo.getStatus().equals(1L)) {
+            LambdaUpdateWrapper<RsPcrData> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.ne(RsPcrData::getId, bo.getId()).eq(RsPcrData::getModeName, bo.getModeName()).set(RsPcrData::getStatus, 2);
+            baseMapper.update(updateWrapper);
+        }
         return flag;
     }
 
@@ -98,6 +106,12 @@
     public Boolean updateByBo(RsPcrDataBo bo) {
         RsPcrData update = MapstructUtils.convert(bo, RsPcrData.class);
         validEntityBeforeSave(update);
+        // 鍚敤鏂版暟鎹皢鍏朵綑鍚岀被鍨嬫暟鎹敼涓虹鐢�
+        if (bo.getStatus().equals(1L)) {
+            LambdaUpdateWrapper<RsPcrData> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.ne(RsPcrData::getId, bo.getId()).eq(RsPcrData::getModeName, bo.getModeName()).set(RsPcrData::getStatus, 2);
+            baseMapper.update(updateWrapper);
+        }
         return baseMapper.updateById(update) > 0;
     }
 
@@ -105,7 +119,7 @@
      * 淇濆瓨鍓嶇殑鏁版嵁鏍¢獙
      */
     private void validEntityBeforeSave(RsPcrData entity){
-        //TODO 鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫
+        entity.setCreateTime(new Date());
     }
 
     /**

--
Gitblit v1.8.0