From a1ddf5116492be4a0e0bf597683aa01ec14977b3 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期二, 21 十一月 2023 13:47:16 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionRecordServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionRecordServiceImpl.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionRecordServiceImpl.java
index dec4ea5..b12d1b6 100644
--- a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionRecordServiceImpl.java
+++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionRecordServiceImpl.java
@@ -4,6 +4,7 @@
import com.github.pagehelper.PageInfo;
import com.thhy.general.common.BasicResult;
import com.thhy.general.config.SysUserInfo;
+import com.thhy.general.utils.ExcelUtils;
import com.thhy.general.utils.UUIDUtils;
import com.thhy.general.utils.UserInfoUtils;
import com.thhy.secure.modules.biz.regionInspection.entity.*;
@@ -15,6 +16,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
@@ -77,7 +79,7 @@
if (!recordEntities.isEmpty()){
recordEntities.forEach(obj->{
String statusName = obj.getStatusName();
- if("完成".equals(statusName)){
+ if("已完成".equals(statusName)){
atomicInteger.incrementAndGet();
}
});
@@ -109,11 +111,28 @@
String companyId = sysUserInfo.getCompanyId();
int pageNum = (int) map.get("pageNum");
int pageSize = (int) map.get("pageSize");
- PageHelper.startPage(pageNum,pageSize);
+ String startHour = " 00:00:00";
+ String endHour = " 23:59:59";
+ String startTime = map.get("startTime").toString();
+ String endTime = map.get("endTime").toString();
+ if(StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)){
+ startTime = startTime+startHour;
+ endTime = endTime +endHour;
+ map.put("startTime",startTime);
+ map.put("endTime",endTime);
+ }
+ if (StringUtils.isNotBlank(map.get("status").toString())){
+ int intStatus = Integer.valueOf(map.get("status").toString());
+ map.put("intStatus",intStatus);
+ }
map.put("companyId",companyId);
- return BasicResult.success(new PageInfo<>(
- regionInspectionRecordMapper.selectPageList(map)
- ));
+ map.put("page",(pageNum-1)*10);
+ map.put("limit",pageSize);
+ List<RegionInspectionRecordEntity> recordEntities = regionInspectionRecordMapper.selectPageList(map);
+ Integer integer = regionInspectionRecordMapper.selectCount(map);
+ map.put("list",recordEntities);
+ map.put("total",integer);
+ return BasicResult.success(map);
}
@Override
@@ -185,5 +204,26 @@
return BasicResult.success(new PageInfo<>(regionInspectionRecordMapper.selectAppList(map)));
}
-
+ @Override
+ public void export(Map map, HttpServletResponse response) {
+ SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
+ String companyId = sysUserInfo.getCompanyId();
+ String startHour = " 00:00:00";
+ String endHour = " 23:59:59";
+ String startTime = map.get("startTime").toString();
+ String endTime = map.get("endTime").toString();
+ if(StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)){
+ startTime = startTime+startHour;
+ endTime = endTime +endHour;
+ map.put("startTime",startTime);
+ map.put("endTime",endTime);
+ }
+ if (StringUtils.isNotBlank(map.get("status").toString())){
+ int intStatus = Integer.valueOf(map.get("status").toString());
+ map.put("intStatus",intStatus);
+ }
+ map.put("companyId",companyId);
+ List<RegionInspectionRecordEntity> recordEntities = regionInspectionRecordMapper.selectPageList(map);
+ ExcelUtils.downExcel(recordEntities,RegionInspectionRecordEntity.class,response,"打卡导出");
+ }
}
--
Gitblit v1.9.3