Inicio Explorar Ayuda
Registro Iniciar sesión
wutt
/
manHourHousekeeper
1
0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Explorar el Código

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

QuYueTing hace 5 meses
padre
ee4967474f bbd7f05c9c
commit
d71f1fe2c4
Se han modificado 16 ficheros con 64 adiciones y 84 borrados
Dividir vista Mostrar estadísticas de diff
  1. 1 1
      fhKeeper/formulahousekeeper/customerBuler-crm/index.html
  2. 1 1
      fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/header/header.vue
  3. 1 1
      fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/login.vue
  4. 2 5
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/FeishuInfoController.java
  5. 4 0
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java
  6. 4 7
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserController.java
  7. 4 15
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/WeiXinCorpController.java
  8. 2 0
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ParticipationMapper.java
  9. 2 3
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/FeishuInfoService.java
  10. 8 10
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/DingDingServiceImpl.java
  11. 9 14
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/FeishuInfoServiceImpl.java
  12. 4 7
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java
  13. 5 0
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/WxCorpInfoServiceImpl.java
  14. 10 19
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java
  15. 1 1
      fhKeeper/formulahousekeeper/management-platform/src/main/resources/application.yml
  16. 6 0
      fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ParticipationMapper.xml

+ 1 - 1
fhKeeper/formulahousekeeper/customerBuler-crm/index.html
Ver fichero 

@@ -4,7 +4,7 @@
 
   <meta charset="UTF-8" />
 
   <link rel="icon" type="image/svg+xml" href="./logo.svg" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-  <title>客户管家</title>
 
+  <title>智能客户管家</title>
 
 </head>
 
 
 <body>

+ 1 - 1
fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/header/header.vue
Ver fichero 

@@ -1,7 +1,7 @@
 
 <template>
 
   <div class="trademark mr-8 flex items-center text-white">
 
     <img :src="loginLogin" class="w-10 h-10 mr-4" />
 
-    <div class="text-nowrap">客户管家</div>
 
+    <div class="text-nowrap">智能客户管家</div>
 
   </div>
 
   <div class=" flex flex-row justify-start items-center text-white flex-1 parentDiv" ref="parentDiv">
 
     <div v-for="(routerItem, routerItemIdex) in routerList" @click="setCurrentRouter(routerItem)"

+ 1 - 1
fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/login.vue
Ver fichero 

@@ -4,7 +4,7 @@
 
       <div class="m-auto pt-4">
 
         <img class="w-1/5 m-auto" :src="loginLogo" alt="">
 
       </div>
 
-      <h2 class="text-xl text-center pt-4 font-bold">客户管家</h2>
 
+      <h2 class="text-xl text-center pt-4 font-bold">智能客户管家</h2>
 
       <el-form class="pt-4" ref="ruleFormRef" :model="ruleForm" :rules="rules">
 
         <el-form-item prop="username">
 
           <el-input clearable :prefix-icon="UserFilled" size="large" class="mt-2" v-model.trim="ruleForm.username"

+ 2 - 5
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/FeishuInfoController.java
Ver fichero 

@@ -29,10 +29,7 @@ import java.io.IOException;
 
 import java.io.PrintWriter;
 
 import java.time.LocalDateTime;
 
 import java.time.ZoneOffset;
 
-import java.util.ArrayList;
 
-import java.util.List;
 
-import java.util.Map;
 
-import java.util.Optional;
 
+import java.util.*;
 
 import java.util.stream.Collectors;
 
 
 /**
 
@@ -97,7 +94,7 @@ public class FeishuInfoController {
 
     public HttpRespMsg loadTaskResult(@RequestBody @Validated LoadTaskResultBO queryBO,HttpServletRequest request){
 
         HttpRespMsg msg = new HttpRespMsg();
 
         try {
 
-            msg = feishuInfoService.loadTaskResult(queryBO,request);
 
+            msg = feishuInfoService.loadTaskResult(queryBO);
 
         } catch (Exception e) {
 
             e.printStackTrace();
 
             msg.setError(MessageUtils.message("other.error"));

+ 4 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java
Ver fichero 

@@ -111,6 +111,9 @@ public class ReportController {
 
     @Resource
 
     private FinancialAuditMapper financialAuditMapper;
 
 
+    @Resource
 
+    private ParticipationMapper participationMapper;
 
+
 
     //获取任务相关的日报列表
 
     @RequestMapping("/getTaskReportList")
 
     public HttpRespMsg getTaskReportList(Integer taskId) {
 
@@ -2941,6 +2944,7 @@ public class ReportController {
 
         User user = userMapper.selectById(userId);
 
         user.setIsActive(0);
 
         userMapper.updateById(user);
 
+        participationMapper.delete(new LambdaQueryWrapper<Participation>().eq(Participation::getUserId,user.getId()));
 
         return msg;
 
     }

+ 4 - 7
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserController.java
Ver fichero 

@@ -1,17 +1,12 @@
 
 package com.management.platform.controller;
 
 
 
-import com.alibaba.fastjson.JSONArray;
 
-import com.alibaba.fastjson.JSONObject;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
-import com.management.platform.constant.Constant;
 
 import com.management.platform.entity.*;
 
 import com.management.platform.mapper.*;
 
 import com.management.platform.service.*;
 
-import com.management.platform.util.ColorUtil;
 
 import com.management.platform.util.HttpRespMsg;
 
-
 
 import com.management.platform.util.ListUtil;
 
 import com.management.platform.util.MessageUtils;
 
 import org.apache.poi.hssf.usermodel.*;
 
@@ -35,8 +30,6 @@ import javax.naming.ldap.SortControl;
 
 import javax.servlet.http.HttpServletRequest;
 
 import java.io.FileOutputStream;
 
 import java.io.IOException;
 
-import java.time.LocalDate;
 
-import java.time.LocalDateTime;
 
 import java.util.*;
 
 import java.util.stream.Collectors;
 
 
@@ -116,6 +109,9 @@ public class UserController {
 
     @Resource
 
     private UserGroupMapper userGroupMapper;
 
 
+    @Resource
 
+    private ParticipationMapper participationMapper;
 
+
 
     public static HashMap<String, Integer> corpddJobCenter = new HashMap();
 
     //用于控制线程锁
 
     public static HashMap<String, CorpwxJobResult> corpwxJobCenter = new HashMap();
 
@@ -769,6 +765,7 @@ public class UserController {
 
         }
 
         user.setIsActive(0);
 
         userService.updateById(user);
 
+        participationMapper.delete(new LambdaQueryWrapper<Participation>().eq(Participation::getUserId,user.getId()));
 
         return msg;
 
     }

+ 4 - 15
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/WeiXinCorpController.java
Ver fichero 

@@ -4,11 +4,6 @@ import com.alibaba.fastjson.JSONArray;
 
 import com.alibaba.fastjson.JSONObject;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
-import com.dingtalk.api.DefaultDingTalkClient;
 
-import com.dingtalk.api.DingTalkClient;
 
-import com.dingtalk.api.request.OapiV2DepartmentListsubRequest;
 
-import com.dingtalk.api.response.OapiV2DepartmentListsubResponse;
 
-import com.google.gson.JsonObject;
 
 import com.management.platform.constant.Constant;
 
 import com.management.platform.entity.*;
 
 import com.management.platform.entity.vo.UserVO;
 
@@ -16,16 +11,12 @@ import com.management.platform.mapper.*;
 
 import com.management.platform.service.*;
 
 import com.management.platform.service.impl.ExcelExportServiceImpl;
 
 import com.management.platform.service.impl.ReportServiceImpl;
 
-import com.management.platform.service.impl.TaskServiceImpl;
 
-import com.management.platform.service.impl.UserServiceImpl;
 
 import com.management.platform.util.*;
 
 import com.qq.weixin.mp.aes.AesException;
 
 import com.qq.weixin.mp.aes.WXBizMsgCrypt;
 
 import com.taobao.api.ApiException;
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.ibatis.annotations.Select;
 
 import org.json.XML;
 
-import org.junit.Test;
 
 import org.springframework.beans.BeanUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.beans.factory.annotation.Value;
 
@@ -39,15 +30,12 @@ import org.springframework.web.servlet.view.RedirectView;
 
 import javax.annotation.Resource;
 
 import javax.servlet.http.HttpServletRequest;
 
 import java.net.URLEncoder;
 
-import java.sql.Timestamp;
 
-import java.time.*;
 
+import java.time.LocalDate;
 
+import java.time.LocalDateTime;
 
+import java.time.ZoneOffset;
 
 import java.time.format.DateTimeFormatter;
 
 import java.util.*;
 
-import java.util.concurrent.ConcurrentHashMap;
 
-import java.util.function.Function;
 
-import java.util.function.Predicate;
 
 import java.util.stream.Collectors;
 
-import java.util.stream.Stream;
 
 
 @RestController
 
 @RequestMapping("/wxcorp")
 
@@ -2567,6 +2555,7 @@ public class WeiXinCorpController {
 
             //批量设置为停用
 
             if (setInactiveList.size() > 0) {
 
                 userService.updateBatchById(setInactiveList);
 
+                participationMapper.deleteBatchByUserId(setInactiveList.stream().map(User::getId).collect(Collectors.toList()));
 
             }
 
             List<User> newUserList = allCorpWxUserList.stream().filter(newItem -> !existingUsers.stream().anyMatch(existingItem -> newItem.getCorpwxUserid().equals(existingItem.getCorpwxUserid()))).collect(Collectors.toList());
 
             newUserList.forEach(newItem->{

+ 2 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ParticipationMapper.java
Ver fichero 

@@ -20,4 +20,6 @@ public interface ParticipationMapper extends BaseMapper<Participation> {
 
     List<Map<String, Object>> getParticipator(@Param("projectId") Integer projectId);
 
 
     List<ParticipationUser> getAllParticipator(@Param("projectIdList") List<Integer> projectIdList, Integer companyId);
 
+
 
+    void deleteBatchByUserId(@Param("userIds") List<String> userIds);
 
 }

+ 2 - 3
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/FeishuInfoService.java
Ver fichero 

@@ -2,12 +2,11 @@ package com.management.platform.service;
 
 
 import com.alibaba.fastjson.JSONArray;
 
 import com.alibaba.fastjson.JSONObject;
 
-import com.management.platform.entity.FeishuInfo;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import com.management.platform.entity.FeishuInfo;
 
 import com.management.platform.entity.bo.LoadTaskResultBO;
 
 import com.management.platform.util.HttpRespMsg;
 
 
-import javax.servlet.http.HttpServletRequest;
 
 import java.util.List;
 
 import java.util.Map;
 
 
@@ -42,5 +41,5 @@ public interface FeishuInfoService extends IService<FeishuInfo> {
 
 
     HttpRespMsg initSuperManager(String corpid, String name);
 
 
-    HttpRespMsg loadTaskResult(LoadTaskResultBO queryBO, HttpServletRequest request);
 
+    HttpRespMsg loadTaskResult(LoadTaskResultBO queryBO);
 
 }

+ 8 - 10
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/DingDingServiceImpl.java
Ver fichero 

@@ -3,8 +3,7 @@ package com.management.platform.service.impl;
 
 import com.alibaba.fastjson.JSON;
 
 import com.alibaba.fastjson.JSONArray;
 
 import com.alibaba.fastjson.JSONObject;
 
-import com.aliyun.dingtalkcontact_1_0.Client;
 
-import com.aliyun.dingtalkcontact_1_0.models.GetUserHeaders;
 
+import com.aliyun.dingtalkcontact_1_0.models.*;
 
 import com.aliyun.dingtalkoauth2_1_0.models.GetAuthInfoHeaders;
 
 import com.aliyun.dingtalkoauth2_1_0.models.GetAuthInfoRequest;
 
 import com.aliyun.dingtalkoauth2_1_0.models.GetAuthInfoResponse;
 
@@ -14,6 +13,7 @@ import com.aliyun.tea.TeaException;
 
 import com.aliyun.tea.TeaPair;
 
 import com.aliyun.teaopenapi.models.Config;
 
 import com.aliyun.teautil.models.RuntimeOptions;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import com.dingtalk.api.DefaultDingTalkClient;
 
 import com.dingtalk.api.DingTalkClient;
 
@@ -41,7 +41,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 
 import javax.annotation.Resource;
 
 import javax.servlet.http.HttpServletRequest;
 
-import java.math.BigInteger;
 
 import java.math.RoundingMode;
 
 import java.text.DecimalFormat;
 
 import java.text.SimpleDateFormat;
 
@@ -49,13 +48,6 @@ import java.time.*;
 
 import java.time.format.DateTimeFormatter;
 
 import java.util.*;
 
 import java.util.stream.Collectors;
 
-import com.aliyun.tea.*;
 
-import com.aliyun.teautil.*;
 
-import com.aliyun.teautil.models.*;
 
-import com.aliyun.dingtalkcontact_1_0.*;
 
-import com.aliyun.dingtalkcontact_1_0.models.*;
 
-import com.aliyun.teaopenapi.*;
 
-import com.aliyun.teaopenapi.models.*;
 
 
 //import com.management.platform.entity.vo.LeaveQuotaNum;
 
 
@@ -161,6 +153,9 @@ public class DingDingServiceImpl implements DingDingService {
 
     @Resource
 
     private TaskExecutorMapper taskExecutorMapper;
 
 
+    @Resource
 
+    private ParticipationMapper participationMapper;
 
+
 
 
     @Value("${configEnv.isPrivateDeploy}")
 
     private boolean isPrivateDeploy;//企业内部应用，私有化部署的情况
 
@@ -748,6 +743,7 @@ public class DingDingServiceImpl implements DingDingService {
 
                         u.setIsActive(0);
 
                         u.setInductionDate(LocalDate.now());
 
                         updateUser.add(u);
 
+                        participationMapper.delete(new LambdaQueryWrapper<Participation>().eq(Participation::getUserId,err.getId()));
 
                     });
 
                     if (updateUser.size() > 0) {
 
                         userService.updateBatchById(updateUser);
 
@@ -1368,6 +1364,7 @@ public class DingDingServiceImpl implements DingDingService {
 
                                             user.setIsActive(0);
 
                                             user.setInactiveDate(LocalDate.now());
 
                                             userMapper.updateById(user);
 
+                                            participationMapper.delete(new LambdaQueryWrapper<Participation>().eq(Participation::getUserId,user.getId()));
 
                                         }
 
                                     }
 
                                 }
 
@@ -2426,6 +2423,7 @@ public class DingDingServiceImpl implements DingDingService {
 
                 user.setIsActive(0);
 
                 user.setInactiveDate(leaveDate);
 
                 userMapper.updateById(user);
 
+                participationMapper.delete(new LambdaQueryWrapper<Participation>().eq(Participation::getUserId,user.getId()));
 
             }
 
         }
 
     }

+ 9 - 14
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/FeishuInfoServiceImpl.java
Ver fichero 

@@ -20,7 +20,6 @@ import org.springframework.stereotype.Service;
 
 import org.springframework.web.client.RestTemplate;
 
 
 import javax.annotation.Resource;
 
-import javax.servlet.http.HttpServletRequest;
 
 import java.math.BigDecimal;
 
 import java.math.RoundingMode;
 
 import java.text.SimpleDateFormat;
 
@@ -492,14 +491,8 @@ public class FeishuInfoServiceImpl extends ServiceImpl<FeishuInfoMapper, FeishuI
 
         }
 
 
         @Override
 
-        public HttpRespMsg loadTaskResult(LoadTaskResultBO queryBO, HttpServletRequest request) {
 
+        public HttpRespMsg loadTaskResult(LoadTaskResultBO queryBO) {
 
                 HttpRespMsg msg = new HttpRespMsg();
 
-//                User user = userMapper.selectById(request.getHeader("TOKEN"));
 
-//                if(null == user){
 
-//                        msg.setError("token有误，用户不存在");
 
-//                        return msg;
 
-//                }
 
-//                Integer companyId = user.getCompanyId();
 
 
                 LambdaQueryWrapper<User> lqw = new LambdaQueryWrapper<>();
 
                 lqw.select(User::getId,User::getJobNumber,User::getCompanyId).isNotNull(User::getJobNumber)
 
@@ -680,8 +673,8 @@ public class FeishuInfoServiceImpl extends ServiceImpl<FeishuInfoMapper, FeishuI
 
                                                 }
 
                                         }
 
 
-//                                        userFvTime.setStartTime(startTime);
 
-//                                        userFvTime.setEndTime(endTime);
 
+                                        userFvTime.setStartTime(startTime);
 
+                                        userFvTime.setEndTime(endTime);
 
                                         userFvTime.setWorkDate(LocalDate.parse(String.valueOf(day),DateTimeFormatter.ofPattern("yyyyMMdd")));
 
                                         userFvTime.setCompanyId(jobNumUserMap.get(userTaskResult.getUser_id()).getCompanyId());
 
 //                                        userFvTime.setWorkHours(workHours);
 
@@ -692,7 +685,7 @@ public class FeishuInfoServiceImpl extends ServiceImpl<FeishuInfoMapper, FeishuI
 
                                         for (FeishuRestTimeRule feishuRestTimeRule : restTimeRule) {
 
                                                 LocalTime tmpBeginTime = LocalTime.parse(feishuRestTimeRule.getRest_begin_time(), DateTimeFormatter.ofPattern("HH:mm"));
 
                                                 LocalTime tmpEndTime = LocalTime.parse(feishuRestTimeRule.getRest_end_time(), DateTimeFormatter.ofPattern("HH:mm"));
 
-                                                sumRestSecond = tmpEndTime.toSecondOfDay() - tmpBeginTime.toSecondOfDay();
 
+                                                sumRestSecond += tmpEndTime.toSecondOfDay() - tmpBeginTime.toSecondOfDay();
 
                                         }
 
 
                                         //获取加班时间段
 
@@ -700,11 +693,13 @@ public class FeishuInfoServiceImpl extends ServiceImpl<FeishuInfoMapper, FeishuI
 
                                         List<FeishuClockTaskRecord> overTimeList = userTaskResult.getRecords().stream().filter(t -> 1 == t.getTask_shift_type())
 
                                                 .collect(Collectors.toList());
 
                                         long sumOverTimeSeconds = 0;
 
+                                        long offRuleSeconds = offLocalDateTime.toEpochSecond(ZoneOffset.of("+8"));
 
                                         if(CollectionUtils.isNotEmpty(overTimeList)){
 
                                                 for (FeishuClockTaskRecord feishuClockTaskRecord : overTimeList) {
 
                                                         long startOver = Long.parseLong(feishuClockTaskRecord.getCheck_in_record().getCheck_time());
 
                                                         long endOver = Long.parseLong(feishuClockTaskRecord.getCheck_in_record().getCheck_time());
 
-                                                        sumOverTimeSeconds = endOver-startOver;
 
+                                                        startOver = Math.max(startOver, offRuleSeconds);
 
+                                                        sumOverTimeSeconds += endOver-startOver;
 
                                                 }
 
                                         }
 
 //                                        float overTimeHours = BigDecimal.valueOf(sumOverTimeSeconds/ (60 * 60f)).setScale(2, RoundingMode.HALF_UP).floatValue();
 
@@ -719,8 +714,8 @@ public class FeishuInfoServiceImpl extends ServiceImpl<FeishuInfoMapper, FeishuI
 
                                         userFvTime.setUserId(jobNumUserMap.get(userTaskResult.getUser_id()).getId());
 
                                         Date checkInTime = new Date(Long.parseLong(record.getCheck_in_record().getCheck_time()) * 1000);
 
                                         Date checkOutTime = new Date(Long.parseLong(record.getCheck_out_record().getCheck_time()) * 1000);
 
-                                        userFvTime.setStartTime(HMFormat.format(checkInTime));
 
-                                        userFvTime.setEndTime(HMFormat.format(checkOutTime));
 
+//                                        userFvTime.setStartTime(HMFormat.format(checkInTime));
 
+//                                        userFvTime.setEndTime(HMFormat.format(checkOutTime));
 
 
                                         map.put("data",userFvTime);
 
                                         map.put("startDateTime",format.format(checkInTime));

+ 4 - 7
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java
Ver fichero 

@@ -10,22 +10,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.management.platform.constant.Constant;
 
-import com.management.platform.controller.WeiXinCorpController;
 
 import com.management.platform.entity.*;
 
 import com.management.platform.entity.vo.SysRichFunction;
 
 import com.management.platform.entity.vo.UserVO;
 
 import com.management.platform.mapper.*;
 
 import com.management.platform.service.*;
 
 import com.management.platform.util.*;
 
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
 
 import me.chanjar.weixin.mp.api.WxMpInMemoryConfigStorage;
 
 import me.chanjar.weixin.mp.api.WxMpService;
 
 import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
 
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
 
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
 
-import org.apache.commons.collections4.Put;
 
-import org.apache.commons.io.FileUtils;
 
-import org.apache.poi.hssf.usermodel.*;
 
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 
 import org.apache.poi.ss.usermodel.*;
 
 import org.apache.poi.xssf.usermodel.XSSFCell;
 
@@ -35,12 +30,13 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 import org.springframework.beans.BeanUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.beans.factory.annotation.Value;
 
-import org.springframework.http.*;
 
+import org.springframework.http.HttpMethod;
 
+import org.springframework.http.HttpStatus;
 
+import org.springframework.http.ResponseEntity;
 
 import org.springframework.ldap.core.LdapTemplate;
 
 import org.springframework.ldap.filter.EqualsFilter;
 
 import org.springframework.stereotype.Service;
 
 import org.springframework.util.StringUtils;
 
-import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.client.RestTemplate;
 
 import org.springframework.web.multipart.MultipartFile;
 
 import org.springframework.web.servlet.ModelAndView;
 
@@ -3193,6 +3189,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
                 if(optional.isPresent()){
 
                     optional.get().setIsActive(0);
 
                     userMapper.updateById(optional.get());
 
+                    participationMapper.delete(new LambdaQueryWrapper<Participation>().eq(Participation::getUserId,optional.get().getId()));
 
                 }
 
                 continue;
 
             }

+ 5 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/WxCorpInfoServiceImpl.java
Ver fichero 

@@ -2,6 +2,7 @@ package com.management.platform.service.impl;
 
 
 import com.alibaba.fastjson.JSONArray;
 
 import com.alibaba.fastjson.JSONObject;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -170,6 +171,9 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
 
     @Resource
 
     WxCorpTemplateService wxCorpTemplateService;
 
 
+    @Resource
 
+    private ParticipationMapper participationMapper;
 
+
 
 
     //获取服务商provider_access_token
 
     @Override
 
@@ -964,6 +968,7 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
 
                 contactSyncLogMapper.insert(contactSyncLog);
 
                 user.setIsActive(0);//先同步过来，但是停用
 
                 userMapper.insert(user);
 
+                participationMapper.delete(new LambdaQueryWrapper<Participation>().eq(Participation::getUserId,user.getId()));
 
             }else {
 
                 userMapper.insert(user);
 
                 contactSyncLog.setResult(1);

+ 10 - 19
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java
Ver fichero 

@@ -1,21 +1,17 @@
 
 package com.management.platform.task;
 
 
-import com.alibaba.fastjson.JSON;
 
 import com.alibaba.fastjson.JSONArray;
 
 import com.alibaba.fastjson.JSONObject;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
-import com.baomidou.mybatisplus.core.injector.methods.SelectById;
 
-import com.management.platform.controller.WeiXinCorpController;
 
 import com.management.platform.entity.*;
 
-import com.management.platform.entity.Task;
 
-import com.management.platform.entity.vo.TokenVo;
 
 import com.management.platform.mapper.*;
 
 import com.management.platform.service.*;
 
-import com.management.platform.service.impl.WxCorpInfoServiceImpl;
 
 import com.management.platform.util.*;
 
-import com.management.platform.webservice.po.*;
 
-import jdk.nashorn.internal.ir.ContinueNode;
 
+import com.management.platform.webservice.po.ProjectQueryResponse;
 
+import com.management.platform.webservice.po.ProjectTask;
 
+import com.management.platform.webservice.po.ServiceProduct;
 
+import com.management.platform.webservice.po.XmlResponseData;
 
 import lombok.extern.slf4j.Slf4j;
 
 import me.chanjar.weixin.mp.api.WxMpInMemoryConfigStorage;
 
 import me.chanjar.weixin.mp.api.WxMpService;
 
@@ -29,7 +25,6 @@ import org.springframework.http.client.ClientHttpResponse;
 
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 import org.springframework.scheduling.annotation.Scheduled;
 
 import org.springframework.stereotype.Component;
 
-import org.springframework.transaction.annotation.Transactional;
 
 import org.springframework.util.StringUtils;
 
 import org.springframework.web.client.DefaultResponseErrorHandler;
 
 import org.springframework.web.client.RestTemplate;
 
@@ -38,24 +33,17 @@ import javax.annotation.Resource;
 
 import java.io.File;
 
 import java.io.IOException;
 
 import java.math.BigDecimal;
 
-import java.math.RoundingMode;
 
 import java.security.SecureRandom;
 
-import java.sql.Time;
 
-import java.sql.Timestamp;
 
 import java.text.DecimalFormat;
 
 import java.time.*;
 
-import java.time.Period;
 
 import java.time.format.DateTimeFormatter;
 
-import java.time.temporal.TemporalAccessor;
 
 import java.time.temporal.TemporalAdjusters;
 
-import java.time.temporal.WeekFields;
 
 import java.util.*;
 
-import java.util.concurrent.*;
 
+import java.util.concurrent.Executor;
 
+import java.util.concurrent.ExecutorService;
 
+import java.util.concurrent.Executors;
 
 import java.util.stream.Collectors;
 
 import java.util.stream.IntStream;
 
-import java.util.stream.Stream;
 
-
 
-import static org.apache.logging.log4j.message.ParameterizedMessage.format;
 
 
 /**
 
  * Author: 吴涛涛
 
@@ -182,6 +170,8 @@ public class TimingTask {
 
     private BeisenConfigMapper beisenConfigMapper;
 
     @Resource
 
     private HolidaySettingService holidaySettingService;
 
+    @Resource
 
+    private ParticipationMapper participationMapper;
 
 
 
     private static final List<Integer> VALID_TOKEN_CHARS = new ArrayList<>();
 
@@ -827,6 +817,7 @@ public class TimingTask {
 
                         User u = optional.get();
 
                         u.setIsActive(0);
 
                         userMapper.updateById(optional.get());
 
+                        participationMapper.delete(new LambdaQueryWrapper<Participation>().eq(Participation::getUserId,u.getId()));
 
                     }
 
                     continue;
 
                 }

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/resources/application.yml
Ver fichero 

@@ -164,7 +164,7 @@ providerSecret: wlwGIUXskWKsNtCfKUsAfJ6ueba55rZnqZvcC-rUM6nQ-LnRDyYgISQ2BO-UlL_A
 
 configEnv:
 
   isDev: true
 
   # 是否是私有化部署，企业内部应用
 
-  isPrivateDeploy: true
 
+  isPrivateDeploy: false
 
 
 privateDeployURL:
 
   pcUrl: http://dev.huoshishanxin.com/#/

+ 6 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ParticipationMapper.xml
Ver fichero 

@@ -13,6 +13,12 @@
 
     <sql id="Base_Column_List">
 
         id, user_id, project_id
 
     </sql>
 
+    <delete id="deleteBatchByUserId">
 
+        delete from participation where user_id in
 
+        <foreach collection="userIds" item="userId" separator="," open="(" close=")">
 
+            #{userId}
 
+        </foreach>
 
+    </delete>
 
 
     <!--根据项目id获取所有参与者id和name-->
 
     <select id="getParticipator" resultType="java.util.Map">