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

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

@@ -1362,7 +1362,7 @@ public class ReportController {
                 LocalDate localEndDate = LocalDate.parse(endDate, dateTimeFormatter);
                 TimeType timeType = timeTypeMapper.selectById(byId.getCompanyId());
                 //时间间隔不得超过365天
-                long until = localStartDate.until(localEndDate, ChronoUnit.DAYS);
+                long until = localStartDate.until(localEndDate, ChronoUnit.DAYS) + 1;
                 if (until > 365) {
                     //msg.setError("日期间隔不得超过365天");
                     msg.setError(MessageUtils.message("date.dateThan365"));

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

@@ -912,12 +912,13 @@ public class WeiXinCorpController {
                     data.setAuthUsername(authUserInfo.getString("name"));
                     String userId = authUserInfo.getString("userid");//授权人的userid
 
-                    //检查公司名称是否存在
-                    List<Company> cpList = companyMapper.selectList(new QueryWrapper<Company>().eq("company_name", corpName).or().eq("company_name", data.getCorpFullName()));
+                    //检查公司名称是否存在，按照corpid比对
+                    WxCorpInfo findCorp = wxCorpInfoMapper.selectById(corpId);
+
                     Company company = null;
                     SysRole managerRole = null;
-                    if (cpList.size() > 0) {
-                        company = cpList.get(0);
+                    if (findCorp != null) {
+                        company = companyMapper.selectById(findCorp.getCompanyId());
                         managerRole = sysRoleMapper.selectOne(new QueryWrapper<SysRole>().eq("company_id", company.getId()).eq("rolename", com.management.platform.constant.Constant.ROLE_SUPER_MANAGER));
                     } else {
                         //首先生成一个新公司,增加会员的试用一个月
@@ -1010,7 +1011,6 @@ public class WeiXinCorpController {
                     data.setSaasSyncContact(enableNewVersion?1:0);
                     wxCorpInfoMapper.insert(data);
                     //默认普通员工的角色
-                    SysRole defaultUserRole = sysRoleService.getOne(new QueryWrapper<SysRole>().eq("company_id", company.getId()).eq("is_default", 1));
                     JSONObject userDetail = getUserInfo(curCorpAccessToken, userId);
                     //检查授权人是否存在
                     int cnt = userMapper.selectCount(new QueryWrapper<User>().eq("corpwx_userid", userId));

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

@@ -4756,7 +4756,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             array.add(object);
         });
         String username = "WPG_GS";
-        String password = "Sys_GS@12345";
+        String password = "Sap_GS@12345";
         String authorization =username + ":" + password;
         JSONObject header=new JSONObject();
         String s = "Basic "+Base64.getEncoder().encodeToString(authorization.getBytes());

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

@@ -602,7 +602,7 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
                     }
                     userCorpwxTime.setWeekDayTxt(DateTimeUtil.getWeekDayTxt(userCorpwxTime.getWeekDay()));
                     BigDecimal bigDecimal=new BigDecimal(Duration.between(LocalTime.parse(minTime,df).plusHours(8),LocalTime.parse(maxTime,df).plusHours(8)).toMinutes());
-                    bigDecimal=bigDecimal.divide(BigDecimal.valueOf(60),1,BigDecimal.ROUND_HALF_UP).subtract(new BigDecimal(restTime));
+                    bigDecimal=bigDecimal.divide(BigDecimal.valueOf(60),0,BigDecimal.ROUND_HALF_UP).subtract(new BigDecimal(restTime));
                     userCorpwxTime.setWorkHours(bigDecimal.doubleValue());
                     System.out.println(userCorpwxTime);
                     UserCorpwxTime item;
@@ -1118,8 +1118,12 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
                             .eq("create_date", localDate));
                     if (item != null) {
                         ct.setId(item.getId());
-                        //已存在记录，进行更新
-                        userCorpwxTimeMapper.updateById(ct);
+                        //已存在记录，但是如果老记录有工作时长，新记录无工作时长，也没有请假外出和打卡时长，说明新的记录是没有取到考勤的。 老记录是通过当天打卡数据获取到的，包含外出的时间
+                        if (item.getWorkHours() > 0 && ct.getWorkHours() == 0 && ct.getCardTime() == 0 && ct.getAskLeaveTime() == 0 && ct.getOutdoorTime() == 0) {
+                            //不处理
+                        } else {
+                            userCorpwxTimeMapper.updateById(ct);
+                        }
                     } else {
                         userCorpwxTimeMapper.insert(ct);
                     }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -492,7 +492,7 @@ public class TimingTask {
     }
 
     public static void main(String[] args) {
-        /*int passwordLength = 30;
+        int passwordLength = 30;
         List<String> stringList=new ArrayList<>();
         new SecureRandom().ints(passwordLength, 0, VALID_TOKEN_CHARS.size())
                 .map(VALID_TOKEN_CHARS::get).forEach(v->stringList.add(String.valueOf((char) v)));
@@ -500,10 +500,7 @@ public class TimingTask {
         for (String s : stringList) {
             token+=s;
         }
-        System.out.println(token);*/
-        LocalDateTime start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
-        LocalDateTime end = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
-        System.out.println(start+"  "+end);
+        System.out.println(token);
     }
 
     //发送上周填写的工时统计

fhKeeper/formulahousekeeper/timesheet/src/views/Login.vue

@@ -146,6 +146,9 @@
             if(urls.indexOf('english=1') != '-1' && localStorage.getItem('lang') != 'en') {
                 this.setlangChange()
                 location.reload()
+            } else {
+                localStorage.setItem("lang", 'zh')
+                location.reload()
             }
         },
         methods: {