From 9da24a8dfa3766cec565b092fc105f7f006de070 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 21 八月 2024 11:52:25 +0800
Subject: [PATCH] 合同考核点位在线率记录
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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 354b073..e41a9c8 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
@@ -64,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("娣诲姞鎴愬姛");
}
@@ -77,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("娣诲姞鎴愬姛");
@@ -89,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)
@@ -96,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("淇敼鎴愬姛");
@@ -111,6 +119,8 @@
YwPoint entity = baseMapper.selectById(form.getId());
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
+ Date now = new Date();
+ entity.setUpdateTime(now);
baseMapper.updateById(entity);
return Result.ok("淇敼鎴愬姛");
}
@@ -214,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();
}
@@ -234,9 +245,9 @@
}
@Override
- public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime) throws IOException {
+ public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantCommandImageTag) throws IOException {
Consumer<List<PointExport>> consumer = (dataList) -> {
- this.updatePoint(dataList, unitId, startTime, endTime);
+ this.updatePoint(dataList, unitId, startTime, endTime, provinceTag, importantCommandImageTag);
};
EasyExcel.read(file.getInputStream(), PointExport.class , new CurrencyDataListener(consumer)).headRowNumber(1).doReadAll();
return Result.ok();
@@ -248,7 +259,7 @@
* @param dataList
* @param unitId
*/
- private void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime) {
+ private void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantCommandImageTag) {
if (CollectionUtils.isEmpty(dataList)) {
throw new RuntimeException("瀵煎叆鏁版嵁涓嶈兘涓虹┖");
}
@@ -258,6 +269,8 @@
.set(YwPoint::getUnitId, unitId)
.set(YwPoint::getStartTime, startTime)
.set(YwPoint::getEndTime, endTime)
+ .set(YwPoint::getProvinceTag, provinceTag)
+ .set(YwPoint::getImportantCommandImageTag, importantCommandImageTag)
.update();
}
--
Gitblit v1.8.0