|
@@ -4011,24 +4011,24 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
List<HashMap<String, Object>> allReportByDate = reportMapper.getAllReportByDate(startDate,thirdPartyInterface.getCompanyId(), null, endDate, null, 1, null);
|
|
List<HashMap<String, Object>> allReportByDate = reportMapper.getAllReportByDate(startDate,thirdPartyInterface.getCompanyId(), null, endDate, null, 1, null);
|
|
final CountDownLatch latch=new CountDownLatch(allReportByDate.size());
|
|
final CountDownLatch latch=new CountDownLatch(allReportByDate.size());
|
|
for (HashMap<String, Object> map : allReportByDate) {
|
|
for (HashMap<String, Object> map : allReportByDate) {
|
|
|
|
+ java.sql.Date sqlCreateDate= (java.sql.Date) map.get("createDate");
|
|
|
|
+ java.sql.Timestamp sqlProjectAuditTime= (Timestamp) map.get("projectAuditTime");
|
|
|
|
+ java.sql.Timestamp sqlTime= (Timestamp) map.get("time");
|
|
|
|
+ if(sqlCreateDate!=null){
|
|
|
|
+ LocalDate createDate = sqlCreateDate.toLocalDate();
|
|
|
|
+ map.put("createDate",df.format(createDate));
|
|
|
|
+ }
|
|
|
|
+ if(sqlProjectAuditTime!=null){
|
|
|
|
+ LocalDateTime projectAuditTime = sqlProjectAuditTime.toLocalDateTime();
|
|
|
|
+ map.put("projectAuditTime",projectAuditTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
|
|
|
|
+ }
|
|
|
|
+ if(sqlTime!=null){
|
|
|
|
+ LocalDateTime time = sqlTime.toLocalDateTime();
|
|
|
|
+ map.put("time",time.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
|
|
|
|
+ }
|
|
executor.execute(new Runnable() {
|
|
executor.execute(new Runnable() {
|
|
@Override
|
|
@Override
|
|
public void run() {
|
|
public void run() {
|
|
- java.sql.Date sqlCreateDate= (java.sql.Date) map.get("createDate");
|
|
|
|
- java.sql.Timestamp sqlProjectAuditTime= (Timestamp) map.get("projectAuditTime");
|
|
|
|
- java.sql.Timestamp sqlTime= (Timestamp) map.get("time");
|
|
|
|
- if(sqlCreateDate!=null){
|
|
|
|
- LocalDate createDate = sqlCreateDate.toLocalDate();
|
|
|
|
- map.put("createDate",df.format(createDate));
|
|
|
|
- }
|
|
|
|
- if(sqlProjectAuditTime!=null){
|
|
|
|
- LocalDateTime projectAuditTime = sqlProjectAuditTime.toLocalDateTime();
|
|
|
|
- map.put("projectAuditTime",projectAuditTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
|
|
|
|
- }
|
|
|
|
- if(sqlTime!=null){
|
|
|
|
- LocalDateTime time = sqlTime.toLocalDateTime();
|
|
|
|
- map.put("time",time.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
|
|
|
|
- }
|
|
|
|
List<ReportLog> item=new ArrayList<>();
|
|
List<ReportLog> item=new ArrayList<>();
|
|
Integer reportId = (Integer) map.get("id");
|
|
Integer reportId = (Integer) map.get("id");
|
|
for (ReportLog reportLog : reportLogList) {
|
|
for (ReportLog reportLog : reportLogList) {
|