美莱德同步请假出差数据 暂时去掉唯一辨识的校验 只按照日期和所属人员区别更新或者新增

八爪鱼增加下载工时管家日志功能

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

@@ -447,9 +447,9 @@ public class TimingTask {
                         default:leaveType=8;
                     }
                     leaveSheet.setLeaveType(leaveType);
-                    leaveSheet.setProcinstId(String.valueOf(map.get("ID")));
+                    leaveSheet.setProcinstId(String.valueOf(map.get("procinstId")));
                     leaveSheet.setGmtFinished(String.valueOf(map.get("gmtFinished")));
-                    Optional<LeaveSheet> first = oldLeaveSheetList.stream().filter(ol -> ol.getStartDate().isEqual(leaveSheet.getStartDate())&&ol.getEndDate().isEqual(leaveSheet.getEndDate())&& ol.getOwnerId().equals(leaveSheet.getOwnerId())&& ol.getProcinstId().equals(leaveSheet.getProcinstId())).findFirst();
+                    Optional<LeaveSheet> first = oldLeaveSheetList.stream().filter(ol -> ol.getStartDate().isEqual(leaveSheet.getStartDate())&&ol.getEndDate().isEqual(leaveSheet.getEndDate())&& ol.getOwnerId().equals(leaveSheet.getOwnerId())).findFirst();
                     if(first.isPresent()){
                         leaveSheet.setId(first.get().getId());
                     }
@@ -502,9 +502,9 @@ public class TimingTask {
                     businessTrip.setGoBack(goBack);
                     Double dayCount =Double.valueOf(String.valueOf(map.get("dayCount")));
                     businessTrip.setDayCount(dayCount.intValue());
-                    businessTrip.setProcinstId((String) map.get("ID"));
+                    businessTrip.setProcinstId((String) map.get("procinstId"));
                     businessTrip.setGmtFinished((String)map.get("gmtFinished"));
-                    Optional<BusinessTrip> first = oldBusinessTripList.stream().filter(ol -> ol.getStartDate().isEqual(businessTrip.getStartDate())&&ol.getEndDate().isEqual(businessTrip.getEndDate())&& ol.getOwnerId().equals(businessTrip.getOwnerId())&& ol.getProcinstId().equals(businessTrip.getProcinstId())).findFirst();
+                    Optional<BusinessTrip> first = oldBusinessTripList.stream().filter(ol -> ol.getStartDate().isEqual(businessTrip.getStartDate())&&ol.getEndDate().isEqual(businessTrip.getEndDate())&& ol.getOwnerId().equals(businessTrip.getOwnerId())).findFirst();
                     if(first.isPresent()){
                         businessTrip.setId(first.get().getId());
                     }

fhKeeper/formulahousekeeper/octopus/src/views/Home.vue

@@ -15,6 +15,7 @@
                 </div>
             </el-col>
             <el-col :span="10" class="userinfo">
+                <el-button type="text" style="margin-right:30px; color:#fff" @click="downLoadLog" >下载工时管家日志</el-button>
                 <el-dropdown trigger="hover" style="margin-right:30px;">
                     <span class="el-dropdown-link userinfo-inner">
                         <i class="el-icon-user" style="font-size:18px" ></i>
@@ -364,6 +365,27 @@
                 //     });
                 // });
             },
+            //下载日志文件
+            downLoadLog() {
+                this.http.post('/common/downLoadLog',{},
+                res => {
+                    if (res.code == "ok") {
+                        var filePath = res.data;
+                        const a = document.createElement('a'); // 创建a标签
+                        a.setAttribute('download',"wt_print.log"+ '.log');// download属性
+                        a.setAttribute('href', filePath);// href链接
+                        a.click(); //自执行点击事件
+                        a.remove();
+                    } 
+                },
+                error => {
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                    }
+                );
+            },
 
             //点击消息的跳转
             locationHerf(id, date, type) {

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

@@ -1,17 +1,27 @@
 package com.management.platform.controller;
 
+import com.management.platform.entity.Company;
 import com.management.platform.util.HttpRespMsg;
+import fr.opensagres.poi.xwpf.converter.pdf.PdfConverter;
+import fr.opensagres.poi.xwpf.converter.pdf.PdfOptions;
+import fr.opensagres.xdocreport.document.IXDocReport;
+import fr.opensagres.xdocreport.document.registry.XDocReportRegistry;
+import fr.opensagres.xdocreport.template.IContext;
+import fr.opensagres.xdocreport.template.TemplateEngineKind;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
+import java.math.BigDecimal;
+import java.nio.channels.FileChannel;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.UUID;
 
 @RestController
@@ -57,4 +67,28 @@ public class CommonUploadController {
 
         return msg;
     }
+    @RequestMapping("/downLoadLog")
+    public HttpRespMsg downLoadLog() throws IOException {
+        HttpRespMsg httpRespMsg=new HttpRespMsg();
+        FileChannel sourceChannel = null;
+        FileChannel destChannel = null;
+        try {
+            File file=new File("/www/worktime/server/");
+            if(!file.exists()){
+                file.mkdirs();
+            }
+            sourceChannel = new FileInputStream("/www/worktime/server/wt_print.log").getChannel();
+            destChannel = new FileOutputStream(path+"wt_print.log").getChannel();
+            destChannel.transferFrom(sourceChannel, 0, sourceChannel.size());
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally{
+            sourceChannel.close();
+            destChannel.close();
+        }
+        httpRespMsg.data="/upload/"+"wt_print.log";
+        return httpRespMsg;
+    }
 }