From 0a1af1f220a6b47db08bc6d2e2b9660d08fe59ed Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 16 八月 2024 13:38:47 +0800
Subject: [PATCH] leftjoin

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java |   32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
index a379aa6..52af163 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -36,6 +36,7 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Consumer;
@@ -63,6 +64,9 @@
     @Override
     public Result add(YwPointForm form) {
         YwPoint entity = YwPointForm.getEntityByForm(form, null);
+        Date now = new Date();
+        entity.setCreateTime(now);
+        entity.setUpdateTime(now);
         if(baseMapper.insert(entity) > 0) {
             return Result.ok("娣诲姞鎴愬姛");
         }
@@ -76,6 +80,9 @@
                 .forEach(form -> {
                     YwPoint entity = YwPointForm.getEntityByForm(form, null);
                     entity.setStatus("鏈紑濮�");
+                    Date now = new Date();
+                    entity.setCreateTime(now);
+                    entity.setUpdateTime(now);
                     baseMapper.insert(entity);
                 });
         return Result.ok("娣诲姞鎴愬姛");
@@ -88,6 +95,7 @@
             new LambdaUpdateChainWrapper<>(baseMapper)
                     .in(YwPoint::getId, form.getIds())
                     .set(YwPoint::getUnitId, form.getUnitId())
+                    .set(YwPoint::getUpdateTime, new Date())
                     .update();
         } else {
             new LambdaUpdateChainWrapper<>(baseMapper)
@@ -95,6 +103,7 @@
                     .set(YwPoint::getUnitId, form.getUnitId())
                     .set(YwPoint::getStartTime, null)
                     .set(YwPoint::getEndTime, null)
+                    .set(YwPoint::getUpdateTime, new Date())
                     .update();
         }
         return Result.ok("淇敼鎴愬姛");
@@ -110,7 +119,8 @@
         YwPoint entity = baseMapper.selectById(form.getId());
         Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
         BeanUtils.copyProperties(form, entity);
-        entity.setPointTag(form.getPointTag().stream().collect(Collectors.joining(",")));
+        Date now = new Date();
+        entity.setUpdateTime(now);
         baseMapper.updateById(entity);
         return Result.ok("淇敼鎴愬姛");
     }
@@ -150,11 +160,6 @@
     public Result page(YwPointQuery query) {
         IPage<YwPointVO> page = PageUtil.getPage(query, YwPointVO.class);
         baseMapper.page(page, query);
-        page.getRecords().stream().forEach(point -> {
-            if (StringUtils.hasText(point.getPointTagString())) {
-                point.setPointTags(point.getPointTagString().split(","));
-            }
-        });
         return Result.ok().data(page.getRecords()).total(page.getTotal());
     }
 
@@ -168,9 +173,6 @@
         YwPoint entity = baseMapper.selectById(id);
         Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
         YwPointVO vo = YwPointVO.getVoByEntity(entity, null);
-        if (StringUtils.hasText(entity.getPointTag())) {
-            vo.setPointTags(entity.getPointTag().split(","));
-        }
         if (Objects.nonNull(entity.getDeptId())) {
             vo.setDeptIds(sysDeptMapper.selectParents(entity.getDeptId()));
         }
@@ -222,6 +224,7 @@
         return new LambdaUpdateChainWrapper<>(baseMapper)
                 .in(YwPoint::getSerialNumber, serialNumberList)
                 .set(YwPoint::getRecovery, recovery)
+                .set(YwPoint::getUpdateTime, new Date())
                 .set(recovery == 0, YwPoint::getRecoveryTime, DateUtils.getNowDate())
                 .update();
     }
@@ -242,9 +245,9 @@
     }
 
     @Override
-    public Result importData(MultipartFile file, Integer unitId) throws IOException {
+    public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantTag, Boolean importantCommandImageTag) throws IOException {
         Consumer<List<PointExport>> consumer = (dataList) -> {
-            this.updatePoint(dataList, unitId);
+            this.updatePoint(dataList, unitId, startTime, endTime, provinceTag, importantTag, importantCommandImageTag);
         };
         EasyExcel.read(file.getInputStream(), PointExport.class , new CurrencyDataListener(consumer)).headRowNumber(1).doReadAll();
         return Result.ok();
@@ -256,7 +259,7 @@
      * @param dataList
      * @param unitId
      */
-    private void updatePoint(List<PointExport> dataList, Integer unitId) {
+    private void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantTag, Boolean importantCommandImageTag) {
         if (CollectionUtils.isEmpty(dataList)) {
             throw new RuntimeException("瀵煎叆鏁版嵁涓嶈兘涓虹┖");
         }
@@ -264,6 +267,11 @@
         new LambdaUpdateChainWrapper<>(baseMapper)
                 .in(YwPoint::getSerialNumber, pointList)
                 .set(YwPoint::getUnitId, unitId)
+                .set(YwPoint::getStartTime, startTime)
+                .set(YwPoint::getEndTime, endTime)
+                .set(YwPoint::getProvinceTag, provinceTag)
+                .set(YwPoint::getImportantTag, importantTag)
+                .set(YwPoint::getImportantCommandImageTag, importantCommandImageTag)
                 .update();
     }
 

--
Gitblit v1.8.0