bug修复

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

@@ -1287,6 +1287,13 @@ public class DingDingServiceImpl implements DingDingService {
                             sheet.setGmtFinished(item.getString("gmt_finished"));
                             Long cha = sheet.getEndDate().toEpochDay() - sheet.getStartDate().toEpochDay() + 1;
                             sheet.setTimeDays((float)cha);
+                            Integer timeType = item.getInteger("timeType");
+                            if (timeType == 0){
+                                TimeType allDay = timeTypeMapper.selectOne(new QueryWrapper<TimeType>().eq("company_id", user.getCompanyId()));
+                                sheet.setTimeHours(sheet.getTimeDays()*allDay.getAllday());
+                            }else {
+                                sheet.setTimeHours(item.getFloat("timeHours"));
+                            }
                             sheet.setCompanyId(dingding.getCompanyId());
                             sheet.setStatus(0);
                             sheet.setProcinstId(item.getString("procInst_id"));

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

@@ -1423,12 +1423,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 }
 
                 if (rowIndex == 0) {
-                    if ((!"工号".equals(jobNumber)) || (!"Job No".equals(jobNumber))) {
+                    if (("工号".equals(jobNumber)) || ("Job No".equals(jobNumber))) {
+                        continue;
+                    } else {
                         //httpRespMsg.setError("缺少部门列，请下载最新模板进行导入");
                         httpRespMsg.setError(MessageUtils.message("Template.lackJobNumber"));
                         return httpRespMsg;
-                    } else {
-                        continue;
                     }
                 }
                 //姓名为空的，不处理

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

@@ -12,6 +12,7 @@ import com.management.platform.entity.*;
 import com.management.platform.mapper.*;
 import com.management.platform.service.WxCorpInfoService;
 import com.management.platform.util.*;
+import javafx.scene.effect.Light;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.utils.HttpClientUtils;
@@ -1235,6 +1236,7 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
                 ResponseEntity<String> ResponseEntity = restTemplate.postForEntity(url, entity, String.class);
                 if (ResponseEntity.getStatusCode() == HttpStatus.OK) {
                     String resp = ResponseEntity.getBody();
+                    System.err.println("++++++++++++" + resp + "++++++++++++");
                     JSONObject json = JSONObject.parseObject(resp);
                     Object[] sp_no_lists = json.getJSONArray("sp_no_list").toArray();
                     //查询每个审批号审批详情
@@ -1392,7 +1394,6 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
                     }
                     //判断是否需要多次拉取
                     int nextCur = json.getIntValue("next_cursor");
-                    System.err.println(nextCur);
                     if (nextCur==0){
                         break;
                     }else {

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

@@ -317,7 +317,7 @@ public class TimingTask {
 
     //每天1:00 同步昨天的微信请假信息
     //@Scheduled(cron = "0 0 1 ? * *")
-    //@Scheduled(cron = "0 13 18 ? * *")
+    @Scheduled(cron = "0 22 10 ? * *")
     public void synWxLeave() throws Exception {
         //if (isDev) return;
         System.out.println("+++++++++++++++++++微信请假同步开始+++++++++++++++++++");