Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportAuditLogController.java

@@ -4,15 +4,12 @@ package com.management.platform.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.management.platform.entity.LocaleInformation;
 import com.management.platform.entity.ReportAlogMembdate;
 import com.management.platform.entity.ReportAuditLog;
-import com.management.platform.entity.ReportImportLog;
 import com.management.platform.entity.User;
 import com.management.platform.entity.vo.SysRichFunction;
-import com.management.platform.mapper.ReportAlogMembdateMapper;
-import com.management.platform.mapper.ReportAuditLogMapper;
-import com.management.platform.mapper.SysFunctionMapper;
-import com.management.platform.mapper.UserMapper;
+import com.management.platform.mapper.*;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -21,10 +18,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -49,6 +45,10 @@ public class ReportAuditLogController {
     UserMapper userMapper;
     @Resource
     SysFunctionMapper sysFunctionMapper;
+    @Resource
+    LocaleInformationMapper localeInformationMapper;
+    @Resource
+    CompanyMapper companyMapper;
 
     @RequestMapping("getImportAuditLog")
     public HttpRespMsg getImportAuditLog(Integer companyId, @RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
@@ -71,7 +71,20 @@ public class ReportAuditLogController {
                     l.setMembdateList(membList.stream().filter(m->m.getRlogId().equals(l.getId())).collect(Collectors.toList()));
                 });
             }
-
+            if (companyMapper.selectById(companyId).getIsInternational() == 1) {
+                //国际化版本
+                LocaleInformation locale = localeInformationMapper.selectById(companyId);
+                TimeZone curZone = TimeZone.getTimeZone(locale.getTimezone());
+                int offsetSeconds = (curZone.getRawOffset() - TimeZone.getTimeZone("GMT+8").getRawOffset())/1000;
+                //时区转换，默认数据库存的是GMT+8
+                DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
+                for (ReportAuditLog reportAuditLog : list) {
+                    String inDate = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(reportAuditLog.getIndate());
+                    LocalDateTime time = LocalDateTime.parse(inDate, dtf);
+                    time = time.plusSeconds(offsetSeconds);
+                    reportAuditLog.setIndate(time);
+                }
+            }
             Long total = iPage.getTotal();
             Map<String, Object> map = new HashMap<>();
             map.put("records", list);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/User.java

@@ -257,8 +257,4 @@ public class User extends Model<User> {
         return this.id;
     }
 
-//    public LocalDateTime getCreateTime() {
-//        if ()
-//        return createTime;
-//    }
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/BusinessTripServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -52,6 +53,10 @@ public class BusinessTripServiceImpl extends ServiceImpl<BusinessTripMapper, Bus
     DepartmentMapper departmentMapper;
     @Resource
     DepartmentService departmentService;
+    @Resource
+    LocaleInformationMapper localeInformationMapper;
+    @Resource
+    CompanyMapper companyMapper;
 
     @Override
     public HttpRespMsg modifyProject(BusinessTrip sheet) {
@@ -248,6 +253,20 @@ public class BusinessTripServiceImpl extends ServiceImpl<BusinessTripMapper, Bus
                     queryWrapper);
         }
         List<BusinessTrip> records = listIPager.getRecords();
+        if (companyMapper.selectById(user.getCompanyId()).getIsInternational() == 1) {
+            //国际化版本
+            LocaleInformation locale = localeInformationMapper.selectById(user.getCompanyId());
+            TimeZone curZone = TimeZone.getTimeZone(locale.getTimezone());
+            int offsetSeconds = (curZone.getRawOffset() - TimeZone.getTimeZone("GMT+8").getRawOffset())/1000;
+            //时区转换，默认数据库存的是GMT+8
+            DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
+            for (BusinessTrip record : records) {
+                String inDate = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(record.getIndate());
+                LocalDateTime time = LocalDateTime.parse(inDate, dtf);
+                time = time.plusSeconds(offsetSeconds);
+                record.setIndate(time);
+            }
+        }
         //赋值项目名称
         List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().eq("company_id", sheet.getCompanyId()));
         if (records.size() > 0) {

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -1287,7 +1287,6 @@
         from department
         left JOIN (
         SELECT `user`.department_id AS departmentId,
-        project.create_date,
         COUNT(DISTINCT(project.id)) AS projectCount,
         COUNT(`user`.id) AS peopleCount
         from  `user`