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

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

@@ -4,9 +4,11 @@ package com.management.platform.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.Project;
 import com.management.platform.entity.ReportExtraDegree;
+import com.management.platform.entity.TimeType;
 import com.management.platform.entity.User;
 import com.management.platform.mapper.ProjectMapper;
 import com.management.platform.mapper.ReportExtraDegreeMapper;
+import com.management.platform.mapper.TimeTypeMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.ProjectService;
 import com.management.platform.service.ReportExtraDegreeService;
@@ -47,6 +49,8 @@ public class ReportExtraDegreeController {
     ProjectService projectService;
     @Resource
     ReportExtraDegreeService reportExtraDegreeService;
+    @Resource
+    TimeTypeMapper timeTypeMapper;
 
     /**
      * addOrMod添加或者修改
@@ -59,12 +63,13 @@ public class ReportExtraDegreeController {
         String token = request.getHeader("TOKEN");
         User user = userMapper.selectById(token);
         List<ReportExtraDegree> reportExtraDegreeMapperAll = reportExtraDegreeMapper.getAll(user.getCompanyId());
+        TimeType timeType = timeTypeMapper.selectById(user.getCompanyId());
         List<String> nameList=new ArrayList<>();
         reportExtraDegreeMapperAll.forEach(re->{
             nameList.add(re.getName());
         });
         if(nameList.contains(info.getName())){
-            msg.setError("客户名称重复");
+            msg.setError(timeType.getCustomDegreeName()+"名称重复");
             return msg;
         }
         if (info.getId() == null) {

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

@@ -8,6 +8,7 @@ import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.CustomerInfoService;
 import com.management.platform.util.ExcelUtil;
 import com.management.platform.util.HttpRespMsg;
+import org.apache.poi.EncryptedDocumentException;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.*;
 import org.springframework.stereotype.Service;
@@ -118,7 +119,13 @@ public class CustomerInfoServiceImpl extends ServiceImpl<CustomerInfoMapper, Cus
             return msg;
         } catch (InvalidFormatException e) {
             e.printStackTrace();
+            msg.setError("文件格式错误，如果安装了加密软件需要先解密再上传");
+            return msg;
+        } catch (EncryptedDocumentException e) {
+            e.printStackTrace();
+            msg.setError("文件加密状态，需要先解除加密状态再上传");
+            return msg;
         }
-        return null;
     }
+
 }

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

@@ -3,25 +3,21 @@ package com.management.platform.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.entity.*;
 import com.management.platform.mapper.*;
 import com.management.platform.service.FinanceFixedcolnameService;
 import com.management.platform.service.FinanceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.service.ReportService;
 import com.management.platform.service.UserService;
-import com.management.platform.util.*;
-import lombok.extern.log4j.Log4j;
+import com.management.platform.util.ExcelUtil;
+import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.UserNotFoundException;
 import org.apache.commons.io.FileUtils;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
-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;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,10 +27,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.*;
 import java.math.BigDecimal;
-import java.sql.Timestamp;
-import java.text.SimpleDateFormat;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -423,6 +416,12 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
             log.setRecoverReport(syncHistoryReport?1:0);
             log.setState(1);//默认审核通过
             financeImportMapper.insert(log);
+        }catch (IOException e){
+            e.printStackTrace();
+            msg.setError("文件处理错误");
+        }catch (InvalidFormatException e) {
+            e.printStackTrace();
+            msg.setError("文件格式错误，如果安装了加密软件需要先解密再上传");
         } finally {
             //关闭流
             try {

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

@@ -1,23 +1,24 @@
 package com.management.platform.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.google.gson.JsonObject;
-import com.management.platform.entity.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.management.platform.entity.FinanceProjects;
+import com.management.platform.entity.Project;
+import com.management.platform.entity.ProjectPercentage;
+import com.management.platform.entity.User;
 import com.management.platform.mapper.ProjectMapper;
 import com.management.platform.mapper.ProjectPercentageMapper;
 import com.management.platform.mapper.ReportMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.FinanceProjectsService;
 import com.management.platform.service.ProjectPercentageService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.util.ExcelUtil;
 import com.management.platform.util.HttpRespMsg;
+import org.apache.poi.EncryptedDocumentException;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.*;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
@@ -25,7 +26,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.*;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 /**
@@ -262,7 +262,12 @@ public class ProjectPercentageServiceImpl extends ServiceImpl<ProjectPercentageM
             return msg;
         } catch (InvalidFormatException e) {
             e.printStackTrace();
+            msg.setError("文件格式错误，如果安装了加密软件需要先解密再上传");
+            return msg;
+        }catch (EncryptedDocumentException e) {
+            e.printStackTrace();
+            msg.setError("文件加密状态，需要先解除加密状态再上传");
+            return msg;
         }
-        return null;
     }
 }

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

@@ -13,6 +13,8 @@ import com.management.platform.service.*;
 import com.management.platform.util.ExcelUtil;
 import com.management.platform.util.HttpRespMsg;
 import com.management.platform.util.ListUtil;
+import org.apache.poi.EncryptedDocumentException;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -2076,6 +2078,13 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             e.printStackTrace();
             msg.setError("数据格式有误或存在空数据 导入失败");
             return msg;
+        }catch (InvalidFormatException e) {
+            e.printStackTrace();
+            msg.setError("文件格式错误，如果安装了加密软件需要先解密再上传");
+        }catch (EncryptedDocumentException e) {
+            e.printStackTrace();
+            msg.setError("文件加密状态，需要先解除加密状态再上传");
+            return msg;
         } catch (Exception e) {
             e.printStackTrace();
             msg.setError("上传失败："+e.getMessage());

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

@@ -8,6 +8,7 @@ import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.ReportExtraDegreeService;
 import com.management.platform.util.ExcelUtil;
 import com.management.platform.util.HttpRespMsg;
+import org.apache.poi.EncryptedDocumentException;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -86,7 +87,7 @@ public class ReportExtraDegreeServiceImpl extends ServiceImpl<ReportExtraDegreeM
                     return msg;
                 }
                 if(nameList.contains(row.getCell(0).toString())){
-                    msg.setError("当前导入数据存在重复中心名称["+row.getCell(1).toString()+"]");
+                    msg.setError("当前导入数据存在重复中心名称["+row.getCell(0).toString()+"]");
                     return msg;
                 }
                 nameList.add(row.getCell(0).toString());
@@ -110,7 +111,12 @@ public class ReportExtraDegreeServiceImpl extends ServiceImpl<ReportExtraDegreeM
             return msg;
         } catch (InvalidFormatException e) {
             e.printStackTrace();
+            msg.setError("文件格式错误，如果安装了加密软件需要先解密再上传");
+            return msg;
+        }catch (EncryptedDocumentException e) {
+            e.printStackTrace();
+            msg.setError("文件加密状态，需要先解除加密状态再上传");
+            return msg;
         }
-        return null;
     }
 }

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

@@ -18,7 +18,9 @@ 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.io.FileUtils;
+import org.apache.poi.EncryptedDocumentException;
 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.stereotype.Service;
@@ -2461,6 +2463,14 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             e.printStackTrace();
             msg.setError("数据格式有误或存在空数据 导入失败");
             return msg;
+        }catch (InvalidFormatException e) {
+            e.printStackTrace();
+            msg.setError("文件格式错误，如果安装了加密软件需要先解密再上传");
+            return msg;
+        }catch (EncryptedDocumentException e) {
+            e.printStackTrace();
+            msg.setError("文件加密状态，需要先解除加密状态再上传");
+            return msg;
         } catch (Exception e) {
             e.printStackTrace();
             msg.setError("发生其他错误："+e.getMessage());

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

@@ -1,19 +1,23 @@
 package com.management.platform.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.management.platform.entity.SimpleFinance;
+import com.management.platform.entity.SimpleProjectime;
+import com.management.platform.entity.SimpleReport;
+import com.management.platform.entity.User;
 import com.management.platform.mapper.SimpleFinanceMapper;
 import com.management.platform.mapper.SimpleProjectimeMapper;
 import com.management.platform.mapper.SimpleReportMapper;
 import com.management.platform.service.SimpleFinanceService;
 import com.management.platform.service.SimpleProjectimeService;
 import com.management.platform.service.SimpleReportService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.util.ExcelUtil;
 import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.UserNotFoundException;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
+import org.apache.poi.EncryptedDocumentException;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -34,7 +38,10 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -342,6 +349,14 @@ public class SimpleReportServiceImpl extends ServiceImpl<SimpleReportMapper, Sim
             e.printStackTrace();
             msg.setError("数据格式有误或存在空数据 导入失败");
             return msg;
+        }catch (InvalidFormatException e) {
+            e.printStackTrace();
+            msg.setError("文件格式错误，如果安装了加密软件需要先解密再上传");
+            return msg;
+        }catch (EncryptedDocumentException e) {
+            e.printStackTrace();
+            msg.setError("文件加密状态，需要先解除加密状态再上传");
+            return msg;
         } catch (Exception e) {
             e.printStackTrace();
             msg.setError("发生其他错误");

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -1,7 +1,8 @@
 var path = require('path')
 
 //  var ip = '127.0.0.1'
-var ip = '192.168.2.15'
+// var ip = '192.168.2.15'
+var ip = '192.168.2.39'
 // var ip = '192.168.2.12'// var ip = '47.100.37.243' 
 
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip

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

@@ -3,8 +3,10 @@
         <div class="page-img">
             <img src="../assets/image/404.png" />
         </div>
-        <p class="page-container"><b>Error</b>  闫某人真帅 非常抱歉你访问的页面不存在！！！1234567</p>        <div class="page-button">
-            <el-button type="primary" round @click="back" icon="el-icon-s-promotion">返回首页</el-button>
+        <p>请联系李晶亚</p>
+        <p class="page-container"><b>Error</b> 非常抱歉你访问的页面不存在！！！</p>        <div class="page-button">
+            <el-button type="danage" round @click="back" icon="el-icon-s-promotion">返回首页</el-button>
+            <button>123</button>
         </div>
     </div>
 </template>