日报审核通过提醒控制

出差导出修改

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

@@ -1,23 +1,23 @@
 package com.management.platform.entity;
 
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import java.util.List;
-
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
 /**
  * <p>
  * 
  * </p>
  *
  * @author Seyason
- * @since 2022-08-12
+ * @since 2022-08-17
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -338,6 +338,12 @@ public class TimeType extends Model<TimeType> {
     @TableField("finance_jobnum_enabled")
     private Integer financeJobnumEnabled;
 
+    /**
+     * 日报审核通过消息推送 0-未开启 1-开启
+     */
+    @TableField("report_approve_msgpush")
+    private Integer reportApproveMsgpush;
+
     @TableField(exist = false)
     private List<User> userList;
 

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

@@ -68,7 +68,7 @@ public class BusinessTripServiceImpl extends ServiceImpl<BusinessTripMapper, Bus
         List<List<String>> sheetOneDataList=new ArrayList<>();
         List<List<String>> sheetTwoDataList=new ArrayList<>();
         DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        String[] sheetOneTitleArray=new String[]{"出差人员","出差事由","出差详情","交通工具","出差天数","出差开始时间","出差结束时间","状态","备注"};
+        String[] sheetOneTitleArray=new String[]{"出差人员","出差天数","出差详情","交通工具","出差开始时间","出差结束时间","状态","备注"};
         String[] sheetTwoTitleArray=new String[]{"出差人员","总出差天数"};
         List<String> sheetOneTitleList=Arrays.asList(sheetOneTitleArray);
         List<String> sheetTwoTitleList=Arrays.asList(sheetTwoTitleArray);
@@ -78,7 +78,7 @@ public class BusinessTripServiceImpl extends ServiceImpl<BusinessTripMapper, Bus
         for (BusinessTrip businessTrip : recordsList) {
             List<String> item=new ArrayList<>();
             item.add(businessTrip.getOwnerName());
-            item.add(businessTrip.getReason());
+            item.add(String.valueOf(businessTrip.getDayCount()));
             List<BustripProject> businessTripProjectList = businessTrip.getProjectList();
             String detail="";
             if(businessTripProjectList.size()>0){
@@ -89,7 +89,6 @@ public class BusinessTripServiceImpl extends ServiceImpl<BusinessTripMapper, Bus
                     }else {
                         detail+=bustripProject.getStartDate()+"至"+bustripProject.getEndDate()+" "+(StringUtils.isEmpty(bustripProject.getProjectName())?"":bustripProject.getProjectName())+" "+(StringUtils.isEmpty(bustripProject.getDegreeName())?"":bustripProject.getDegreeName());
                     }
-
                 }
             }
             item.add(detail);
@@ -105,7 +104,6 @@ public class BusinessTripServiceImpl extends ServiceImpl<BusinessTripMapper, Bus
                 case 4:item.add("其他");
                     break;
             }
-            item.add(String.valueOf(businessTrip.getDayCount()));
             item.add(df.format(businessTrip.getStartDate()));
             item.add(df.format(businessTrip.getEndDate()));
             switch (businessTrip.getStatus()){

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

@@ -23,7 +23,6 @@ import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.*;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -1400,42 +1399,44 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             List<CompanyDingding> companyDingdingList = companyDingdingService.list(new QueryWrapper<CompanyDingding>().eq("company_id", company.getId()));
             String pNames = projectList.stream().map(Project::getProjectName).collect(Collectors.joining(", ", "[", "]"));
             //审核通过操作 向被审核人推送消息
-            for (Report report : reportList) {
-                if(report.getState()==1){
-                    String uId = report.getCreatorId();
-                    Optional<User> first = userList.stream().filter(ul -> ul.getId().equals(uId)).findFirst();
-                    if(first.isPresent()){
-                        User u = first.get();
-                        if(u.getCorpwxUserid()!=null){
-                            if(wxCorpInfoList.size()>0){
-                                JSONObject json=new JSONObject();
-                                JSONArray dataJson=new JSONArray();
-                                JSONObject item=new JSONObject();
-                                item.put("key","审核人");
-                                item.put("value",user.getName());
-                                dataJson.add(item);
-                                if(timeType.getNeedEvaluate()==1){
-                                    JSONObject item1=new JSONObject();
-                                    item1.put("key","评价");
-                                    item1.put("value",StringUtils.isEmpty(report.getEvaluate())?"":report.getEvaluate());
-                                    dataJson.add(item1);
-                                    json.put("template_id","tty9TkCAAAWoUyhGnXRCZuhkgCqw_Uow");
-                                }else {
-                                    json.put("template_id","tty9TkCAAANpvEtLrkPUGeOEd1-U7W2w");
+            if(timeType.getReportApproveMsgpush()==1){
+                for (Report report : reportList) {
+                    if(report.getState()==1){
+                        String uId = report.getCreatorId();
+                        Optional<User> first = userList.stream().filter(ul -> ul.getId().equals(uId)).findFirst();
+                        if(first.isPresent()){
+                            User u = first.get();
+                            if(u.getCorpwxUserid()!=null){
+                                if(wxCorpInfoList.size()>0){
+                                    JSONObject json=new JSONObject();
+                                    JSONArray dataJson=new JSONArray();
+                                    JSONObject item=new JSONObject();
+                                    item.put("key","审核人");
+                                    item.put("value",user.getName());
+                                    dataJson.add(item);
+                                    if(timeType.getNeedEvaluate()==1){
+                                        JSONObject item1=new JSONObject();
+                                        item1.put("key","评价");
+                                        item1.put("value",StringUtils.isEmpty(report.getEvaluate())?"":report.getEvaluate());
+                                        dataJson.add(item1);
+                                        json.put("template_id","tty9TkCAAAWoUyhGnXRCZuhkgCqw_Uow");
+                                    }else {
+                                        json.put("template_id","tty9TkCAAANpvEtLrkPUGeOEd1-U7W2w");
+                                    }
+                                    JSONObject item2=new JSONObject();
+                                    item2.put("key","日期");
+                                    item2.put("value",report.getCreateDate());
+                                    dataJson.add(item2);
+                                    json.put("url","https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww4e237fd6abb635af&redirect_uri=http://mobworktime.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=0#wechat_redirect");
+                                    json.put("content_item",dataJson);
+                                    wxCorpInfoService.sendWXCorpTemplateMsg(wxCorpInfoList.get(0),u.getCorpwxUserid(),json);
                                 }
-                                JSONObject item2=new JSONObject();
-                                item2.put("key","日期");
-                                item2.put("value",report.getCreateDate());
-                                dataJson.add(item2);
-                                json.put("url","https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww4e237fd6abb635af&redirect_uri=http://mobworktime.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=0#wechat_redirect");
-                                json.put("content_item",dataJson);
-                                wxCorpInfoService.sendWXCorpTemplateMsg(wxCorpInfoList.get(0),u.getCorpwxUserid(),json);
                             }
-                        }
-                        if(u.getDingdingUserid()!=null){
-                            if(companyDingdingList.size()>0){
-                                CompanyDingding companyDingding = companyDingdingList.get(0);
-                                companyDingdingService.sendReportApproveMsg(company.getId(),companyDingding.getAgentId(),user.getName(),report.getEvaluate(),report.getCreateDate(),u.getDingdingUserid());
+                            if(u.getDingdingUserid()!=null){
+                                if(companyDingdingList.size()>0){
+                                    CompanyDingding companyDingding = companyDingdingList.get(0);
+                                    companyDingdingService.sendReportApproveMsg(company.getId(),companyDingding.getAgentId(),user.getName(),report.getEvaluate(),report.getCreateDate(),u.getDingdingUserid());
+                                }
                             }
                         }
                     }
@@ -2183,43 +2184,45 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             List<CompanyDingding> companyDingdingList = companyDingdingService.list(new QueryWrapper<CompanyDingding>().eq("company_id", company.getId()));
             String s = org.apache.commons.lang3.StringUtils.join(stringList, ",");
             int channel = oldState == -1?0:1; //0-导入审核, 项目报告审核
-            //审核通过操作 向被审核人推送消息
-            for (Report report : allReports) {
-                if(report.getState()==1){
-                    String uId = report.getCreatorId();
-                    Optional<User> first = userList.stream().filter(ul -> ul.getId().equals(uId)).findFirst();
-                    if(first.isPresent()){
-                        User u = first.get();
-                        if(u.getCorpwxUserid()!=null){
-                            if(wxCorpInfoList.size()>0){
-                                JSONObject json=new JSONObject();
-                                JSONArray dataJson=new JSONArray();
-                                JSONObject item=new JSONObject();
-                                item.put("key","审核人");
-                                item.put("value",user.getName());
-                                dataJson.add(item);
-                                if(timeType.getNeedEvaluate()==1){
-                                    JSONObject item1=new JSONObject();
-                                    item1.put("key","评价");
-                                    item1.put("value",StringUtils.isEmpty(report.getEvaluate())?"":report.getEvaluate());
-                                    dataJson.add(item1);
-                                    json.put("template_id","tty9TkCAAAWoUyhGnXRCZuhkgCqw_Uow");
-                                }else {
-                                    json.put("template_id","tty9TkCAAANpvEtLrkPUGeOEd1-U7W2w");
+            if(timeType.getReportApproveMsgpush()==1){
+                //审核通过操作 向被审核人推送消息
+                for (Report report : allReports) {
+                    if(report.getState()==1){
+                        String uId = report.getCreatorId();
+                        Optional<User> first = userList.stream().filter(ul -> ul.getId().equals(uId)).findFirst();
+                        if(first.isPresent()){
+                            User u = first.get();
+                            if(u.getCorpwxUserid()!=null){
+                                if(wxCorpInfoList.size()>0){
+                                    JSONObject json=new JSONObject();
+                                    JSONArray dataJson=new JSONArray();
+                                    JSONObject item=new JSONObject();
+                                    item.put("key","审核人");
+                                    item.put("value",user.getName());
+                                    dataJson.add(item);
+                                    if(timeType.getNeedEvaluate()==1){
+                                        JSONObject item1=new JSONObject();
+                                        item1.put("key","评价");
+                                        item1.put("value",StringUtils.isEmpty(report.getEvaluate())?"":report.getEvaluate());
+                                        dataJson.add(item1);
+                                        json.put("template_id","tty9TkCAAAWoUyhGnXRCZuhkgCqw_Uow");
+                                    }else {
+                                        json.put("template_id","tty9TkCAAANpvEtLrkPUGeOEd1-U7W2w");
+                                    }
+                                    JSONObject item2=new JSONObject();
+                                    item2.put("key","日期");
+                                    item2.put("value",report.getCreateDate());
+                                    dataJson.add(item2);
+                                    json.put("url","https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww4e237fd6abb635af&redirect_uri=http://mobworktime.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=0#wechat_redirect");
+                                    json.put("content_item",dataJson);
+                                    wxCorpInfoService.sendWXCorpTemplateMsg(wxCorpInfoList.get(0),u.getCorpwxUserid(),json);
                                 }
-                                JSONObject item2=new JSONObject();
-                                item2.put("key","日期");
-                                item2.put("value",report.getCreateDate());
-                                dataJson.add(item2);
-                                json.put("url","https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww4e237fd6abb635af&redirect_uri=http://mobworktime.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=0#wechat_redirect");
-                                json.put("content_item",dataJson);
-                                wxCorpInfoService.sendWXCorpTemplateMsg(wxCorpInfoList.get(0),u.getCorpwxUserid(),json);
                             }
-                        }
-                        if(u.getDingdingUserid()!=null){
-                            if(companyDingdingList.size()>0){
-                                CompanyDingding companyDingding = companyDingdingList.get(0);
-                                companyDingdingService.sendReportApproveMsg(company.getId(),companyDingding.getAgentId(),user.getName(),report.getEvaluate(),report.getCreateDate(),u.getDingdingUserid());
+                            if(u.getDingdingUserid()!=null){
+                                if(companyDingdingList.size()>0){
+                                    CompanyDingding companyDingding = companyDingdingList.get(0);
+                                    companyDingdingService.sendReportApproveMsg(company.getId(),companyDingding.getAgentId(),user.getName(),report.getEvaluate(),report.getCreateDate(),u.getDingdingUserid());
+                                }
                             }
                         }
                     }

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

@@ -263,8 +263,8 @@ public class TimingTask {
             wxCorpInfoService.getUserCheckInDayData(companyId, null, start, end, false);
         }
     }
-    //每个月第一天推送token到每个公司
-    @Scheduled(cron = "0 30 7 1 * ?")
+    //每半个小时推送一次token到每个公司
+    @Scheduled(fixedRate = 1800 * 1000)
     public void  pushToken(){
         int passwordLength = 30;
         LocalDateTime localDateTime=LocalDateTime.now();
@@ -283,7 +283,7 @@ public class TimingTask {
                     continue;
                 }
                 thirdPartyInterface.setToken(token);
-                thirdPartyInterface.setExpireTime(localDateTime.plusMonths(1));
+                thirdPartyInterface.setExpireTime(localDateTime.plusDays(1));
             }
         }
         thirdPartyInterfaceService.updateBatchById(thirdPartyInterfaceList);