清理客户管家代码

fhKeeper/formulahousekeeper/management-crm/pom.xml

@@ -64,19 +64,6 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-generator</artifactId>
         </dependency>
-
-        <!-- velocity模板引擎 -->
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
-        </dependency>
-
-        <!-- freemarker 模板引擎-->
-        <dependency>
-            <groupId>org.freemarker</groupId>
-            <artifactId>freemarker</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -87,27 +74,13 @@
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
         </dependency>
-
-        <!-- openoffice -->
-        <dependency>
-            <groupId>com.artofsolving</groupId>
-            <artifactId>jodconverter</artifactId>
-            <version>2.2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.artofsolving</groupId>
-            <artifactId>jodconverter-core-3.0.jar</artifactId>
-            <version>1.0</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/src/main/resources/lib/jodconverter-core-3.0.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>com.dingtalk</groupId>
-            <artifactId>taobao-sdk-java-auto_1479188381469-20210623.jar</artifactId>
-            <version>1.0</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/src/main/resources/lib/taobao-sdk-java-auto_1479188381469-20210623.jar</systemPath>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.dingtalk</groupId>-->
+<!--            <artifactId>taobao-sdk-java-auto_1479188381469-20210623.jar</artifactId>-->
+<!--            <version>1.0</version>-->
+<!--            <scope>system</scope>-->
+<!--            <systemPath>${basedir}/src/main/resources/lib/taobao-sdk-java-auto_1479188381469-20210623.jar</systemPath>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>dingtalk</artifactId>

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

@@ -5,9 +5,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.AuditWorkflowSetting;
-import com.management.platform.entity.AuditWorkflowSetting;
-import com.management.platform.entity.Department;
-import com.management.platform.entity.Report;
 import com.management.platform.mapper.*;
 import com.management.platform.service.AuditWorkflowSettingService;
 import com.management.platform.util.HttpRespMsg;

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

@@ -1,152 +1,145 @@
-package com.management.platform.controller;
-
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.api.R;
-import com.management.platform.entity.*;
-import com.management.platform.mapper.*;
-import com.management.platform.service.ReportService;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.MessageUtils;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-07-25
- */
-@RestController
-@RequestMapping("/audit-workflow-time-setting")
-public class AuditWorkflowTimeSettingController {
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    AuditWorkflowTimeSettingMapper auditWorkflowTimeSettingMapper;
-    @Resource
-    UserMapper userMapper;
-    @Resource
-    DepartmentMapper departmentMapper;
-    @Resource
-    ReportMapper reportMapper;
-    @Resource
-    TimeTypeMapper timeTypeMapper;
-    @Resource
-    ReportService reportService;
-
-
-    @RequestMapping("/add")
-    public HttpRespMsg add(String json, Integer deptId) {
-        String token = request.getHeader("TOKEN");
-        Integer companyId = userMapper.selectById(token).getCompanyId();
-        auditWorkflowTimeSettingMapper.delete(new QueryWrapper<AuditWorkflowTimeSetting>().eq("dept_id", deptId));
-        JSONArray array = JSONArray.parseArray(json);
-
-        if (array.size() == 1 && array.getJSONObject(0).getInteger("isDeptAudit") == 0) {
-            //只有一个项目负责人审核，不保存
-        } else {
-            //检查是否有重复的部门
-            List<Integer> auditDeptIds = new ArrayList<>();
-            for (int i=0;i<array.size(); i++) {
-                JSONObject obj = array.getJSONObject(i);
-                AuditWorkflowTimeSetting auditWorkflowTimeSetting = JSONObject.toJavaObject(obj, AuditWorkflowTimeSetting.class);
-                if (auditDeptIds.contains(auditWorkflowTimeSetting.getAuditDeptId())) {
-                    HttpRespMsg msg = new HttpRespMsg();
-                    msg.setError(MessageUtils.message("department.duplicateError",auditWorkflowTimeSetting.getAuditDeptName()));
-                    return msg;
-                } else {
-                    auditDeptIds.add(auditWorkflowTimeSetting.getAuditDeptId());
-                }
-            }
-
-            for (int i=0;i<array.size(); i++) {
-                JSONObject obj = array.getJSONObject(i);
-                AuditWorkflowTimeSetting auditWorkflowTimeSetting = JSONObject.toJavaObject(obj, AuditWorkflowTimeSetting.class);
-                auditWorkflowTimeSetting.setCompanyId(companyId);
-                auditWorkflowTimeSetting.setSeq(i+1);
-                if (i == array.size() -1) {
-                    auditWorkflowTimeSetting.setIsFinal(1);
-                } else {
-                    auditWorkflowTimeSetting.setIsFinal(0);
-                }
-                auditWorkflowTimeSetting.setDeptId(deptId);
-                auditWorkflowTimeSettingMapper.insert(auditWorkflowTimeSetting);
-            }
-        }
-        return new HttpRespMsg();
-    }
-
-    @RequestMapping("/checkNodeInUse")
-    public HttpRespMsg checkNodeInUse(String auditDeptId, Integer deptId) {
-        String token = request.getHeader("TOKEN");
-        Integer companyId = userMapper.selectById(token).getCompanyId();
-        HttpRespMsg msg = new HttpRespMsg();
-        List<AuditWorkflowTimeSetting> targetNode = auditWorkflowTimeSettingMapper.selectList(new QueryWrapper<AuditWorkflowTimeSetting>().eq("dept_id", deptId).eq("audit_dept_id", auditDeptId));
-        if (targetNode.size() > 0) {
-            //要删除的部门节点是存在的，需要检测是否有待审核的走到这个流程点了
-            long num = reportMapper.selectCount(new QueryWrapper<Report>().eq("state", 0).eq("is_dept_audit", 1).eq("audit_deptid", auditDeptId));
-            if (num > 0) {
-                msg.setError(MessageUtils.message("department.reviewedError"));
-            }
-        }
-        return msg;
-    }
-
-    @RequestMapping("/approveDeptAuditReport")
-    public HttpRespMsg approveDeptAuditReport(String auditDeptId) {
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        return reportService.approveDeptAuditReport(user, auditDeptId);
-    }
-
-    @RequestMapping("/get")
-    public HttpRespMsg get(Integer deptId) {
-        String token = request.getHeader("TOKEN");
-        Integer companyId = userMapper.selectById(token).getCompanyId();
-        List<AuditWorkflowTimeSetting> auditWorkflowTimeSettings = auditWorkflowTimeSettingMapper.selectList(new QueryWrapper<AuditWorkflowTimeSetting>().eq("dept_id", deptId).orderByAsc("seq"));
-        HttpRespMsg msg = new HttpRespMsg();
-        if (auditWorkflowTimeSettings.size() == 0) {
-            int seq = 1;
-            //未独立设置，获取默认的设置,默认直接就是项目负责人审批
-            Department dept = departmentMapper.selectById(deptId);
-            AuditWorkflowTimeSetting setting = new AuditWorkflowTimeSetting();
-            setting.setSeq(seq);
-            setting.setCompanyId(companyId);
-            setting.setDeptId(dept.getDepartmentId());
-            setting.setIsFinal(1);
-            setting.setIsDeptAudit(0);
-            auditWorkflowTimeSettings.add(setting);
-//            while (dept.getSuperiorId() != null && dept.getSuperiorId() > 0) {
-//                seq++;
-//                dept = departmentMapper.selectById(dept.getSuperiorId());
-//                setting = new AuditWorkflowTimeSetting();
-//                setting.setCompanyId(companyId);
-//                setting.setDeptId(dept.getDepartmentId());
-//                setting.setSeq(seq);
-//                setting.setAuditDeptId(dept.getDepartmentId());
-//                setting.setAuditDeptName(dept.getDepartmentName());
-//                auditWorkflowTimeSettings.add(setting);
+//package com.management.platform.controller;
+//
+//
+//import com.alibaba.fastjson.JSONArray;
+//import com.alibaba.fastjson.JSONObject;
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.baomidou.mybatisplus.extension.api.R;
+//import com.management.platform.entity.*;
+//import com.management.platform.mapper.*;
+//import com.management.platform.service.ReportService;
+//import com.management.platform.util.HttpRespMsg;
+//import com.management.platform.util.MessageUtils;
+//import org.springframework.util.StringUtils;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import javax.annotation.Resource;
+//import javax.servlet.http.HttpServletRequest;
+//import java.time.LocalDateTime;
+//import java.util.ArrayList;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.stream.Collectors;
+//
+///**
+// * <p>
+// *  前端控制器
+// * </p>
+// *
+// * @author Seyason
+// * @since 2021-07-25
+// */
+//@RestController
+//@RequestMapping("/audit-workflow-time-setting")
+//public class AuditWorkflowTimeSettingController {
+//    @Resource
+//    private HttpServletRequest request;
+//    @Resource
+//    AuditWorkflowTimeSettingMapper auditWorkflowTimeSettingMapper;
+//    @Resource
+//    UserMapper userMapper;
+//    @Resource
+//    DepartmentMapper departmentMapper;
+//
+//    @RequestMapping("/add")
+//    public HttpRespMsg add(String json, Integer deptId) {
+//        String token = request.getHeader("TOKEN");
+//        Integer companyId = userMapper.selectById(token).getCompanyId();
+//        auditWorkflowTimeSettingMapper.delete(new QueryWrapper<AuditWorkflowTimeSetting>().eq("dept_id", deptId));
+//        JSONArray array = JSONArray.parseArray(json);
+//
+//        if (array.size() == 1 && array.getJSONObject(0).getInteger("isDeptAudit") == 0) {
+//            //只有一个项目负责人审核，不保存
+//        } else {
+//            //检查是否有重复的部门
+//            List<Integer> auditDeptIds = new ArrayList<>();
+//            for (int i=0;i<array.size(); i++) {
+//                JSONObject obj = array.getJSONObject(i);
+//                AuditWorkflowTimeSetting auditWorkflowTimeSetting = JSONObject.toJavaObject(obj, AuditWorkflowTimeSetting.class);
+//                if (auditDeptIds.contains(auditWorkflowTimeSetting.getAuditDeptId())) {
+//                    HttpRespMsg msg = new HttpRespMsg();
+//                    msg.setError(MessageUtils.message("department.duplicateError",auditWorkflowTimeSetting.getAuditDeptName()));
+//                    return msg;
+//                } else {
+//                    auditDeptIds.add(auditWorkflowTimeSetting.getAuditDeptId());
+//                }
 //            }
-
-        }
-        msg.data = auditWorkflowTimeSettings;
-        return msg;
-    }
-
-
-}
-
+//
+//            for (int i=0;i<array.size(); i++) {
+//                JSONObject obj = array.getJSONObject(i);
+//                AuditWorkflowTimeSetting auditWorkflowTimeSetting = JSONObject.toJavaObject(obj, AuditWorkflowTimeSetting.class);
+//                auditWorkflowTimeSetting.setCompanyId(companyId);
+//                auditWorkflowTimeSetting.setSeq(i+1);
+//                if (i == array.size() -1) {
+//                    auditWorkflowTimeSetting.setIsFinal(1);
+//                } else {
+//                    auditWorkflowTimeSetting.setIsFinal(0);
+//                }
+//                auditWorkflowTimeSetting.setDeptId(deptId);
+//                auditWorkflowTimeSettingMapper.insert(auditWorkflowTimeSetting);
+//            }
+//        }
+//        return new HttpRespMsg();
+//    }
+//
+//    @RequestMapping("/checkNodeInUse")
+//    public HttpRespMsg checkNodeInUse(String auditDeptId, Integer deptId) {
+//        String token = request.getHeader("TOKEN");
+//        Integer companyId = userMapper.selectById(token).getCompanyId();
+//        HttpRespMsg msg = new HttpRespMsg();
+//        List<AuditWorkflowTimeSetting> targetNode = auditWorkflowTimeSettingMapper.selectList(new QueryWrapper<AuditWorkflowTimeSetting>().eq("dept_id", deptId).eq("audit_dept_id", auditDeptId));
+//        if (targetNode.size() > 0) {
+//            //要删除的部门节点是存在的，需要检测是否有待审核的走到这个流程点了
+//            long num = reportMapper.selectCount(new QueryWrapper<Report>().eq("state", 0).eq("is_dept_audit", 1).eq("audit_deptid", auditDeptId));
+//            if (num > 0) {
+//                msg.setError(MessageUtils.message("department.reviewedError"));
+//            }
+//        }
+//        return msg;
+//    }
+//
+//    @RequestMapping("/approveDeptAuditReport")
+//    public HttpRespMsg approveDeptAuditReport(String auditDeptId) {
+//        String token = request.getHeader("TOKEN");
+//        User user = userMapper.selectById(token);
+//        return reportService.approveDeptAuditReport(user, auditDeptId);
+//    }
+//
+//    @RequestMapping("/get")
+//    public HttpRespMsg get(Integer deptId) {
+//        String token = request.getHeader("TOKEN");
+//        Integer companyId = userMapper.selectById(token).getCompanyId();
+//        List<AuditWorkflowTimeSetting> auditWorkflowTimeSettings = auditWorkflowTimeSettingMapper.selectList(new QueryWrapper<AuditWorkflowTimeSetting>().eq("dept_id", deptId).orderByAsc("seq"));
+//        HttpRespMsg msg = new HttpRespMsg();
+//        if (auditWorkflowTimeSettings.size() == 0) {
+//            int seq = 1;
+//            //未独立设置，获取默认的设置,默认直接就是项目负责人审批
+//            Department dept = departmentMapper.selectById(deptId);
+//            AuditWorkflowTimeSetting setting = new AuditWorkflowTimeSetting();
+//            setting.setSeq(seq);
+//            setting.setCompanyId(companyId);
+//            setting.setDeptId(dept.getDepartmentId());
+//            setting.setIsFinal(1);
+//            setting.setIsDeptAudit(0);
+//            auditWorkflowTimeSettings.add(setting);
+////            while (dept.getSuperiorId() != null && dept.getSuperiorId() > 0) {
+////                seq++;
+////                dept = departmentMapper.selectById(dept.getSuperiorId());
+////                setting = new AuditWorkflowTimeSetting();
+////                setting.setCompanyId(companyId);
+////                setting.setDeptId(dept.getDepartmentId());
+////                setting.setSeq(seq);
+////                setting.setAuditDeptId(dept.getDepartmentId());
+////                setting.setAuditDeptName(dept.getDepartmentName());
+////                auditWorkflowTimeSettings.add(setting);
+////            }
+//
+//        }
+//        msg.data = auditWorkflowTimeSettings;
+//        return msg;
+//    }
+//
+//
+//}
+//

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

@@ -1,118 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.BusinessTrip;
-import com.management.platform.entity.BustripProject;
-import com.management.platform.entity.Project;
-import com.management.platform.entity.ReportExtraDegree;
-import com.management.platform.mapper.BusinessTripMapper;
-import com.management.platform.mapper.ProjectMapper;
-import com.management.platform.mapper.ReportExtraDegreeMapper;
-import com.management.platform.service.BusinessTripService;
-import com.management.platform.service.BustripProjectService;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.MessageUtils;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.time.format.DateTimeFormatter;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-05-17
- */
-@RestController
-@RequestMapping("/bustrip-project")
-public class BustripProjectController {
-    @Resource
-    BustripProjectService bustripProjectService;
-    @Resource
-    ReportExtraDegreeMapper reportExtraDegreeMapper;
-    @Resource
-    ProjectMapper projectMapper;
-    @Resource
-    BusinessTripMapper businessTripMapper;
-
-    @RequestMapping("/addOrMod")
-    public HttpRespMsg addOrMod(BustripProject item) {
-        HttpRespMsg msg = new HttpRespMsg();
-        BusinessTrip businessTrip = businessTripMapper.selectById(item.getBustripId());
-        //检查时间段不能超出总时间段的显示
-        if (item.getStartDate() == null || item.getEndDate() == null) {
-            //msg.setError("开始日期和结束日期不能为空");
-            msg.setError(MessageUtils.message("date.dateNullError"));
-        } else {
-            DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            //校验比对日期
-            if (item.getStartDate().isBefore(businessTrip.getStartDate())) {
-                //msg.setError("开始日期不得早于"+dtf.format(businessTrip.getStartDate()));
-                msg.setError(MessageUtils.message("date.startDateError",dtf.format(businessTrip.getStartDate())));
-            } else if (item.getEndDate().isAfter(businessTrip.getEndDate())) {
-                //msg.setError("结束日期不得晚于"+dtf.format(businessTrip.getEndDate()));
-                msg.setError(MessageUtils.message("date.endDateError",dtf.format(businessTrip.getEndDate())));
-            } else {
-                if (item.getDegreeId() != null) {
-                    String name = reportExtraDegreeMapper.selectById(item.getDegreeId()).getName();
-                    item.setDegreeName(name);
-                }
-                bustripProjectService.saveOrUpdate(item);
-                //检查出差的关联标记
-                if (businessTrip.getIsLinked() == 0) {
-                    businessTrip.setIsLinked(1);
-                    businessTripMapper.updateById(businessTrip);
-                }
-            }
-        }
-
-        return msg;
-    }
-
-    @RequestMapping("/delete")
-    public HttpRespMsg delete(Integer id) {
-        BustripProject bp = bustripProjectService.getById(id);
-        bustripProjectService.removeById(id);
-        int leftCount = bustripProjectService.count(new QueryWrapper<BustripProject>().eq("bustrip_id", bp.getBustripId()));
-        //检查出差的关联标记
-        if (leftCount == 0) {
-            BusinessTrip businessTrip = new BusinessTrip();
-            businessTrip.setId(bp.getBustripId());
-            businessTrip.setIsLinked(0);//没有关联的项目了
-            businessTripMapper.updateById(businessTrip);
-        }
-        return new HttpRespMsg();
-    }
-
-    @RequestMapping("/list")
-    public HttpRespMsg list(Integer bustripId) {
-        List<BustripProject> list = bustripProjectService.list(new QueryWrapper<BustripProject>().eq("bustrip_id", bustripId));
-        List<Integer> collect = list.stream().map(BustripProject::getProjectId).collect(Collectors.toList());
-        if (collect.size() > 0) {
-            List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().in("id", collect));
-            list.forEach(li->{
-                if (li.getProjectId() != null) {
-                    Optional<Project> first = projectList.stream().filter(p -> p.getId().equals(li.getProjectId())).findFirst();
-                    if (first.isPresent()) {
-                        li.setProjectName(first.get().getProjectName());
-                    }
-                }
-            });
-        }
-
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = list;
-        return msg;
-    }
-
-}
-

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

@@ -6,12 +6,10 @@ import com.management.platform.constant.Constant;
 import com.management.platform.entity.*;
 import com.management.platform.mapper.*;
 import com.management.platform.service.CompanyService;
-import com.management.platform.service.DingDingService;
 import com.management.platform.service.ExpenseMainTypeService;
 import com.management.platform.service.ExpenseTypeService;
 import com.management.platform.util.HttpRespMsg;
 import com.management.platform.util.MessageUtils;
-import com.taobao.api.ApiException;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -39,8 +37,6 @@ public class CompanyController {
     @Resource
     private CompanyService companyService;
     @Resource
-    private DingDingService dingDingService;
-    @Resource
     private UserMapper userMapper;
     @Resource
     private CompanyDingdingMapper companyDingdingMapper;
@@ -87,42 +83,42 @@ public class CompanyController {
     }
 
     //同步钉钉
-    @RequestMapping("/syncCorpMembs")
-    public HttpRespMsg syncCorpMembs() {
-        try {
-            HttpRespMsg msg = new HttpRespMsg();
-            String token = request.getHeader("TOKEN");
-            User user = userMapper.selectById(token);
-            Company company = companyMapper.selectOne(new QueryWrapper<Company>().eq("id", user.getCompanyId()));
-            Integer employeeCnt = userMapper.selectCount(new QueryWrapper<User>().eq("company_id", company.getId()).eq("is_active",1));
-            if (employeeCnt > company.getStaffCountMax()){
-                //公司人员已达上限，请联系客服提高人数上限。
-                msg.setError(MessageUtils.message("wx.employeeFull"));
-                return msg;
-            }
-            CompanyDingding companyDingding = companyDingdingMapper.selectOne(new QueryWrapper<CompanyDingding>().eq("company_id", user.getCompanyId()));
-            if (companyDingding != null) {
-                System.out.println("===========同步钉钉===========");
-                String rest = dingDingService.syncCorpMembs(companyDingding.getCorpid());
-                /*syncLog.remove(user.getCompanyId()+"_status");*/
-                if (rest.startsWith("调用失败")) {
-                    msg.setError(rest);
-                } else {
-                    msg.data = rest;
-                }
-            } else {
-                //msg.setError("非钉钉企业，无法同步");
-                msg.setError(MessageUtils.message("Company.sysDDError"));
-            }
-            return msg;
-        } catch (Exception e) {
-            e.printStackTrace();
-            System.err.println(e.getMessage());
-            HttpRespMsg msg = new HttpRespMsg();
-            msg.setError(e.getMessage());
-            return msg;
-        }
-    }
+//    @RequestMapping("/syncCorpMembs")
+//    public HttpRespMsg syncCorpMembs() {
+//        try {
+//            HttpRespMsg msg = new HttpRespMsg();
+//            String token = request.getHeader("TOKEN");
+//            User user = userMapper.selectById(token);
+//            Company company = companyMapper.selectOne(new QueryWrapper<Company>().eq("id", user.getCompanyId()));
+//            Integer employeeCnt = userMapper.selectCount(new QueryWrapper<User>().eq("company_id", company.getId()).eq("is_active",1));
+//            if (employeeCnt > company.getStaffCountMax()){
+//                //公司人员已达上限，请联系客服提高人数上限。
+//                msg.setError(MessageUtils.message("wx.employeeFull"));
+//                return msg;
+//            }
+//            CompanyDingding companyDingding = companyDingdingMapper.selectOne(new QueryWrapper<CompanyDingding>().eq("company_id", user.getCompanyId()));
+//            if (companyDingding != null) {
+//                System.out.println("===========同步钉钉===========");
+//                String rest = dingDingService.syncCorpMembs(companyDingding.getCorpid());
+//                /*syncLog.remove(user.getCompanyId()+"_status");*/
+//                if (rest.startsWith("调用失败")) {
+//                    msg.setError(rest);
+//                } else {
+//                    msg.data = rest;
+//                }
+//            } else {
+//                //msg.setError("非钉钉企业，无法同步");
+//                msg.setError(MessageUtils.message("Company.sysDDError"));
+//            }
+//            return msg;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            System.err.println(e.getMessage());
+//            HttpRespMsg msg = new HttpRespMsg();
+//            msg.setError(e.getMessage());
+//            return msg;
+//        }
+//    }
     @RequestMapping("/settingExpenseType")
     public HttpRespMsg settingExpenseType(){
         HttpRespMsg httpRespMsg=new HttpRespMsg();

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

@@ -1,100 +1,99 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dingtalk.api.request.OapiMessageCorpconversationAsyncsendV2Request;
-import com.management.platform.entity.CompanyDingding;
-import com.management.platform.entity.User;
-import com.management.platform.mapper.CompanyDingdingMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.CompanyDingdingService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-06-27
- */
-@RestController
-@RequestMapping("/company-dingding")
-public class CompanyDingdingController {
-    @Resource
-    private CompanyDingdingService companyDingdingService;
-    @Resource
-    private CompanyDingdingMapper companyDingdingMapper;
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    private UserMapper userMapper;
-
-    @RequestMapping("/getSyncContact")
-    public HttpRespMsg getSyncContact() {
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        HttpRespMsg msg = new HttpRespMsg();
-        CompanyDingding dd = companyDingdingMapper.selectOne(new QueryWrapper<CompanyDingding>().eq("company_id", user.getCompanyId()));
-        msg.data = dd.getSyncContact();
-
-        return msg;
-    }
-
-
-    @RequestMapping("/setSyncContact")
-    public HttpRespMsg setSyncContact(Integer isSync) {
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        HttpRespMsg msg = new HttpRespMsg();
-        CompanyDingding dd = companyDingdingMapper.selectOne(new QueryWrapper<CompanyDingding>().eq("company_id", user.getCompanyId()));
-        if (dd != null) {
-            CompanyDingding companyDingding = new CompanyDingding();
-            companyDingding.setCorpid(dd.getCorpid());
-            companyDingding.setSyncContact(isSync);
-            companyDingdingMapper.updateById(companyDingding);
-        } else {
-            msg.setError("未找到公司钉钉配置");
-        }
-
-        return msg;
-    }
-
-    @RequestMapping("/pushAlertMsg")
-    public HttpRespMsg pushAlertMsg(String corpid, String userDingId) {
-        CompanyDingding companyDingding = companyDingdingMapper.selectById(corpid);
-        companyDingdingService.sendFillReportAlertMsg(companyDingding.getCompanyId(), companyDingding.getAgentId(), "填入日报哦", "040534176023851922");
-        return new HttpRespMsg();
-    }
-
-    @RequestMapping("/pushFinishMileStoneMsg")
-    public HttpRespMsg pushFinishMileStoneMsg(String corpid, String userDingId, Integer projectId, String projectName) {
-        CompanyDingding companyDingding = companyDingdingMapper.selectById(corpid);
-        LocalDate now = LocalDate.now();
-        String finishDate = DateTimeFormatter.ofPattern("yyyy-MM-dd").format(now);
-        companyDingdingService.sendFinishMileStoneMsg(companyDingding, userDingId, "测试里程碑", projectId,projectName, finishDate);
-        return new HttpRespMsg();
-    }
-
-    @RequestMapping("/sendOAMsg")
-    public HttpRespMsg sendOAMsg(String corpid, String userDingId) {
-        CompanyDingding companyDingding = companyDingdingMapper.selectById(corpid);
-        List<OapiMessageCorpconversationAsyncsendV2Request.Form> form=new ArrayList<>();
-        OapiMessageCorpconversationAsyncsendV2Request.Form item=new OapiMessageCorpconversationAsyncsendV2Request.Form();
-        item.setKey("测试");
-        item.setValue("试试成功没");
-        form.add(item);
-        companyDingdingService.sendOAMsg(companyDingding, "040534176023851922", "OA提醒测试","这是一次测试",form,null);
-        return new HttpRespMsg();
-    }
-}
-
+//package com.management.platform.controller;
+//
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.management.platform.entity.CompanyDingding;
+//import com.management.platform.entity.User;
+//import com.management.platform.mapper.CompanyDingdingMapper;
+//import com.management.platform.mapper.UserMapper;
+//import com.management.platform.service.CompanyDingdingService;
+//import com.management.platform.util.HttpRespMsg;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import javax.annotation.Resource;
+//import javax.servlet.http.HttpServletRequest;
+//import java.time.LocalDate;
+//import java.time.format.DateTimeFormatter;
+//import java.util.ArrayList;
+//import java.util.List;
+//
+///**
+// * <p>
+// *  前端控制器
+// * </p>
+// *
+// * @author Seyason
+// * @since 2021-06-27
+// */
+//@RestController
+//@RequestMapping("/company-dingding")
+//public class CompanyDingdingController {
+//    @Resource
+//    private CompanyDingdingService companyDingdingService;
+//    @Resource
+//    private CompanyDingdingMapper companyDingdingMapper;
+//    @Resource
+//    private HttpServletRequest request;
+//    @Resource
+//    private UserMapper userMapper;
+//
+//    @RequestMapping("/getSyncContact")
+//    public HttpRespMsg getSyncContact() {
+//        String token = request.getHeader("TOKEN");
+//        User user = userMapper.selectById(token);
+//        HttpRespMsg msg = new HttpRespMsg();
+//        CompanyDingding dd = companyDingdingMapper.selectOne(new QueryWrapper<CompanyDingding>().eq("company_id", user.getCompanyId()));
+//        msg.data = dd.getSyncContact();
+//
+//        return msg;
+//    }
+//
+//
+//    @RequestMapping("/setSyncContact")
+//    public HttpRespMsg setSyncContact(Integer isSync) {
+//        String token = request.getHeader("TOKEN");
+//        User user = userMapper.selectById(token);
+//        HttpRespMsg msg = new HttpRespMsg();
+//        CompanyDingding dd = companyDingdingMapper.selectOne(new QueryWrapper<CompanyDingding>().eq("company_id", user.getCompanyId()));
+//        if (dd != null) {
+//            CompanyDingding companyDingding = new CompanyDingding();
+//            companyDingding.setCorpid(dd.getCorpid());
+//            companyDingding.setSyncContact(isSync);
+//            companyDingdingMapper.updateById(companyDingding);
+//        } else {
+//            msg.setError("未找到公司钉钉配置");
+//        }
+//
+//        return msg;
+//    }
+//
+//    @RequestMapping("/pushAlertMsg")
+//    public HttpRespMsg pushAlertMsg(String corpid, String userDingId) {
+//        CompanyDingding companyDingding = companyDingdingMapper.selectById(corpid);
+//        companyDingdingService.sendFillReportAlertMsg(companyDingding.getCompanyId(), companyDingding.getAgentId(), "填入日报哦", "040534176023851922");
+//        return new HttpRespMsg();
+//    }
+//
+//    @RequestMapping("/pushFinishMileStoneMsg")
+//    public HttpRespMsg pushFinishMileStoneMsg(String corpid, String userDingId, Integer projectId, String projectName) {
+//        CompanyDingding companyDingding = companyDingdingMapper.selectById(corpid);
+//        LocalDate now = LocalDate.now();
+//        String finishDate = DateTimeFormatter.ofPattern("yyyy-MM-dd").format(now);
+//        companyDingdingService.sendFinishMileStoneMsg(companyDingding, userDingId, "测试里程碑", projectId,projectName, finishDate);
+//        return new HttpRespMsg();
+//    }
+//
+//    @RequestMapping("/sendOAMsg")
+//    public HttpRespMsg sendOAMsg(String corpid, String userDingId) {
+//        CompanyDingding companyDingding = companyDingdingMapper.selectById(corpid);
+//        List<OapiMessageCorpconversationAsyncsendV2Request.Form> form=new ArrayList<>();
+//        OapiMessageCorpconversationAsyncsendV2Request.Form item=new OapiMessageCorpconversationAsyncsendV2Request.Form();
+//        item.setKey("测试");
+//        item.setValue("试试成功没");
+//        form.add(item);
+//        companyDingdingService.sendOAMsg(companyDingding, "040534176023851922", "OA提醒测试","这是一次测试",form,null);
+//        return new HttpRespMsg();
+//    }
+//}
+//

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

@@ -67,15 +67,5 @@ public class ContractDocumentController {
     public HttpRespMsg fileDelete (HttpServletRequest request, ContractFileDelVO contractFileDelVo){
         return contractDocumentService.fileDelete(request,contractFileDelVo);
     }
-
-    /**
-     * 在线预览
-     * @param inputFilePath
-     * @return
-     */
-    @RequestMapping("/onlineShow")
-    public HttpRespMsg onlineShow (@RequestParam String inputFilePath){
-        return contractDocumentService.onlineShow(inputFilePath);
-    }
 }
 

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

@@ -1,291 +1,291 @@
-package com.management.platform.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.*;
-import com.management.platform.mapper.*;
-import com.management.platform.service.CompanyDingdingService;
-import com.management.platform.service.DingDingService;
-import com.management.platform.service.impl.DingDingServiceImpl;
-import com.management.platform.util.*;
-import com.taobao.api.ApiException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.stream.Collectors;
-
-@RestController
-@RequestMapping("/dingding")
-public class DingDingController {
-
-    private final Logger bizLogger = LoggerFactory.getLogger(getClass());
-
-    String aesKey = "ktmbamhymjsf60ndwp6n81mnu92847oynsgj9e0zr9v";
-    String token = "cf776d62c5fb3508b5d8c2cbb9f3df0c";
-
-    String suiteKey = "suitejwoq9dw4bxv4stdb";
-    String suiteSecret = "o-TWFLkFe8YbJsa_025JOj_JEWydP5GR3eigt1Yn1rtx5dTcryTJiSA6KEih3Bi4";
-
-    @Value("${configEnv.isPrivateDeploy}")
-    private boolean isPrivateDeploy;
-
-    @Resource
-    private DingDingService dingDingService;
-    static ExecutorService executorService = Executors.newCachedThreadPool();
-    @Resource
-    private CompanyDingdingService companyDingdingService;
-    @Resource
-    private UserMapper userMapper;
-    @Resource
-    private CompanyDingdingMapper companyDingdingMapper;
-    @Resource
-    private TimeTypeMapper timeTypeMapper;
-    @Resource
-    private CompanyMapper companyMapper;
-
-
-    @RequestMapping("/callback")
-    public Map<String, String> dingCallback(
-            @RequestParam(value = "signature") String signature,
-            @RequestParam(value = "timestamp") String timestamp,
-            @RequestParam(value = "nonce") String nonce,
-            @RequestBody(required = false) JSONObject body,
-            @RequestParam(value = "innerAppKey", required = false) String innerAppKey
-    ) {
-        System.out.println("接收到ding call back"+(isPrivateDeploy?", innerAppKey="+innerAppKey:""));
-        if (body == null) {
-            DingCallbackCrypto callbackCrypto = null;
-            try {
-                callbackCrypto = new DingCallbackCrypto(token, aesKey, isPrivateDeploy?innerAppKey:suiteKey);
-                Map<String, String> successMap = callbackCrypto.getEncryptedMap("success");
-                LocalDateTime now = LocalDateTime.now();
-                DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
-                System.out.println(dtf.format(now)+" 给钉钉返回数据了："+successMap);
-                return successMap;
-            } catch (DingCallbackCrypto.DingTalkEncryptException e) {
-                e.printStackTrace();
-            }
-        }
-        try {
-            // 1. 从http请求中获取加解密参数
-
-            // 2. 使用加解密类型
-            // Constant.OWNER_KEY 说明：
-            // 1、开发者后台配置的订阅事件为应用级事件推送，
-            //      此时OWNER_KEY为应用的APP_KEY（企业内部应用）或SUITE_KEY（三方应用）。
-            // 2、调用订阅事件接口订阅的事件为企业级事件推送，
-            //      此时OWNER_KEY为：企业的CORP_ID（企业内部应用）或SUITE_KEY（三方应用）
-            DingCallbackCrypto callbackCrypto = new DingCallbackCrypto(token, aesKey, isPrivateDeploy?innerAppKey:suiteKey);
-            String encryptMsg = body.getString("encrypt");
-            String decryptMsg = callbackCrypto.getDecryptMsg(signature, timestamp, nonce, encryptMsg);
-            dingDingService.asyncHandleMsg(decryptMsg);
-
-            // 5. 返回success的加密数据
-            Map<String, String> successMap = callbackCrypto.getEncryptedMap("success");
-            LocalDateTime now = LocalDateTime.now();
-            DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
-            System.out.println(dtf.format(now)+" 给钉钉返回数据了："+successMap);
-            return successMap;
-        } catch (DingCallbackCrypto.DingTalkEncryptException e) {
-            e.printStackTrace();
-            System.out.println(e.getMessage());
-        }
-        return null;
-    }
-
-    @RequestMapping("/inactiveUserNotInAuthRange")
-    public HttpRespMsg inactiveUserNotInAuthRange(String corpid) {
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = dingDingService.inactiveUserNotInAuthRange(corpid);
-        return msg;
-    }
-
-    @RequestMapping("/syncCorpMembs")
-    public HttpRespMsg syncCorpMembs(String corpid) {
-        try {
-            System.out.println("===========手动调用syncCorpMembs请求接口===========");
-            String rest = dingDingService.syncCorpMembs(corpid);
-            HttpRespMsg msg = new HttpRespMsg();
-            msg.data = rest;
-            return msg;
-        } catch (Exception e) {
-            CompanyDingding dingding = companyDingdingMapper.selectById(corpid);
-            Company company = companyMapper.selectById(dingding.getCompanyId());
-            String token=company.getCompanyName();
-            //移除锁
-            DingDingServiceImpl.syncLog.remove(token);
-            DingDingServiceImpl.syncLog.remove(company.getId()+"_status");
-
-            e.printStackTrace();
-            System.err.println(e.getMessage());
-            HttpRespMsg msg = new HttpRespMsg();
-            msg.setError(e.getMessage());
-            return msg;
-        }
-    }
-
-    @RequestMapping("/getUserByCode")
-    public HttpRespMsg getUserByCode(String code, String corpid) {
-        return dingDingService.getUserByCode(code, corpid);
-    }
-
-    @RequestMapping("/syncCorpInfo")
-    public HttpRespMsg syncCorpInfo(String corpid) {
-        return dingDingService.syncCorpInfo(corpid);
-    }
-
-    @RequestMapping("/syncCorpAgent")
-    public HttpRespMsg syncCorpAgent(String corpid) {
-        return dingDingService.syncCorpAgent(corpid);
-    }
-
-    @RequestMapping("/getUnActiveCorp")
-    public HttpRespMsg getUnActiveCorp() {
-        return dingDingService.getUnActiveCorp();
-    }
-
-    @RequestMapping("/reAuthCorp")
-    public HttpRespMsg reAuthCorp(String corpid) {
-        return dingDingService.reAuthCorp(corpid);
-    }
-
-    @RequestMapping("/pushLeaveAuditAlert")
-    public HttpRespMsg pushLeaveAuditAlert(String userId) {
-        HttpRespMsg msg = new HttpRespMsg();
-        User user = userMapper.selectById(userId);
-        System.out.println("测试发送审批给=="+user.getName());
-        CompanyDingding dingding = companyDingdingService.getOne(new QueryWrapper<CompanyDingding>().eq("company_id", user.getCompanyId()));
-        companyDingdingService.sendLeaveApplyAlertMsg(dingding.getCompanyId(), dingding.getAgentId(), "", user.getDingdingUserid());
-        return msg;
-    }
-
-    @RequestMapping("/syncCardTime")
-    public HttpRespMsg syncCardTime(Integer companyId, String userId, String startDate, String endDate) {
-        dingDingService.syncCardTime(companyId, userId, startDate, endDate);
-        return new HttpRespMsg();
-    }
-//
-//    @RequestMapping("/syncLeaveTime")
-//    public HttpRespMsg syncLeaveTime(Integer companyId, String userId, String startDate, String endDate) {
-//        dingDingService.syncLeaveTime(companyId, userId, startDate, endDate);
+//package com.management.platform.controller;
+//
+//import com.alibaba.fastjson.JSON;
+//import com.alibaba.fastjson.JSONArray;
+//import com.alibaba.fastjson.JSONObject;
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.management.platform.entity.*;
+//import com.management.platform.mapper.*;
+//import com.management.platform.service.CompanyDingdingService;
+//import com.management.platform.service.DingDingService;
+//import com.management.platform.service.impl.DingDingServiceImpl;
+//import com.management.platform.util.*;
+//import com.taobao.api.ApiException;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.scheduling.annotation.Async;
+//import org.springframework.web.bind.annotation.*;
+//
+//import javax.annotation.Resource;
+//import javax.servlet.http.HttpServletRequest;
+//import java.time.LocalDate;
+//import java.time.LocalDateTime;
+//import java.time.ZoneOffset;
+//import java.time.format.DateTimeFormatter;
+//import java.util.List;
+//import java.util.Map;
+//import java.util.concurrent.ExecutorService;
+//import java.util.concurrent.Executors;
+//import java.util.stream.Collectors;
+//
+//@RestController
+//@RequestMapping("/dingding")
+//public class DingDingController {
+//
+//    private final Logger bizLogger = LoggerFactory.getLogger(getClass());
+//
+//    String aesKey = "ktmbamhymjsf60ndwp6n81mnu92847oynsgj9e0zr9v";
+//    String token = "cf776d62c5fb3508b5d8c2cbb9f3df0c";
+//
+//    String suiteKey = "suitejwoq9dw4bxv4stdb";
+//    String suiteSecret = "o-TWFLkFe8YbJsa_025JOj_JEWydP5GR3eigt1Yn1rtx5dTcryTJiSA6KEih3Bi4";
+//
+//    @Value("${configEnv.isPrivateDeploy}")
+//    private boolean isPrivateDeploy;
+//
+//    @Resource
+//    private DingDingService dingDingService;
+//    static ExecutorService executorService = Executors.newCachedThreadPool();
+//    @Resource
+//    private CompanyDingdingService companyDingdingService;
+//    @Resource
+//    private UserMapper userMapper;
+//    @Resource
+//    private CompanyDingdingMapper companyDingdingMapper;
+//    @Resource
+//    private TimeTypeMapper timeTypeMapper;
+//    @Resource
+//    private CompanyMapper companyMapper;
+//
+//
+//    @RequestMapping("/callback")
+//    public Map<String, String> dingCallback(
+//            @RequestParam(value = "signature") String signature,
+//            @RequestParam(value = "timestamp") String timestamp,
+//            @RequestParam(value = "nonce") String nonce,
+//            @RequestBody(required = false) JSONObject body,
+//            @RequestParam(value = "innerAppKey", required = false) String innerAppKey
+//    ) {
+//        System.out.println("接收到ding call back"+(isPrivateDeploy?", innerAppKey="+innerAppKey:""));
+//        if (body == null) {
+//            DingCallbackCrypto callbackCrypto = null;
+//            try {
+//                callbackCrypto = new DingCallbackCrypto(token, aesKey, isPrivateDeploy?innerAppKey:suiteKey);
+//                Map<String, String> successMap = callbackCrypto.getEncryptedMap("success");
+//                LocalDateTime now = LocalDateTime.now();
+//                DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
+//                System.out.println(dtf.format(now)+" 给钉钉返回数据了："+successMap);
+//                return successMap;
+//            } catch (DingCallbackCrypto.DingTalkEncryptException e) {
+//                e.printStackTrace();
+//            }
+//        }
+//        try {
+//            // 1. 从http请求中获取加解密参数
+//
+//            // 2. 使用加解密类型
+//            // Constant.OWNER_KEY 说明：
+//            // 1、开发者后台配置的订阅事件为应用级事件推送，
+//            //      此时OWNER_KEY为应用的APP_KEY（企业内部应用）或SUITE_KEY（三方应用）。
+//            // 2、调用订阅事件接口订阅的事件为企业级事件推送，
+//            //      此时OWNER_KEY为：企业的CORP_ID（企业内部应用）或SUITE_KEY（三方应用）
+//            DingCallbackCrypto callbackCrypto = new DingCallbackCrypto(token, aesKey, isPrivateDeploy?innerAppKey:suiteKey);
+//            String encryptMsg = body.getString("encrypt");
+//            String decryptMsg = callbackCrypto.getDecryptMsg(signature, timestamp, nonce, encryptMsg);
+//            dingDingService.asyncHandleMsg(decryptMsg);
+//
+//            // 5. 返回success的加密数据
+//            Map<String, String> successMap = callbackCrypto.getEncryptedMap("success");
+//            LocalDateTime now = LocalDateTime.now();
+//            DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
+//            System.out.println(dtf.format(now)+" 给钉钉返回数据了："+successMap);
+//            return successMap;
+//        } catch (DingCallbackCrypto.DingTalkEncryptException e) {
+//            e.printStackTrace();
+//            System.out.println(e.getMessage());
+//        }
+//        return null;
+//    }
+//
+//    @RequestMapping("/inactiveUserNotInAuthRange")
+//    public HttpRespMsg inactiveUserNotInAuthRange(String corpid) {
+//        HttpRespMsg msg = new HttpRespMsg();
+//        msg.data = dingDingService.inactiveUserNotInAuthRange(corpid);
+//        return msg;
+//    }
+//
+//    @RequestMapping("/syncCorpMembs")
+//    public HttpRespMsg syncCorpMembs(String corpid) {
+//        try {
+//            System.out.println("===========手动调用syncCorpMembs请求接口===========");
+//            String rest = dingDingService.syncCorpMembs(corpid);
+//            HttpRespMsg msg = new HttpRespMsg();
+//            msg.data = rest;
+//            return msg;
+//        } catch (Exception e) {
+//            CompanyDingding dingding = companyDingdingMapper.selectById(corpid);
+//            Company company = companyMapper.selectById(dingding.getCompanyId());
+//            String token=company.getCompanyName();
+//            //移除锁
+//            DingDingServiceImpl.syncLog.remove(token);
+//            DingDingServiceImpl.syncLog.remove(company.getId()+"_status");
+//
+//            e.printStackTrace();
+//            System.err.println(e.getMessage());
+//            HttpRespMsg msg = new HttpRespMsg();
+//            msg.setError(e.getMessage());
+//            return msg;
+//        }
+//    }
+//
+//    @RequestMapping("/getUserByCode")
+//    public HttpRespMsg getUserByCode(String code, String corpid) {
+//        return dingDingService.getUserByCode(code, corpid);
+//    }
+//
+//    @RequestMapping("/syncCorpInfo")
+//    public HttpRespMsg syncCorpInfo(String corpid) {
+//        return dingDingService.syncCorpInfo(corpid);
+//    }
+//
+//    @RequestMapping("/syncCorpAgent")
+//    public HttpRespMsg syncCorpAgent(String corpid) {
+//        return dingDingService.syncCorpAgent(corpid);
+//    }
+//
+//    @RequestMapping("/getUnActiveCorp")
+//    public HttpRespMsg getUnActiveCorp() {
+//        return dingDingService.getUnActiveCorp();
+//    }
+//
+//    @RequestMapping("/reAuthCorp")
+//    public HttpRespMsg reAuthCorp(String corpid) {
+//        return dingDingService.reAuthCorp(corpid);
+//    }
+//
+//    @RequestMapping("/pushLeaveAuditAlert")
+//    public HttpRespMsg pushLeaveAuditAlert(String userId) {
+//        HttpRespMsg msg = new HttpRespMsg();
+//        User user = userMapper.selectById(userId);
+//        System.out.println("测试发送审批给=="+user.getName());
+//        CompanyDingding dingding = companyDingdingService.getOne(new QueryWrapper<CompanyDingding>().eq("company_id", user.getCompanyId()));
+//        companyDingdingService.sendLeaveApplyAlertMsg(dingding.getCompanyId(), dingding.getAgentId(), "", user.getDingdingUserid());
+//        return msg;
+//    }
+//
+//    @RequestMapping("/syncCardTime")
+//    public HttpRespMsg syncCardTime(Integer companyId, String userId, String startDate, String endDate) {
+//        dingDingService.syncCardTime(companyId, userId, startDate, endDate);
+//        return new HttpRespMsg();
+//    }
+////
+////    @RequestMapping("/syncLeaveTime")
+////    public HttpRespMsg syncLeaveTime(Integer companyId, String userId, String startDate, String endDate) {
+////        dingDingService.syncLeaveTime(companyId, userId, startDate, endDate);
+////        return new HttpRespMsg();
+////    }
+//
+//    @RequestMapping("/fixAttendance")
+//    public HttpRespMsg fixAttendance(Integer companyId) {
+//        return dingDingService.fixAttendance(companyId);
+//    }
+//
+//
+//
+//    @RequestMapping("/syncUserWorkData")
+//    public HttpRespMsg syncUserWorkData(Integer companyId, String userId, String startDate, String endDate, @RequestParam(required = false, defaultValue = "false") boolean onlySyncAttendance) {
+//        CompanyDingding dingding = companyDingdingMapper.selectOne(new QueryWrapper<CompanyDingding>().eq("company_id", companyId).isNotNull("inner_appkey"));
+//        HttpRespMsg msg = new HttpRespMsg();
+//        if (startDate.compareTo(endDate) > 0) {
+//            //msg.setError("开始日期不能晚于结束日期");
+//            msg.setError(MessageUtils.message("DD.dateError"));
+//            return msg;
+//        }
+//
+//        if (companyId != null) {
+//            if (dingding == null) {
+//                //msg.setError("该公司没有设置innerAppkey和innerAppSecrt");
+//                msg.setError(MessageUtils.message("DD.keyAndSecretError"));
+//                return msg;
+//            } else {
+//                long t1 = System.currentTimeMillis();
+//                dingDingService.syncUserWorkData(dingding, userId, startDate, endDate, true, onlySyncAttendance);
+//                long t2 = System.currentTimeMillis();
+//                System.out.println("总共耗时："+(t2-t1)+"ms");
+//            }
+//        } else {
+//            List<TimeType> timeTypeList = timeTypeMapper.selectList(new QueryWrapper<TimeType>().eq("sync_dingding", 1));
+//            List<Integer> compIds = timeTypeList.stream().map(TimeType::getCompanyId).collect(Collectors.toList());
+//            //企业内部应用才有权限调用
+//            List<CompanyDingding> dingdingList = companyDingdingMapper.selectList(new QueryWrapper<CompanyDingding>().in("company_id", compIds)
+//                    .isNotNull("inner_appkey"));
+//            System.out.println("==========获取钉钉内部应用的数量是:"+dingdingList.size());
+//            if (dingdingList.size() == 0) {
+//                //msg.setError("没有设置innerAppkey和innerAppSecrt的数据");
+//                msg.setError(MessageUtils.message("DD.keyAndSecretError"));
+//                return msg;
+//            } else {
+//                long t1 = System.currentTimeMillis();
+//                for (int i=0;i<dingdingList.size(); i++) {
+//                    dingDingService.syncUserWorkData(dingdingList.get(i), userId, startDate, endDate, true, onlySyncAttendance);
+//                }
+//                long t2 = System.currentTimeMillis();
+//                System.out.println("总共耗时："+(t2-t1)+"ms");
+//            }
+//        }
+//
 //        return new HttpRespMsg();
 //    }
-
-    @RequestMapping("/fixAttendance")
-    public HttpRespMsg fixAttendance(Integer companyId) {
-        return dingDingService.fixAttendance(companyId);
-    }
-
-
-
-    @RequestMapping("/syncUserWorkData")
-    public HttpRespMsg syncUserWorkData(Integer companyId, String userId, String startDate, String endDate, @RequestParam(required = false, defaultValue = "false") boolean onlySyncAttendance) {
-        CompanyDingding dingding = companyDingdingMapper.selectOne(new QueryWrapper<CompanyDingding>().eq("company_id", companyId).isNotNull("inner_appkey"));
-        HttpRespMsg msg = new HttpRespMsg();
-        if (startDate.compareTo(endDate) > 0) {
-            //msg.setError("开始日期不能晚于结束日期");
-            msg.setError(MessageUtils.message("DD.dateError"));
-            return msg;
-        }
-
-        if (companyId != null) {
-            if (dingding == null) {
-                //msg.setError("该公司没有设置innerAppkey和innerAppSecrt");
-                msg.setError(MessageUtils.message("DD.keyAndSecretError"));
-                return msg;
-            } else {
-                long t1 = System.currentTimeMillis();
-                dingDingService.syncUserWorkData(dingding, userId, startDate, endDate, true, onlySyncAttendance);
-                long t2 = System.currentTimeMillis();
-                System.out.println("总共耗时："+(t2-t1)+"ms");
-            }
-        } else {
-            List<TimeType> timeTypeList = timeTypeMapper.selectList(new QueryWrapper<TimeType>().eq("sync_dingding", 1));
-            List<Integer> compIds = timeTypeList.stream().map(TimeType::getCompanyId).collect(Collectors.toList());
-            //企业内部应用才有权限调用
-            List<CompanyDingding> dingdingList = companyDingdingMapper.selectList(new QueryWrapper<CompanyDingding>().in("company_id", compIds)
-                    .isNotNull("inner_appkey"));
-            System.out.println("==========获取钉钉内部应用的数量是:"+dingdingList.size());
-            if (dingdingList.size() == 0) {
-                //msg.setError("没有设置innerAppkey和innerAppSecrt的数据");
-                msg.setError(MessageUtils.message("DD.keyAndSecretError"));
-                return msg;
-            } else {
-                long t1 = System.currentTimeMillis();
-                for (int i=0;i<dingdingList.size(); i++) {
-                    dingDingService.syncUserWorkData(dingdingList.get(i), userId, startDate, endDate, true, onlySyncAttendance);
-                }
-                long t2 = System.currentTimeMillis();
-                System.out.println("总共耗时："+(t2-t1)+"ms");
-            }
-        }
-
-        return new HttpRespMsg();
-    }
-
-    @RequestMapping("/testWaitingApply")
-    public HttpRespMsg testWaitingApply(Integer companyId) {
-        CompanyDingding companyDingding = companyDingdingService.getOne(new QueryWrapper<CompanyDingding>().eq("company_id", companyId));
-        companyDingdingService.sendReportWaitingApplyMsg(companyId, companyDingding.getAgentId(),
-                4L, "040534176023851922");
-        return new HttpRespMsg();
-    }
-//
-    @RequestMapping("/syncLeaveQuotaData")
-    public HttpRespMsg syncLeaveQuotaData(Integer companyId, HttpServletRequest request) {
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        return dingDingService.syncLeaveQuotaData(companyId);
-    }
-
-    @RequestMapping("/testSendBusTripLink")
-    public HttpRespMsg testSendBusTripLink(Integer companyId) {
-        CompanyDingding dingding = companyDingdingMapper.selectOne(new QueryWrapper<CompanyDingding>().eq("company_id", companyId));
-
-        companyDingdingService.sendBusinessTripSettingMsg(companyId, dingding.getAgentId(), "040534176023851922");
-        return new HttpRespMsg();
-    }
-
-    /**
-     * 初始化内部应用的系统数据
-     * @return
-     */
-    @RequestMapping("/initSystem")
-    public HttpRespMsg initSystem(String corpid) {
-        try {
-            return dingDingService.initSystem(corpid);
-        } catch (ApiException e) {
-            e.printStackTrace();
-            String errMsg = e.getErrMsg();
-            HttpRespMsg msg = new HttpRespMsg();
-            msg.setError(errMsg);
-            return msg;
-        }
-    }
-
-    @RequestMapping("/removeCompInfo")
-    public HttpRespMsg removeCompInfo(String corpid) {
-        return dingDingService.removeCompInfo(corpid);
-    }
-
-    @RequestMapping("/initSuperManager")
-    public HttpRespMsg initSuperManager(String corpid, String name) {
-        return dingDingService.initSuperManager(corpid, name);
-    }
-
-}
+//
+//    @RequestMapping("/testWaitingApply")
+//    public HttpRespMsg testWaitingApply(Integer companyId) {
+//        CompanyDingding companyDingding = companyDingdingService.getOne(new QueryWrapper<CompanyDingding>().eq("company_id", companyId));
+//        companyDingdingService.sendReportWaitingApplyMsg(companyId, companyDingding.getAgentId(),
+//                4L, "040534176023851922");
+//        return new HttpRespMsg();
+//    }
+////
+//    @RequestMapping("/syncLeaveQuotaData")
+//    public HttpRespMsg syncLeaveQuotaData(Integer companyId, HttpServletRequest request) {
+//        String token = request.getHeader("TOKEN");
+//        User user = userMapper.selectById(token);
+//        return dingDingService.syncLeaveQuotaData(companyId);
+//    }
+//
+//    @RequestMapping("/testSendBusTripLink")
+//    public HttpRespMsg testSendBusTripLink(Integer companyId) {
+//        CompanyDingding dingding = companyDingdingMapper.selectOne(new QueryWrapper<CompanyDingding>().eq("company_id", companyId));
+//
+//        companyDingdingService.sendBusinessTripSettingMsg(companyId, dingding.getAgentId(), "040534176023851922");
+//        return new HttpRespMsg();
+//    }
+//
+//    /**
+//     * 初始化内部应用的系统数据
+//     * @return
+//     */
+//    @RequestMapping("/initSystem")
+//    public HttpRespMsg initSystem(String corpid) {
+//        try {
+//            return dingDingService.initSystem(corpid);
+//        } catch (ApiException e) {
+//            e.printStackTrace();
+//            String errMsg = e.getErrMsg();
+//            HttpRespMsg msg = new HttpRespMsg();
+//            msg.setError(errMsg);
+//            return msg;
+//        }
+//    }
+//
+//    @RequestMapping("/removeCompInfo")
+//    public HttpRespMsg removeCompInfo(String corpid) {
+//        return dingDingService.removeCompInfo(corpid);
+//    }
+//
+//    @RequestMapping("/initSuperManager")
+//    public HttpRespMsg initSuperManager(String corpid, String name) {
+//        return dingDingService.initSuperManager(corpid, name);
+//    }
+//
+//}

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

@@ -1,47 +1,47 @@
-package com.management.platform.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.Report;
-import com.management.platform.mapper.ReportMapper;
-import com.management.platform.service.ReportService;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.ListUtil;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/clean")
-public class DirtyCleanController {
-    @Resource
-    private ReportService reportService;
-    @Resource
-    private ReportMapper reportMapper;
-
-
-
-    @RequestMapping("/removeDuplicate")
-    public HttpRespMsg removeDuplicate(Integer companyId) {
-        HttpRespMsg msg = new HttpRespMsg();
-        List<Map<String, Object>> list = reportMapper.getDuplicate(companyId);
-        System.out.println("共=="+list.size()+"条重复记录");
-        List<Integer> reportIds = new ArrayList<>();
-        for(int i=0;i<list.size(); i++) {
-            Map map = list.get(i);
-            String ids = (String)map.get("reportIds");
-            reportIds.addAll(ListUtil.convertIntegerIdsArrayToList(ids));
-        }
-        System.out.println(reportIds);
-        System.out.println("日报记录report ="+reportIds.size());
-//        QueryWrapper<Report> queryWrapper = new QueryWrapper<Report>().in("id", reportIds).eq("company_id", companyId);
-//        reportMapper.delete(queryWrapper);
-//        List<Report> rList = reportMapper.selectList();
-//        System.out.println("去查找的日报数量="+rList.size());
-
-        return msg;
-    }
-}
+//package com.management.platform.controller;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.management.platform.entity.Report;
+//import com.management.platform.mapper.ReportMapper;
+//import com.management.platform.service.ReportService;
+//import com.management.platform.util.HttpRespMsg;
+//import com.management.platform.util.ListUtil;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import javax.annotation.Resource;
+//import java.util.ArrayList;
+//import java.util.List;
+//import java.util.Map;
+//
+//@RestController
+//@RequestMapping("/clean")
+//public class DirtyCleanController {
+//    @Resource
+//    private ReportService reportService;
+//    @Resource
+//    private ReportMapper reportMapper;
+//
+//
+//
+//    @RequestMapping("/removeDuplicate")
+//    public HttpRespMsg removeDuplicate(Integer companyId) {
+//        HttpRespMsg msg = new HttpRespMsg();
+//        List<Map<String, Object>> list = reportMapper.getDuplicate(companyId);
+//        System.out.println("共=="+list.size()+"条重复记录");
+//        List<Integer> reportIds = new ArrayList<>();
+//        for(int i=0;i<list.size(); i++) {
+//            Map map = list.get(i);
+//            String ids = (String)map.get("reportIds");
+//            reportIds.addAll(ListUtil.convertIntegerIdsArrayToList(ids));
+//        }
+//        System.out.println(reportIds);
+//        System.out.println("日报记录report ="+reportIds.size());
+////        QueryWrapper<Report> queryWrapper = new QueryWrapper<Report>().in("id", reportIds).eq("company_id", companyId);
+////        reportMapper.delete(queryWrapper);
+////        List<Report> rList = reportMapper.selectList();
+////        System.out.println("去查找的日报数量="+rList.size());
+//
+//        return msg;
+//    }
+//}

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

@@ -1,184 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.*;
-import com.management.platform.mapper.CompanyMapper;
-import com.management.platform.mapper.FinanceTblcuscolMapper;
-import com.management.platform.mapper.TimeTypeMapper;
-import com.management.platform.mapper.WxCorpInfoMapper;
-import com.management.platform.service.ExcelExportService;
-import com.management.platform.service.FinanceFixedcolnameService;
-import com.management.platform.service.FinanceService;
-import com.management.platform.util.ExcelUtil;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.MessageUtils;
-import com.management.platform.util.UserNotFoundException;
-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 javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-02-18
- */
-@RestController
-@RequestMapping("/finance")
-public class FinanceController {
-
-    @Resource
-    private FinanceService financeService;
-    @Resource
-    private FinanceTblcuscolMapper financeTblcuscolMapper;
-    @Resource
-    private CompanyMapper companyMapper;
-    @Resource
-    private FinanceFixedcolnameService financeFixedcolnameService;
-    @Resource
-    private TimeTypeMapper timeTypeMapper;
-    @Resource
-    private WxCorpInfoMapper wxCorpInfoMapper;
-    @Resource
-    private ExcelExportService excelExportService;
-
-    @Value(value = "${upload.path}")
-    private String path;
-
-    @RequestMapping("/getByMonth")
-    public HttpRespMsg getByMonth(Integer companyId, String yearMonth) {
-        return financeService.getByMonth(companyId, yearMonth);
-    }
-
-    @RequestMapping("/getProjects")
-    public HttpRespMsg getProjects(Integer companyId, String yearMonth) {
-        return financeService.getProjects(companyId, yearMonth);
-    }
-
-    @RequestMapping("/importData")
-    public HttpRespMsg importData(Integer companyId, String yearMonth,
-                                  Boolean syncUserCost, Boolean syncHistoryReport,
-                                  MultipartFile file, HttpServletRequest request) {
-        HttpRespMsg msg = new HttpRespMsg();
-        try {
-            return financeService.importData(companyId, yearMonth, syncUserCost, syncHistoryReport, file, request);
-        } catch (IOException e) {
-            e.printStackTrace();
-            //msg.setError("文件处理出错");
-            msg.setError(MessageUtils.message("file.error"));
-            return msg;
-        } catch (UserNotFoundException e) {
-            e.printStackTrace();
-            msg.setError(e.getMessage());
-            return msg;
-        } catch (NullPointerException e) {
-            e.printStackTrace();
-            //msg.setError("数据格式有误或存在空数据 导入失败");
-            msg.setError(MessageUtils.message("file.dataFormatError"));
-            return msg;
-        } catch (Exception e) {
-            e.printStackTrace();
-            //msg.setError("发生其他错误");
-            msg.setError(MessageUtils.message("other.error"));
-            return msg;
-        }
-    }
-
-    //导出分摊数据
-    @RequestMapping("/exportData")
-    public HttpRespMsg exportData(@RequestParam(required = false, defaultValue = "0") Integer groupByCategory,
-                                  @RequestParam String date, Boolean assignNoProUser,HttpServletRequest request) {
-        return financeService.exportData(groupByCategory, date, assignNoProUser, request);
-    }
-
-    /**
-     * 导出薪资数据
-     * @param date
-     * @param request
-     * @return
-     */
-    @RequestMapping("/exportFinance")
-    public HttpRespMsg exportFinance(@RequestParam String date, HttpServletRequest request) {
-        return financeService.exportFinance(date, request);
-    }
-
-    //按照项目分配财务成本
-    @RequestMapping("/getTimeCost")
-    public HttpRespMsg getTimeCost(String yearMonth, Boolean assignNoProUser,HttpServletRequest request) {
-        return financeService.getTimeCost(yearMonth, assignNoProUser,request);
-    }
-
-    @RequestMapping("/getNoProjectUsers")
-    public HttpRespMsg getNoProjectUsers(String yearMonth, HttpServletRequest request) {
-        return financeService.getNoProjectUsers(yearMonth, request);
-    }
-
-
-    /**
-     * 获取财务报表模板
-     * @param companyId
-     * @return
-     */
-    @RequestMapping("/getTemplate")
-    public HttpRespMsg getTemplate(Integer companyId) throws Exception {
-        List<FinanceTblcuscol> list = financeTblcuscolMapper.selectList(new QueryWrapper<FinanceTblcuscol>().eq("company_id", companyId));
-        HttpRespMsg msg = new HttpRespMsg();
-        FinanceFixedcolname item = financeFixedcolnameService.getById(companyId);
-
-        List<String> heads = new ArrayList<>();
-        Company company = companyMapper.selectById(companyId);
-//        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", companyId));
-        //判断是否启用了工号模式
-        TimeType timeType = timeTypeMapper.selectById(companyId);
-        if (timeType.getFinanceJobnumEnabled() == 1) {
-            //heads.add("工号");
-            heads.add(MessageUtils.message("entry.No"));
-        }
-        //heads.add("姓名");
-        heads.add(MessageUtils.message("entry.name"));
-        heads.add(item.getMonthCost());//heads.add("工资");
-        heads.add(item.getBonus());//heads.add("奖金");
-        heads.add(item.getAllowance());//heads.add("津贴");
-        heads.add(item.getInsuranceOld());//heads.add("养老保险");
-        heads.add(item.getInsuranceMedical());//heads.add("医疗保险");
-        heads.add(item.getInsuranceLosejob());//heads.add("失业保险");
-        heads.add(item.getInsuranceInjury());//heads.add("工伤保险");
-        heads.add(item.getHouseFund());//heads.add("住房公积金");
-        if (list.size() > 0) {
-            List<String> collect = list.stream().map(FinanceTblcuscol::getFieldName).collect(Collectors.toList());
-            heads.addAll(collect);
-        }
-        List<List<String>> allList = new ArrayList<>();
-        allList.add(heads);
-        //String fileName = company.getCompanyName()+"_财务人员成本模板";
-        String fileName = MessageUtils.message("fileName.financialCost",company.getCompanyName());
-        //导出模板不需要转译，不传wxCorpInfo
-        return excelExportService.exportGeneralExcelByTitleAndList(null, fileName, allList, path);
-    }
-    @RequestMapping("/batchRemove")
-    public HttpRespMsg batchRemove(String ids){
-        HttpRespMsg msg=new HttpRespMsg();
-        String[] split = ids.split(",");
-        List<String> list = Arrays.asList(split);
-        if(financeService.removeByIds(list)){
-            return msg;
-        }
-        //msg.setError("删除失败");
-        msg.setError(MessageUtils.message("file.deleteError"));
-        return msg;
-    }
-}
-

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

@@ -1,97 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.FinanceImport;
-import com.management.platform.entity.User;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.FinanceImportService;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.MessageUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-03-22
- */
-@RestController
-@RequestMapping("/finance-import")
-public class FinanceImportController {
-
-    @Resource
-    private FinanceImportService financeImportService;
-    @Resource
-    private UserMapper userMapper;
-
-    @RequestMapping("submitImport")
-    public HttpRespMsg submitImport(Integer companyId, String yearMonth,
-                                  Boolean syncUserCost, Boolean syncHistoryReport,
-                                  MultipartFile file, HttpServletRequest request) {
-        return financeImportService.submitImport(companyId, yearMonth, syncUserCost, syncHistoryReport, file, request);
-    }
-
-    @RequestMapping("list")
-    public HttpRespMsg list(Integer companyId, HttpServletRequest request) {
-        return financeImportService.list(companyId, request);
-    }
-
-    @RequestMapping("/agree")
-    public HttpRespMsg agree(Integer id, HttpServletRequest request) {
-
-        return financeImportService.agree(id, request);
-    }
-
-    @RequestMapping("/getStatus")
-    public HttpRespMsg getStatus(Integer companyId, String yearMonth) {
-        FinanceImport item = financeImportService.getOne(new QueryWrapper<FinanceImport>().eq("company_id", companyId).eq("ymonth", yearMonth).orderByDesc("indate").last("limit 1"));
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = item;
-        return msg;
-    }
-
-    @RequestMapping("/deny")
-    public HttpRespMsg deny(Integer id, HttpServletRequest request) {
-        HttpRespMsg msg = new HttpRespMsg();
-        FinanceImport item = new FinanceImport();
-        item.setId(id);
-        item.setState(2);
-        FinanceImport old = financeImportService.getById(id);
-        if (old.getState() == 0) {
-            User auditor = userMapper.selectById(request.getHeader("TOKEN"));
-            item.setAuditorId(auditor.getId());
-            item.setAuditorName(auditor.getName());
-            financeImportService.updateById(item);
-        } else {
-            //msg.setError("只有待审核状态才可以操作");
-            msg.setError(MessageUtils.message("finance.operationStateError"));
-        }
-        return msg;
-    }
-
-    @RequestMapping("/cancel")
-    public HttpRespMsg cancel(Integer id, HttpServletRequest request) {
-        HttpRespMsg msg = new HttpRespMsg();
-        FinanceImport item = new FinanceImport();
-        item.setId(id);
-        item.setState(-1);
-        FinanceImport old = financeImportService.getById(id);
-        if (old.getState() == 1) {
-            financeImportService.updateById(item);
-        } else {
-            //msg.setError("只有审核通过状态才可以撤销");
-            msg.setError(MessageUtils.message("finance.revokeStateError"));
-        }
-        return msg;
-    }
-}
-

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

@@ -1,242 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.*;
-import com.management.platform.entity.vo.ExportLeave;
-import com.management.platform.mapper.DepartmentMapper;
-import com.management.platform.mapper.SysFunctionMapper;
-import com.management.platform.mapper.TimeTypeMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.DepartmentService;
-import com.management.platform.service.LeaveSheetService;
-import com.management.platform.util.DockWithMLD;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-12-09
- */
-@RestController
-@RequestMapping("/leave-sheet")
-public class LeaveSheetController {
-
-    @Resource
-    UserMapper userMapper;
-    @Resource
-    LeaveSheetService leaveSheetService;
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    SysFunctionMapper sysFunctionMapper;
-    @Resource
-    DepartmentMapper departmentMapper;
-    @Resource
-    DepartmentService departmentService;
-    @Resource
-    TimeTypeMapper timeTypeMapper;
-
-
-    /**
-     * 提交请假申请单
-     * @param sheet 请假单封装数据
-     * @return
-     */
-    @RequestMapping("/add")
-    public HttpRespMsg add(LeaveSheet sheet) {
-        String userId = request.getHeader("Token");
-        return leaveSheetService.add(sheet, userId);
-
-    }
-
-    @RequestMapping("/cancel")
-    public HttpRespMsg cancel(Integer id) {
-        String userId = request.getHeader("Token");
-        return leaveSheetService.cancel(id, userId);
-    }
-
-
-
-    @RequestMapping("/delete")
-    public HttpRespMsg delete(Integer id) {
-        return leaveSheetService.delete(id);
-
-    }
-
-    @RequestMapping("/list")
-    public HttpRespMsg list(LeaveSheet sheet, @RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
-        return leaveSheetService.queryList(sheet, pageIndex, pageSize);
-    }
-
-    @RequestMapping("/auditList")
-    public HttpRespMsg auditList(LeaveSheet sheet, @RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
-        return leaveSheetService.auditList(sheet, pageIndex, pageSize);
-    }
-
-    @RequestMapping("/approve")
-    public HttpRespMsg approve(Integer id) {
-        return leaveSheetService.approve(id);
-    }
-    @RequestMapping("/deny")
-    public HttpRespMsg deny(Integer id, String reason) {
-        return leaveSheetService.deny(id, reason);
-    }
-
-    /**
-     *
-     * @param keyword 姓名（模糊匹配）
-     * @param startDate 开始日期
-     * @param endDate 结束日期
-     * @return
-     */
-    @RequestMapping("/summaryData")
-    public HttpRespMsg summaryData(String keyword, String startDate, String endDate) {
-        String userId = request.getHeader("Token");
-        return leaveSheetService.summaryData(keyword, startDate, endDate, userId);
-
-    }
-
-    /**
-     * 获取员工加班剩余可抵扣的调休天数
-     * @param userId
-     * @return
-     */
-    @RequestMapping("/getOTAvaiDays")
-    public HttpRespMsg getOTAvaiDays(String userId) {
-        return leaveSheetService.getOTAvaiDays(userId);
-    }
-
-    /**
-     * 导出请假信息
-     * @return
-     */
-    @RequestMapping("/exportLeave")
-    public HttpRespMsg exportLeaveData(ExportLeave exportLeave) {
-        String userId = request.getHeader("Token");
-        return leaveSheetService.exportLeaveData(userId,exportLeave.getStatus(),exportLeave.getLeaveType(),exportLeave.getStartTime(),exportLeave.getEndTime());
-    }
-
-    /**
-     * 计算请假的时长
-     * @param startDate
-     * @param endDate
-     * @return
-     */
-    @RequestMapping("/leaveDays")
-    public HttpRespMsg leaveDays (String startDate,String endDate){
-        return leaveSheetService.leaveDays(startDate,endDate);
-    }
-
-    @RequestMapping("/syncLeaveSheet")
-    public HttpRespMsg syncLeaveSheet(){
-        HttpRespMsg msg=new HttpRespMsg();
-        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
-        TimeType one = timeTypeMapper.selectOne(new QueryWrapper<TimeType>().eq("company_id", companyId).eq("sync_fanwei", 1));
-        if(one==null){
-            msg.setError("暂无请假数据待同步");
-            return msg;
-        }
-        DockWithMLD dockWithMLD=new DockWithMLD();
-        JSONObject jsonObject=new JSONObject();
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        DateTimeFormatter dtf1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        String startDate = dtf.format(LocalDateTime.now());
-        jsonObject.put("gmtFinished",startDate);
-        String jsonString = jsonObject.toJSONString();
-        TimeType allDay = timeTypeMapper.selectOne(new QueryWrapper<TimeType>().eq("company_id", companyId));
-        List<User> allUserList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId));
-        List<LeaveSheet> leaveSheetList=new ArrayList<>();
-        List<LeaveSheet> oldLeaveSheetList = leaveSheetService.list(new QueryWrapper<LeaveSheet>().eq("company_id", companyId));
-        //Todo: 获取请假数据
-        HttpRespMsg leaveRecordMsg = dockWithMLD.getResult("http://10.1.10.51:20175/api/cube/restful/interface/getModeDataPageList/getLeaveRecord", jsonString);
-        if(leaveRecordMsg.getCode().equals("error")){
-            msg.setError("同步失败");
-            return msg;
-        }
-        List<Map<String,Object>> leaveRecordList= (List<Map<String, Object>>) leaveRecordMsg.data;
-        for (Map<String, Object> map : leaveRecordList) {
-            Optional<User> optional=allUserList.stream().filter(al->al.getJobNumber()!=null&&al.getJobNumber().equals(map.get("rybh"))).findFirst();
-            if(!optional.isPresent()){
-                continue;
-            }
-            User user=optional.get();
-            /*System.out.println("泛微同步人员请假数据----"+user.getName());*/
-            if(companyId.equals(user.getCompanyId())){
-                LeaveSheet leaveSheet = new LeaveSheet();
-                leaveSheet.setCompanyId(user.getCompanyId());
-                leaveSheet.setStatus(0);
-                leaveSheet.setOwnerId(user.getId());
-                leaveSheet.setOwnerName(user.getName());
-                leaveSheet.setStartDate(LocalDate.parse(String.valueOf(map.get("startDate")),dtf1));
-                leaveSheet.setEndDate(LocalDate.parse(String.valueOf(map.get("endDate")),dtf1));
-                Integer timeType=null;
-                switch (String.valueOf(map.get("timeType"))){
-                    case "小时":timeType=1;
-                        break;
-                    case "天":timeType=0;
-                        break;
-                }
-                leaveSheet.setTimeType(timeType);
-                leaveSheet.setTimeDays(Float.parseFloat(((String) map.get("timeDays")).equals("")?"0.00":((String) map.get("timeDays"))));
-                if (timeType == 0){
-                    leaveSheet.setTimeHours(leaveSheet.getTimeDays()*allDay.getAllday());
-                }else {
-                    leaveSheet.setTimeHours(Float.parseFloat(((String) map.get("timeHours")).equals("")?"0.00":((String) map.get("timeHours"))));
-                }
-                Integer leaveType;
-                switch (String.valueOf(map.get("leaveType"))){
-                    case "事假":leaveType=0;
-                        break;
-                    case "病假":leaveType=1;
-                        break;
-                    case "年假":leaveType=2;
-                        break;
-                    case "产假":leaveType=3;
-                        break;
-                    case "婚假":leaveType=4;
-                        break;
-                    case "丧假":leaveType=5;
-                        break;
-                    case "调休":leaveType=6;
-                        break;
-                    case "陪产假":leaveType=7;
-                        break;
-                    default:leaveType=8;
-                }
-                leaveSheet.setLeaveType(leaveType);
-                leaveSheet.setProcinstId(String.valueOf(map.get("id")));
-                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()!=null&& ol.getProcinstId().equals(leaveSheet.getProcinstId()))).findFirst();
-                if(first.isPresent()){
-                    leaveSheet.setId(first.get().getId());
-                }
-                leaveSheetList.add(leaveSheet);
-            }
-        }
-        if(leaveSheetList.size()>0){
-            leaveSheetService.remove(new QueryWrapper<LeaveSheet>().eq("company_id",companyId));
-            leaveSheetService.saveBatch(leaveSheetList);
-        }
-        return msg;
-    }
-
-
-}
-

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

@@ -1,118 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.management.platform.entity.*;
-import com.management.platform.mapper.ProfessionMapper;
-import com.management.platform.mapper.ProjectProfessionMapper;
-import com.management.platform.mapper.ReportProfessionProgressMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.MessageUtils;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-08-28
- */
-@RestController
-@RequestMapping("/profession")
-public class ProfessionController {
-    @Resource
-    HttpServletRequest request;
-    @Resource
-    UserMapper userMapper;
-    @Resource
-    ProfessionMapper professionMapper;
-    @Resource
-    ReportProfessionProgressMapper reportProfessionProgressMapper;
-    @Resource
-    ProjectProfessionMapper projectProfessionMapper;
-
-    @RequestMapping("/addOrMod")
-    public HttpRespMsg addOrMod(Profession info) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        if (info.getId() == null) {
-            info.setCompanyId(user.getCompanyId());
-            professionMapper.insert(info);
-        } else {
-            info.setCompanyId(user.getCompanyId());
-            professionMapper.updateById(info);
-            //更新项目专业表中的专业名称
-            ProjectProfession p = new ProjectProfession();
-            p.setProfessionName(info.getName());
-            projectProfessionMapper.update(p, new QueryWrapper<ProjectProfession>().eq("profession_id", info.getId()));
-        }
-        return msg;
-    }
-
-    @RequestMapping("/delete")
-    public HttpRespMsg delete(Integer id) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        //检查，该专业是否已经被日报使用
-        Integer cnt = reportProfessionProgressMapper.selectCount(new QueryWrapper<ReportProfessionProgress>().eq("profession_id", id));
-        if (cnt > 0) {
-            //msg.setError("该专业已经存在相关日报，无法删除");
-            msg.setError(MessageUtils.message("profession.existsError"));
-        } else {
-            int r = professionMapper.delete(new QueryWrapper<Profession>().eq("id", id).eq("company_id", user.getCompanyId()));
-            if (r <= 0) {
-                //msg.setError("无权删除");
-                msg.setError(MessageUtils.message("access.deleteError"));
-            }
-        }
-
-        return msg;
-    }
-
-    @RequestMapping("/list")
-    public HttpRespMsg list(@RequestParam Integer pageIndex, @RequestParam Integer pageSize, String keyword) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        QueryWrapper<Profession> queryWrapper = new QueryWrapper<Profession>().eq("company_id", user.getCompanyId()).orderByDesc("id");
-        if (!StringUtils.isEmpty(keyword)) {
-            queryWrapper.like("name", keyword);
-        }
-        IPage<Profession> projectIPage = professionMapper.selectPage(new Page<>(pageIndex, pageSize),
-                queryWrapper);
-        List<Profession> list = projectIPage.getRecords();
-        Long total = projectIPage.getTotal();
-        Map<String, Object> map = new HashMap<>();
-        map.put("records", list);
-        map.put("total", total);
-        msg.data = map;
-        return msg;
-    }
-
-    @RequestMapping("/getAll")
-    public HttpRespMsg getAll() {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        List<Profession> all = professionMapper.selectList(new QueryWrapper<Profession>().eq("company_id", user.getCompanyId()));
-        msg.data = all;
-        return msg;
-    }
-}
-

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

@@ -1,99 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.ExpenseMainType;
-import com.management.platform.entity.ExpenseSheet;
-import com.management.platform.entity.ProjectBasecostSetting;
-import com.management.platform.entity.ProjectCurrentcost;
-import com.management.platform.mapper.*;
-import com.management.platform.service.ProjectCurrentcostService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-05-07
- */
-@RestController
-@RequestMapping("/project-currentcost")
-public class ProjectCurrentcostController {
-    @Resource
-    private ProjectCurrentcostService projectCurrentcostService;
-    @Resource
-    private ReportMapper reportMapper;
-    @Resource
-    ProjectBasecostSettingMapper projectBasecostSettingMapper;
-    @Resource
-    ExpenseMainTypeMapper expenseMainTypeMapper;
-    @Resource
-    ExpenseItemMapper expenseItemMapper;
-
-    @RequestMapping("/get")
-    public HttpRespMsg get(Integer companyId, Integer projectId) {
-        List<ProjectCurrentcost> projectCurrentcosts = projectCurrentcostService.list(new QueryWrapper<ProjectCurrentcost>().eq("project_id", projectId));
-        HttpRespMsg msg = new HttpRespMsg();
-        List<ProjectBasecostSetting> basecostSettingList = projectBasecostSettingMapper.selectList(new QueryWrapper<ProjectBasecostSetting>().eq("company_id", companyId).eq("alarm_type", 1));
-        List<Integer> projectIds = new ArrayList<>();
-        projectIds.add(projectId);
-        List<Map<String, Object>> projectCost = reportMapper.getOneProjectBaseCost(projectId);
-
-        //设置了成本预算项的费用类型
-        List<ExpenseMainType> mainTypeList = expenseMainTypeMapper.selectList(new QueryWrapper<ExpenseMainType>().eq("company_id", companyId).isNotNull("basecost_setting_id"));
-        //设置alarmType类型, 实际成本
-        projectCurrentcosts.forEach(cur->{
-            Optional<ProjectBasecostSetting> first = basecostSettingList.stream().filter(base -> base.getId().equals(cur.getBaseId())).findFirst();
-            if (first.isPresent()) {
-                cur.setAlarmType(first.get().getAlarmType());
-            }
-            for (Map<String, Object> map : projectCost) {
-                int bid = (int)map.get("basecostId");
-                if (bid == cur.getBaseId()) {
-                    double cost = ((BigDecimal)map.get("cost")).doubleValue();
-                    cur.setRealCost(cost);
-                    break;
-                }
-            }
-            //费用报销对应的预算
-            if (cur.getAlarmType() == null) {
-                List<ExpenseMainType> expenseTypeFindList = mainTypeList.stream().filter(main -> cur.getBaseId().equals(main.getBasecostSettingId())).collect(Collectors.toList());
-                if (expenseTypeFindList.size() > 0) {
-                    double sum = 0;
-                    for (ExpenseMainType type : expenseTypeFindList) {
-                        int expenseTypeId = type.getId();
-                        sum += expenseItemMapper.selectExpenseByProject(null, null, projectId, expenseTypeId);
-                    }
-                    cur.setRealCost(sum);
-                }
-            }
-        });
-        msg.data = projectCurrentcosts;
-        return msg;
-    }
-
-    @RequestMapping("/getTimeSheetCostListByProject")
-    public HttpRespMsg getTimeSheetCostListByProject(Integer companyId, Integer projectId) {
-        List<ProjectCurrentcost> projectCurrentcosts = projectCurrentcostService.list(new QueryWrapper<ProjectCurrentcost>().eq("project_id", projectId));
-        HttpRespMsg msg = new HttpRespMsg();
-        List<ProjectBasecostSetting> basecostSettingList = projectBasecostSettingMapper.selectList(new QueryWrapper<ProjectBasecostSetting>().eq("company_id", companyId).eq("alarm_type", 1));
-        //取alarmType为1的，即是工时预警类型的
-        projectCurrentcosts = projectCurrentcosts.stream().filter(cur->{
-            int alarmType = basecostSettingList.stream().filter(base->base.getId().equals(cur.getBaseId())).findFirst().get().getAlarmType();
-            return alarmType == 1;
-        }).collect(Collectors.toList());
-        msg.data = projectCurrentcosts;
-        return msg;
-    }
-}
-

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

@@ -170,39 +170,7 @@ public class ProjectDocumentController {
 
         return msg;
     }
-    //在线预览
-    //inputFilePath 文件路径
-    @RequestMapping(value="onlineShow")
-    public HttpRespMsg onlineShow(@RequestParam String inputFilePath) {
-        String destFileName = inputFilePath.substring(0, inputFilePath.lastIndexOf(".")+1)+"pdf";
-        File dir = new File(uploadPath);
-        if (!dir.exists()) {
-            dir.mkdir();
-        }
 
-        HttpRespMsg msg = new HttpRespMsg();
-        Map<String,String> map = new HashMap<String,String>();
-        File destFile = new File(dir, destFileName);
-        if(destFile.exists()) {
-            //文件已存在直接显示
-            map.put("pdfFileName", uploadPath + destFile.getName());
-        }else {
-            //文件不存在，转化后显示
-            OpenOfficeService service = new OpenOfficeService();
-            service.start();
-            File inputFile = new File(dir, inputFilePath);
-            Integer state = service.office2PDF(inputFile.getAbsolutePath(),destFile.getAbsolutePath());
-            if(state == 0){
-                //转换成功
-                map.put("pdfFileName", uploadPath + destFile.getName());
-            }else {
-                //转换失败
-            }
-            service.shutdown();
-        }
-        msg.data = map;
-        return msg;
-    }
     @RequestMapping(value="delete")
     public HttpRespMsg delDocument(@RequestParam Integer id, Integer isFolder) {
         ProjectDocument record = new ProjectDocument();

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

@@ -8,7 +8,6 @@ import com.management.platform.entity.TimeType;
 import com.management.platform.mapper.TimeTypeMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.ProjectLevelService;
-import com.management.platform.service.ProjectService;
 import com.management.platform.util.HttpRespMsg;
 import com.management.platform.util.MessageUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,8 +34,6 @@ public class ProjectLevelController {
     @Resource
     private UserMapper userMapper;
     @Resource
-    private ProjectService projectService;
-    @Resource
     private TimeTypeMapper timeTypeMapper;
     @RequestMapping("/addOrMod")
     public HttpRespMsg addOrMod(HttpServletRequest request, ProjectLevel projectLevel){
@@ -55,15 +52,6 @@ public class ProjectLevelController {
         HttpRespMsg httpRespMsg=new HttpRespMsg();
         Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
         TimeType timeType = timeTypeMapper.selectById(companyId);
-        if(timeType.getProjectLevelState()==1){
-            int cut = projectService.count(new QueryWrapper<Project>().eq("level", id).eq("company_id",companyId));
-            if(cut>0){
-                //httpRespMsg.setError("已绑定项目");
-                httpRespMsg.setError(MessageUtils.message("project.BoundItems"));
-                return httpRespMsg;
-            }
-            projectLevelService.removeById(id);
-        }
         return httpRespMsg;
     }
 }

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

@@ -6,7 +6,6 @@ import com.management.platform.entity.Project;
 import com.management.platform.entity.ProjectMain;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.ProjectMainService;
-import com.management.platform.service.ProjectService;
 import com.management.platform.util.HttpRespMsg;
 import com.management.platform.util.MessageUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,8 +31,6 @@ public class ProjectMainController {
     private ProjectMainService projectMainService;
     @Resource
     private UserMapper userMapper;
-    @Resource
-    private ProjectService projectService;
     @RequestMapping("/addOrMod")
     public HttpRespMsg addOrMod(HttpServletRequest request,ProjectMain projectMain){
        return projectMainService.addOrMod(request,projectMain);
@@ -49,12 +46,6 @@ public class ProjectMainController {
     @RequestMapping("/delete")
     public HttpRespMsg delete(Integer id){
         HttpRespMsg httpRespMsg=new HttpRespMsg();
-        int cut = projectService.count(new QueryWrapper<Project>().eq("project_main_id", id));
-        if(cut>0){
-            //httpRespMsg.setError("已绑定项目");
-            httpRespMsg.setError(MessageUtils.message("project.BoundItems"));
-            return httpRespMsg;
-        }
         projectMainService.removeById(id);
         return httpRespMsg;
     }

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

@@ -1,56 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.PpMembs;
-import com.management.platform.entity.ProjectProfession;
-import com.management.platform.mapper.ProjectProfessionMapper;
-import com.management.platform.service.ProjectProfessionService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-08-28
- */
-@RestController
-@RequestMapping("/project-profession")
-public class ProjectProfessionController {
-    @Resource
-    ProjectProfessionService projectProfessionService;
-    @RequestMapping("/modify")
-    public HttpRespMsg modify(Integer projectId, String json) {
-        return projectProfessionService.modify(projectId, json);
-    }
-
-    //获取项目相关的工程专业列表
-    @RequestMapping("/get")
-    public HttpRespMsg get(Integer projectId) {
-        return projectProfessionService.get(projectId);
-    }
-
-    //获取项目相关的工程专业列表
-    @RequestMapping("/getMyProfession")
-    public HttpRespMsg getMyProfession(Integer projectId) {
-        return projectProfessionService.getMyProfession(projectId);
-    }
-
-    @RequestMapping("/getProgressData")
-    public HttpRespMsg getProgressData(Integer projectId) {
-        return projectProfessionService.getProgressData(projectId);
-    }
-
-}
-

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.Project;
 import com.management.platform.entity.ProjectStage;
 import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.ProjectService;
 import com.management.platform.service.ProjectStageService;
 import com.management.platform.util.HttpRespMsg;
 import com.management.platform.util.MessageUtils;
@@ -32,8 +31,6 @@ public class ProjectStageController {
     private ProjectStageService projectStageService;
     @Resource
     private UserMapper userMapper;
-    @Resource
-    private ProjectService projectService;
 
     @RequestMapping("/list")
     public HttpRespMsg list(HttpServletRequest request){
@@ -73,12 +70,6 @@ public class ProjectStageController {
     @RequestMapping("/delete")
     public HttpRespMsg delete(Integer id){
         HttpRespMsg httpRespMsg =new HttpRespMsg();
-        int cut = projectService.count(new QueryWrapper<Project>().eq("current_stage_id", id));
-        if(cut>0){
-            //httpRespMsg.setError("该阶段已被使用");
-            httpRespMsg.setError(MessageUtils.message("project.StageUsedError"));
-            return httpRespMsg;
-        }
         if(projectStageService.removeById(id)){
             return httpRespMsg;
         }

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

@@ -1,152 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.ProjectTimer;
-import com.management.platform.entity.Report;
-import com.management.platform.entity.User;
-import com.management.platform.mapper.ProjectTimerMapper;
-import com.management.platform.mapper.ReportMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.ProjectService;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.MessageUtils;
-import org.apache.log4j.helpers.DateTimeDateFormat;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-03-17
- */
-@RestController
-@RequestMapping("/project-timer")
-public class ProjectTimerController {
-    @Resource
-    private ProjectTimerMapper projectTimerMapper;
-    @Resource
-    private ReportMapper reportMapper;
-    @Resource
-    private UserMapper userMapper;
-    @Resource
-    private HttpServletRequest request;
-
-    /**
-     * 获取定时器
-     */
-    @RequestMapping("/getMyTimer")
-    public HttpRespMsg getMyTimer() {
-        QueryWrapper<ProjectTimer> query = new QueryWrapper<ProjectTimer>();
-        String userId = request.getHeader("Token");
-
-        query.eq("user_id", userId);
-        query.orderByDesc("id");
-        HttpRespMsg msg = new HttpRespMsg();
-        List<ProjectTimer> list = projectTimerMapper.selectList(query);
-        LocalDateTime now = LocalDateTime.now();
-        list.forEach(t->{
-            if (t.getEndTime() == null) {
-                t.setTimer(now.toEpochSecond(ZoneOffset.ofHours(8)) - t.getStartTime().toEpochSecond(ZoneOffset.ofHours(8)));
-            } else {
-                t.setTimer(t.getEndTime().toEpochSecond(ZoneOffset.ofHours(8)) - t.getStartTime().toEpochSecond(ZoneOffset.ofHours(8)));
-            }
-        });
-        msg.data = list;
-        return msg;
-    }
-
-    @RequestMapping("/addTimer")
-    public HttpRespMsg addTimer(ProjectTimer timer) {
-        String userId = request.getHeader("Token");
-        timer.setUserId(userId);
-        timer.setStartTime(LocalDateTime.now());
-        projectTimerMapper.insert(timer);
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = timer;
-        return msg;
-    }
-
-
-    @RequestMapping("/deleteTimer")
-    public HttpRespMsg deleteTimer(Integer id) {
-        String userId = request.getHeader("Token");
-        HttpRespMsg msg = new HttpRespMsg();
-        ProjectTimer timer = projectTimerMapper.selectById(id);
-        if (!timer.getUserId().equals(userId)) {
-            //msg.setError("非创建人无权删除");
-            msg.setError(MessageUtils.message("access.createDelete"));
-        } else {
-            projectTimerMapper.deleteById(id);
-        }
-        return msg;
-    }
-
-
-    @RequestMapping("/endTimer")
-    public HttpRespMsg endTimer(Integer id) {
-        String userId = request.getHeader("Token");
-        HttpRespMsg msg = new HttpRespMsg();
-        ProjectTimer timer = projectTimerMapper.selectById(id);
-        if (!timer.getUserId().equals(userId)) {
-            //msg.setError("非创建人无权结束");
-            msg.setError(MessageUtils.message("access.createEnd"));
-        } else {
-            timer.setEndTime(LocalDateTime.now());
-            projectTimerMapper.updateById(timer);
-            msg.data = timer;
-        }
-        return msg;
-    }
-
-    @RequestMapping("/tranferToReport")
-    public HttpRespMsg tranferToReport(Integer id, String content) {
-        String userId = request.getHeader("Token");
-        User user = userMapper.selectById(userId);
-        HttpRespMsg msg = new HttpRespMsg();
-        ProjectTimer timer = projectTimerMapper.selectById(id);
-        if (!timer.getUserId().equals(userId)) {
-            //msg.setError("非创建人无权操作");
-            msg.setError(MessageUtils.message("access.createOperation"));
-        } else {
-            //创建日报
-            DateTimeFormatter df = DateTimeFormatter.ofPattern("HH:mm");
-            Report report = new Report();
-            report.setSubProjectId(timer.getSubProjectId());
-            report.setProjectId(timer.getProjectId());
-            report.setCreatorId(timer.getUserId());
-            report.setContent(content);
-            report.setCreateDate(timer.getStartTime().toLocalDate());
-            report.setStartTime(df.format(timer.getStartTime()));
-            report.setEndTime(df.format(timer.getEndTime()));
-            report.setReportTimeType(2);//2-按时间段录入
-            //计算时长
-            long time = timer.getEndTime().toEpochSecond(ZoneOffset.ofHours(8)) - timer.getStartTime().toEpochSecond(ZoneOffset.ofHours(8));
-            int minutes = (int)time/60;
-            double hours = (minutes*1.0f/60);
-            report.setWorkingTime(hours);
-            report.setCost(user.getCost().multiply(new BigDecimal(hours)));
-
-            reportMapper.insert(report);
-            timer.setReportId(report.getId());
-            projectTimerMapper.updateById(timer);
-            msg.data = timer;
-        }
-        return msg;
-    }
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-03-24
- */
-@RestController
-@RequestMapping("/report-alog-membdate")
-public class ReportAlogMembdateController {
-
-}
-

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

@@ -1,139 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.management.platform.entity.LocaleInformation;
-import com.management.platform.entity.ReportAlogMembdate;
-import com.management.platform.entity.ReportAuditLog;
-import com.management.platform.entity.User;
-import com.management.platform.entity.vo.SysRichFunction;
-import com.management.platform.mapper.*;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-03-24
- */
-@RestController
-@RequestMapping("/report-audit-log")
-public class ReportAuditLogController {
-
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    ReportAuditLogMapper reportAuditLogMapper;
-    @Resource
-    ReportAlogMembdateMapper reportAlogMembdateMapper;
-    @Resource
-    UserMapper userMapper;
-    @Resource
-    SysFunctionMapper sysFunctionMapper;
-    @Resource
-    LocaleInformationMapper localeInformationMapper;
-    @Resource
-    CompanyMapper companyMapper;
-
-    @RequestMapping("getImportAuditLog")
-    public HttpRespMsg getImportAuditLog(Integer companyId, @RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        HttpRespMsg msg = new HttpRespMsg();
-        List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看导审记录");
-        if (functionList.size() > 0) {
-            QueryWrapper<ReportAuditLog> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("company_id", companyId).eq("audit_channel", 0).orderByDesc("indate");
-            IPage<ReportAuditLog> iPage = reportAuditLogMapper.selectPage(new Page<>(pageIndex, pageSize),
-                    queryWrapper);
-            List<ReportAuditLog> list = iPage.getRecords();
-            if (list.size() > 0) {
-                //还有获取各项的人员日期名单
-                List<Integer> ids = list.stream().map(ReportAuditLog::getId).collect(Collectors.toList());
-
-                List<ReportAlogMembdate> membList = reportAlogMembdateMapper.selectList(new QueryWrapper<ReportAlogMembdate>().in("rlog_id", ids));
-                list.forEach(l->{
-                    l.setMembdateList(membList.stream().filter(m->m.getRlogId().equals(l.getId())).collect(Collectors.toList()));
-                });
-            }
-            if (companyMapper.selectById(companyId).getIsInternational() == 1) {
-                //国际化版本
-                LocaleInformation locale = localeInformationMapper.selectById(companyId);
-                TimeZone curZone = TimeZone.getTimeZone(locale.getTimezone());
-                int offsetSeconds = (curZone.getRawOffset() - TimeZone.getTimeZone("GMT+8").getRawOffset())/1000;
-                //时区转换，默认数据库存的是GMT+8
-                DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
-                for (ReportAuditLog reportAuditLog : list) {
-                    String inDate = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(reportAuditLog.getIndate());
-                    LocalDateTime time = LocalDateTime.parse(inDate, dtf);
-                    time = time.plusSeconds(offsetSeconds);
-                    reportAuditLog.setIndate(time);
-                }
-            }
-            Long total = iPage.getTotal();
-            Map<String, Object> map = new HashMap<>();
-            map.put("records", list);
-            map.put("total", total);
-            msg.data = map;
-        } else {
-            Map<String, Object> map = new HashMap<>();
-            map.put("records", new ArrayList<>());
-            map.put("total", 0);
-            msg.data = map;
-        }
-        return msg;
-    }
-
-
-    @RequestMapping("getProjectReportAuditLog")
-    public HttpRespMsg getProjectReportAuditLog(Integer companyId, @RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        HttpRespMsg msg = new HttpRespMsg();
-        QueryWrapper<ReportAuditLog> queryWrapper = new QueryWrapper<>();
-        //检查权限，是否可以看全部的
-        List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看全部审核记录");
-        if (functionList.size() == 0) {
-            //每个人看自己的
-            queryWrapper.eq("company_id", companyId).eq("audit_channel", 1).eq("user_id", user.getId()).orderByDesc("indate");
-        } else {
-            queryWrapper.eq("company_id", companyId).eq("audit_channel", 1).orderByDesc("indate");
-        }
-
-        IPage<ReportAuditLog> iPage = reportAuditLogMapper.selectPage(new Page<>(pageIndex, pageSize),
-                queryWrapper);
-        List<ReportAuditLog> list = iPage.getRecords();
-        if (list.size() > 0) {
-            //还有获取各项的人员日期名单
-            List<Integer> ids = list.stream().map(ReportAuditLog::getId).collect(Collectors.toList());
-
-            List<ReportAlogMembdate> membList = reportAlogMembdateMapper.selectList(new QueryWrapper<ReportAlogMembdate>().in("rlog_id", ids));
-            list.forEach(l->{
-                l.setMembdateList(membList.stream().filter(m->m.getRlogId().equals(l.getId())).collect(Collectors.toList()));
-            });
-        }
-
-        Long total = iPage.getTotal();
-        Map<String, Object> map = new HashMap<>();
-        map.put("records", list);
-        map.put("total", total);
-        msg.data = map;
-        return msg;
-    }
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-09-28
- */
-@RestController
-@RequestMapping("/report-auditor-setting")
-public class ReportAuditorSettingController {
-
-}
-

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

@@ -1,50 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.management.platform.service.ReportBatchService;
-import com.management.platform.service.ReportService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2023-08-10
- */
-@RestController
-@RequestMapping("/report-batch")
-public class ReportBatchController {
-
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    private ReportBatchService reportBatchService;
-
-    @Resource
-    private ReportService reportService;
-
-    @RequestMapping("/getAuditList")
-    public HttpRespMsg getAuditList(@RequestParam Integer state,
-                                    Integer departmentId,
-                                    Integer projectId,
-                                    String date,
-                                    String startDate,
-                                    String endDate,
-                                    String userId,
-                                    HttpServletRequest request) {
-
-        return reportBatchService.getAuditList(state,departmentId,projectId,date,startDate,endDate,userId,request);
-    }
-}
-

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

@@ -1,250 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.*;
-import com.management.platform.mapper.*;
-import com.management.platform.service.ProjectService;
-import com.management.platform.service.ReportExtraDegreeService;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.MessageUtils;
-import org.apache.poi.util.StringUtil;
-import org.springframework.util.StringUtils;
-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 javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-12-16
- */
-@RestController
-@RequestMapping("/report-extra-degree")
-public class ReportExtraDegreeController {
-
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    UserMapper userMapper;
-    @Resource
-    ReportExtraDegreeMapper reportExtraDegreeMapper;
-    @Resource
-    ReportMapper reportMapper;
-    @Resource
-    ProjectMapper projectMapper;
-    @Resource
-    ProjectService projectService;
-    @Resource
-    ReportExtraDegreeService reportExtraDegreeService;
-    @Resource
-    TimeTypeMapper timeTypeMapper;
-
-    /**
-     * addOrMod添加或者修改
-     * @param info
-     * @return
-     */
-    @RequestMapping("/addOrMod")
-    public HttpRespMsg addOrMod(ReportExtraDegree info) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        TimeType timeType = timeTypeMapper.selectById(user.getCompanyId());
-        if (info.getId() == null) {
-            info.setCompanyId(user.getCompanyId());
-            int cut = reportExtraDegreeMapper.selectCount(new QueryWrapper<ReportExtraDegree>().eq("name",info.getName()).eq("company_id", user.getCompanyId()));
-            if(cut>0){
-                //msg.setError(timeType.getCustomDegreeName()+"名称重复");
-                msg.setError(MessageUtils.message("name.nameRepeatByParam",timeType.getCustomDegreeName()));
-                return msg;
-            }
-            info.setCompanyId(user.getCompanyId());
-            reportExtraDegreeMapper.insert(info);
-        } else {
-            int cut = reportExtraDegreeMapper.selectCount(new QueryWrapper<ReportExtraDegree>().eq("name",info.getName()).ne("id",info.getId()).eq("company_id", user.getCompanyId()));
-            if(cut>0){
-                //msg.setError(timeType.getCustomDegreeName()+"名称重复");
-                msg.setError(MessageUtils.message("name.nameRepeatByParam",timeType.getCustomDegreeName()));
-                return msg;
-            }
-            //检查名字是否发生变化
-            int id = info.getId();
-            List<Project> existsProjects = projectMapper.selectList(new QueryWrapper<Project>()
-                    .eq("company_id", user.getCompanyId())
-                    .and(wrapper->wrapper.eq("associate_degrees", id)
-                            .or().likeRight("associate_degrees", id+",")
-                            .or().like("associate_degrees", ","+id+",")
-                            .or().likeLeft("associate_degrees", ","+id)));
-            if (existsProjects.size() > 0) {
-                List<Project> updateList = new ArrayList<>();
-                for (Project p : existsProjects) {
-                    String associateDegrees = p.getAssociateDegrees();
-                    String[] split = associateDegrees.split("\\,");
-                    String[] names = p.getAssociateDegreeNames().split("\\,");
-
-                    for (int i=0;i<split.length; i++) {
-                        if (split[i].equals(id+"")) {
-                            names[i] = info.getName();//更换新名字
-                        }
-                    }
-                    String replaceNames = StringUtil.join(names, ",");
-                    Project newP = new Project();
-                    newP.setId(p.getId());
-                    newP.setAssociateDegreeNames(replaceNames);
-                    updateList.add(newP);
-                }
-                projectService.updateBatchById(updateList);
-            }
-            reportExtraDegreeMapper.updateById(info);
-        }
-        return msg;
-    }
-
-    /**
-     * delete删除
-     * @param id
-     * @return
-     */
-    @RequestMapping("/delete")
-    public HttpRespMsg delete(Integer id) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        Integer companyId = user.getCompanyId();
-        //检查是否已经被使用
-        List<Project> existsProjects = projectMapper.selectList(new QueryWrapper<Project>()
-                        .eq("associate_degrees", id)
-                        .or().likeRight("associate_degrees", id+",")
-                        .or().like("associate_degrees", ","+id+",")
-                        .or().likeLeft("associate_degrees", ","+id));
-        if (existsProjects.size() > 0) {
-            String names = existsProjects.stream().map(Project::getProjectName).collect(Collectors.joining(","));
-            //msg.setError("该数据已经被以下项目关联，无法删除："+names);
-            msg.setError(MessageUtils.message("project.DateRelation",names));
-            return msg;
-        }
-        //检查日报中是否已经使用过
-        int count = reportMapper.selectCount(new QueryWrapper<Report>().eq("degree_id", id).eq("company_id", companyId));
-        if (count > 0) {
-            msg.setError("该数据已经被日报关联，无法删除");
-            return msg;
-        }
-        TimeType timeType = timeTypeMapper.selectById(companyId);
-        if (timeType.getCustomDegreeMultiple()) {
-            //检查日报的多选字段
-            List<Report> rList = reportMapper.selectList(new QueryWrapper<Report>().select("multi_degr_id").like("multi_degr_id", id).eq("company_id", companyId));
-            if (rList.size() > 0) {
-                boolean find = false;
-                for (Report r : rList) {
-                    String multiDegrId = r.getMultiDegrId();
-                    multiDegrId = multiDegrId.replace("@", ",");
-                    JSONArray array = JSONArray.parseArray(multiDegrId);
-                    for (int i=0; i<array.size(); i++) {
-                        if (array.getInteger(i).equals(id)) {
-                            find = true;
-                            break;
-                        }
-                    }
-                    if (find) {
-                        break;
-                    }
-                }
-                if (find) {
-                    msg.setError("该数据已经被日报关联，无法删除");
-                    return msg;
-                }
-            }
-        }
-        int r = reportExtraDegreeMapper.delete(new QueryWrapper<ReportExtraDegree>().eq("id", id).eq("company_id", user.getCompanyId()));
-        if (r <= 0) {
-            //msg.setError("无权删除");
-            msg.setError(MessageUtils.message("access.deleteError"));
-        }
-        return msg;
-    }
-
-    @RequestMapping("/batchDelete")
-    public HttpRespMsg batchDelete(String batchIds) {
-        HttpRespMsg msg = new HttpRespMsg();
-        if(!StringUtils.isEmpty(batchIds)&&!batchIds.equals("")){
-            String[] split = batchIds.split(",");
-            List<String> list = Arrays.asList(split);
-            String token = request.getHeader("TOKEN");
-            User user = userMapper.selectById(token);
-            //检查是否已经被使用
-            QueryWrapper<Project> queryWrapper=new QueryWrapper<>();
-            queryWrapper.in("associate_degrees", list);
-            list.forEach(li->{
-                queryWrapper.or().likeRight("associate_degrees", li+",")
-                        .or().like("associate_degrees", ","+li+",")
-                        .or().likeLeft("associate_degrees", ","+li);
-            });
-            List<Project> existsProjects = projectMapper.selectList(queryWrapper);
-            if (existsProjects.size() > 0) {
-                String names = existsProjects.stream().map(Project::getProjectName).collect(Collectors.joining(","));
-                //msg.setError("该数据已经被以下项目关联，无法删除："+names);
-                msg.setError(MessageUtils.message("project.DateRelation",names));
-                return msg;
-            }
-            int r = reportExtraDegreeMapper.delete(new QueryWrapper<ReportExtraDegree>().eq("id", list.get(0)).eq("company_id", user.getCompanyId()));
-            if (r <= 0) {
-                //msg.setError("无权删除");
-                msg.setError(MessageUtils.message("access.deleteError"));
-                return msg;
-            }
-            reportExtraDegreeMapper.deleteBatchIds(list);
-        }
-        return msg;
-    }
-
-    /**
-     * 获取全部getAll
-     * @return
-     */
-    @RequestMapping("/getAll")
-    public HttpRespMsg getAll(@RequestParam(required = false, defaultValue = "0") Integer withProjects) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-
-        List<ReportExtraDegree> all = reportExtraDegreeMapper.getAll(user.getCompanyId()); 
-        if (withProjects == 1) {
-            List<Project> allProjects = projectMapper.selectList(new QueryWrapper<Project>().eq("company_id", user.getCompanyId()));
-            for (ReportExtraDegree degree : all) {
-                degree.setProjects(allProjects.stream().filter(pro->pro.getAssociateDegreeNames() != null &&
-                        (pro.getAssociateDegreeNames().equals(degree.getName()) || pro.getAssociateDegreeNames().startsWith(degree.getName()+",")
-                            || pro.getAssociateDegreeNames().contains(","+degree.getName()+",")
-                            || pro.getAssociateDegreeNames().endsWith(","+degree.getName()))).map(Project::getProjectName).collect(Collectors.joining(",")));
-                degree.setProjectNum((int) allProjects.stream().filter(pro->pro.getAssociateDegreeNames() != null &&
-                        (pro.getAssociateDegreeNames().equals(degree.getName()) || pro.getAssociateDegreeNames().startsWith(degree.getName()+",")
-                                || pro.getAssociateDegreeNames().contains(","+degree.getName()+",")
-                                || pro.getAssociateDegreeNames().endsWith(","+degree.getName()))).count());
-            }
-        }
-
-        msg.data = all;
-        return msg;
-    }
-    @RequestMapping("/importData")
-    public HttpRespMsg importData(HttpServletRequest request, MultipartFile file){
-       return reportExtraDegreeService.importData(request,file);
-    }
-    @RequestMapping("/exportData")
-    public HttpRespMsg exportData(HttpServletRequest request){
-        return reportExtraDegreeService.exportData(request);
-    }
-}
-

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

@@ -1,95 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.management.platform.entity.Project;
-import com.management.platform.entity.ReportImportLog;
-import com.management.platform.entity.User;
-import com.management.platform.mapper.ReportImportLogMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-03-20
- */
-@RestController
-@RequestMapping("/report-import-log")
-public class ReportImportLogController {
-
-    @Resource
-    private ReportImportLogMapper reportImportLogMapper;
-    @Resource
-    private UserMapper userMapper;
-    @Resource
-    private HttpServletRequest request;
-
-    @RequestMapping("/getList")
-    public HttpRespMsg getList(Integer companyId, @RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
-        HttpRespMsg msg = new HttpRespMsg();
-        QueryWrapper<ReportImportLog> queryWrapper = new QueryWrapper<>();
-        //先硬编码，后面再改；针对角色是管理员的写死可见全部，其他人只能看到自己上传的记录
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        if (user.getRoleName().contains("管理员")) {
-            queryWrapper.eq("company_id", companyId).orderByDesc("indate");
-        } else {
-            queryWrapper.eq("user_id", token).eq("company_id", companyId).orderByDesc("indate");
-        }
-
-        IPage<ReportImportLog> iPage = reportImportLogMapper.selectPage(new Page<>(pageIndex, pageSize),
-                queryWrapper);
-        List<ReportImportLog> list = iPage.getRecords();
-        Long total = iPage.getTotal();
-        Map<String, Object> map = new HashMap<>();
-        map.put("records", list);
-        map.put("total", total);
-        msg.data = map;
-        return msg;
-    }
-
-
-    @RequestMapping("/changeTime")
-    public HttpRespMsg changeTime(Integer id, String modLogDateTime, String modImportUserId) {
-        HttpRespMsg msg = new HttpRespMsg();
-        ReportImportLog reportImportLog = reportImportLogMapper.selectById(id);
-        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        LocalDateTime localDateTime = LocalDateTime.parse(modLogDateTime, dateTimeFormatter);
-        if (!StringUtils.isEmpty(modImportUserId)) {
-            reportImportLog.setUserId(modImportUserId);
-            reportImportLog.setUserName(userMapper.selectById(modImportUserId).getName());
-        }
-        reportImportLog.setIndate(localDateTime);
-        reportImportLogMapper.updateById(reportImportLog);
-        return msg;
-    }
-    @RequestMapping("/delete")
-    public HttpRespMsg delete(Integer id) {
-        HttpRespMsg msg = new HttpRespMsg();
-        reportImportLogMapper.deleteById(id);
-        return msg;
-    }
-
-
-
-}
-

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

@@ -1,61 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.ReportLog;
-import com.management.platform.entity.User;
-import com.management.platform.entity.WxCorpInfo;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.mapper.WxCorpInfoMapper;
-import com.management.platform.service.ReportLogService;
-import com.management.platform.service.ReportService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-06-24
- */
-@RestController
-@RequestMapping("/report-log")
-public class ReportLogController {
-
-    @Resource
-    private ReportLogService reportLogService;
-    @Resource
-    private UserMapper userMapper;
-    @Resource
-    WxCorpInfoMapper wxCorpInfoMapper;
-
-    @RequestMapping("/get")
-    public HttpRespMsg get(String creatorId, String createDate) {
-        HttpRespMsg msg = new HttpRespMsg();
-        User user = userMapper.selectById(creatorId);
-        List<ReportLog> list = reportLogService.list(new QueryWrapper<ReportLog>().eq("creator_id", creatorId).eq("create_date", createDate));
-        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id",user.getCompanyId()));
-        if (wxCorpInfo!=null && wxCorpInfo.getSaasSyncContact() == 1){
-            List<User> users = userMapper.selectList(new QueryWrapper<User>().eq("company_id",user.getCompanyId()));
-            for (ReportLog reportLog : list) {
-                String operatorId = reportLog.getOperatorId();
-                for (User item : users) {
-                    if (item.getId().equals(operatorId)){
-                        String name = item.getName();
-                        reportLog.setMsg(reportLog.getMsg().replace(name,"$userName=" + item.getCorpwxUserid() + "$"));
-                    }
-                }
-            }
-        }
-        msg.data = list;
-        return msg;
-    }
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-09-19
- */
-@RestController
-@RequestMapping("/report-log-detail")
-public class ReportLogDetailController {
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-08-29
- */
-@RestController
-@RequestMapping("/report-profession-progress")
-public class ReportProfessionProgressController {
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2023-11-17
- */
-@RestController
-@RequestMapping("/report-push-log")
-public class ReportPushLogController {
-
-}
-

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

@@ -8,7 +8,6 @@ import com.management.platform.entity.ProjectTimer;
 import com.management.platform.entity.SubProject;
 import com.management.platform.mapper.ProjectTimerMapper;
 import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.ProjectService;
 import com.management.platform.service.SubProjectService;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -74,8 +74,6 @@ public class UserController {
     private ExpenseMainTypeService expenseMainTypeService;
     @Resource
     private ExpenseTypeService expenseTypeService;
-    @Resource
-    private ReportMapper reportMapper;
     @Value("${spring.ldap.urls}")
     private String ldapUrl;
     @Value("${spring.ldap.base.dcFirst}")
@@ -279,19 +277,6 @@ public class UserController {
     @RequestMapping("/deactiveUser")
     public HttpRespMsg deactiveUser(User user) {
         HttpRespMsg msg = new HttpRespMsg();
-        Integer companyId = userService.getById(request.getHeader("token")).getCompanyId();
-        //针对美莱德，飞锐特，湾创在对人员进行停用操作时，需要检查待他审核的日报
-        if(companyId==876||companyId==877||companyId==878){
-            LambdaQueryWrapper<Report> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(Report::getState,0);
-            queryWrapper.eq(Report::getCompanyId,companyId);
-            queryWrapper.and(wrapper->wrapper.and(wr->wr.eq(Report::getAuditDeptManagerid,user.getId()).eq(Report::getIsDeptAudit,1)).or(wr1->wr1.eq(Report::getProjectAuditorId,user.getId()).eq(Report::getIsDeptAudit,0)));
-            Integer count = reportMapper.selectCount(queryWrapper);
-            if(count>0){
-                msg.setError("当前员工有待审核日报，确认停用并驳回日报吗？");
-                return msg;
-            }
-        }
         user.setIsActive(0);
         userService.updateById(user);
         return msg;

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

@@ -64,8 +64,6 @@ public class UserCorpwxTimeController {
     @Resource
     ProjectMapper projectMapper;
     @Resource
-    ReportService reportService;
-    @Resource
     DepartmentMapper departmentMapper;
     @Resource
     CompanyMapper companyMapper;
@@ -80,249 +78,6 @@ public class UserCorpwxTimeController {
     @Resource
     UserCorpwxTimeService userCorpwxTimeService;
 
-    @RequestMapping("/getMyDeptMembsData")
-    public HttpRespMsg getMyDeptMembsData(String startDate, String endDate) {
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        List<Map> list = new ArrayList<Map>();
-        int onlyWorkDays = 1;//只要工作日
-        List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "全部企微考勤");
-        if (functionList.size() > 0) {
-            //查看全部人员的
-            list = userCorpwxTimeMapper.getUserDataList(user.getCompanyId(), startDate, endDate, null);
-        } else {
-            Integer manageDeptId = user.getManageDeptId();
-            if (manageDeptId != null && manageDeptId != 0) {
-                //一个人可能担任多个部门负责人
-                List<Department> departments = departmentMapper.selectList(new QueryWrapper<Department>().eq("manager_id", user.getId()));
-                if (departments.size() == 1) {
-                    list = userCorpwxTimeMapper.getUserDataList(user.getCompanyId(), startDate, endDate, manageDeptId);
-                } else {
-                    for (Department d:departments) {
-                        list.addAll(userCorpwxTimeMapper.getUserDataList(user.getCompanyId(), startDate, endDate, d.getDepartmentId()));
-                    }
-                }
-            }
-        }
-
-        //工作日处理，排除常规周末和法定节假日
-        if (onlyWorkDays == 1) {
-            DateTimeFormatter dtf =  DateTimeFormatter.ofPattern("yyyy/MM/dd");
-            list = list.stream().filter(time->{
-                String date = (String)time.get("createDate");
-                if (WorkDayCalculateUtils.isWorkDay(LocalDate.parse(date, dtf))) {
-                    return true;
-                } else {
-                    return false;
-                }
-            }).collect(Collectors.toList());
-        }
-        DateTimeFormatter standFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        HashMap item = new HashMap();
-        item.put("list", list);
-        if (list.size() > 0) {
-            List<String> userIdList = new ArrayList<>();
-            for (int i=0;i<list.size(); i++) {
-                Map map = list.get(i);
-                String userId = (String)map.get("userId");
-                userIdList.add(userId);
-            }
-            //员工参与的项目
-            List<Participation> participationList = participationMapper.selectList(new QueryWrapper<Participation>().in("user_id", userIdList));
-            List<String> names = new ArrayList<>();
-            LocalDate localStart = LocalDate.parse(startDate, standFormatter);
-            LocalDate localEnd = LocalDate.parse(endDate, standFormatter);
-            if (participationList.size() > 0) {
-                List<Integer> collect = participationList.stream().map(Participation::getProjectId).collect(Collectors.toList());
-                List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().in("id", collect).eq("is_public", 0).eq("company_id", user.getCompanyId()).orderByAsc("id"));
-
-                names = projectList.stream().filter(p->{
-                    if (p.getPlanStartDate() != null) {
-                        if (p.getPlanStartDate().isAfter(localEnd)) {
-                            return false;
-                        }
-                    }
-                    if (p.getPlanEndDate() != null) {
-                        if (p.getPlanEndDate().isBefore(localStart)) {
-                            return false;
-                        }
-                    }
-                    return true;
-                }).map(Project::getProjectName).collect(Collectors.toList());
-            }
-            //添加公共项目
-            List<Project> publicProjects = projectMapper.selectList(new QueryWrapper<Project>().eq("company_id", user.getCompanyId()).eq("is_public", 1));
-            if (publicProjects.size() > 0) {
-                List<String> collect = publicProjects.stream().filter(p->{
-                    if (p.getPlanStartDate() != null) {
-                        if (p.getPlanStartDate().isAfter(localEnd)) {
-                            return false;
-                        }
-                    }
-                    if (p.getPlanEndDate() != null) {
-                        if (p.getPlanEndDate().isBefore(localStart)) {
-                            return false;
-                        }
-                    }
-                    return true;
-                }).map(Project::getProjectName).collect(Collectors.toList());
-                names.addAll(collect);
-            }
-            item.put("projects", names);
-        } else {
-            item.put("projects", new ArrayList<String>());
-        }
-
-        //获取该时间段已经审核通过的报告
-        List<Report> reportList = reportService.list(new QueryWrapper<Report>()
-                .eq("company_id", user.getCompanyId()).between("create_date", startDate, endDate).eq("state", 1));
-
-        DateTimeFormatter splashDtf = DateTimeFormatter.ofPattern("yyyy/MM/dd");
-        //数据填充
-        for (Map dataItem : list) {
-            List<String> dataList = new ArrayList<>();
-            String userId = (String)dataItem.get("userId");
-            String createDate = (String)dataItem.get("createDate");
-            //检查该人员当天是否已经有审核通过的
-            boolean hasPassed = reportList.stream().anyMatch(r->r.getCreatorId().equals(userId) && splashDtf.format(r.getCreateDate()).equals(createDate));
-            dataItem.put("hasPassed", hasPassed);
-        }
-
-        //返回数据
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = item;
-        return msg;
-    }
-
-    @RequestMapping("/submitProjectTime")
-    public HttpRespMsg submitProjectTime(String json, String projectColumns) {
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        JSONArray array = JSONArray.parseArray(json);
-        JSONArray columnsArray = JSONArray.parseArray(projectColumns);
-        List<String> pnames = new ArrayList<>();
-        for (int i=0;i<columnsArray.size(); i++) {
-            System.out.println(columnsArray.getString(i));
-            pnames.add(columnsArray.getString(i));
-        }
-        List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().in("project_name", pnames).eq("company_id", user.getCompanyId()));
-
-        List<Report> reportList = new ArrayList<>();
-
-        for (int i=0;i<array.size(); i++) {
-            JSONObject jsonObject = array.getJSONObject(i);
-            System.out.println(jsonObject);
-            LocalDate createDate = LocalDate.parse(jsonObject.getString("createDate"), DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-            String userId = jsonObject.getString("userId");
-            //获取该员工的各个项目分配的工时
-
-            for (int j=0;j<projectList.size(); j++) {
-                Project p = projectList.get(j);
-                String key = p.getProjectName();
-                if (jsonObject.containsKey(key)) {
-                    double time = jsonObject.getDouble(key);
-                    if (time > 0) {
-                        Report report = new Report();
-                        report.setWorkingTime(time);
-                        report.setCreatorId(userId);
-                        report.setCreateDate(createDate);
-                        report.setProjectId(p.getId());
-                        reportList.add(report);
-                    }
-
-                }
-            }
-        }
-
-        return reportService.saveProjectTime(user.getCompanyId(), reportList, array);
-    }
-
-    //导出带考勤数据的模板
-    @RequestMapping("/exportCheckInExcel")
-    public HttpRespMsg exportCheckInExcel(String startDate, String endDate) throws Exception {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        Integer companyId = user.getCompanyId();
-        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", companyId));
-        Integer manageDeptId = user.getManageDeptId();
-
-        HttpRespMsg ret = getMyDeptMembsData(startDate, endDate);
-        HashMap map = (HashMap)ret.data;
-        List<Map> list = (List<Map>) map.get("list");
-        List<String> projects = (List) map.get("projects");
-        if (projects == null) {
-           // msg.setError("员工无参与的项目，请先到项目管理中进行设置项目参与人");
-            msg.setError(MessageUtils.message("project.joinError"));
-        }
-        List<String> titles = new ArrayList<>();
-        //titles.add("工作日期");
-        titles.add(MessageUtils.message("entry.workDate"));
-        //titles.add("星期");
-        titles.add(MessageUtils.message("entry.week"));
-        //titles.add("员工姓名");
-        titles.add(MessageUtils.message("entry.staffName"));
-        titles.add("部门");
-        //titles.add("上班时间");
-        titles.add(MessageUtils.message("entry.goWorkTime"));
-        //titles.add("下班时间");
-        titles.add(MessageUtils.message("entry.offWorkTime"));
-//        titles.add("打卡时长");
-//        titles.add("请假时长");
-//        titles.add("补卡/外出时长");
-        //titles.add("实际工作时长");
-        titles.add(MessageUtils.message("entry.actualWorkTime"));
-        //添加项目名称作为列名
-        for (String p : projects) {
-            titles.add(p);
-        }
-        List<List<String>> allData = new ArrayList<>();
-        allData.add(titles);
-
-        //数据填充
-        for (Map dataItem : list) {
-            List<String> dataList = new ArrayList<>();
-            boolean hasPassed = (boolean)dataItem.get("hasPassed");
-            if (hasPassed) {
-                continue;
-            }
-            Double workHours = (Double) dataItem.get("workHours");
-            System.out.println((String)dataItem.get("username") + " workHours:" + workHours);
-            if (workHours == null  || workHours.doubleValue() <= 0.0) {
-                continue;
-            }
-            String createDate = (String)dataItem.get("createDate");
-            dataList.add(createDate);
-            dataList.add((String)dataItem.get("weekDayTxt"));
-            if(wxCorpInfo.getSaasSyncContact()==1){
-                dataList.add("$userName="+(String)dataItem.get("corpwxUserid")+"$");
-            }else{
-                dataList.add((String)dataItem.get("username"));
-            }
-            dataList.add((String)dataItem.get("departmentName"));
-            dataList.add((String)dataItem.get("startTime"));
-            dataList.add((String)dataItem.get("endTime"));
-//            dataList.add(""+(Double)dataItem.get("cardTime"));
-//            dataList.add(""+(Double)dataItem.get("askLeaveTime"));
-//            dataList.add(""+(Double)dataItem.get("outdoorTime"));
-
-            dataList.add(""+workHours);
-            for (String p : projects) {
-                dataList.add("");
-            }
-            allData.add(dataList);
-        }
-        String fileName = companyMapper.selectById(user.getCompanyId()).getCompanyName();
-        if (manageDeptId != null && manageDeptId != 0) {
-            List<Department> allDeptList = departmentMapper.selectList(new QueryWrapper<Department>().eq("manager_id", user.getId()));
-            String departmentName = allDeptList.stream().map(Department::getDepartmentName).collect(Collectors.joining("+"));
-            fileName = departmentName;
-        }
-        //fileName += "_人员工时统计模板"+startDate+"至"+endDate;
-        fileName += MessageUtils.message("fileName.workHour",startDate,endDate);
-        return excelExportService.exportGeneralExcelByTitleAndList(wxCorpInfo, fileName, allData, path);
-    }
-
     //导出填报工时在考勤工时的占比
     @RequestMapping("/exportProjectTimeRatio")
     public HttpRespMsg exportProjectTimeRatio(String ymonth) throws Exception {

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

@@ -1,451 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.*;
-import com.management.platform.mapper.TimeAutoExcludeMapper;
-import com.management.platform.mapper.TimeTypeMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.BusinessTripService;
-import com.management.platform.service.LeaveSheetService;
-import com.management.platform.service.UserFvTimeService;
-import com.management.platform.util.DockWithMLD;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.WorkDayCalculateUtils;
-import org.springframework.http.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.RestTemplate;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-09-13
- */
-@RestController
-@RequestMapping("/user-fv-time")
-public class UserFvTimeController {
-
-    @Resource
-    UserFvTimeService userFvTimeService;
-    @Resource
-    TimeTypeMapper timeTypeMapper;
-    @Resource
-    LeaveSheetService leaveSheetService;
-    @Resource
-    BusinessTripService businessTripService;
-    @Resource
-    UserMapper userMapper;
-    @Resource
-    TimeAutoExcludeMapper timeAutoExcludeMapper;
-    @Resource
-    private RestTemplate restTemplate;
-
-    private DecimalFormat df = new DecimalFormat("#0.0");
-
-    @RequestMapping("/get")
-    public HttpRespMsg get(String startDate,String endDate, HttpServletRequest request){
-        HttpRespMsg httpRespMsg=new HttpRespMsg();
-        List<TimeType> timeTypeList = timeTypeMapper.selectList(new QueryWrapper<TimeType>().eq("sync_fanwei", 1));
-        List<Integer> compIds = timeTypeList.stream().map(TimeType::getCompanyId).collect(Collectors.toList());
-        if(compIds.isEmpty()){
-            httpRespMsg.setError("验证失败");
-            return httpRespMsg;
-        }
-        //需要修改************************************************  日期
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        DateTimeFormatter dtf1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("HH:mm");
-        LocalDateTime yesterday = LocalDateTime.now().minusDays(2);
-        if (startDate == null) {
-            startDate = dtf.format(yesterday);
-        }
-        if (endDate == null) {
-            endDate = dtf.format(yesterday.plusDays(30));
-        }
-        for (Integer compId : compIds) {
-            DockWithMLD dockWithMLD=new DockWithMLD();
-            JSONObject jsonObject=new JSONObject();
-            List<UserFvTime> oldUserFvTimeList = userFvTimeService.list(new QueryWrapper<UserFvTime>().eq("company_id", compId));
-            List<LeaveSheet> oldLeaveSheetList = leaveSheetService.list(new QueryWrapper<LeaveSheet>().eq("company_id", compId));
-            List<BusinessTrip> oldBusinessTripList = businessTripService.list(new QueryWrapper<BusinessTrip>().eq("company_id", compId));
-            /*jsonObject.put("startDate",startDate);
-            jsonObject.put("endDate",endDate);*/
-            jsonObject.put("workDate",startDate);
-            /*jsonObject.put("gmtFinished",startDate);*/
-            String jsonString = jsonObject.toJSONString();
-            List<UserFvTime> userFvTimeList=new ArrayList<>();
-            List<LeaveSheet> leaveSheetList=new ArrayList<>();
-            List<BusinessTrip> businessTripList=new ArrayList<>();
-            TimeType allDay = timeTypeMapper.selectOne(new QueryWrapper<TimeType>().eq("company_id", compId));
-            List<User> allUserList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", compId));
-            //获取休息设置
-            List<TimeAutoExclude> excludeTimeList = timeAutoExcludeMapper.selectList(new QueryWrapper<TimeAutoExclude>().eq("company_id", compId));
-            //Todo: 获取考勤打卡数据
-            HttpRespMsg workDataMsg = dockWithMLD.getResult("http://10.1.10.51:20175/api/cube/restful/interface/getModeDataPageList/getWorkData", jsonString);
-            List<Map<String,Object>> workDataList= (List<Map<String, Object>>) workDataMsg.data;
-            //Todo: 获取外出打卡数据
-            HttpRespMsg outWorkDataMsg = dockWithMLD.getResult("http://10.1.10.51:20175/api/cube/restful/interface/getModeDataPageList/getOutRecord", jsonString);
-            List<Map<String,Object>> outWorkDataList= (List<Map<String, Object>>) outWorkDataMsg.data;
-            //Todo: 获取考勤补卡数据
-            HttpRespMsg replaceWorkDataMsg = dockWithMLD.getResult("http://10.1.10.51:20175/api/cube/restful/interface/getModeDataPageList/getReplaceRecord", jsonString);
-            List<Map<String,Object>> replaceWorkDataList= (List<Map<String, Object>>) replaceWorkDataMsg.data;
-            List<String> userIds = workDataList.stream().map(map -> String.valueOf(map.get("userId"))).distinct().collect(Collectors.toList());
-            List<User> userList = userMapper.selectList(new QueryWrapper<User>().in("job_number", userIds));
-            List<LocalDateTime> dateTimeList = getDays(yesterday, yesterday.plusDays(2));
-            for (User user : userList) {
-                //按当前填报人所属部门或者全公司来匹配
-                excludeTimeList = excludeTimeList.stream().filter(ex->ex.getDId() == null || ex.getDId().equals(user.getDepartmentId())).collect(Collectors.toList());
-                for (LocalDateTime localDateTime : dateTimeList) {
-                    LocalDate workDate=localDateTime.toLocalDate();
-                    //当天的考勤记录
-                    List<Map<String, Object>> list = workDataList.stream().filter(wl -> wl.get("userId").equals(user.getJobNumber())&&wl.get("workDate").equals(workDate.format(dtf))).collect(Collectors.toList());
-                    UserFvTime userFvTime=new UserFvTime();
-                    userFvTime.setWorkDate(workDate);
-                    LocalTime startTime=null;
-                    LocalTime endTime=null;
-                    for (Map<String, Object> map : list) {
-                        if(String.valueOf(map.get("signtype")).equals("签到")&&!map.get("signtime").equals("")){
-                            startTime=LocalTime.parse(String.valueOf(map.get("signtime")), dtf2);
-                        }
-                        if(String.valueOf(map.get("signtype")).equals("签退")&&!map.get("signtime").equals("")){
-                            endTime=LocalTime.parse(String.valueOf(map.get("signtime")), dtf2);
-                        }
-                        //处理外出记录 有外出记录默认以默认规则作为考勤数据来源
-                        Optional<Map<String, Object>> outFirst = outWorkDataList.stream().filter(ol -> ol.get("ycbgkssj").equals(map.get("workDate")) && ol.get("rybh").equals(map.get("userId"))).findFirst();
-                        if(outFirst.isPresent()){
-                            if(startTime==null||LocalTime.parse(String.valueOf(outFirst.get().get("kssj")), dtf2).isBefore(startTime)){
-                                startTime=LocalTime.parse(String.valueOf(outFirst.get().get("kssj")), dtf2);
-                            }
-                            if(endTime==null||LocalTime.parse(String.valueOf(outFirst.get().get("jssj")), dtf2).isBefore(endTime)){
-                                endTime=LocalTime.parse(String.valueOf(outFirst.get().get("jssj")), dtf2);
-                            }
-                        }
-                        //处理补卡记录 有补卡记录以补卡记录作为考勤数据来源
-                        Optional<Map<String, Object>> replaceFirst = replaceWorkDataList.stream().filter(rl -> rl.get("kqrq").equals(map.get("workDate")) && rl.get("rybh").equals(map.get("userId"))).findFirst();
-                        if(replaceFirst.isPresent()){
-                            if(startTime==null||replaceFirst.get().get("bklx").equals("上班")){
-                                startTime=LocalTime.parse(String.valueOf(replaceFirst.get().get("bksj")), dtf2);
-                            }
-                            if(endTime==null||replaceFirst.get().get("bklx").equals("下班")){
-                                endTime=LocalTime.parse(String.valueOf(replaceFirst.get().get("bksj")), dtf2);
-                            }
-                        }
-                    }
-                    if(compIds.contains(user.getCompanyId())){
-                        if(startTime==null||endTime==null){
-                            continue;
-                        }
-                        Duration between = Duration.between(startTime, endTime);
-                        userFvTime.setStartTime(startTime.format(dtf2));
-                        userFvTime.setEndTime(endTime.format(dtf2));
-                        userFvTime.setCompanyId(user.getCompanyId());
-                        userFvTime.setUserId(user.getId());
-                        long workHours = between.toHours();
-                        long restHours = 0;
-                        //处理排除时间段
-                        for (TimeAutoExclude timeAutoExclude : excludeTimeList) {
-                            if(startTime.isBefore(LocalTime.parse(timeAutoExclude.getStartTime(),dtf2))
-                                    &&endTime.isAfter(LocalTime.parse(timeAutoExclude.getEndTime(),dtf2))){
-                                Duration bt = Duration.between(LocalTime.parse(timeAutoExclude.getStartTime(),dtf2), LocalTime.parse(timeAutoExclude.getEndTime(),dtf2));
-                                restHours += bt.toHours();
-                            }
-                        }
-
-                        userFvTime.setWorkHours(BigDecimal.valueOf(workHours).subtract(BigDecimal.valueOf(restHours)).floatValue());
-                        Optional<UserFvTime> first = oldUserFvTimeList.stream().filter(ol -> ol.getWorkDate().isEqual(userFvTime.getWorkDate()) && ol.getUserId().equals(userFvTime.getUserId())).findFirst();
-                        if(first.isPresent()){
-                            userFvTime.setId(first.get().getId());
-                        }
-                        if(endTime.isBefore(startTime)){
-                            continue;
-                        }
-                        userFvTimeList.add(userFvTime);
-                    }
-                }
-            }
-            if(userFvTimeList.size()>0){
-                userFvTimeService.saveOrUpdateBatch(userFvTimeList);
-            }
-            System.out.println(userFvTimeList);
-            //Todo: 获取请假数据
-            HttpRespMsg leaveRecordMsg = dockWithMLD.getResult("http://10.1.10.51:20175/api/cube/restful/interface/getModeDataPageList/getLeaveRecord", jsonString);
-            List<Map<String,Object>> leaveRecordList= (List<Map<String, Object>>) leaveRecordMsg.data;
-            for (Map<String, Object> map : leaveRecordList) {
-                Optional<User> optional=allUserList.stream().filter(al->al.getJobNumber()!=null&&al.getJobNumber().equals(map.get("userId"))).findFirst();
-                if(!optional.isPresent()){
-                    continue;
-                }
-                User user=optional.get();
-                System.out.println("泛微同步人员请假数据----"+user.getName());
-                if(compIds.contains(user.getCompanyId())){
-                    LeaveSheet leaveSheet=new LeaveSheet();
-                    leaveSheet.setCompanyId(user.getCompanyId());
-                    leaveSheet.setStatus(0);
-                    leaveSheet.setOwnerId(user.getId());
-                    leaveSheet.setOwnerName(user.getName());
-                    leaveSheet.setStartDate(LocalDate.parse(String.valueOf(map.get("startDate")),dtf1));
-                    leaveSheet.setEndDate(LocalDate.parse(String.valueOf(map.get("endDate")),dtf1));
-                    Integer timeType=null;
-                    switch (String.valueOf(map.get("timeType"))){
-                        case "小时":timeType=1;
-                            break;
-                        case "天":timeType=0;
-                            break;
-                    }
-                    leaveSheet.setTimeType(timeType);
-                    leaveSheet.setTimeDays(Float.parseFloat(((String) map.get("timeDays")).equals("")?"0.00":((String) map.get("timeDays"))));
-                    if (timeType == 0){
-                        leaveSheet.setTimeHours(leaveSheet.getTimeDays()*allDay.getAllday());
-                    }else {
-                        leaveSheet.setTimeHours(Float.parseFloat(((String) map.get("timeHours")).equals("")?"0.00":((String) map.get("timeHours"))));
-                    }
-                    Integer leaveType;
-                    switch (String.valueOf(map.get("leaveType"))){
-                        case "事假":leaveType=0;
-                            break;
-                        case "病假":leaveType=1;
-                            break;
-                        case "年假":leaveType=2;
-                            break;
-                        case "产假":leaveType=3;
-                            break;
-                        case "婚假":leaveType=4;
-                            break;
-                        case "丧假":leaveType=5;
-                            break;
-                        case "调休":leaveType=6;
-                            break;
-                        case "陪产假":leaveType=7;
-                            break;
-                        default:leaveType=8;
-                    }
-                    leaveSheet.setLeaveType(leaveType);
-                    leaveSheet.setProcinstId(String.valueOf(map.get("procinstId")));
-                    leaveSheet.setGmtFinished(String.valueOf(map.get("gmtFinished")));
-                    /*&& ol.getOwnerId().equals(businessTrip.getOwnerId())*/
-                    Optional<LeaveSheet> first = oldLeaveSheetList.stream().filter(ol -> ol.getStartDate().isEqual(leaveSheet.getStartDate())&&ol.getEndDate().isEqual(leaveSheet.getEndDate())&&ol.getProcinstId().equals(leaveSheet.getProcinstId())).findFirst();
-                    if(first.isPresent()){
-                        leaveSheet.setId(first.get().getId());
-                    }
-                    leaveSheetList.add(leaveSheet);
-                }
-            }
-            if(leaveSheetList.size()>0){
-                leaveSheetService.saveOrUpdateBatch(leaveSheetList);
-            }
-            System.out.println(leaveRecordList);
-            //Todo: 获取出差数据
-            HttpRespMsg travelRecordMsg = dockWithMLD.getResult("http://10.1.10.51:20175/api/cube/restful/interface/getModeDataPageList/getTravelRecord", jsonString);
-            List<Map<String,Object>> travelRecordList= (List<Map<String, Object>>) travelRecordMsg.data;
-            for (Map<String, Object> map : travelRecordList) {
-                Optional<User> optional=allUserList.stream().filter(al->al.getJobNumber()!=null&&al.getJobNumber().equals(map.get("userId"))).findFirst();
-                if(!optional.isPresent()){
-                    continue;
-                }
-                User user=optional.get();
-                if(compIds.contains(user.getCompanyId())){
-                    BusinessTrip businessTrip=new BusinessTrip();
-                    businessTrip.setCompanyId(user.getCompanyId());
-                    businessTrip.setOwnerId(user.getId());
-                    businessTrip.setOwnerName(user.getName());
-                    businessTrip.setStartDate(LocalDate.parse(String.valueOf(map.get("startDate")),dtf1));
-                    businessTrip.setEndDate(LocalDate.parse(String.valueOf(map.get("endDate")),dtf1));
-                    Integer way=null;
-                    switch (String.valueOf(map.get("way"))){
-                        case "飞机":way=0;
-                            break;
-                        case "高铁/火车":way=1;
-                            break;
-                        case "汽车":way=2;
-                            break;
-                        case "轮船":way=3;
-                            break;
-                        case "其他":way=4;
-                            break;
-                    }
-                    businessTrip.setWay(way);
-                    businessTrip.setCityFrom((String) map.get("cityFrom"));
-                    businessTrip.setCityTo((String) map.get("cityTo"));
-                    Integer goBack=null;
-                    switch (String.valueOf(map.get("goBack"))){
-                        case "单程":goBack=0;
-                            break;
-                        case "往返":goBack=1;
-                            break;
-                    }
-                    businessTrip.setGoBack(goBack);
-                    Double dayCount =Double.valueOf(String.valueOf(map.get("dayCount")));
-                    businessTrip.setDayCount(dayCount.intValue());
-                    businessTrip.setProcinstId((String) map.get("procinstId"));
-                    businessTrip.setGmtFinished((String)map.get("gmtFinished"));
-                    /*&& ol.getOwnerId().equals(businessTrip.getOwnerId())*/
-                    Optional<BusinessTrip> first = oldBusinessTripList.stream().filter(ol -> ol.getStartDate().isEqual(businessTrip.getStartDate())&&ol.getEndDate().isEqual(businessTrip.getEndDate())&&ol.getProcinstId().equals(businessTrip.getProcinstId())).findFirst();
-                    if(first.isPresent()){
-                        businessTrip.setId(first.get().getId());
-                    }
-                    businessTripList.add(businessTrip);
-                }
-            }
-            if(businessTripList.size()>0){
-                businessTripService.saveOrUpdateBatch(businessTripList);
-            }
-        }
-        return httpRespMsg;
-    }
-
-
-    private  List<LocalDateTime> getDays(LocalDateTime start, LocalDateTime end) {
-        List<LocalDateTime> result = new ArrayList();
-        while (start.isBefore(end)) {
-            result.add(start);
-            start=start.plusDays(1);
-        }
-        result.add(start);
-        return result;
-    }
-
-    @RequestMapping("syncAttendanceForMingYi")
-    public HttpRespMsg getAttendanceForMingYi( String startDate,String endDate,String userId, HttpServletRequest request) throws Exception {
-        HttpRespMsg httpRespMsg = new HttpRespMsg();
-        JSONObject reqParam = new JSONObject();
-        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
-        List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId).select("id", "job_number"));
-        List<UserFvTime> allList = userFvTimeService.list(new QueryWrapper<UserFvTime>().between("work_date", startDate, endDate).eq("company_id", companyId));
-        DateTimeFormatter date=DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        DateTimeFormatter time=DateTimeFormatter.ofPattern("HH:mm");
-        reqParam.put("startDate",startDate);
-        reqParam.put("endDate",endDate);
-        reqParam.put("userId",userId);
-        HttpHeaders headers = new HttpHeaders();
-        String url="http://localhost:10020/attendance/getAttendanceList";
-        headers.setContentType(MediaType.APPLICATION_JSON);
-        HttpEntity<String> requestEntity = new HttpEntity<String>(reqParam.toJSONString(), headers);
-        ResponseEntity<String> responseEntity = this.restTemplate.exchange(url,
-                HttpMethod.POST, requestEntity, String.class);
-        List<Map> list=new ArrayList<>();
-        if (responseEntity.getStatusCode() == HttpStatus.OK) {
-            String resp = responseEntity.getBody();
-            System.out.println(resp);
-            JSONObject dataJson = JSONObject.parseObject(resp);
-            if (dataJson.getString("code").equals("ok")) {
-                JSONArray data = dataJson.getJSONArray("data");
-                String s = data.toJSONString();
-                list = JSONArray.parseArray(s, Map.class);
-            } else {
-                throw new Exception(dataJson.toJSONString());
-            }
-        }
-        List<UserFvTime> userFvTimeList=new ArrayList<>();
-        List<UserFvTime> userFvTimeUpdateList=new ArrayList<>();
-        for (Map item : list) {
-            Optional<User> user = userList.stream().filter(ul -> ul.getJobNumber() != null && ul.getJobNumber().equals(item.get("userId"))).findFirst();
-            if(user.isPresent()){
-                UserFvTime userFvTime=new UserFvTime();
-                userFvTime.setWorkDate(LocalDate.parse(String.valueOf(item.get("signDate")),date));
-                userFvTime.setUserId(user.get().getId());
-                userFvTime.setCompanyId(companyId);
-                userFvTime.setStartTime(LocalTime.parse(String.valueOf(item.get("clockInTime")),time).format(time));
-                userFvTime.setEndTime(LocalTime.parse(String.valueOf(item.get("afterWorkTime")),time).format(time));
-                Duration between = Duration.between(LocalTime.parse(String.valueOf(item.get("clockInTime")), time), LocalTime.parse(String.valueOf(item.get("afterWorkTime")), time));
-                BigDecimal bigDecimal=new BigDecimal(between.toHours());
-                if(bigDecimal.intValue()>0){
-                    bigDecimal=bigDecimal.subtract(new BigDecimal(1.5));
-                }
-                //存在打卡记录 超过8小时或者小于0小时按照8小时算
-                userFvTime.setWorkHours((bigDecimal.floatValue()<=0||bigDecimal.floatValue()>8)?8:bigDecimal.floatValue());
-                Optional<UserFvTime> first = allList.stream().filter(al -> al.getUserId().equals(user.get().getId()) && al.getWorkDate().equals(LocalDate.parse(String.valueOf(item.get("signDate")), date))).findFirst();
-                if(!first.isPresent()){
-                    userFvTimeList.add(userFvTime);
-                }else {
-                    userFvTime.setId(first.get().getId());
-                    userFvTimeUpdateList.add(userFvTime);
-                }
-            }
-        }
-        if(!userFvTimeService.saveBatch(userFvTimeList)){
-            httpRespMsg.setError("验证失败");
-            return httpRespMsg;
-        }
-        if(!userFvTimeService.updateBatchById(userFvTimeUpdateList)){
-            httpRespMsg.setError("验证失败");
-            return httpRespMsg;
-        }
-        User user = userMapper.selectById(request.getHeader("token"));
-        TimeType timeType = timeTypeMapper.selectById(user.getCompanyId());
-        //根据配置决定是否过滤掉周末
-        List<LocalDate> workDaysListInRange = WorkDayCalculateUtils.getWorkDaysListInRange(startDate, endDate, timeType.getIncludeWeekends());
-        List<UserFvTime> timeList = userFvTimeService.list(new QueryWrapper<UserFvTime>().in("work_date", workDaysListInRange).eq("company_id", user.getCompanyId()).eq("user_id", user.getId()));
-        double sum = 0;
-        for (LocalDate workDay : workDaysListInRange) {
-            if (timeList.stream().filter(tl -> tl.getWorkDate().equals(workDay)).count() == 0) {
-                sum += 8.0;
-            } else {
-                sum += timeList.stream().filter(tl -> tl.getWorkDate().equals(workDay)).findFirst().get().getWorkHours();
-            }
-        }
-        int workDayCount = workDaysListInRange.size();
-        HashMap map = new HashMap();
-        map.put("workHours", df.format(sum));
-        map.put("workDayCount", workDayCount);
-        if (workDayCount == 0) {
-            map.put("avgWorkDayHours", 0);
-        } else {
-            map.put("avgWorkDayHours", df.format(sum / workDayCount));
-        }
-        httpRespMsg.setData(map);
-        return httpRespMsg;
-    }
-
-    @RequestMapping("/getMinYiWorkHour")
-    public HttpRespMsg getMinYiWorkHour(HttpServletRequest request, String startDate,String endDate){
-        HttpRespMsg httpRespMsg=new HttpRespMsg();
-        DecimalFormat df = new DecimalFormat("#0.0");
-        User user = userMapper.selectById(request.getHeader("token"));
-        TimeType timeType = timeTypeMapper.selectById(user.getCompanyId());
-        //根据配置决定是否过滤掉周末
-        List<LocalDate> workDaysListInRange = WorkDayCalculateUtils.getWorkDaysListInRange(startDate, endDate, timeType.getIncludeWeekends());
-        List<UserFvTime> userFvTimeList = userFvTimeService.list(new QueryWrapper<UserFvTime>().in("work_date", workDaysListInRange).eq("company_id", user.getCompanyId()).eq("user_id", user.getId()));
-
-        double sum = 0;
-        for (LocalDate workDay : workDaysListInRange) {
-            if (userFvTimeList.stream().filter(tl -> tl.getWorkDate().equals(workDay)).count() == 0) {
-                sum += 8.0;
-            } else {
-                sum += userFvTimeList.stream().filter(tl -> tl.getWorkDate().equals(workDay)).findFirst().get().getWorkHours();
-            }
-        }
-        int workDayCount = workDaysListInRange.size();
-        HashMap map = new HashMap();
-        map.put("workHours", df.format(sum));
-        map.put("workDayCount", workDayCount);
-        if (workDayCount == 0) {
-            map.put("avgWorkDayHours", 0);
-        } else {
-            map.put("avgWorkDayHours", df.format(sum / workDayCount));
-        }
-        httpRespMsg.setData(map);
-        return httpRespMsg;
-    }
-
-}
-

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

@@ -4,22 +4,16 @@ package com.management.platform.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dingtalk.api.DefaultDingTalkClient;
-import com.dingtalk.api.DingTalkClient;
-import com.dingtalk.api.request.OapiAttendanceVacationTypeListRequest;
-import com.dingtalk.api.response.OapiAttendanceVacationTypeListResponse;
 import com.management.platform.entity.*;
 import com.management.platform.entity.vo.DdLeaveQtVo;
 import com.management.platform.entity.vo.SysRichFunction;
 import com.management.platform.mapper.*;
 import com.management.platform.service.*;
-import com.management.platform.service.impl.ProjectServiceImpl;
 import com.management.platform.util.HttpRespMsg;
 import com.management.platform.util.ListUtil;
 import com.management.platform.util.MessageUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RequestParam;
@@ -45,10 +39,8 @@ public class UserYearleaveSettingController {
     private UserYearleaveSettingService userYearleaveSettingService;
     @Resource
     private UserYearleaveSettingMapper userYearleaveSettingMapper;
-    @Resource
-    private DingDingService dingDingService;
-    @Resource
-    private CompanyDingdingService companyDingdingService;
+//    @Resource
+//    private CompanyDingdingService companyDingdingService;
     @Resource
     private LeaveQuotaNumMapper leaveQuotaNumMapper;
     @Resource

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

@@ -9,12 +9,10 @@ import com.management.platform.entity.vo.UserVO;
 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.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.json.XML;
 import org.springframework.beans.BeanUtils;
@@ -635,7 +633,7 @@ public class WeiXinCorpController {
                     result.setJobType(jobType);
                     corpwxJobResultMapper.insert(result);
                     ExcelExportServiceImpl.corpwxJobCenter.put(jobId, result);
-                    ReportServiceImpl.corpwxJobCenter.put(jobId, result);
+//                    ReportServiceImpl.corpwxJobCenter.put(jobId, result);
                     UserServiceImpl.corpwxJobCenter.put(jobId, result);
 //                    TaskServiceImpl.corpwxJobCenter.put(jobId, result);
                 } else if ("auto_activate".equals(infoType)) {
@@ -3467,188 +3465,187 @@ public class WeiXinCorpController {
      */
     @RequestMapping("/initSystem")
     public HttpRespMsg initSystem(String corpid) throws Exception{
-        try {
-            //初始化数据生成公司
-            System.out.println("========接收到initSystem请求===corpid="+corpid);
-            HttpRespMsg msg = new HttpRespMsg();
-            if (!isPrivateDeploy) {
-                //msg.setError("请配置isPrivateDeploy: true");
-                msg.setError(MessageUtils.message("config.isPrivateDeploy"));
+        //初始化数据生成公司
+        System.out.println("========接收到initSystem请求===corpid="+corpid);
+        HttpRespMsg msg = new HttpRespMsg();
+        if (!isPrivateDeploy) {
+            //msg.setError("请配置isPrivateDeploy: true");
+            msg.setError(MessageUtils.message("config.isPrivateDeploy"));
+        } else {
+            //查找公司对应的记录是否已经添加
+            WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectById(corpid);
+            if (wxCorpInfo == null) {
+                //msg.setError("请在company_dingding表中增加corpid:" + corpid);
+                msg.setError(MessageUtils.message("config.ddCorpId"));
+            } else if (wxCorpInfo.getCompanyId() != null) {
+                //msg.setError("companyId已存在，如需重新初始化请先重置company_dingding中该条数据的companyId为null");
+                msg.setError(MessageUtils.message("config.companyIdExist"));
             } else {
-                //查找公司对应的记录是否已经添加
-                WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectById(corpid);
-                if (wxCorpInfo == null) {
-                    //msg.setError("请在company_dingding表中增加corpid:" + corpid);
-                    msg.setError(MessageUtils.message("config.ddCorpId"));
-                } else if (wxCorpInfo.getCompanyId() != null) {
-                    //msg.setError("companyId已存在，如需重新初始化请先重置company_dingding中该条数据的companyId为null");
-                    msg.setError(MessageUtils.message("config.companyIdExist"));
-                } else {
-                    Company company = new Company().setCompanyName(wxCorpInfo.getCorpName())
-                            .setExpirationDate(LocalDateTime.now().plusDays(15));
-                    company.setPackageWorktime(1);
-                    //设置来源
-                    company.setRegFrom("企业微信");
-                    companyMapper.insert(company);
-                    wxCorpInfo.setCompanyId(company.getId());
-                    wxCorpInfoMapper.updateById(wxCorpInfo);
-                    //生成工作时长
-                    TimeType timeType = new TimeType();
-                    timeType.setCompanyId(company.getId());
-                    timeType.setFinanceJobnumEnabled(1);//启用工号来导入财务匹配
-                    timeType.setProjectManDay(1);
-                    timeTypeMapper.insert(timeType);
-                    SysRole smanager = sysRoleService.generateDefaultRoles(company.getId());
-                    //生成项目的成本基线默认条目
-                    String[] array = Constant.DEFAULT_BASE_COST_ITEMS;
-                    for (String baseItem : array) {
-                        ProjectBasecostSetting setting = new ProjectBasecostSetting();
-                        setting.setName(baseItem);
-                        setting.setCompanyId(company.getId());
-                        projectBasecostSettingMapper.insert(setting);
-                    }
-                    //todo: 生成项目报表服务默认条目
-                    Integer[] arrayInteger=new Integer[]{1,2,3,4,7};
-                    for (Integer integerItem : arrayInteger) {
-                        CompanyReport companyReport=new CompanyReport();
-                        companyReport.setCompanyId(company.getId());
-                        companyReport.setReportFormId(integerItem);
-                        companyReportMapper.insert(companyReport);
+                Company company = new Company().setCompanyName(wxCorpInfo.getCorpName())
+                        .setExpirationDate(LocalDateTime.now().plusDays(15));
+                company.setPackageWorktime(1);
+                //设置来源
+                company.setRegFrom("企业微信");
+                companyMapper.insert(company);
+                wxCorpInfo.setCompanyId(company.getId());
+                wxCorpInfoMapper.updateById(wxCorpInfo);
+                //生成工作时长
+                TimeType timeType = new TimeType();
+                timeType.setCompanyId(company.getId());
+                timeType.setFinanceJobnumEnabled(1);//启用工号来导入财务匹配
+                timeType.setProjectManDay(1);
+                timeTypeMapper.insert(timeType);
+                SysRole smanager = sysRoleService.generateDefaultRoles(company.getId());
+                //生成项目的成本基线默认条目
+                String[] array = Constant.DEFAULT_BASE_COST_ITEMS;
+                for (String baseItem : array) {
+                    ProjectBasecostSetting setting = new ProjectBasecostSetting();
+                    setting.setName(baseItem);
+                    setting.setCompanyId(company.getId());
+                    projectBasecostSettingMapper.insert(setting);
+                }
+                //todo: 生成项目报表服务默认条目
+                Integer[] arrayInteger=new Integer[]{1,2,3,4,7};
+                for (Integer integerItem : arrayInteger) {
+                    CompanyReport companyReport=new CompanyReport();
+                    companyReport.setCompanyId(company.getId());
+                    companyReport.setReportFormId(integerItem);
+                    companyReportMapper.insert(companyReport);
+                }
+                String accessToken = getCorpConcactAccessToken(wxCorpInfo);
+                //获取组织架构 同步部门
+                String departmentInfoResp=wxCorpInfoService.getDepartmentInfoWithApplication(accessToken);
+                System.out.println(departmentInfoResp);
+                JSONObject departmentInfoOb = JSONObject.parseObject(departmentInfoResp);
+                JSONArray departmentInfoArrays = departmentInfoOb.getJSONArray("department");
+                for (int i = 0; i < departmentInfoArrays.size(); i++) {
+                    JSONObject ob = departmentInfoArrays.getJSONObject(i);
+                    String departmentName = String.valueOf(ob.get("name"));
+                    System.out.println("synchronizationDP========="+departmentName);
+                    Integer departmentId = ob.getInteger("id");
+                    Integer departmentParentId =ob.getInteger("parentid");
+                    Integer cut = departmentWxMapper.selectCount(new QueryWrapper<DepartmentWx>().eq("corpid",corpid).eq("wx_deptid",departmentId));
+                    if(cut==0&&departmentId!=1){
+                        System.out.println("join===========");
+                        DepartmentWx departmentWx=new DepartmentWx();
+                        departmentWx.setCorpid(corpid)
+                                .setName(departmentName)
+                                .setWxParentid(departmentParentId)
+                                .setWxDeptid(departmentId);
+                        Department department = new Department();
+                        department.setCompanyId(company.getId());
+                        department.setDepartmentName(departmentName);
+                        department.setCorpwxDeptid(departmentId);
+                        departmentMapper.insert(department);
+                        departmentWx.setSysDeptid(department.getDepartmentId());
+                        departmentWxMapper.insert(departmentWx);
                     }
-                    String accessToken = getCorpConcactAccessToken(wxCorpInfo);
-                    //获取组织架构 同步部门
-                    String departmentInfoResp=wxCorpInfoService.getDepartmentInfoWithApplication(accessToken);
-                    System.out.println(departmentInfoResp);
-                    JSONObject departmentInfoOb = JSONObject.parseObject(departmentInfoResp);
-                    JSONArray departmentInfoArrays = departmentInfoOb.getJSONArray("department");
-                    for (int i = 0; i < departmentInfoArrays.size(); i++) {
-                        JSONObject ob = departmentInfoArrays.getJSONObject(i);
-                        String departmentName = String.valueOf(ob.get("name"));
-                        System.out.println("synchronizationDP========="+departmentName);
-                        Integer departmentId = ob.getInteger("id");
-                        Integer departmentParentId =ob.getInteger("parentid");
-                        Integer cut = departmentWxMapper.selectCount(new QueryWrapper<DepartmentWx>().eq("corpid",corpid).eq("wx_deptid",departmentId));
-                        if(cut==0&&departmentId!=1){
-                            System.out.println("join===========");
-                            DepartmentWx departmentWx=new DepartmentWx();
-                            departmentWx.setCorpid(corpid)
-                                    .setName(departmentName)
-                                    .setWxParentid(departmentParentId)
-                                    .setWxDeptid(departmentId);
-                            Department department = new Department();
-                            department.setCompanyId(company.getId());
-                            department.setDepartmentName(departmentName);
-                            department.setCorpwxDeptid(departmentId);
-                            departmentMapper.insert(department);
-                            departmentWx.setSysDeptid(department.getDepartmentId());
-                            departmentWxMapper.insert(departmentWx);
+                }
+                SysRole role = sysRoleMapper.selectOne(new QueryWrapper<SysRole>().eq("company_id", company.getId()).eq("rolename","普通员工"));
+                List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", company.getId()));
+                List<DepartmentWx> departmentWxList = departmentWxMapper.selectList(new QueryWrapper<DepartmentWx>().eq("corpid", corpid));
+                List<User> userList=new ArrayList<>();
+                for (DepartmentWx departmentWx : departmentWxList) {
+                    Optional<Department> first = departmentList.stream().filter(dl -> dl.getDepartmentId().equals(departmentWx.getSysDeptid())).findFirst();
+                    //获取到当前部门的上级部门
+                    Optional<DepartmentWx> wx = departmentWxList.stream().filter(dl -> dl.getWxDeptid().equals(departmentWx.getWxParentid())).findFirst();
+                    if(first.isPresent()){
+                        if(wx.isPresent()){
+                            Optional<Department> dp = departmentList.stream().filter(dl -> dl.getDepartmentId().equals(wx.get().getSysDeptid())).findFirst();
+                            if(dp.isPresent()){
+                                first.get().setSuperiorId(dp.get().getDepartmentId());
+                                departmentMapper.updateById(first.get());
+                            }
                         }
                     }
-                    SysRole role = sysRoleMapper.selectOne(new QueryWrapper<SysRole>().eq("company_id", company.getId()).eq("rolename","普通员工"));
-                    List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", company.getId()));
-                    List<DepartmentWx> departmentWxList = departmentWxMapper.selectList(new QueryWrapper<DepartmentWx>().eq("corpid", corpid));
-                    List<User> userList=new ArrayList<>();
-                    for (DepartmentWx departmentWx : departmentWxList) {
-                        Optional<Department> first = departmentList.stream().filter(dl -> dl.getDepartmentId().equals(departmentWx.getSysDeptid())).findFirst();
-                        //获取到当前部门的上级部门
-                        Optional<DepartmentWx> wx = departmentWxList.stream().filter(dl -> dl.getWxDeptid().equals(departmentWx.getWxParentid())).findFirst();
-                        if(first.isPresent()){
-                            if(wx.isPresent()){
-                                Optional<Department> dp = departmentList.stream().filter(dl -> dl.getDepartmentId().equals(wx.get().getSysDeptid())).findFirst();
-                                if(dp.isPresent()){
-                                    first.get().setSuperiorId(dp.get().getDepartmentId());
-                                    departmentMapper.updateById(first.get());
-                                }
-                            }
+                    //处理部门下的人员
+                    String resp=wxCorpInfoService.getUserInfoWithDepartment(accessToken,departmentWx.getWxDeptid());
+                    System.out.println("userList======"+resp);
+                    JSONObject userOb = JSONObject.parseObject(resp);
+                    JSONArray jsonArray = userOb.getJSONArray("userlist");
+                    for (int m=0;m<jsonArray.size(); m++) {
+                        JSONObject userJson = jsonArray.getJSONObject(m);
+                        String curUserid = userJson.getString("userid");
+                        String openUserid = userJson.getString("open_userid");
+                        int status = userJson.getIntValue("status");
+                        if(status!=1){
+                            continue;
                         }
-                        //处理部门下的人员
-                        String resp=wxCorpInfoService.getUserInfoWithDepartment(accessToken,departmentWx.getWxDeptid());
-                        System.out.println("userList======"+resp);
-                        JSONObject userOb = JSONObject.parseObject(resp);
-                        JSONArray jsonArray = userOb.getJSONArray("userlist");
-                        for (int m=0;m<jsonArray.size(); m++) {
-                            JSONObject userJson = jsonArray.getJSONObject(m);
-                            String curUserid = userJson.getString("userid");
-                            String openUserid = userJson.getString("open_userid");
-                            int status = userJson.getIntValue("status");
+                        List<Integer> departments = (List<Integer>) userJson.get("department");
+                        System.out.println("user info======："+userJson.toString());
+                        //不存在的人员， 进行插入
+                        User user = new User();
+                        //在当前部门下的员工
+                        user.setId(SnowFlake.nextId()+"")
+                                .setRoleId(role.getId())//默认普通员工
+                                .setRoleName(role.getRolename())
+                                .setCompanyId(company.getId())
+                                .setName(userJson.getString("name"))
+                                .setCorpwxUserid(openUserid)
+                                .setCorpwxRealUserid(curUserid)
+                                .setColor(ColorUtil.randomColor())
+                                .setJobNumber(curUserid)
+                                .setPassword(MD5Util.getPassword("000000"))
+                                .setCorpwxDeptid(departmentWx.getWxDeptid());
+                        Integer max = Collections.max(departments);
+                        Optional<DepartmentWx> dpWx = departmentWxList.stream().filter(dl -> dl.getWxDeptid().equals(max)).findFirst();
+                        if(dpWx.isPresent()){
+                            Optional<Department> dp = departmentList.stream().filter(dl -> dl.getDepartmentId().equals(dpWx.get().getSysDeptid())).findFirst();
+                            user.setDepartmentName(dp.get().getDepartmentName());
+                            user.setDepartmentId(dp.get().getDepartmentId());
+                            user.setDepartmentCascade(convertDepartmentIdToCascade(dp.get().getDepartmentId(),departmentList));
+                        }
+                        boolean b = userList.stream().anyMatch(ul ->ul.getCorpwxUserid()!=null&&ul.getCorpwxUserid().equals(user.getCorpwxUserid()));
+                        if(!b){
+                            userList.add(user);
+                        }
+                    }
+                }
+                String url = GET_APPLICATION_INFO.replace("ACCESS_TOKEN",accessToken).replace("AGENTID",String.valueOf(wxCorpInfo.getAgentid()));
+                HttpHeaders headers = new HttpHeaders();
+                headers.setContentType(MediaType.APPLICATION_JSON);
+                ResponseEntity<String> responseEntity = this.restTemplate.getForEntity(url,String.class);
+                if (responseEntity.getStatusCode() == HttpStatus.OK) {
+                    String resp = responseEntity.getBody();
+                    JSONObject json = JSONObject.parseObject(resp);
+                    if (json.getIntValue("errcode") == 0) {
+                        System.out.println("this is agentinfo========"+resp);
+                        String allow_userinfos = json.getString("allow_userinfos");
+                        JSONObject jsonObject = JSONObject.parseObject(allow_userinfos);
+                        JSONArray userInfo = jsonObject.getJSONArray("user");
+                        for (int i = 0; i < userInfo.size(); i++) {
+                            JSONObject object = userInfo.getJSONObject(i);
+                            String corpWxuserid = object.getString("userid");
+                            int status = object.getIntValue("status");
                             if(status!=1){
                                 continue;
                             }
-                            List<Integer> departments = (List<Integer>) userJson.get("department");
-                            System.out.println("user info======："+userJson.toString());
-                            //不存在的人员， 进行插入
-                            User user = new User();
-                            //在当前部门下的员工
-                            user.setId(SnowFlake.nextId()+"")
-                                    .setRoleId(role.getId())//默认普通员工
-                                    .setRoleName(role.getRolename())
-                                    .setCompanyId(company.getId())
-                                    .setName(userJson.getString("name"))
-                                    .setCorpwxUserid(openUserid)
-                                    .setCorpwxRealUserid(curUserid)
-                                    .setColor(ColorUtil.randomColor())
-                                    .setJobNumber(curUserid)
-                                    .setPassword(MD5Util.getPassword("000000"))
-                                    .setCorpwxDeptid(departmentWx.getWxDeptid());
-                            Integer max = Collections.max(departments);
-                            Optional<DepartmentWx> dpWx = departmentWxList.stream().filter(dl -> dl.getWxDeptid().equals(max)).findFirst();
-                            if(dpWx.isPresent()){
-                                Optional<Department> dp = departmentList.stream().filter(dl -> dl.getDepartmentId().equals(dpWx.get().getSysDeptid())).findFirst();
-                                user.setDepartmentName(dp.get().getDepartmentName());
-                                user.setDepartmentId(dp.get().getDepartmentId());
-                                user.setDepartmentCascade(convertDepartmentIdToCascade(dp.get().getDepartmentId(),departmentList));
-                            }
-                            boolean b = userList.stream().anyMatch(ul ->ul.getCorpwxUserid()!=null&&ul.getCorpwxUserid().equals(user.getCorpwxUserid()));
-                            if(!b){
-                                userList.add(user);
-                            }
-                        }
-                    }
-                    String url = GET_APPLICATION_INFO.replace("ACCESS_TOKEN",accessToken).replace("AGENTID",String.valueOf(wxCorpInfo.getAgentid()));
-                    HttpHeaders headers = new HttpHeaders();
-                    headers.setContentType(MediaType.APPLICATION_JSON);
-                    ResponseEntity<String> responseEntity = this.restTemplate.getForEntity(url,String.class);
-                    if (responseEntity.getStatusCode() == HttpStatus.OK) {
-                        String resp = responseEntity.getBody();
-                        JSONObject json = JSONObject.parseObject(resp);
-                        if (json.getIntValue("errcode") == 0) {
-                            System.out.println("this is agentinfo========"+resp);
-                            String allow_userinfos = json.getString("allow_userinfos");
-                            JSONObject jsonObject = JSONObject.parseObject(allow_userinfos);
-                            JSONArray userInfo = jsonObject.getJSONArray("user");
-                            for (int i = 0; i < userInfo.size(); i++) {
-                                JSONObject object = userInfo.getJSONObject(i);
-                                String corpWxuserid = object.getString("userid");
-                                int status = object.getIntValue("status");
-                                if(status!=1){
-                                    continue;
-                                }
-                                String userInfoResp=wxCorpInfoService.getUserInfoWithApplication(accessToken,corpWxuserid);
-                                System.out.println("this is userinfo======="+userInfoResp);
-                                JSONObject userInfoOb = JSONObject.parseObject(userInfoResp);
-                                //跳过非激活状态的员工
-                                if (userInfoOb.getInteger("status") != 1) continue;
-                                String userName = String.valueOf(userInfoOb.get("name"));
+                            String userInfoResp=wxCorpInfoService.getUserInfoWithApplication(accessToken,corpWxuserid);
+                            System.out.println("this is userinfo======="+userInfoResp);
+                            JSONObject userInfoOb = JSONObject.parseObject(userInfoResp);
+                            //跳过非激活状态的员工
+                            if (userInfoOb.getInteger("status") != 1) continue;
+                            String userName = String.valueOf(userInfoOb.get("name"));
 //                                String phone = String.valueOf(userInfoOb.get("phone"));
-                                String openUserid = userInfoOb.getString("open_userid");
-                                List<Integer> departments = (List<Integer>) userInfoOb.get("department");
-                                Integer deptId = departments.get(0);
-                                User user=new User();
-                                user.setId(String.valueOf(SnowFlake.nextId()));
-                                user.setCompanyId(company.getId());
-                                System.out.println("now dept id is ==="+deptId);
-                                for (Integer department : departments) {
-                                    Optional<DepartmentWx> first = departmentWxList.stream().filter(dl -> dl.getWxDeptid().equals(department)).findFirst();
-                                    if(first.isPresent()){
-                                        if(department.equals(deptId)){
-                                            user.setDepartmentId(first.get().getSysDeptid());
-                                            user.setDepartmentName(first.get().getName());
-                                            user.setCorpwxDeptid(first.get().getWxDeptid());
-                                            user.setDepartmentCascade(convertDepartmentIdToCascade(first.get().getSysDeptid(), departmentList));
-                                        }
+                            String openUserid = userInfoOb.getString("open_userid");
+                            List<Integer> departments = (List<Integer>) userInfoOb.get("department");
+                            Integer deptId = departments.get(0);
+                            User user=new User();
+                            user.setId(String.valueOf(SnowFlake.nextId()));
+                            user.setCompanyId(company.getId());
+                            System.out.println("now dept id is ==="+deptId);
+                            for (Integer department : departments) {
+                                Optional<DepartmentWx> first = departmentWxList.stream().filter(dl -> dl.getWxDeptid().equals(department)).findFirst();
+                                if(first.isPresent()){
+                                    if(department.equals(deptId)){
+                                        user.setDepartmentId(first.get().getSysDeptid());
+                                        user.setDepartmentName(first.get().getName());
+                                        user.setCorpwxDeptid(first.get().getWxDeptid());
+                                        user.setDepartmentCascade(convertDepartmentIdToCascade(first.get().getSysDeptid(), departmentList));
                                     }
                                 }
-                                user.setCorpwxUserid(corpWxuserid)
+                            }
+                            user.setCorpwxUserid(corpWxuserid)
                                     .setName(userName)
                                     .setRoleName(role.getRolename())
                                     .setRoleId(role.getId())
@@ -3657,27 +3654,21 @@ public class WeiXinCorpController {
                                     .setColor(ColorUtil.randomColor())
                                     .setPassword(MD5Util.getPassword("000000"))
                                     .setJobNumber(corpWxuserid);
-                                boolean b = userList.stream().anyMatch(ul -> ul.getCorpwxUserid().equals(user.getCorpwxUserid()));
-                                if(!b){
-                                    userList.add(user);
-                                }
+                            boolean b = userList.stream().anyMatch(ul -> ul.getCorpwxUserid().equals(user.getCorpwxUserid()));
+                            if(!b){
+                                userList.add(user);
                             }
-                        } else {
-                            throw new Exception(json.toJSONString());
                         }
+                    } else {
+                        throw new Exception(json.toJSONString());
                     }
-                    System.out.println("resutlList========="+userList);
-                    userService.saveBatch(userList);
                 }
+                System.out.println("resutlList========="+userList);
+                userService.saveBatch(userList);
             }
-            return msg;
-        } catch (ApiException e) {
-            e.printStackTrace();
-            String errMsg = e.getErrMsg();
-            HttpRespMsg msg = new HttpRespMsg();
-            msg.setError(errMsg);
-            return msg;
         }
+        return msg;
+
     }
 
 

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

@@ -1,433 +0,0 @@
-package com.management.platform.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.management.platform.entity.vo.WorktimeItem;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author Seyason
- * @since 2024-01-26
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class Report extends Model<Report> {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * user表外键 报告的作者
-     */
-    @TableField("creator_id")
-    private String creatorId;
-
-    /**
-     * project表外键 相关项目
-     */
-    @TableField("project_id")
-    private Integer projectId;
-
-    /**
-     * 工作日期
-     */
-    @TableField("create_date")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate createDate;
-
-    /**
-     * 工作时间
-     */
-    @TableField("working_time")
-    private Double workingTime;
-
-    /**
-     * 报告内容； 根据multi_worktime的取值，形式有差别
-     */
-    @TableField("content")
-    private String content;
-
-    /**
-     * 审查状态 0-未审核 1-已通过 2-未通过, -1-导入待审核， 3草稿
-     */
-    @TableField("state")
-    private Integer state;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    private LocalDateTime createTime;
-
-    /**
-     * 0-全天， 1-上午，2-下午
-     */
-    @TableField("time_type")
-    private Integer timeType;
-
-    /**
-     * 成本
-     */
-    @TableField("cost")
-    private BigDecimal cost;
-
-    /**
-     * 开始时间
-     */
-    @TableField("start_time")
-    private String startTime;
-
-    /**
-     * 结束时间
-     */
-    @TableField("end_time")
-    private String endTime;
-
-    /**
-     * 员工填写时长类型
-     */
-    @TableField("report_time_type")
-    private Integer reportTimeType;
-
-    /**
-     * 子项目id
-     */
-    @TableField("sub_project_id")
-    private Integer subProjectId;
-
-    /**
-     * 任务id
-     */
-    @TableField("task_id")
-    private Integer taskId;
-
-    /**
-     * 是否是加班
-     */
-    @TableField("is_overtime")
-    private Integer isOvertime;
-
-    /**
-     * 用时占比
-     */
-    @TableField("progress")
-    private Integer progress;
-
-
-    @TableField(exist = false)
-    private List<SubProject> subProjectList;
-    @TableField(exist = false)
-    private List<UserRecentTask> taskList;
-    @TableField(exist = false)
-    private List<ReportProfessionProgress> professionProgressList;
-    @TableField(exist = false)
-    private List<Stages> stages;
-
-    /**
-     * 部门审核状态： -1 专业未审核，0-部门未审核，1-已通过，2-未通过
-     */
-    @TableField("department_audit_state")
-    private Integer departmentAuditState;
-
-
-    /**
-     * 阶段/岗位/工序
-     */
-    @TableField("stage")
-    private String stage;
-
-
-    /**
-     * 图片的数组字符串
-     */
-    @TableField("pic_str")
-    private String picStr;
-
-
-    @TableField(exist = false)
-    private String picAdd;
-
-    /**
-     * 传给客户端的图片数组
-     */
-    @TableField(exist = false)
-    private List<String> pics;
-    /**
-     * 是否是多个时间工作事项
-     */
-    @TableField("multi_worktime")
-    private Integer multiWorktime;
-
-
-    @TableField(exist = false)
-    private List<WorktimeItem> worktimeList;
-    /**
-     * 驳回原因
-     */
-    @TableField("reject_reason")
-    private String rejectReason;
-
-    /**
-     * 驳回人姓名
-     */
-    @TableField("reject_username")
-    private String rejectUsername;
-
-    /**
-     * 驳回人id
-     */
-    @TableField("reject_userid")
-    private String rejectUserid;
-
-
-    /**
-     * 选择的自定义维度
-     */
-    @TableField("degree_id")
-    private Integer degreeId;
-
-
-    @TableField(exist = false)
-    private List<HashMap> degreeList;
-    /**
-     * 公司id
-     */
-    @TableField("company_id")
-    private Integer companyId;
-
-    /**
-     * 代填或者导入的用户id
-     */
-    @TableField("fill_userid")
-    private String fillUserid;
-
-    /**
-     * 审核流程：当前审核的部门id
-     */
-    @TableField("audit_deptid")
-    private Integer auditDeptid;
-
-    /**
-     * 审核流程: 是否是部门审核
-     */
-    @TableField("is_dept_audit")
-    private Integer isDeptAudit;
-
-    /**
-     * 审核流程：当前审核的部门负责人id
-     */
-    @TableField("audit_dept_managerid")
-    private String auditDeptManagerid;
-
-    /**
-     * 是否是最后一步审核
-     */
-    @TableField("is_final_audit")
-    private Integer isFinalAudit;
-
-    /**
-     * 审核流程：审核过程中，项目的审核状态； 0-待审核，1-审核通过
-     */
-    @TableField("project_audit_state")
-    private Integer projectAuditState;
-
-
-    /**
-     * 任务分组id
-     */
-    @TableField("group_id")
-    private Integer groupId;
-
-    @TableField(exist = false)
-    private String groupName;
-
-    @TableField(exist = false)
-    private List<TaskGroup> taskGroups;
-    /**
-     * 自定义的数值
-     */
-    @TableField("custom_data")
-    private Double customData;
-
-    /**
-     * 项目审核人id
-     */
-    @TableField("project_auditor_id")
-    private String projectAuditorId;
-
-    @TableField(exist = false)
-    private List<ProjectAuditor> auditUserList;
-
-    @TableField(exist = false)
-    private String projectAuditorName;
-
-
-    /**
-     * 工时日报所属部门id
-     */
-    @TableField("dept_id")
-    private Integer deptId;
-
-    /**
-     * 加班时长
-     */
-    @TableField("overtime_hours")
-    private Double overtimeHours;
-
-
-    /**
-     * 加班薪资
-     */
-    @TableField("overtime_cost")
-    private BigDecimal overtimeCost;
-
-
-    @TableField(exist = false)
-    private Integer taskFinish;
-
-    /**
-     * 自定义文本信息内容
-     */
-    @TableField("custom_text")
-    private String customText;
-
-    /**
-     * 对应成本项的id
-     */
-    @TableField("basecost_id")
-    private Integer basecostId;
-
-
-    /**
-     * 项目日报审核时间
-     */
-    @TableField("project_audit_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    private LocalDateTime projectAuditTime;
-
-
-    /**
-     * 任务分组负责人审核状态： 0-待审核，1-审核通过
-     */
-    @TableField("group_audit_state")
-    private Integer groupAuditState;
-
-    /**
-     * 评价
-     */
-    @TableField("evaluate")
-    private String evaluate;
-
-    /**
-     * 是否属于自动审核通过  0-不属于 1-属于
-     */
-    @TableField("report_auto_approve")
-    private Integer reportAutoApprove;
-
-
-    @TableField(exist = false)
-    private ReportAuditorSetting auditorSetting;
-
-    @TableField(exist = false)
-    private User auditorFirst;
-    @TableField(exist = false)
-    private User auditorSec;
-    @TableField(exist = false)
-    private User auditorThird;
-    @TableField(exist = false)
-    private User ccUserid;
-    /**
-     * 批量填报时的report_batch表id
-     */
-    @TableField("batch_id")
-    private Integer batchId;
-
-
-    /**
-     * 昱众-角色类型:0-PM，1-CRC
-     */
-    @TableField("extra_field1")
-    private Integer extraField1;
-
-    /**
-     * 昱众-工作职责
-     */
-    @TableField("extra_field2")
-    private Integer extraField2;
-
-    /**
-     * 昱众-工作内容
-     */
-    @TableField("extra_field3")
-    private Integer extraField3;
-
-    @TableField(exist = false)
-    private List<ProFunWorkContext> workContentList;
-
-    @TableField(exist = false)
-    private Integer extraField2Name;
-
-    @TableField(exist = false)
-    private Integer extraField3Name;
-
-
-    /**
-     * SAP项目服务ID
-     */
-    @TableField("sap_service_id")
-    private Integer sapServiceId;
-
-    @TableField(exist = false)
-    private String sapServiceName;
-
-    @TableField(exist = false)
-    private List<SapProjectService> serviceList;
-
-    @TableField(exist = false)
-    private String projectName;
-    @TableField(exist = false)
-    private String taskName;
-
-    /**
-     * 多选自定义维度id
-     */
-    @TableField("multi_degr_id")
-    private String multiDegrId;
-
-    //用于后端传递给前端的数组
-    @TableField(exist = false)
-    private List<Integer> multiDegrIdList;
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

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

@@ -1,106 +0,0 @@
-package com.management.platform.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author Seyason
- * @since 2023-11-27
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class ReportBatch extends Model<ReportBatch> {
-
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @TableField("creator_id")
-    private String creatorId;
-
-    /**
-     * 开始日期
-     */
-    @TableField("start_date")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate startDate;
-
-    /**
-     * 结束日期
-     */
-    @TableField("end_date")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate endDate;
-
-    /**
-     * 总工作时长
-     */
-    @TableField("total_work_time")
-    private Double totalWorkTime;
-    @TableField(exist = false)
-    private Double reportTime;
-
-    /**
-     * 0-待审核，1-已通过，2-已驳回
-     */
-    @TableField("state")
-    private Integer state;
-
-    @TableField("create_time")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createTime;
-
-    @TableField("company_id")
-    private Integer companyId;
-
-    @TableField(exist = false)
-    private String name;
-
-    @TableField(exist = false)
-    private String departmentName;
-
-    @TableField(exist = false)
-    private List<Map> data;
-
-    @TableField(exist = false)
-    private String dateStr;
-
-
-    @TableField(exist = false)
-    private String reportIds;
-
-    /**
-     * 周总结
-     */
-    @TableField("summary")
-    private String summary;
-
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

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

@@ -1,65 +0,0 @@
-package com.management.platform.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author Seyason
- * @since 2023-11-16
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class ReportExtraDegree extends Model<ReportExtraDegree> {
-
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 公司id
-     */
-    @TableField("company_id")
-    private Integer companyId;
-
-    /**
-     * 自定义数据内容
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 编号
-     */
-    @TableField("code")
-    private String code;
-
-    /**
-     * 备注
-     */
-    @TableField("rmark")
-    private String rmark;
-
-    @TableField(exist = false)
-    private String projects;
-
-    @TableField(exist = false)
-    private Integer projectNum;
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

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

@@ -1,75 +0,0 @@
-package com.management.platform.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author Seyason
- * @since 2022-03-20
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class ReportImportLog extends Model<ReportImportLog> {
-
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 导入人id
-     */
-    @TableField("user_id")
-    private String userId;
-
-    /**
-     * 导入人姓名
-     */
-    @TableField("user_name")
-    private String userName;
-
-    /**
-     * 原文件名称
-     */
-    @TableField("file_name")
-    private String fileName;
-
-    /**
-     * 服务器上的文件名称
-     */
-    @TableField("server_name")
-    private String serverName;
-
-    /**
-     * 导入时间
-     */
-    @TableField("indate")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-    private LocalDateTime indate;
-
-    @TableField("company_id")
-    private Integer companyId;
-
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

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

@@ -1,90 +0,0 @@
-package com.management.platform.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author Seyason
- * @since 2022-06-24
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class ReportLog extends Model<ReportLog> {
-
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 日报创建人
-     */
-    @TableField("creator_id")
-    private String creatorId;
-
-    /**
-     * 日报所属日期
-     */
-    @TableField("create_date")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate createDate;
-
-    /**
-     * 相关项目日报id
-     */
-    @TableField("report_ids")
-    private String reportIds;
-
-    /**
-     * 日志内容
-     */
-    @TableField("msg")
-    private String msg;
-
-    /**
-     * 操作人
-     */
-    @TableField("operator_id")
-    private String operatorId;
-
-    /**
-     * 所属公司id
-     */
-    @TableField("company_id")
-    private Integer companyId;
-
-    @TableField("operate_date")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    private LocalDateTime operateDate;
-
-    @TableField(exist = false)
-    private String creatorName;
-
-    @TableField(exist = false)
-    private String operateName;
-
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

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

@@ -1,71 +0,0 @@
-package com.management.platform.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author Seyason
- * @since 2022-09-19
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class ReportLogDetail extends Model<ReportLogDetail> {
-
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 日报的id
-     */
-    @TableField("report_id")
-    private Integer reportId;
-
-    /**
-     * 审核内容
-     */
-    @TableField("msg")
-    private String msg;
-
-    /**
-     * 操作人id
-     */
-    @TableField("operator_id")
-    private String operatorId;
-
-    /**
-     * 操作日期
-     */
-    @TableField("operate_date")
-    private LocalDateTime operateDate;
-
-    @TableField("company_id")
-    private Integer companyId;
-
-    /**
-     * 日报所属工作日期
-     */
-    @TableField("work_date")
-    private LocalDate workDate;
-
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

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

@@ -1,57 +0,0 @@
-package com.management.platform.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author Seyason
- * @since 2021-08-31
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class ReportProfessionProgress extends Model<ReportProfessionProgress> {
-
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @TableField("project_id")
-    private Integer projectId;
-
-    @TableField("report_id")
-    private Integer reportId;
-
-    @TableField("profession_id")
-    private Integer professionId;
-
-    @TableField("progress")
-    private Integer progress;
-
-    /**
-     * 0-待审核，1-审核通过，2-驳回
-     */
-    @TableField("audit_state")
-    private Integer auditState;
-
-
-    @TableField(exist = false)
-    private String professionName;
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/vo/ReportVO.java

@@ -1,21 +0,0 @@
-package com.management.platform.entity.vo;
-
-import com.management.platform.entity.Report;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.time.LocalDateTime;
-
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class ReportVO extends Report {
-    private String name;//用户姓名
-    private String project;//项目名称
-    private String subProjectName;//子项目名称
-    private String taskName;//任务名称
-    private String degreeName;//自定义维度名称
-    private String groupName;//分组名称
-}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/ReportBatchMapper.java

@@ -1,16 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.ReportBatch;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2023-08-10
- */
-public interface ReportBatchMapper extends BaseMapper<ReportBatch> {
-
-}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/ReportExtraDegreeMapper.java

@@ -1,19 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.ReportExtraDegree;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2021-12-16
- */
-public interface ReportExtraDegreeMapper extends BaseMapper<ReportExtraDegree> {
-
-    public List<ReportExtraDegree> getAll(Integer companyId);
-}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/ReportImportLogMapper.java

@@ -1,16 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.ReportImportLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2022-03-20
- */
-public interface ReportImportLogMapper extends BaseMapper<ReportImportLog> {
-
-}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/ReportLogDetailMapper.java

@@ -1,16 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.ReportLogDetail;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2022-09-19
- */
-public interface ReportLogDetailMapper extends BaseMapper<ReportLogDetail> {
-
-}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/ReportLogMapper.java

@@ -1,16 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.ReportLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2022-06-24
- */
-public interface ReportLogMapper extends BaseMapper<ReportLog> {
-
-}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/ReportMapper.java

@@ -1,209 +0,0 @@
-package com.management.platform.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.management.platform.entity.Report;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * Mapper 接口
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-12-31
- */
-public interface ReportMapper extends BaseMapper<Report> {
-    List<HashMap<String, Object>> getAllReportByDate(@Param("startDate") String startDate,
-                                                     @Param("companyId") Integer companyId,
-                                                     @Param("userId") String userId,
-                                                     @Param("endDate") String endDate,
-                                                     @Param("projectId") Integer projectId,
-                                                     @Param("stateKey") Integer stateKey,
-                                                     @Param("branchDepartment")List<Integer> branchDepartment
-                                                 );
-    List<HashMap<String, Object>> getAllReportByDateWithReportLog(@Param("startDate") String startDate,
-                                                     @Param("companyId") Integer companyId,
-                                                     @Param("userId") String userId,
-                                                     @Param("endDate") String endDate,
-                                                     @Param("projectId") Integer projectId,
-                                                     @Param("stateKey") Integer stateKey,
-                                                     @Param("branchDepartment")List<Integer> branchDepartment
-    );
-    List<HashMap<String, Object>> getProjectMembReportByDate(@Param("startDate") String startDate,
-                                                     @Param("companyId") Integer companyId,
-                                                     @Param("leaderId") String leaderId,
-                                                     @Param("endDate") String endDate,
-                                                     @Param("projectId") Integer projectId,
-                                                     @Param("stateKey") Integer stateKey,
-                                                     @Param("branchDepartment")List<Integer> branchDepartment,
-                                                             @Param("ccProjectIds")List<Integer> ccProjectIds);
-    List<HashMap<String, Object>> getProjectMembReportByDateWithReportLog(@Param("startDate") String startDate,
-                                                             @Param("companyId") Integer companyId,
-                                                             @Param("leaderId") String leaderId,
-                                                             @Param("endDate") String endDate,
-                                                             @Param("projectId") Integer projectId,
-                                                             @Param("stateKey") Integer stateKey,
-                                                             @Param("branchDepartment")List<Integer> branchDepartment,
-                                                                          @Param("ccProjectIds")List<Integer> ccProjectIds);
-    //获取部门下的人员的日报
-    List<HashMap<String, Object>> getDeptMembReportByDate(@Param("startDate") String startDate,
-                                                             @Param("companyId") Integer companyId,
-                                                             @Param("deptIds") List<Integer> deptIds,
-                                                             @Param("endDate") String endDate, @Param("projectId") Integer projectId,@Param("stateKey")Integer stateKey,@Param("branchDepartment")List<Integer> branchDepartment);
-
-    //按当前人员获取本人报告
-    List<Map<String, Object>> getReportByDate(@Param("date") String date, @Param("id") String id);
-    //获取项目经理所管理的人员的报告
-    List<Map<String, Object>> getInchargeReportByDate(@Param("date") String date, @Param("id") String id, @Param("state") Integer state);
-
-    //获取待日报审核的列表
-    List<Map<String, Object>> getAuditReportList(@Param("date") String date, @Param("companyId") Integer companyId,
-                                                 @Param("departmentId") Integer departmentId,
-                                                 @Param("projectId") Integer projectId,
-                                                 @Param("auditorId") String auditorId,
-                                                 @Param("isEngeering") Integer isEngeering,
-                                                 @Param("startDate") String startDate,
-                                                 @Param("endDate") String endDate,
-                                                 @Param("targetUserId") List<String> targetUserId,
-                                                 @Param("auditUserId")String auditUserId
-                                                 );
-
-    //获取本人负责的专业的相关的日报
-    List<Map<String, Object>> getProfessionInchargeReportByDate(@Param("date") String date,
-                                                                @Param("id") String id,
-                                                                @Param("state") Integer state
-                                                                );
-
-    List<Map<String, Object>> getUserReportByDate(@Param("date") String date, @Param("userIds") List<String> userIds);
-
-    List<Map<String, Object>> getReportByTask(@Param("taskId") Integer taskId);
-
-    List<Map<String, Object>> getReportNameByDate(@Param("date") String date, @Param("companyId") Integer companyId, @Param("leaderId") String leaderId);
-
-    List<Map<String, Object>> getReportNameByDateAndDept(@Param("date") String date,
-                                                         @Param("deptIds") List<Integer> deptIds,
-                                                         @Param("userId") String userId,
-                                                         @Param("companyId") Integer company);
-    List<Map<String, Object>> getDetailByStateInMyProfession(@Param("state") Integer state,
-                                               @Param("companyId") Integer companyId,
-                                               @Param("leaderId") String leaderId);
-
-    List<Map<String, Object>> getRealProjectTime(@Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, Integer companyId);
-
-    List<Map<String, Object>> getReportFillStatus(String startDate, String endDate, String userId);
-
-    List<Map<String, Object>> getDepartmentDetailByState(@Param("departmentIds") List<Integer> departmentIds,
-                                               @Param("companyId") Integer companyId);
-
-    List<Map<String, Object>> getUserDailyWorkTime(Integer companyId, String startDate, String endDate, List<Integer> deptIds, String leaderId);
-
-    List<Map<String, Object>> getUserWorkingTimeByRange(Integer companyId, String startDate, String endDate);
-
-    List<Report> selectSimpleTime(Integer companyId, String startDate, String endDate);
-
-    List<Map<String, Object>> getDeptImportAuditList(@Param("companyId") Integer companyId,
-                                               @Param("leaderId") String leaderId,
-                                                     @Param("startDate") String startDate,
-                                                     @Param("endDate") String endDate,
-                                                     @Param("departmentIdList") List<Integer> departmentIdList,
-                                                     @Param("projectId") Integer projectId,
-                                                     @Param("startIndex") Integer startIndex,
-                                                     @Param("pageSize") Integer pageSize
-                                                     );
-    void approveAllDeptImportList(@Param("companyId") Integer companyId,
-                                  @Param("leaderId") String leaderId);
-    Long getDeptImportAuditListCount(@Param("companyId") Integer companyId,
-                                                          @Param("leaderId") String leaderId,
-                                                          @Param("startDate") String startDate,
-                                                          @Param("endDate") String endDate,
-                                                          @Param("departmentIdList") List<Integer> departmentIdList,
-                                                          @Param("projectId") Integer projectId);
-    List<Map<String, Object>> selectFillReportUserList(Integer companyId, String startDate, String endDate);
-
-    List<Map<String, Object>> getMonthReportProjectList(Integer companyId, String startDate, String endDate);
-
-    void deleteUserSameDayReport(Integer companyId, @Param("dateReportList") List<Report> dateReportList, Integer needDeptAudit);
-
-    List<Map<String, Object>> getDuplicate(Integer companyId);
-
-    List<Map> getSameDayPassReport(Integer companyId, @Param("dateReportList") List<Report> dateReportList);
-
-    double getMyOvertime(String userId, String startDate);
-
-    List<Map<String, Object>> getProWaitingApproveCnt(Integer companyId);
-
-    List<Map<String, Object>> getDeptWaitingApproveCnt(Integer companyId);
-
-    List<Map<String, Object>> getProjectCost(Integer companyId, List<Integer> projectIds);
-
-    //获取项目填报的成本，包括已审核和待审核的
-    List<Map<String, Object>> getProjectFillCost(Integer companyId, List<Integer> projectIds);
-
-    List<Map<String, Object>> getOneProjectBaseCost(Integer projectId);
-
-    @Update("update report set task_id = null where task_id=#{taskId}")
-    void deleteReportTask(Integer taskId);
-
-    List<Map<String, Object>> getUserReportTimelinessRate(Integer companyId,String startDate, String endDate,String userId,List<Integer> deptIds);
-    @Select("SELECT report.id, report.creator_id,  DATE_FORMAT(report.`create_date`, '%Y-%m-%d') AS create_date FROM report WHERE report.state = 1  AND report.`project_audit_state`=0 \n" +
-            "AND EXISTS(SELECT 1 FROM audit_workflow_time_setting s, `user` u WHERE s.dept_id = u.department_id AND u.id = report.`creator_id` AND s.audit_dept_id IS NOT NULL)\n" +
-            "AND EXISTS(SELECT 1 FROM report r WHERE report.`creator_id` = r.creator_id AND report.`create_date` = r.create_date AND report.id <> r.id AND r.state = 0)\n" +
-            "AND report.audit_dept_managerid IS NULL AND report.`company_id` = #{companyId}\n")
-    List<Map<String, Object>> getErrorData(Integer companyId);
-    //获取审批流程中卡住的数据，项目审核过了，但是没有进入到部门审核，也没最终审核
-    @Select("SELECT report.id, user.name, create_date, creator_id, state, report.create_time, project_audit_time,u.name AS auditorName FROM report\n" +
-            "LEFT JOIN `user` ON user.id = report.`creator_id` \n" +
-            "LEFT JOIN `user` u ON u.id = report.`project_auditor_id`\n" +
-            "WHERE state = 0 AND project_audit_state = 1 AND is_dept_audit=0 AND is_final_audit=0 \n" +
-            "AND NOT EXISTS(SELECT 1 FROM report r WHERE r.id <> report.id AND r.`creator_id` = report.`creator_id` AND r.`create_date` = report.`create_date` AND r.project_audit_state = 0)\n" +
-            "AND EXISTS (SELECT 1 FROM report r WHERE r.id <> report.id AND r.`creator_id` = report.`creator_id` AND r.`create_date` = report.`create_date`)\n")
-    List<Map<String, Object>> getProcessErrorData();
-
-    List<Map<String, Object>> getUploadThirdReportData(Integer companyId,@Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
-
-    List<HashMap<String, Object>> geReportByProject(String startDate, Integer companyId, String endDate);
-
-    Map<String, Object> getDefaultDegree(Integer companyId, String userId, Integer projectId);
-
-    Map<String, Object> selectCostTimeByProject(String startDate, String endDate, Integer projectId);
-
-    List<HashMap<String, Object>> selectFill(String userId,LocalDate startDate, LocalDate endDate);
-
-    List<Map<String, Object>> getCcReportNameByDate(String date, Integer companyId, String leaderId);
-
-    List<Map<String, Object>> getCcReportByDate(@Param("date") String date, @Param("id") String id, @Param("state") Integer state);
-
-    List<Map<String, Object>> getPushProjectReportToSap(Integer companyId, String startDate, String endDate,String userId,Integer reportId);
-
-    List<Report> getSumWorkingTime(ArrayList<Integer> deptIds, String startDate, String endDate);
-
-    Double getReallWorkingTimeByProjectId(Integer id);
-
-    Double getReallWorkingTimeByProjectAndGroup(Integer projectId, Integer taskGroupId);
-
-    List<Map<String, Object>> getProjectPlanData(Integer companyId,@Param("list") List<Integer> taskIds, String startDate, String endDate);
-
-    List<String> getUserIds(ArrayList<Integer> deptIds, String startDate, String endDate);
-
-    List<Map<String, Object>> getProjectTimeCost(Integer companyId,Integer projectId);
-
-    List<Map<String, Object>> getProjectMainTimeCost(Integer companyId,String requestProjectMainCode);
-
-    List<Map<String, Object>> getTaskGroupPlanTime(@Param("list") List<Integer> projectIds);
-
-    List<Map<String, Object>> getUserWorkTimeByCategory(Integer categoryId, String userId,Integer companyId,@Param("list")List<Integer> deptIds, Integer deptId, String startDate, String endDate);
-
-    List<Map<String, Object>> selectReallyTimeWithMap(Integer companyId,Integer projectId);
-    List<Map<String, Object>> getCustomDataWithDate(String startDate, String endDate, Integer companyId);
-
-    @Select("SELECT report.id,report.creator_id,  report.`create_date`, report.`create_time`, group_id, task_group.`name`,report.project_id, task_group.`project_id` AS error_pid FROM report LEFT JOIN task_group ON task_group.id = report.`group_id` WHERE report.`company_id`=#{companyId} AND report.project_id <> task_group.`project_id`  AND create_date BETWEEN #{startDate} AND #{endDate} ORDER BY report.id DESC")
-    List<Map<String, Object>> selectErrorGroupData(Integer companyId, String startDate, String endDate);
-}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/ReportProfessionProgressMapper.java

@@ -1,16 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.ReportProfessionProgress;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2021-08-29
- */
-public interface ReportProfessionProgressMapper extends BaseMapper<ReportProfessionProgress> {
-
-}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/ReportPushLogMapper.java

@@ -1,16 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.ReportPushLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2023-11-17
- */
-public interface ReportPushLogMapper extends BaseMapper<ReportPushLog> {
-
-}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/CompanyDingdingService.java

@@ -1,40 +1,40 @@
-package com.management.platform.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dingtalk.api.request.OapiMessageCorpconversationAsyncsendV2Request;
-import com.management.platform.entity.CompanyDingding;
-
-import java.time.LocalDate;
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author Seyason
- * @since 2021-06-27
- */
-public interface CompanyDingdingService extends IService<CompanyDingding> {
-
-    public void sendFillReportAlertMsg(Integer companyId, Long agentId, String msg, String useridList);
-
-    public void sendRejectReportMsg(Integer companyId, String date, String projectNames, String reason, String auditorName, String useridList);
-
-    public void sendLeaveApplyAlertMsg(Integer companyId, Long agentId, String msg, String useridList);
-
-    public void sendReportWaitingApplyMsg(Integer companyId, Long agentId, Long auditNum, String useridList);
-
-    public void sendReportApproveMsg(Integer companyId, Long agentId, String auditorName, String evaluate, LocalDate date, String useridList);
-
-    public void sendBusinessTripSettingMsg(Integer companyId, Long agentId, String useridList);
-
-    public void sendNewTaskMsg(CompanyDingding dingding, String userId, String title, String endDate);
-
-
-    public void sendFinishMileStoneMsg(CompanyDingding dingding, String useridList, String taskName, Integer projectId, String project, String finishDate);
-
-    public void sendOAMsg(CompanyDingding dingding, String useridList,String titleText,String content, List<OapiMessageCorpconversationAsyncsendV2Request.Form> form,Integer projectId);
-
-    public void sendInnerLinkMsg(CompanyDingding dingding, String useridList, String title, String alertMsg);
-}
+//package com.management.platform.service;
+//
+//import com.baomidou.mybatisplus.extension.service.IService;
+//import com.dingtalk.api.request.OapiMessageCorpconversationAsyncsendV2Request;
+//import com.management.platform.entity.CompanyDingding;
+//
+//import java.time.LocalDate;
+//import java.util.List;
+//
+///**
+// * <p>
+// *  服务类
+// * </p>
+// *
+// * @author Seyason
+// * @since 2021-06-27
+// */
+//public interface CompanyDingdingService extends IService<CompanyDingding> {
+//
+//    public void sendFillReportAlertMsg(Integer companyId, Long agentId, String msg, String useridList);
+//
+//    public void sendRejectReportMsg(Integer companyId, String date, String projectNames, String reason, String auditorName, String useridList);
+//
+//    public void sendLeaveApplyAlertMsg(Integer companyId, Long agentId, String msg, String useridList);
+//
+//    public void sendReportWaitingApplyMsg(Integer companyId, Long agentId, Long auditNum, String useridList);
+//
+//    public void sendReportApproveMsg(Integer companyId, Long agentId, String auditorName, String evaluate, LocalDate date, String useridList);
+//
+//    public void sendBusinessTripSettingMsg(Integer companyId, Long agentId, String useridList);
+//
+//    public void sendNewTaskMsg(CompanyDingding dingding, String userId, String title, String endDate);
+//
+//
+//    public void sendFinishMileStoneMsg(CompanyDingding dingding, String useridList, String taskName, Integer projectId, String project, String finishDate);
+//
+//    public void sendOAMsg(CompanyDingding dingding, String useridList,String titleText,String content, List<OapiMessageCorpconversationAsyncsendV2Request.Form> form,Integer projectId);
+//
+//    public void sendInnerLinkMsg(CompanyDingding dingding, String useridList, String title, String alertMsg);
+//}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/ContractDocumentService.java

@@ -23,7 +23,5 @@ public interface ContractDocumentService extends IService<ContractDocument> {
 
     HttpRespMsg fileDown(HttpServletRequest request, HttpServletResponse response, Integer folderId, Integer contractId,Integer fileId);
 
-    HttpRespMsg onlineShow(String inputFilePath);
-
     HttpRespMsg fileDelete(HttpServletRequest request, ContractFileDelVO contractFileDelVo);
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/DingDingService.java

@@ -1,56 +1,56 @@
-package com.management.platform.service;
-
-import com.alibaba.fastjson.JSONArray;
-import com.management.platform.entity.CompanyDingding;
-import com.management.platform.entity.UserDingdingTime;
-import com.management.platform.util.HttpRespMsg;
-import com.taobao.api.ApiException;
-
-import java.time.LocalDate;
-
-public interface DingDingService {
-    public HttpRespMsg initSystem(String corpid) throws ApiException;
-
-    public void corpAuth(String corpid, String corpName, String authUserId, Long agentId) throws ApiException;
-
-    public String syncCorpMembs(String corpid) throws ApiException;
-
-    public void updateSuiteTicket(String suiteTicket);
-
-    HttpRespMsg getUserByCode(String code, String corpid);
-
-    public void asyncHandleMsg(String decryptMsg);
-
-    HttpRespMsg syncCorpInfo(String corpid);
-
-    HttpRespMsg syncCorpAgent(String corpid);
-
-    HttpRespMsg getUnActiveCorp();
-
-    HttpRespMsg reAuthCorp(String corpid);
-
-
-    public void syncCardTime(Integer companyId, String userId, String startDate, String endDate);
-
-    void syncLeaveTime(Integer companyId, String userId, String startDate, String endDate);
-
-    void syncUserWorkData(CompanyDingding dingding,String userId, String startDate, String endDate, boolean showLog, boolean onlySyncAttendance);
-
-    void getCorpSelfDefSmartReport(CompanyDingding dingding);
-
-//    public HttpRespMsg getLeaveTypeList(String leaveCode, Integer companyId, Integer departmentId, String userId, Integer pageIndex);
-
-    public HttpRespMsg syncLeaveQuotaData(Integer companyId);
-
-    HttpRespMsg removeCompInfo(String corpid);
-
-    HttpRespMsg initSuperManager(String corpid, String name);
-
-    void userLeaveOrg(String corpId, JSONArray userIdArray, LocalDate leaveDate);
-
-    void userAddOrg(String corpId, JSONArray userIdArray);
-
-    String inactiveUserNotInAuthRange(String corpid);
-
-    HttpRespMsg fixAttendance(Integer companyId);
-}
+//package com.management.platform.service;
+//
+//import com.alibaba.fastjson.JSONArray;
+//import com.management.platform.entity.CompanyDingding;
+//import com.management.platform.entity.UserDingdingTime;
+//import com.management.platform.util.HttpRespMsg;
+//import com.taobao.api.ApiException;
+//
+//import java.time.LocalDate;
+//
+//public interface DingDingService {
+//    public HttpRespMsg initSystem(String corpid) throws ApiException;
+//
+//    public void corpAuth(String corpid, String corpName, String authUserId, Long agentId) throws ApiException;
+//
+//    public String syncCorpMembs(String corpid) throws ApiException;
+//
+//    public void updateSuiteTicket(String suiteTicket);
+//
+//    HttpRespMsg getUserByCode(String code, String corpid);
+//
+//    public void asyncHandleMsg(String decryptMsg);
+//
+//    HttpRespMsg syncCorpInfo(String corpid);
+//
+//    HttpRespMsg syncCorpAgent(String corpid);
+//
+//    HttpRespMsg getUnActiveCorp();
+//
+//    HttpRespMsg reAuthCorp(String corpid);
+//
+//
+//    public void syncCardTime(Integer companyId, String userId, String startDate, String endDate);
+//
+//    void syncLeaveTime(Integer companyId, String userId, String startDate, String endDate);
+//
+//    void syncUserWorkData(CompanyDingding dingding,String userId, String startDate, String endDate, boolean showLog, boolean onlySyncAttendance);
+//
+//    void getCorpSelfDefSmartReport(CompanyDingding dingding);
+//
+////    public HttpRespMsg getLeaveTypeList(String leaveCode, Integer companyId, Integer departmentId, String userId, Integer pageIndex);
+//
+//    public HttpRespMsg syncLeaveQuotaData(Integer companyId);
+//
+//    HttpRespMsg removeCompInfo(String corpid);
+//
+//    HttpRespMsg initSuperManager(String corpid, String name);
+//
+//    void userLeaveOrg(String corpId, JSONArray userIdArray, LocalDate leaveDate);
+//
+//    void userAddOrg(String corpId, JSONArray userIdArray);
+//
+//    String inactiveUserNotInAuthRange(String corpid);
+//
+//    HttpRespMsg fixAttendance(Integer companyId);
+//}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/FinanceImportService.java

@@ -1,25 +0,0 @@
-package com.management.platform.service;
-
-import com.management.platform.entity.FinanceImport;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author Seyason
- * @since 2022-03-22
- */
-public interface FinanceImportService extends IService<FinanceImport> {
-
-    HttpRespMsg submitImport(Integer companyId, String yearMonth, Boolean syncUserCost, Boolean syncHistoryReport, MultipartFile file, HttpServletRequest request);
-
-    HttpRespMsg list(Integer companyId, HttpServletRequest request);
-
-    HttpRespMsg agree(Integer id, HttpServletRequest request);
-}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/LeaveSheetService.java

@@ -1,46 +0,0 @@
-package com.management.platform.service;
-
-import com.management.platform.entity.ExpenseSheet;
-import com.management.platform.entity.LeaveSheet;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.management.platform.util.HttpRespMsg;
-
-import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDate;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author Seyason
- * @since 2021-12-09
- */
-public interface LeaveSheetService extends IService<LeaveSheet> {
-
-    HttpRespMsg add(LeaveSheet sheet, String userId);
-
-    HttpRespMsg delete(Integer id);
-
-    HttpRespMsg queryList(LeaveSheet sheet,  Integer pageIndex,  Integer pageSize);
-
-    HttpRespMsg approve(Integer id);
-
-    HttpRespMsg deny(Integer id, String reason);
-
-    HttpRespMsg summaryData(String keyword, String startDate, String endDate, String userId);
-
-    HttpRespMsg getOTAvaiDays(String userId);
-
-    HttpRespMsg exportLeaveData(String userId,Integer status, Integer leaveType, String startTime,String endTime);
-
-    HttpRespMsg cancel(Integer id, String userId);
-
-    HttpRespMsg auditList(LeaveSheet sheet, Integer pageIndex, Integer pageSize);
-
-    float leaveTimeSum(Integer companyId, String startDate, String endDate, float standardHours, float allDay, List<LeaveSheet> leaveSheets);
-
-    HttpRespMsg leaveDays(String startDate, String endDate);
-}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/ProjectProfessionService.java

@@ -1,24 +0,0 @@
-package com.management.platform.service;
-
-import com.management.platform.entity.ProjectProfession;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.management.platform.util.HttpRespMsg;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author Seyason
- * @since 2021-08-28
- */
-public interface ProjectProfessionService extends IService<ProjectProfession> {
-
-    HttpRespMsg modify(Integer projectId, String json);
-
-    HttpRespMsg get(Integer projectId);
-
-    HttpRespMsg getMyProfession(Integer projectId);
-
-    HttpRespMsg getProgressData(Integer projectId);
-}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/ProjectService.java

@@ -1,295 +0,0 @@
-package com.management.platform.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.management.platform.entity.ProFunWorkContext;
-import com.management.platform.entity.Project;
-import com.management.platform.entity.ProjectSeparate;
-import com.management.platform.entity.vo.OvertimeListVO;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDate;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author 吴涛涛
- * @since 2020-01-03
- */
-public interface ProjectService extends IService<Project> {
-    HttpRespMsg getProjectList(Integer forReport, HttpServletRequest request);
-
-    HttpRespMsg getProjectPage(Integer pageIndex, Integer pageSize, String keyword, Integer searchField,
-                               Integer status, Integer category, Integer projectId,Integer projectMainId,Integer deptId, String sortProp, Integer sortOrder,String inchagerId,String participation,String startDate,String endDate, HttpServletRequest request);
-
-    HttpRespMsg editProject(Integer id, String name, String code, String[] userIds, String inchargerId,
-                            Integer isPublic,
-                            String planStartDate,
-                            String planEndDate,
-                            Integer level,
-                            Double contractAmount,
-                            String changeContractReason,
-                            String projectBaseCostData,
-                            String projectKeyNodesData,
-                            Double budget,
-                            Integer customerId,
-                            String chosenLeaders,
-                            String associateDegrees,
-                            String associateDegreeNames,
-                            Integer taskGpIncharge,
-                            String auditUserIds,
-                            String ccUserIds,
-                            Integer category,
-                            String projectDesc,
-                            Integer projectMainId,
-                            String providerIds,
-                            String providerNames,
-                            HttpServletRequest request,
-                            ProjectSeparate projectSeparate,Double outputValue,Integer deptId,boolean onlyChangeParticipate,String buId,Integer manDay,String manDayStartDate,String plate1,
-                            String plate2,
-                            String plate3,
-                            String plate4,
-                            String plate5,
-                            String plate6,
-                            String plate7,
-                            String plate8,
-                            String plate9,
-                            String plate10);
-
-    HttpRespMsg deleteProject(Integer id, Integer force);
-
-    HttpRespMsg getTimeCost(String startDate, String endDate, String userIds,Integer projectId, Integer type,HttpServletRequest request);
-
-    HttpRespMsg getProjectCost(String startDate, String endDate, Integer projectId,Integer stateKey, HttpServletRequest request);
-
-    HttpRespMsg getCostInStage(String startDate, String endDate, Integer projectId, HttpServletRequest request);
-
-    HttpRespMsg getAllMembCost(String startDate, String endDate, Integer projectId, HttpServletRequest request);
-
-    HttpRespMsg exportTimeCost(Integer withMainProject, String exportContent,String startDate, String endDate, Integer projectId,String userIds, Boolean projectSum,Integer type,Integer deptId,Integer stateKey, Integer withPercent,Integer projectCategoryId, HttpServletRequest request);
-
-    HttpRespMsg updateProgress(Integer id, Integer progress, HttpServletRequest request);
-
-    HttpRespMsg updateStatus(Integer id, Integer status, LocalDate finishDate, HttpServletRequest request);
-
-    HttpRespMsg detail(Integer id, HttpServletRequest request);
-
-    HttpRespMsg detailTwo(Integer id, HttpServletRequest request);
-
-    HttpRespMsg taskSum(Integer id, HttpServletRequest request);
-
-    HttpRespMsg restartProject(Integer id);
-
-    HttpRespMsg addMemb(Integer id, String[] userId);
-
-    HttpRespMsg adjustBase(String baseCostData, Project project, String remark, HttpServletRequest request);
-
-    HttpRespMsg exportProfit(HttpServletRequest request);
-
-    HttpRespMsg exportProject(HttpServletRequest request);
-
-    HttpRespMsg getProjectTask(Integer pageIndex, Integer pageSize, Integer projectId,Integer groupId, HttpServletRequest request,Integer taskType);
-
-    HttpRespMsg exportProjectTask(HttpServletRequest request,Integer taskType);
-
-    HttpRespMsg getAllProjectCost(Integer pageIndex, Integer pageSize, Integer projectId,HttpServletRequest request);
-
-    HttpRespMsg exportAllProjectCost(HttpServletRequest request);
-
-    HttpRespMsg exportProjectEstimatedWorkTime(HttpServletRequest request,Integer projectId);
-
-    HttpRespMsg getProjectInAndOut(Integer pageIndex, Integer pageSize, Integer projectId, HttpServletRequest request);
-
-    HttpRespMsg exportProjectInAndOut(HttpServletRequest request);
-
-    HttpRespMsg importData(String userId, MultipartFile file,Integer key,@RequestParam(defaultValue = "0") Integer changeParticipation, HttpServletRequest request);
-
-    HttpRespMsg getCustomerProjectInAndOut(Integer pageIndex, Integer pageSize, HttpServletRequest request,Integer customerId,Integer projectId);
-
-    HttpRespMsg exportCustomerProjectInAndOut(HttpServletRequest request);
-
-    HttpRespMsg getGanttData(Integer type, String startDate, String endDate, String userId, Integer projectId, String groupName,Integer taskType, HttpServletRequest request);
-
-    HttpRespMsg getProjectStagesCost(Integer pageIndex, Integer pageSize, Integer projectId, HttpServletRequest request,String stageNames,String startDate,String endDate);
-
-    HttpRespMsg exportProjectStagesCost( HttpServletRequest request,String stageNames,String startDate,String endDate, Integer projectId);
-
-    HttpRespMsg getOvertimeList(OvertimeListVO overtimeListVO);
-
-    HttpRespMsg exportOvertimeList(OvertimeListVO overtimeListVO, HttpServletRequest request);
-
-    HttpRespMsg getDegreeCost(String startDate, String endDate, Integer projectId, String userId,HttpServletRequest request);
-
-    HttpRespMsg exportData(String keyword,
-                           @RequestParam(required = false, defaultValue = "1") Integer searchField,
-                           Integer projectId, //可以直接传projectId来进行匹配
-                           Integer status, Integer category,Integer projectMainId,Integer deptId,String inchagerId,String participation,HttpServletRequest request);
-
-    HttpRespMsg exportGroupData(Integer projectCategorySubId,HttpServletRequest request);
-
-    HttpRespMsg getCustomDataSum(String startDate, String endDate, String userId, HttpServletRequest request);
-
-    HttpRespMsg exportCustomDataSum(String startDate, String endDate, Integer projectId, String userId, HttpServletRequest request);
-
-    HttpRespMsg getMyUsers(HttpServletRequest request);
-
-    HttpRespMsg getMyParticiPMList(HttpServletRequest request);
-
-    HttpRespMsg getOvertimeDetail(String userId, Integer projectId, String startDate, String endDate, HttpServletRequest request);
-
-    HttpRespMsg saveBatchAccoDegrees(String ids, String associateDegrees, String associateDegreeNames, HttpServletRequest request);
-
-    HttpRespMsg getProjectCostAlarm(Integer pageIndex, Integer pageSize, Integer projectId, HttpServletRequest request);
-
-    HttpRespMsg addBatchAccoDegrees(String ids, String associateDegrees, String associateDegreeNames, HttpServletRequest request);
-
-    HttpRespMsg getBaseCostAndRealCost(Integer pageIndex, Integer pageSize, Integer projectId, HttpServletRequest request);
-
-    HttpRespMsg exportBaseCostAndRealCost(HttpServletRequest request);
-
-    HttpRespMsg getProjectsGroups(String projectIdArray);
-
-    HttpRespMsg batchAddMembToGroup(String membIdArray, String groupIds);
-
-    HttpRespMsg getProjectByCustomer(Integer customerId, HttpServletRequest request);
-
-    HttpRespMsg getTimeCostByCategory(String startDate, String endDate, String userIds, HttpServletRequest request);
-
-    HttpRespMsg exportTimeCostByCategory(String exportContent,String startDate, String endDate, Integer projectCategoryId, String userIds, Boolean projectSum, Integer type, HttpServletRequest request);
-
-    HttpRespMsg getUserWorkingTimeList(String userId, Integer projectId, String startDate, String endDate, Integer pageIndex, Integer pageSize,HttpServletRequest request,Integer departmentId);
-
-    HttpRespMsg exportUserWorkingTimeList(String userId, Integer projectId, String startDate, String endDate,HttpServletRequest request,Integer departmentId);
-
-    HttpRespMsg getUserReportTimelinessRate(HttpServletRequest request, String startDate, String endDate, Integer departmentId, String userId,Integer pageIndex,Integer pageSize);
-
-    HttpRespMsg exportReportTimelinessRate(HttpServletRequest request, String startDate, String endDate);
-
-    HttpRespMsg getWaitingReviewList(HttpServletRequest request, Integer stateKey, String userId,Integer pageIndex,Integer pageSize,String startDate,String endDate,Integer departmentId);
-
-    HttpRespMsg exportWaitingReviewList(HttpServletRequest request, Integer stateKey, String userId,String startDate,String endDate);
-
-    HttpRespMsg batchSetParticipation(HttpServletRequest request,String projectIdArray , String userIds);
-
-    HttpRespMsg suspendProject(Integer id);
-
-    HttpRespMsg getUserWorkingTimeStatic(String startDate, String endDate, Integer pageIndex, Integer pageSize, HttpServletRequest request,String userId,Integer departmentId);
-
-    HttpRespMsg exportUserWorkingTimeStatic(String startDate, String endDate, HttpServletRequest request, String userId, Integer departmentId);
-
-    HttpRespMsg batchDeleteProject(String projectIdArray, HttpServletRequest request);
-
-    HttpRespMsg modifyContract(Integer projectId, Double oldContractAmount, Double newContractAmount,String reason,HttpServletRequest request);
-
-    HttpRespMsg getTimeCostByMainProject(String startDate, String endDate, String userId, HttpServletRequest request);
-
-    HttpRespMsg getCostByGroup(String startDate, String endDate, Integer id, HttpServletRequest request);
-
-    HttpRespMsg getTimeCostByGroup(String startDate, String endDate, Integer pageIndex, Integer pageSize, Integer groupId, Integer projectId,HttpServletRequest request);
-
-    HttpRespMsg getTimeCostByGroupProject(String startDate, String endDate, Integer pageIndex, Integer pageSize, Integer groupId, Integer projectId,Integer projectCategorySubId, HttpServletRequest request);
-
-    HttpRespMsg exportGroupWithProjectTimeCost(String startDate, String endDate, Integer pageIndex, Integer pageSize, Integer groupId, Integer projectId,Integer projectCategorySubId, HttpServletRequest request);
-
-    HttpRespMsg getProjectBaseCost(Integer projectId, HttpServletRequest request, Integer pageIndex, Integer pageSize);
-
-    HttpRespMsg exportProjectBaseCost(HttpServletRequest request);
-
-    HttpRespMsg getTimeCostByUserCustom(String startDate, String endDate, String subCustomName, Integer customId,HttpServletRequest request,String fieldName);
-
-    HttpRespMsg exportTimeCostByUserCustom(String startDate, String endDate, String subCustomName, Integer customId, HttpServletRequest request, String fieldName);
-
-    HttpRespMsg importPersonnelWithGroup(MultipartFile file, HttpServletRequest request);
-
-    HttpRespMsg batchExchangeIncharger(String projectIds, String inchargerId, HttpServletRequest request);
-
-    HttpRespMsg fixParticipators(Integer companyId, HttpServletRequest request);
-
-    HttpRespMsg removeDuplicateParticipators(Integer companyId, HttpServletRequest request);
-
-    HttpRespMsg synchronizationProject(String dataJson);
-
-    HttpRespMsg testRead(String jobId);
-
-    HttpRespMsg testAdd(String jobId);
-
-    HttpRespMsg getEmpMonthHours(Integer pageIndex, Integer pageSize, String month,Integer departmentId,String userId,Integer whether,HttpServletRequest request);
-
-    HttpRespMsg exportEmpMonthHours(String month, HttpServletRequest request, String userId, Integer departmentId,Integer whether);
-
-    HttpRespMsg deptPartInProjects(Integer pageIndex, Integer pageSize, String month, Integer departmentId, HttpServletRequest request);
-
-    HttpRespMsg exportDeptPartInProjects(String month, Integer departmentId, HttpServletRequest request);
-
-    HttpRespMsg exportReportTimelinessRateByQuarter(HttpServletRequest request, String year, Integer quarter);
-
-    HttpRespMsg getGanttDataNew(Integer type, String startDate, String endDate, String userId, Integer projectId, String groupName, Integer taskType, HttpServletRequest request);
-
-    HttpRespMsg projectGroupAndCategoryWorkTime(HttpServletRequest request, String startDate, String endDate, Integer projectId, String groupNames, Integer pageIndex,Integer pageSize);
-
-    HttpRespMsg exportProjectGroupAndCategoryWorkTime(HttpServletRequest request, String startDate, String endDate, Integer projectId, String groupNames);
-
-    HttpRespMsg getSubProjectTimeCost(HttpServletRequest request, String startDate, String endDate, Integer projectId,Integer pageIndex,Integer pageSize);
-
-    HttpRespMsg exportSubProjectTimeCost(HttpServletRequest request,String startDate,String endDate, Integer projectId);
-
-    HttpRespMsg exportDegreeCost(String startDate, String endDate, Integer projectId,Integer deptId, HttpServletRequest request);
-
-    HttpRespMsg timeCostAndExpenseByProject(HttpServletRequest request, String startDate, String endDate, Integer projectId);
-
-    HttpRespMsg nearProject(HttpServletRequest request);
-
-    HttpRespMsg getFTEData(Integer pageIndex, Integer pageSize,String monthStart,String monthEnd, String area,String sortProp, Integer sortOrder, HttpServletRequest request);
-
-    HttpRespMsg exportFTEData(String monthStart,String monthEnd, String area, HttpServletRequest request);
-
-    HttpRespMsg getProjectListByToken(String json);
-
-    HttpRespMsg getTimeCostByToken(String json);
-
-    HttpRespMsg editFunctionalDivision(String json);
-
-    HttpRespMsg deleteFunctionalDivision(Integer id);
-
-    HttpRespMsg getFunctionalDivisionList();
-
-    HttpRespMsg editFunWorkContext(String json);
-
-    HttpRespMsg deleteFunWorkContext(Integer id);
-
-    HttpRespMsg getFunWorkContextList(Integer id);
-
-    HttpRespMsg syncProjectWithSap(String startDate,String endDate,String projectCodes);
-
-    HttpRespMsg getEffectiveLaborHourRate(String startDate, String endDate);
-
-    HttpRespMsg getProjectEstimatedWork(Integer pageIndex, Integer pageSize, Integer projectId, HttpServletRequest request);
-
-    HttpRespMsg getProjectFillTime(HttpServletRequest request, Integer projectId);
-
-    HttpRespMsg getMembProjectCateRatio(String startDate, String endDate,Integer departmentId,String subUserCustomName, Integer onlyShowWarning);
-
-    HttpRespMsg exportMembProjectCateRatio(String startDate, String endDate,Integer departmentId,String subUserCustomName, Integer onlyShowWarning);
-
-    HttpRespMsg userProjectProcessList(Integer deptId, String userId, Integer projectId, Integer pageIndex, Integer pageSize);
-
-    HttpRespMsg exportUserProjectProcessList(Integer deptId, String userId, Integer projectId);
-
-    HttpRespMsg groupExpendProcessList(String startDate, String endDate,Integer pageIndex,Integer pageSize);
-
-    HttpRespMsg exportGroupExpendProcessList(String startDate, String endDate);
-
-    HttpRespMsg projectExpendProcessList(String startDate,String endDate,Integer projectId, Integer categoryId, String userId, Integer pageIndex, Integer pageSize);
-
-    HttpRespMsg exportProjectExpendProcessList(String startDate,String endDate,Integer projectId, Integer categoryId, String userId);
-
-    HttpRespMsg userTaskProcessList(Integer deptId, String userId, Integer projectId,String startDate,String endDate, Integer pageIndex, Integer pageSize);
-
-    HttpRespMsg exportUserTaskProcessList(Integer deptId, String userId, Integer projectId,String startDate,String endDate);
-
-    HttpRespMsg exportEffectiveLaborHourRate(String startDate, String endDate);
-}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/ReportBatchService.java

@@ -1,20 +0,0 @@
-package com.management.platform.service;
-
-import com.management.platform.entity.ReportBatch;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.management.platform.util.HttpRespMsg;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author Seyason
- * @since 2023-08-10
- */
-public interface ReportBatchService extends IService<ReportBatch> {
-
-    HttpRespMsg getAuditList(Integer state, Integer departmentId, Integer projectId, String date, String startDate, String endDate, String userId, HttpServletRequest request);
-}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/ReportExtraDegreeService.java

@@ -1,23 +0,0 @@
-package com.management.platform.service;
-
-import com.management.platform.entity.ReportExtraDegree;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author Seyason
- * @since 2021-12-16
- */
-public interface ReportExtraDegreeService extends IService<ReportExtraDegree> {
-
-    HttpRespMsg importData(HttpServletRequest request, MultipartFile file);
-
-    HttpRespMsg exportData(HttpServletRequest request);
-}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/ReportImportLogService.java

@@ -1,16 +0,0 @@
-package com.management.platform.service;
-
-import com.management.platform.entity.ReportImportLog;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author Seyason
- * @since 2022-03-20
- */
-public interface ReportImportLogService extends IService<ReportImportLog> {
-
-}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/ReportLogDetailService.java

@@ -1,16 +0,0 @@
-package com.management.platform.service;
-
-import com.management.platform.entity.ReportLogDetail;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author Seyason
- * @since 2022-09-19
- */
-public interface ReportLogDetailService extends IService<ReportLogDetail> {
-
-}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/ReportLogService.java

@@ -1,16 +0,0 @@
-package com.management.platform.service;
-
-import com.management.platform.entity.ReportLog;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author Seyason
- * @since 2022-06-24
- */
-public interface ReportLogService extends IService<ReportLog> {
-
-}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/ReportProfessionProgressService.java

@@ -1,16 +0,0 @@
-package com.management.platform.service;
-
-import com.management.platform.entity.ReportProfessionProgress;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author Seyason
- * @since 2021-08-29
- */
-public interface ReportProfessionProgressService extends IService<ReportProfessionProgress> {
-
-}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/ReportPushLogService.java

@@ -1,16 +0,0 @@
-package com.management.platform.service;
-
-import com.management.platform.entity.ReportPushLog;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author Seyason
- * @since 2023-11-17
- */
-public interface ReportPushLogService extends IService<ReportPushLog> {
-
-}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/ReportService.java

@@ -1,156 +0,0 @@
-package com.management.platform.service;
-
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.management.platform.entity.Report;
-import com.management.platform.entity.User;
-import com.management.platform.entity.vo.MonthWorkingTimeVO;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-12-31
- */
-public interface ReportService extends IService<Report> {
-    HttpRespMsg getReportList(String date, Integer deptId, String userId, HttpServletRequest request);
-
-    HttpRespMsg exportReport(@RequestParam String startDate, @RequestParam String endDate,Integer exportType, Integer projectId,Integer stateKey,Integer departmentId, HttpServletRequest request);
-
-    HttpRespMsg getReport(String date, HttpServletRequest request);
-
-    HttpRespMsg getCardTime(String date, HttpServletRequest request);
-
-    HttpRespMsg editReport(List<Report> reportList, String date, List<User> userList, BigDecimal hourCost, Integer companyId, String summary);
-
-    HttpRespMsg deleteReport(String userId, String date);
-
-    HttpRespMsg getListByState(Integer state, Integer departmentId,
-                               Integer projectId,
-                               String date,
-                               String startDate,
-                               String endDate,
-                               String userId,String auditUserId,
-                               HttpServletRequest request);
-
-    HttpRespMsg approveReport(String reportIds, Integer isDepartment, HttpServletRequest request,String evaluate);
-
-    HttpRespMsg denyReport(String date, String reportIds, String reason, Integer isDepartment, HttpServletRequest request);
-
-    HttpRespMsg getMembList(String date, HttpServletRequest request);
-
-    HttpRespMsg batchApproveReport(String ids, Integer isDepartment, HttpServletRequest request,String evaluate);
-    HttpRespMsg batchDenyReport(String ids, Integer isDepartment, String reason, HttpServletRequest request);
-
-    HttpRespMsg cancelReport(String userId, String reportIds, HttpServletRequest request);
-
-    HttpRespMsg getReportFillStatus(String startDate, String endDate, String userId, HttpServletRequest request);
-
-    HttpRespMsg listByStateProfession(Integer state, Integer departmentId, Integer projectId, String date, HttpServletRequest request);
-
-    HttpRespMsg listByStateDepartment(Integer state, Integer projectId, String date, HttpServletRequest request);
-
-    HttpRespMsg getUserDailyWorkTime(HttpServletRequest request, String startDate, String endDate);
-
-    HttpRespMsg exportUserDailyWorkTime(HttpServletRequest request, String startDate, String endDate);
-
-    HttpRespMsg importData(Integer companyId, Integer withCheckIn, MultipartFile file, HttpServletRequest request);
-
-    //新版导入日报，采用项目在行上的模式
-    HttpRespMsg importNewData(Integer companyId, MultipartFile file, HttpServletRequest request);
-
-    HttpRespMsg saveProjectTime(Integer companyId, List<Report> reportList, JSONArray userReportArray);
-
-    HttpRespMsg listDeptImportByState(String leaderId,
-                               Integer projectId,
-                               Integer dateType,
-                               String date,
-                                      Integer pageIndex, Integer pageSize,
-                                      Integer deprarmtentId, HttpServletRequest request);
-
-    HttpRespMsg getlastWeekFillTime(String userId);
-
-    HttpRespMsg getNoReportUserList(HttpServletRequest request, String startDate, String endDate,Integer noReportDeptId);
-
-    List<Map<String, Object>> getNotFullReportUserList(Integer companyId, LocalDate startDate, LocalDate endDate);
-
-    HttpRespMsg exportNoReportUserList(HttpServletRequest request, String startDate, String endDate,Integer noReportDeptId);
-
-    HttpRespMsg approveAllImport(HttpServletRequest request);
-
-    HttpRespMsg denyHisReport(Integer hisId, String reason, HttpServletRequest request);
-
-    HttpRespMsg getReportListByToken(String json);
-
-    HttpRespMsg fixIssue(Integer companyId, String startDate, String endDate);
-
-    HttpRespMsg getWeeklyCardTime(String dateStr, HttpServletRequest request);
-
-    HttpRespMsg getWeeklyWorkTime(String dateStr, HttpServletRequest request);
-
-    HttpRespMsg getProcessErrorData();
-
-    HttpRespMsg uploadThirdReportData(String yearMonth,HttpServletRequest request);
-
-    HttpRespMsg pushReportDataToThird(String yearMonth,HttpServletRequest request);
-
-    List<Map<String, Object>> getTaskReportList(Integer taskId);
-
-    HttpRespMsg correctWorkingTime(String userIds, String startDate, String endDate);
-
-    HttpRespMsg defaultDegree(Integer projectId, HttpServletRequest request);
-
-	HttpRespMsg approveDeptAuditReport(User user, String auditDeptId);
-
-    void moveReport(User sourceUser,User targetUser);
-
-    HttpRespMsg fillWorkingHours(String yearMonth, MonthWorkingTimeVO monthVO, HttpServletRequest request);
-
-    HttpRespMsg fillAll(String month, String userId, Integer departmentId, Integer whether,HttpServletRequest request);
-
-    HttpRespMsg getAIReport(HttpServletRequest request);
-
-    HttpRespMsg getWeeklyReportData(String targetDate, HttpServletRequest request);
-
-    HttpRespMsg batchDelete(String userIds, Integer deptId, String startDate, String endDate, HttpServletRequest request);
-
-    HttpRespMsg batchApproveByDate(String startDate, String endDate, Integer departmentId, HttpServletRequest request);
-
-    List getAuditWorkflowList(Integer reportId);
-
-    HttpRespMsg getWeeklyFillReportData(String targetDate, HttpServletRequest request);
-
-    HttpRespMsg pushProjectReportToSap(String pushDate,Integer reportId);
-
-    HttpRespMsg getReportById(Integer reportId, HttpServletRequest request);
-
-    HttpRespMsg geProjectTimeCostByThird(String json);
-
-    HttpRespMsg getUserTimeCostByThird(String json);
-
-    HttpRespMsg getUserWorkTimeByCategory(Integer categoryId, Integer deptId, String userId, String startDate, String endDate, Integer pageIndex, Integer pageSize);
-
-    HttpRespMsg exportUserWorkTimeByCategory(Integer categoryId, Integer deptId, String userId, String startDate, String endDate);
-
-    HttpRespMsg cannelAllReport();
-
-    HttpRespMsg getHasPushForSap(String startDate, String endDate, String employeeID);
-
-    HttpRespMsg getCustomDataWithDate(String startDate, String endDate, HttpServletRequest request);
-
-    HttpRespMsg exportCustomerTotalCount(String startDate, String endDate, String userId, Integer departmentId, Integer exportType, HttpServletRequest request) throws Exception;
-
-    HttpRespMsg exportCustomerTransferRate(String startDate, String endDate, String userId, Integer departmentId, Integer exportType, HttpServletRequest request) throws Exception;
-}

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

@@ -3,15 +3,10 @@ package com.management.platform.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.AuditWorkflowSetting;
 import com.management.platform.entity.Department;
-import com.management.platform.entity.User;
 import com.management.platform.mapper.AuditWorkflowSettingMapper;
 import com.management.platform.mapper.DepartmentMapper;
-import com.management.platform.mapper.ReportMapper;
-import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.AuditWorkflowSettingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.management.platform.util.HttpRespMsg;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

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

@@ -26,17 +26,11 @@ import java.util.stream.Collectors;
  */
 @Service
 public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements CompanyService {
-    @Resource
-    private CompanyMapper companyMapper;
     @Resource
     private UserMapper userMapper;
     @Resource
     private ProjectMapper projectMapper;
     @Resource
-    private ProjectService projectService;
-    @Resource
-    private ReportMapper reportMapper;
-    @Resource
     private CustomerInfoMapper customerInfoMapper;
     @Resource
     private ParticipationMapper participationMapper;
@@ -52,8 +46,6 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     private ProjectAuditorService projectAuditorService;
     @Resource
     private UserService userService;
-    @Resource
-    private ReportService reportService;
     @Override
     public HttpRespMsg dataMigration(Integer oldCompanyId,Integer targetCompanyId) {
         HttpRespMsg msg=new HttpRespMsg();
@@ -151,41 +143,8 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
                 newParticipationList.add(participation);
             }
         }
-        projectService.saveBatch(newProjectList);
         projectAuditorService.saveBatch(newProjectAuditorList);
         participationService.saveBatch(newParticipationList);
-        List<Project> oldProjectList = projectMapper.selectList(new QueryWrapper<Project>().in("id", projectIds));
-        //处理日报
-        List<Report> reportList = reportMapper.selectList(new QueryWrapper<Report>().in("creator_id", ids));
-        List<Report> changeReportList=new ArrayList<>();
-        for (Report report : reportList) {
-            //项目关联
-            Optional<Project> oldProject = oldProjectList.stream().filter(op -> op.getId().equals(report.getProjectId())).findFirst();
-            Optional<Project> targetProject = projectList.stream().filter(pro -> pro.getProjectCode().equals(oldProject.get().getProjectCode())).findFirst();
-            report.setProjectId(targetProject.get().getId());
-            Optional<User> oldUser = oldUserList.stream().filter(ou -> ou.getId().equals(report.getCreatorId())).findFirst();
-            Optional<User> targetUser = targetUserList.stream().filter(tu -> tu.getDingdingUserid().equals(oldUser.get().getDingdingUserid())).findFirst();
-            report.setCreatorId(targetUser.get().getId());
-            //部门数据
-            Optional<Department> oldDepart = oldDepartmentList.stream().filter(od -> od.getDepartmentId().equals(report.getDeptId())).findFirst();
-            Optional<Department> targetDepart = targetDepartmentList.stream().filter(td -> td.getDepartmentName().equals(oldDepart.get().getDepartmentName())).findFirst();
-            report.setDeptId(targetDepart.get().getDepartmentId());
-            //当前审核部门数据
-            Optional<Department> oldAuditDepart = oldDepartmentList.stream().filter(od -> od.getDepartmentId().equals(report.getAuditDeptid())).findFirst();
-            if(oldAuditDepart.isPresent()){
-                Optional<Department> targetAuditDepart =targetDepartmentList.stream().filter(td -> td.getDepartmentName().equals(oldAuditDepart.get().getDepartmentName())).findFirst();
-                report.setAuditDeptid(targetAuditDepart.get().getDepartmentId());
-                report.setAuditDeptManagerid(targetAuditDepart.get().getManagerId());
-            }
-            //是否被驳回
-            if(!StringUtils.isNullOrEmpty(report.getRejectUsername())){
-                Optional<User> rejectUser = targetUserList.stream().filter(tu -> tu.getName().equals(report.getRejectUsername())).findFirst();
-                report.setRejectUserid(rejectUser.get().getId());
-            }
-            report.setCompanyId(targetCompanyId);
-            changeReportList.add(report);
-        }
-        reportService.updateBatchById(changeReportList);
         return msg;
     }
 }

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

@@ -163,37 +163,6 @@ public class ContractDocumentServiceImpl extends ServiceImpl<ContractDocumentMap
         return msg;
     }
 
-    @Override
-    public HttpRespMsg onlineShow(String inputFilePath) {
-        String destFileName = inputFilePath.substring(0, inputFilePath.lastIndexOf(".")+1)+"pdf";
-        File dir = new File(path);
-        if (!dir.exists()) {
-            dir.mkdir();
-        }
-
-        HttpRespMsg msg = new HttpRespMsg();
-        Map<String,String> map = new HashMap<String,String>();
-        File destFile = new File(dir, destFileName);
-        if(destFile.exists()) {
-            //文件已存在直接显示
-            map.put("pdfFileName", path + destFile.getName());
-        }else {
-            //文件不存在，转化后显示
-            OpenOfficeService service = new OpenOfficeService();
-            service.start();
-            File inputFile = new File(dir, inputFilePath);
-            Integer state = service.office2PDF(inputFile.getAbsolutePath(),destFile.getAbsolutePath());
-            if(state == 0){
-                //转换成功
-                map.put("pdfFileName", path + destFile.getName());
-            }else {
-                //转换失败
-            }
-            service.shutdown();
-        }
-        msg.data = map;
-        return msg;
-    }
 
     /**
      * 删除文件

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

@@ -62,10 +62,6 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
     @Resource
     private AuditWorkflowTimeSettingMapper auditWorkflowTimeSettingMapper;
     @Resource
-    private ReportMapper reportMapper;
-    @Resource
-    private LeaveSheetMapper leaveSheetMapper;
-    @Resource
     private AuditWorkflowSettingMapper auditWorkflowSettingMapper;
     @Resource
     private DepartmentOtherManagerMapper departmentOtherManagerMapper;
@@ -197,17 +193,6 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                                     userMapper.updateById(manageDeptOldUser);
                                 }
 
-                                //如果存在审核中的日报，需要切换部门的审核人为新的负责人
-                                List<Report> oldReportList = reportMapper.selectList(new QueryWrapper<Report>().select("id")
-                                        .eq("audit_dept_managerid", manageDeptOldUser.getId())
-                                        .eq("audit_deptid", departmentId)
-                                        .eq("state", 0)
-                                        .eq("company_id", companyId));
-                                if (oldReportList.size() > 0) {
-                                    Report r = new Report();
-                                    r.setAuditDeptManagerid(managerId);
-                                    reportMapper.update(r, new QueryWrapper<Report>().in("id", oldReportList.stream().map(Report::getId).collect(Collectors.toList())));
-                                }
                             }
                         }
                     } else {
@@ -267,19 +252,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                 //httpRespMsg.setError("不能在有子级部门时删除部门");
                 httpRespMsg.setError(MessageUtils.message("department.subDep"));
             } else {
-                Integer reportCut = reportMapper.selectCount(new QueryWrapper<Report>().eq("dept_id", departmentId));
-                if(reportCut>0){
-                    //httpRespMsg.setError("当前部门已被日报数据使用");
-                    httpRespMsg.setError(MessageUtils.message("department.dailyData"));
-                    return httpRespMsg;
-                }
-                //请假单只关联到审核人，不关联审核部门
-//                Integer auditDeptidCut = leaveSheetMapper.selectCount(new QueryWrapper<LeaveSheet>().eq("audit_deptid", departmentId));
-//                if(auditDeptidCut>0){
-//                    //httpRespMsg.setError("当前部门已被请假数据使用");
-//                    httpRespMsg.setError(MessageUtils.message("department.leaveDate"));
-//                    return httpRespMsg;
-//                }
+
                 Integer auditWorkflowTimeSettingCut = auditWorkflowTimeSettingMapper.selectCount(new QueryWrapper<AuditWorkflowTimeSetting>().eq("audit_dept_id", departmentId));
                 if(auditWorkflowTimeSettingCut>0){
                     //httpRespMsg.setError("当前部门已被工时审批流数据使用");

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

@@ -6,7 +6,6 @@ import com.management.platform.entity.CorpwxJobResult;
 import com.management.platform.entity.WxCorpInfo;
 import com.management.platform.mapper.CorpwxJobResultMapper;
 import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.DingDingService;
 import com.management.platform.service.ExcelExportService;
 import com.management.platform.service.WxCorpInfoService;
 import com.management.platform.util.ExcelUtil;
@@ -36,8 +35,6 @@ public class ExcelExportServiceImpl implements ExcelExportService {
     @Resource
     private WxCorpInfoService wxCorpInfoService;
     @Resource
-    private DingDingService dingDingService;
-    @Resource
     private HttpServletRequest request;
     @Resource
     private UserMapper userMapper;

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

@@ -1,569 +0,0 @@
-package com.management.platform.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.*;
-import com.management.platform.mapper.*;
-import com.management.platform.service.*;
-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.MessageUtils;
-import com.management.platform.util.UserNotFoundException;
-import org.apache.commons.io.FileUtils;
-import org.apache.poi.ss.usermodel.*;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.io.*;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author Seyason
- * @since 2022-03-22
- */
-@Service
-public class FinanceImportServiceImpl extends ServiceImpl<FinanceImportMapper, FinanceImport> implements FinanceImportService {
-    @Value(value = "${upload.path}")
-    private String path;
-
-    @Resource
-    private FinanceFixedcolnameService financeFixedcolnameService;
-    @Resource
-    private UserMapper userMapper;
-    @Resource
-    private FinanceImportMapper financeImportMapper;
-    @Resource
-    private DepartmentMapper departmentMapper;
-    @Resource
-    private FinanceMapper financeMapper;
-    @Resource
-    private TimeTypeMapper timeTypeMapper;
-    @Resource
-    private FinanceTblcuscolMapper financeTblcuscolMapper;
-    @Resource
-    private ReportMapper reportMapper;
-    @Resource
-    private FinanceService financeService;
-    @Resource
-    private UserService userService;
-    @Resource
-    private ReportService reportService;
-
-
-    @Override
-    @Transactional
-    public HttpRespMsg submitImport(Integer companyId, String yearMonth, Boolean syncUserCost, Boolean syncHistoryReport, MultipartFile multipartFile, HttpServletRequest request) {
-        HttpRespMsg msg = new HttpRespMsg();
-        User user = userMapper.selectById(request.getHeader("TOKEN"));
-        //检查当月是否已经存在审核通过的
-        FinanceImport oldItem = financeImportMapper.selectOne(new QueryWrapper<FinanceImport>().eq("company_id", companyId).eq("ymonth", yearMonth).orderByDesc("indate").last("limit 1"));
-        if (oldItem != null) {
-            if (oldItem.getState() == 1) {
-                //msg.setError(yearMonth+"月薪资已审核通过,无法上传。");
-                msg.setError(MessageUtils.message("salary.uploadErrorByAdopt"));
-                return msg;
-            } else {
-                if (oldItem.getState() == 0) {
-                    String[] fname = oldItem.getServerName().split("\\/");
-                    File oldFile = new File(new File(path, fname[0]), fname[1]);
-                    oldFile.delete();
-                    financeImportMapper.deleteById(oldItem.getId());
-                }
-            }
-        }
-
-        //然后处理文件
-        String fileName = multipartFile.getOriginalFilename();
-        File file = new File(fileName == null ? "file" : fileName);
-        InputStream inputStream = null;
-        OutputStream outputStream = null;
-        try {
-            inputStream = multipartFile.getInputStream();
-            outputStream = new FileOutputStream(file);
-            byte[] buffer = new byte[4096];
-            int temp = 0;
-            while ((temp = inputStream.read(buffer, 0, 4096)) != -1) {
-                outputStream.write(buffer, 0, temp);
-            }
-            inputStream.close();
-            outputStream.close();
-            //然后解析表格, 进行数据格式校验
-            Workbook wb = WorkbookFactory.create(new FileInputStream(file));
-            Sheet sheet = wb.getSheetAt(0);
-            //要插入的账号列表
-            List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId));
-            List<Finance> financeList = new ArrayList<Finance>();
-            //需要更新成本的人员数据
-            List<User> updateUserList = new ArrayList<>();
-
-            String startStr = yearMonth + "-01";
-            String endStr = yearMonth + "-31";
-            //由于第一行需要指明列对应的标题
-            int rowNum = sheet.getLastRowNum();
-            for (int rowIndex = 0; rowIndex <= sheet.getLastRowNum(); rowIndex++) {
-                Row row = sheet.getRow(rowIndex);
-                if (row == null) {
-                    continue;
-                }
-                if (ExcelUtil.isRowEmpty(row)) {
-                    continue;
-                }
-                //姓名	工资	奖金	津贴	养老保险	医疗保险	失业保险	(新增工伤保险) 住房公积金	其他; 可能有自定义的项
-                Cell nameCell = row.getCell(0);
-                nameCell.setCellType(CellType.STRING);
-
-                String name = nameCell.getStringCellValue().trim().replaceAll("\\u00a0", "");
-                Finance finance = new Finance();
-
-                //if (name.equals("姓名") && rowIndex == 0) {
-                if ((name.equals("姓名") || name.equals("name")) && rowIndex == 0) {
-                    continue;
-                }
-                finance.setName(name);
-                Optional<User> first = userList.stream().filter(u -> u.getName().equals(name)).findFirst();
-                if (first.isPresent()) {
-                    finance.setUserId(first.get().getId());
-                    //如果需要更新员工成本
-                    if (syncUserCost || syncHistoryReport) {
-                        //设置人员总id
-                        User localUser = new User();
-                        localUser.setId(finance.getUserId());
-                        updateUserList.add(localUser);
-                    }
-                } else {
-                    //msg.setError("用户["+name+"]不存在,请在组织结构中添加该成员");
-                    msg.setError(MessageUtils.message("group.userNull",name));
-                    return msg;
-                }
-                finance.setYmonth(yearMonth);
-                financeList.add(finance);
-            }
-            if (financeList.size() == 0) {
-                //msg.setError("请填写数据再上传");
-                msg.setError(MessageUtils.message("file.dateNull"));
-                return msg;
-            }
-
-            //如果有必要，更新该月份的日报相关的成本
-            if (syncHistoryReport) {
-                List<Report> reportList = reportMapper.selectSimpleTime(companyId, startStr, endStr);
-                if (reportList.size() > 0) {
-                    for (Report r : reportList) {
-                        Optional<User> first = updateUserList.stream().filter(u -> u.getId().equals(r.getCreatorId())).findFirst();
-                        if (!first.isPresent()) {
-                            String notFillUser = userMapper.selectById(r.getCreatorId()).getName();
-                            System.out.println("缺少[" + notFillUser + "]的薪资成本， 请修改数据重新上传");
-                            //throw new UserNotFoundException("缺少[" + notFillUser + "]的薪资成本， 请修改数据重新上传");
-                            throw new UserNotFoundException(MessageUtils.message("salary.lackAndUpAgain",notFillUser));
-                        }
-                    }
-                }
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-            //msg.setError("文件处理出错");
-            msg.setError(MessageUtils.message("file.error"));
-            return msg;
-        } catch (UserNotFoundException e) {
-            e.printStackTrace();
-            msg.setError(e.getMessage());
-            return msg;
-        } catch (NullPointerException e) {
-            e.printStackTrace();
-            //msg.setError("数据格式有误或存在空数据 导入失败");
-            msg.setError(MessageUtils.message("file.dataFormatError"));
-            return msg;
-        } catch (Exception e) {
-            e.printStackTrace();
-            //msg.setError("发生其他错误");
-            msg.setError(MessageUtils.message("other.error"));
-            return msg;
-        } finally {
-            //关闭流
-            try {
-                if (outputStream != null && inputStream != null) {
-                    outputStream.close();
-                    inputStream.close();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        //保存导入记录
-        String originName = fileName;
-        System.out.println("fileName=="+originName);
-        String[] names = originName.split("\\.");
-        String destFileName = names[0] + "_"+System.currentTimeMillis()+"."+names[1];
-        String financeFolder = "finance";
-        File dir = new File(path, financeFolder);
-        if (!dir.exists()) {
-            dir.mkdir();
-        }
-        File destFile = new File(dir, destFileName);
-        try {
-//            multipartFile.transferTo(destFile);
-            FileUtils.copyFile(file, destFile);
-            FinanceImport log = new FinanceImport();
-            log.setCompanyId(companyId);
-            log.setFileName(originName);
-            log.setServerName(financeFolder+"/"+destFileName);
-            log.setUserId(user.getId());
-            log.setUserName(user.getName());
-            log.setYmonth(yearMonth);
-            log.setRecoverMonthcost(syncUserCost?1:0);
-            log.setRecoverReport(syncHistoryReport?1:0);
-            financeImportMapper.insert(log);
-        } catch (IOException e) {
-            e.printStackTrace();
-            msg.setError(e.getMessage());
-        } finally {
-            System.out.println("删除临时文件："+file.delete());
-        }
-        return msg;
-    }
-
-    @Override
-    public HttpRespMsg list(Integer companyId, HttpServletRequest request) {
-        HttpRespMsg msg = new HttpRespMsg();
-        List<FinanceImport> all = financeImportMapper.selectList(new QueryWrapper<FinanceImport>().eq("company_id", companyId).orderByDesc("indate"));
-        List<FinanceImport> pendingList = all.stream().filter(a->a.getState() == 0).collect(Collectors.toList());
-        List<FinanceImport> passList = all.stream().filter(a->a.getState() == 1).collect(Collectors.toList());
-        List<FinanceImport> rejectList = all.stream().filter(a->a.getState() == 2).collect(Collectors.toList());
-        List<FinanceImport> cancelList = all.stream().filter(a->a.getState() == -1).collect(Collectors.toList());
-        HashMap map = new HashMap();
-        map.put("pendingList", pendingList);
-        map.put("passList", passList);
-        map.put("rejectList", rejectList);
-        map.put("cancelList", cancelList);
-        msg.data = map;
-        return msg;
-    }
-
-    @Override
-    @Transactional
-    public HttpRespMsg agree(Integer id, HttpServletRequest request) {
-        HttpRespMsg msg = new HttpRespMsg();
-        FinanceImport curItem = new FinanceImport();
-        curItem.setId(id);
-        curItem.setState(1);
-        User auditor = userMapper.selectById(request.getHeader("TOKEN"));
-        curItem.setAuditorId(auditor.getId());
-        curItem.setAuditorName(auditor.getName());
-
-        FinanceImport oldItem = financeImportMapper.selectById(id);
-        if (oldItem == null) {
-            //msg.setError("该数据不存在");
-            msg.setError(MessageUtils.message("file.dateNoExist"));
-            return msg;
-        }
-        if (oldItem.getState() == 0) {
-            //读取文件进行更新
-            oldItem.getServerName();
-            String[] fname = oldItem.getServerName().split("\\/");
-            File oldFile = new File(new File(path, fname[0]), fname[1]);
-            FinanceImport financeImport = oldItem;
-            //然后处理文件
-            try {
-                //然后解析表格
-                Workbook wb = WorkbookFactory.create(new FileInputStream(oldFile));
-                Sheet sheet = wb.getSheetAt(0);
-                //要插入的账号列表
-                Integer companyId = financeImport.getCompanyId();
-                String yearMonth = financeImport.getYmonth();
-                List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId));
-                List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", companyId));
-                List<Finance> financeList = new ArrayList<Finance>();
-                List<Finance> oldFinanceList = financeMapper.selectList(new QueryWrapper<Finance>().eq("company_id", companyId).eq("ymonth", yearMonth));
-                //获取月成本列表
-                DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-                String dateStr = yearMonth+"-01 00:00:00";
-                LocalDateTime startDate = LocalDateTime.parse(dateStr,df);
-                LocalDateTime endDate = LocalDateTime.parse(dateStr,df);
-                endDate = endDate.plusMonths(1);
-
-                TimeType timeType = timeTypeMapper.selectById(companyId);
-                BigDecimal monthHours = timeType.getMonthDays().multiply(new BigDecimal(timeType.getAllday()));
-
-                //需要更新成本的人员数据
-                List<User> updateUserList = new ArrayList<>();
-
-                String startStr = yearMonth + "-01";
-                String endStr = yearMonth + "-31";
-                //获取人员该月份填写的日报的总时长
-                List<Map<String, Object>> userTimeList = null;
-                if (financeImport.getRecoverMonthcost()==1 || financeImport.getRecoverReport()==1) {
-                    userTimeList = reportMapper.getUserWorkingTimeByRange(companyId, startStr, endStr);
-                }
-
-                List<FinanceTblcuscol> cusColList = financeTblcuscolMapper.selectList(new QueryWrapper<FinanceTblcuscol>().eq("company_id", companyId));
-                FinanceFixedcolname financeConfig = financeFixedcolnameService.getFixed(companyId);
-                if (cusColList.size() > 0) {
-                    financeConfig.setField1(cusColList.get(0).getFieldName());
-                    financeConfig.setField1Calculate(cusColList.get(0).getNeedCalculate());
-                }
-                if (cusColList.size() > 1) {
-                    financeConfig.setField2(cusColList.get(1).getFieldName());
-                    financeConfig.setField2Calculate(cusColList.get(1).getNeedCalculate());
-                }
-                if (cusColList.size() > 2) {
-                    financeConfig.setField3(cusColList.get(2).getFieldName());
-                    financeConfig.setField3Calculate(cusColList.get(2).getNeedCalculate());
-                }
-                //由于第一行需要指明列对应的标题
-                int rowNum = sheet.getLastRowNum();
-                for (int rowIndex = 0; rowIndex <= sheet.getLastRowNum(); rowIndex++) {
-                    Row row = sheet.getRow(rowIndex);
-                    if (row == null) {
-                        continue;
-                    }
-                    if (ExcelUtil.isRowEmpty(row)) {
-                        continue;
-                    }
-                    //姓名	工资	奖金	津贴	养老保险	医疗保险	失业保险	(新增工伤保险) 住房公积金	其他; 可能有自定义的项
-                    //TODO: 如果后期导入审核的方式下也要支持工号，这里得修改代码
-                    Cell nameCell = row.getCell(0);
-                    Cell salaryCell = row.getCell(1);
-                    Cell bonusCell = row.getCell(2);
-                    Cell allowanceCell = row.getCell(3);
-                    Cell inOldCell = row.getCell(4);
-                    Cell inMedicalCell = row.getCell(5);
-                    Cell inJobCell = row.getCell(6);
-                    Cell injuryCell = row.getCell(7);
-
-                    nameCell.setCellType(CellType.STRING);
-
-                    String name = nameCell.getStringCellValue().trim().replaceAll("\\u00a0", "");
-                    Finance finance = new Finance();
-
-                    //if (name.equals("姓名") && rowIndex == 0) {
-                    if ((name.equals("姓名") || name.equals("name")) && rowIndex == 0) {
-                        continue;
-                    }
-                    Cell houseFundCell = row.getCell(8);
-                    Cell field1 = cusColList.size() > 0?row.getCell(9):null;
-                    Cell field2 = cusColList.size() > 1?row.getCell(10):null;
-                    Cell field3 = cusColList.size() > 2?row.getCell(11):null;
-
-                    if (field1 != null)field1.setCellType(CellType.STRING);
-                    if (field2 != null)field2.setCellType(CellType.STRING);
-                    if (field3 != null)field3.setCellType(CellType.STRING);
-
-                    finance.setCompanyId(companyId);
-                    finance.setName(name);
-
-                    Optional<User> first = userList.stream().filter(u -> u.getName().equals(name)).findFirst();
-                    if (first.isPresent()) {
-                        finance.setUserId(first.get().getId());
-                        BigDecimal total = new BigDecimal(0);
-                        if (salaryCell != null) {
-                            salaryCell.setCellType(CellType.STRING);
-                            String item = salaryCell.getStringCellValue();
-                            BigDecimal value = item != null ? new BigDecimal(item.trim().replaceAll("\\u00a0", "")) : BigDecimal.valueOf(0);
-                            finance.setMonthCost(value);
-                            if (financeConfig.getMonthCostCalculate()==1) total = total.add(value);
-                        }
-
-                        //按姓名做匹配
-                        Optional<Finance> matchItem = oldFinanceList.stream().filter(o -> o.getName().equals(finance.getName())).findFirst();
-                        if (matchItem.isPresent()) {
-                            finance.setId(matchItem.get().getId());
-                        }
-
-                        if (bonusCell != null) {
-                            bonusCell.setCellType(CellType.STRING);
-                            String bonusString = bonusCell.getStringCellValue();
-                            BigDecimal bonus = bonusString != null ? new BigDecimal(bonusString.trim().replaceAll("\\u00a0", "")) : BigDecimal.valueOf(0);
-                            finance.setBonus(bonus);
-                            if (financeConfig.getBonusCalculate()==1) total = total.add(bonus);
-                        }
-                        if (allowanceCell != null) {
-                            allowanceCell.setCellType(CellType.STRING);
-                            String item = allowanceCell.getStringCellValue();
-                            BigDecimal value = item != null ? new BigDecimal(item.trim().replaceAll("\\u00a0", "")) : BigDecimal.valueOf(0);
-                            finance.setAllowance(value);
-                            if (financeConfig.getAllowanceCalculate()==1) total = total.add(value);
-                        }
-                        if (inJobCell != null) {
-                            inJobCell.setCellType(CellType.STRING);
-                            String item = inJobCell.getStringCellValue();
-                            BigDecimal value = item != null ? new BigDecimal(item.trim().replaceAll("\\u00a0", "")) : BigDecimal.valueOf(0);
-                            finance.setInsuranceLosejob(value);
-                            if (financeConfig.getInsuranceLosejobCalculate()==1) total = total.add(value);
-                        }
-                        if (inMedicalCell != null) {
-                            inMedicalCell.setCellType(CellType.STRING);
-                            String item = inMedicalCell.getStringCellValue();
-                            BigDecimal value = item != null ? new BigDecimal(item.trim().replaceAll("\\u00a0", "")) : BigDecimal.valueOf(0);
-                            finance.setInsuranceMedical(value);
-                            if (financeConfig.getInsuranceMedicalCalculate()==1) total = total.add(value);
-                        }
-                        if (inOldCell != null) {
-                            inOldCell.setCellType(CellType.STRING);
-                            String item = inOldCell.getStringCellValue();
-                            BigDecimal value = item != null ? new BigDecimal(item.trim().replaceAll("\\u00a0", "")) : BigDecimal.valueOf(0);
-                            finance.setInsuranceOld(value);
-                            if (financeConfig.getInsuranceOldCalculate()==1) total = total.add(value);
-                        }
-                        if (injuryCell != null) {
-                            injuryCell.setCellType(CellType.STRING);
-                            String item = injuryCell.getStringCellValue();
-                            BigDecimal value = item != null ? new BigDecimal(item.trim().replaceAll("\\u00a0", "")) : BigDecimal.valueOf(0);
-                            finance.setInsuranceInjury(value);
-                            if (financeConfig.getInsuranceInjuryCalculate()==1) total = total.add(value);
-                        }
-                        if (houseFundCell != null) {
-                            houseFundCell.setCellType(CellType.STRING);
-                            String item = houseFundCell.getStringCellValue();
-                            BigDecimal value = item != null ? new BigDecimal(item.trim().replaceAll("\\u00a0", "")) : BigDecimal.valueOf(0);
-                            finance.setHouseFund(value);
-                            if (financeConfig.getHouseFundCalculate()==1) total = total.add(value);
-                        }
-
-                        if (field1 != null) {
-                            field1.setCellType(CellType.STRING);
-                            String item = field1.getStringCellValue();
-                            BigDecimal value = item != null ? new BigDecimal(item.trim().replaceAll("\\u00a0", "")) : BigDecimal.valueOf(0);
-                            finance.setCustomField1(value);
-                            if (financeConfig.getField1Calculate() != null && financeConfig.getField1Calculate()==1) total = total.add(value);
-                        }
-                        if (field2 != null) {
-                            field2.setCellType(CellType.STRING);
-                            String item = field2.getStringCellValue();
-                            BigDecimal value = item != null ? new BigDecimal(item.trim().replaceAll("\\u00a0", "")) : BigDecimal.valueOf(0);
-                            finance.setCustomField2(value);
-                            if (financeConfig.getField2Calculate() != null && financeConfig.getField2Calculate()==1) total = total.add(value);
-                        }
-                        if (field3 != null) {
-                            field3.setCellType(CellType.STRING);
-                            String item = field3.getStringCellValue();
-                            BigDecimal value = item != null ? new BigDecimal(item.trim().replaceAll("\\u00a0", "")) : BigDecimal.valueOf(0);
-                            finance.setCustomField3(value);
-                            if (financeConfig.getField3Calculate() != null && financeConfig.getField3Calculate()==1) total = total.add(value);
-                        }
-                        finance.setTotalCost(total);
-
-                        //如果需要更新员工成本
-                        if (financeImport.getRecoverMonthcost()==1 || financeImport.getRecoverReport()==1) {
-                            //设置人员总成本，计算时薪
-                            User localUser = new User();
-                            localUser.setId(finance.getUserId());
-                            localUser.setMonthCost(total);
-                            for (int i=0;i<userTimeList.size(); i++) {
-                                Map<String, Object> map = userTimeList.get(i);
-                                if (map.get("creatorId").equals(finance.getUserId())) {
-                                    double time = (Double)map.get("workingTime");
-                                    localUser.setCost(total.divide(new BigDecimal(time), 6, BigDecimal.ROUND_HALF_UP));
-                                    break;
-                                }
-                            }
-
-                            updateUserList.add(localUser);
-                        }
-                    } else {
-                        //msg.setError("用户["+name+"]不存在,请在组织结构中添加该成员");
-                        msg.setError(MessageUtils.message("group.userNull",name));
-                        return msg;
-                    }
-                    finance.setYmonth(yearMonth);
-                    financeList.add(finance);
-
-                }
-                if (financeList.size() == 0) {
-                    //msg.setError("请填写数据再上传");
-                    msg.setError(MessageUtils.message("file.dateNull"));
-                    return msg;
-                }
-                //批量插入
-                financeService.saveOrUpdateBatch(financeList);
-                if (financeImport.getRecoverMonthcost()==1) {
-                    //重新计算时薪，保证按照标准工作时长下的时薪正确
-                    List<User> dbUpUserList = new ArrayList<>();
-                    BigDecimal db = timeType.getMonthDays().multiply(new BigDecimal(timeType.getAllday()));
-                    for (User upU : updateUserList) {
-                        User user1 = new User();
-                        user1.setId(upU.getId());
-                        user1.setMonthCost(upU.getMonthCost());
-                        user1.setCost(upU.getMonthCost().divide(db,2, BigDecimal.ROUND_HALF_UP));
-                        dbUpUserList.add(user1);
-                    }
-                    userService.updateBatchById(dbUpUserList);
-                }
-                //检查是否有删除的，需要删除掉
-                List<Integer> readyForDelete = new ArrayList<>();
-                oldFinanceList.forEach(old->{
-                    boolean exists = false;
-                    if (financeList.stream().filter(f->f.getName().equals(old.getName())).findAny().isPresent()) {
-                        exists = true;
-                    }
-                    if (!exists) {
-                        readyForDelete.add(old.getId());
-                    }
-                });
-                if (readyForDelete.size() > 0) {
-                    financeService.removeByIds(readyForDelete);
-                }
-                //如果有必要，更新该月份的日报相关的成本
-                if (financeImport.getRecoverReport()==1) {
-                    List<Report> reportList = reportMapper.selectSimpleTime(companyId, startStr, endStr);
-                    if (reportList.size() > 0) {
-                        for (Report r : reportList) {
-                            Optional<User> first = updateUserList.stream().filter(u -> u.getId().equals(r.getCreatorId())).findFirst();
-                            if (!first.isPresent()) {
-                                String notFillUser = userMapper.selectById(r.getCreatorId()).getName();
-                                System.out.println("缺少[" + notFillUser + "]的薪资成本， 请修改数据重新上传");
-                                //throw new UserNotFoundException("缺少[" + notFillUser + "]的薪资成本， 请修改数据重新上传");
-                                throw new UserNotFoundException(MessageUtils.message("salary.lackAndUpAgain",notFillUser));
-                            }
-                            BigDecimal hourCost = first.get().getCost();
-                            r.setCost(hourCost.multiply(new BigDecimal(r.getWorkingTime())));
-                            r.setCreatorId(null);
-                            r.setWorkingTime(null);
-                        }
-                        //批量更新日报的成本
-                        reportService.updateBatchById(reportList);
-                    }
-                }
-
-                financeImportMapper.updateById(curItem);
-            } catch (IOException e) {
-                e.printStackTrace();
-                //msg.setError("文件处理出错");
-                msg.setError(MessageUtils.message("file.error"));
-                return msg;
-            } catch (UserNotFoundException e) {
-                e.printStackTrace();
-                msg.setError(e.getMessage());
-                return msg;
-            } catch (NullPointerException e) {
-                e.printStackTrace();
-                //msg.setError("数据格式有误或存在空数据 导入失败");
-                msg.setError(MessageUtils.message("file.dataFormatError"));
-                return msg;
-            } catch (Exception e) {
-                e.printStackTrace();
-                //msg.setError("发生其他错误");
-                msg.setError(MessageUtils.message("other.error"));
-                return msg;
-            } finally {
-            }
-        } else {
-            //msg.setError("只有待审核状态才可以操作");
-            msg.setError(MessageUtils.message("finance.operationStateError"));
-        }
-        return msg;
-    }
-
-}

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

@@ -1,820 +0,0 @@
-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.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.management.platform.controller.AuditWorkflowSettingController;
-import com.management.platform.entity.*;
-import com.management.platform.entity.vo.SysRichFunction;
-import com.management.platform.mapper.*;
-import com.management.platform.service.*;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.MessageUtils;
-import com.management.platform.util.WorkDayCalculateUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author Seyason
- * @since 2021-12-09
- */
-@Service
-@Transactional
-public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSheet> implements LeaveSheetService {
-    public static final Integer exLeaveDay = 6;
-    public static final String[] LEAVE_TYPES = new String[]{"事假","病假","年假","产假","婚假","丧假","调休假","陪产假","其他"};
-    @Resource
-    private UserMapper userMapper;
-    @Resource
-    private LeaveSheetMapper leaveSheetMapper;
-    @Resource
-    private TimeTypeMapper timeTypeMapper;
-    @Resource
-    private ReportMapper reportMapper;
-    @Resource
-    private AuditWorkflowSettingService auditWorkflowSettingService;
-    @Resource
-    private AuditWorkflowSettingMapper auditWorkflowSettingMapper;
-    @Resource
-    private DepartmentMapper departmentMapper;
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    SysFunctionMapper sysFunctionMapper;
-    @Resource
-    DepartmentService departmentService;
-    @Resource
-    WxCorpInfoMapper wxCorpInfoMapper;
-    @Resource
-    ExcelExportService excelExportService;
-    @Resource
-    LeaveAuditLogMapper leaveAuditLogMapper;
-    @Resource
-    WxCorpInfoService wxCorpInfoService;
-    @Resource
-    InformationMapper informationMapper;
-
-    @Value(value = "${upload.path}")
-    private String path;
-
-    @Override
-    public HttpRespMsg add(LeaveSheet sheet, String userId) {
-        HttpRespMsg msg = new HttpRespMsg();
-        boolean isNew = false;
-        if (sheet.getId() == null) {
-            isNew = true;
-        }
-        sheet.setOperatorId(userId);//设置操作人id
-        User user = userMapper.selectById(userId);
-        sheet.setOwnerName(userMapper.selectById(sheet.getOwnerId()).getName());
-        sheet.setCompanyId(user.getCompanyId());
-        sheet.setStatus(1);//待审核状态
-        TimeType timeType = timeTypeMapper.selectById(user.getCompanyId());
-        if (sheet.getTimeType() == 0) {
-            //按天请假时，计算小时数
-            float v = timeType.getAllday() * sheet.getTimeDays();
-            sheet.setTimeHours(v);
-        }
-        if (isNew) {
-            //检查该时间段是否已经有按天请假
-            QueryWrapper<LeaveSheet> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("owner_id", sheet.getOwnerId());
-            queryWrapper.le("start_date", sheet.getEndDate()).ge("end_date", sheet.getStartDate());
-
-            int count = leaveSheetMapper.selectCount(queryWrapper);
-            if (count > 0) {
-                //msg.setError("该时间段已有请假申请，不能重复请假");
-                msg.setError(MessageUtils.message("leave.repeatedLeave"));
-                return msg;
-            }
-        }
-
-        //获取第一个审批人
-        User owner = userMapper.selectById(sheet.getOwnerId());
-        if (owner.getDepartmentId() == 0) {
-            //没有部门，不能提交请假申请
-            msg.setError("请联系管理员设置您所在部门");
-            return msg;
-        } else {
-            List<AuditWorkflowSetting> auditList = auditWorkflowSettingService.get(owner.getDepartmentId(), AuditWorkflowSettingController.TYPE_LEAVE);
-            if (auditList.size() > 0) {
-                AuditWorkflowSetting workflowNode = auditList.get(0);
-                if (workflowNode.getAuditorType() == 1) {
-                    //部门负责人
-                    Department dept = departmentMapper.selectById(workflowNode.getAuditDeptId());
-                    if (dept.getManagerId() == null) {
-                        msg.setError("请联系管理员设置您所在部门的主要负责人");
-                        return msg;
-                    }
-                    sheet.setAuditorId(dept.getManagerId());
-                    sheet.setAuditorName(userMapper.selectById(dept.getManagerId()).getName());
-                } else if (workflowNode.getAuditorType() == 2) {
-                    //指定一个人审批
-                    sheet.setAuditorId(workflowNode.getUserId());
-                    sheet.setAuditorName(workflowNode.getUserName());
-                }
-                sheet.setCurAuditSettingId(workflowNode.getId());
-            }
-        }
-
-        if (isNew) {
-            leaveSheetMapper.insert(sheet);
-        } else {
-            //编辑修改
-            leaveSheetMapper.updateById(sheet);
-            //之前的审批流程要删除
-            leaveAuditLogMapper.delete(new QueryWrapper<LeaveAuditLog>().eq("sheet_id", sheet.getId()));
-        }
-        sheet = leaveSheetMapper.selectById(sheet.getId());
-        saveNotifyToAuditor(sheet);
-        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
-        if (wxCorpInfo != null) {
-            sendAuditNotifyMsg(wxCorpInfo, user, sheet);
-        }
-        return msg;
-    }
-
-    //发送审核结果消息提醒
-    private void sendAuditResult(WxCorpInfo wxCorpInfo, User auditor, LeaveSheet sheet, String denyReason) {
-        //推送到企业微信
-        JSONObject json=new JSONObject();
-        JSONArray dataJson=new JSONArray();
-        JSONObject jsonObj=new JSONObject();
-        jsonObj.put("key", "审核结果");
-        jsonObj.put("value",sheet.getStatus() == 0?"通过":"驳回");
-//        jsonObj.put("value",("$userName="+applier.getCorpwxUserid()+"$"));
-        JSONObject jsonObj1=new JSONObject();
-        jsonObj1.put("key", "审核人");
-        jsonObj1.put("value",("$userName="+auditor.getCorpwxUserid()+"$"));
-        String applyTimeDesc = "";
-        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("M月d日");
-        if (sheet.getStartDate().isEqual(sheet.getEndDate())) {
-            applyTimeDesc = dateTimeFormatter.format(sheet.getStartDate()) + ", "+sheet.getTimeHours()+"小时";
-        } else {
-            applyTimeDesc = dateTimeFormatter.format(sheet.getStartDate()) +"至" + dateTimeFormatter.format(sheet.getEndDate()) + ", "+sheet.getTimeHours()+"小时";
-        }
-
-        JSONObject jsonObj2=new JSONObject();
-        jsonObj2.put("key", "请假时间");
-        jsonObj2.put("value",applyTimeDesc);
-        JSONObject jsonObj4=new JSONObject();
-        jsonObj4.put("key", "备注");
-        jsonObj4.put("value",sheet.getStatus()==2?("原因："+denyReason):"请假申请通过了");
-        dataJson.add(jsonObj);
-        dataJson.add(jsonObj1);
-        dataJson.add(jsonObj2);
-        dataJson.add(jsonObj4);
-        json.put("template_id","tty9TkCAAARfwRKiqfj47qNE70KvGhqg");
-        json.put("url","https://open.weixin.qq.com/connect/oauth2/authorize?appid=wwdd1137a65ce0fc87&redirect_uri=http://crm.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=leave#wechat_redirect");
-        json.put("content_item",dataJson);
-        String ownerId = sheet.getOwnerId();
-        User owner = userMapper.selectById(ownerId);
-        wxCorpInfoService.sendWXCorpTemplateMsg(wxCorpInfo,owner.getCorpwxUserid(), json);
-    }
-
-    private void saveNotifyToApplier(LeaveSheet sheet) {
-        //推送到企业微信
-        String applyTimeDesc = "";
-        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("M月d日");
-        if (sheet.getStartDate().isEqual(sheet.getEndDate())) {
-            applyTimeDesc = dateTimeFormatter.format(sheet.getStartDate()) + ", "+sheet.getTimeHours()+"小时";
-        } else {
-            applyTimeDesc = dateTimeFormatter.format(sheet.getStartDate()) +"至" + dateTimeFormatter.format(sheet.getEndDate()) + ", "+sheet.getTimeHours()+"小时";
-        }
-        String ownerId = sheet.getOwnerId();
-        User owner = userMapper.selectById(ownerId);
-        User auditor = userMapper.selectById(sheet.getAuditorId());
-        //系统内消息
-        Information information=new Information();
-        information.setUserId(owner.getId());
-        information.setTime(new Date());
-        information.setMsg("您"+applyTimeDesc + "请假申请审核"+(sheet.getStatus() == 0?"已通过":"已驳回")+", 审核人:"
-                +(auditor.getCorpwxUserid() != null ? ("$userName="+auditor.getCorpwxUserid()+"$"):auditor.getName()));
-        information.setType(4);
-        information.setContent(sheet.getId()+"");
-        information.setPath("/leave-sheet");
-        informationMapper.insert(information);
-    }
-
-    private void saveNotifyToAuditor(LeaveSheet sheet) {
-        //系统内消息
-        Information information=new Information();
-        information.setUserId(sheet.getAuditorId());
-        information.setTime(new Date());
-        User owner = userMapper.selectById(sheet.getOwnerId());
-        information.setMsg("请假待审核, 请假人:" + (owner.getCorpwxUserid() != null?("$userName="+owner.getCorpwxUserid()+"$"):owner.getName()));
-        information.setType(4);
-        information.setContent(sheet.getId()+"");
-        information.setPath("/leave-sheet");
-        informationMapper.insert(information);
-    }
-
-    //发送待审核提醒
-    private void sendAuditNotifyMsg(WxCorpInfo wxCorpInfo, User applier, LeaveSheet sheet) {
-        //推送到企业微信
-        JSONObject json=new JSONObject();
-        JSONArray dataJson=new JSONArray();
-        JSONObject jsonObj=new JSONObject();
-        jsonObj.put("key", "请假人");
-        jsonObj.put("value",("$userName="+applier.getCorpwxUserid()+"$"));
-        JSONObject jsonObj1=new JSONObject();
-        jsonObj1.put("key", "请假类型");
-        jsonObj1.put("value",LEAVE_TYPES[sheet.getLeaveType()]);
-        String applyTimeDesc = "";
-        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("M月d日");
-        if (sheet.getStartDate().isEqual(sheet.getEndDate())) {
-            applyTimeDesc = dateTimeFormatter.format(sheet.getStartDate()) + ", "+sheet.getTimeHours()+"小时";
-        } else {
-            applyTimeDesc = dateTimeFormatter.format(sheet.getStartDate()) +"至" + dateTimeFormatter.format(sheet.getEndDate()) + ", "+sheet.getTimeHours()+"小时";
-        }
-
-        JSONObject jsonObj2=new JSONObject();
-        jsonObj2.put("key", "请假时间");
-        jsonObj2.put("value",applyTimeDesc);
-        JSONObject jsonObj4=new JSONObject();
-        jsonObj4.put("key", "备注");
-        jsonObj4.put("value",sheet.getRemark()==null?"":sheet.getRemark());
-        dataJson.add(jsonObj);
-        dataJson.add(jsonObj1);
-        dataJson.add(jsonObj2);
-        dataJson.add(jsonObj4);
-        json.put("template_id","tty9TkCAAA4WvYmTnsAVoUmdYxHdSG9A");
-        json.put("url","https://open.weixin.qq.com/connect/oauth2/authorize?appid=wwdd1137a65ce0fc87&redirect_uri=http://crm.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=leave#wechat_redirect");
-        json.put("content_item",dataJson);
-        String auditorId = sheet.getAuditorId();
-        User auditor = userMapper.selectById(auditorId);
-        wxCorpInfoService.sendWXCorpTemplateMsg(wxCorpInfo,auditor.getCorpwxUserid(), json);
-    }
-
-    @Override
-    public HttpRespMsg delete(Integer id) {
-        leaveSheetMapper.deleteById(id);
-        return new HttpRespMsg();
-    }
-
-    @Override
-    public HttpRespMsg queryList(LeaveSheet sheet, Integer pageIndex, Integer pageSize) {
-        QueryWrapper<LeaveSheet> queryWrapper = new QueryWrapper<LeaveSheet>();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-
-        List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看全部请假单");
-        if (functionList.size() == 0) {
-            //部门负责人可以看这个部门的
-            List<Integer> mdids = departmentService.getAllManagedDeptIdList(user, null);
-//            List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("manager_id", user.getId()));
-            if (mdids.size() > 0) {
-                //负责的部门的人员
-                //先是自己的
-                List<String> userIds = new ArrayList<>();
-                userIds.add(user.getId());
-                List<User> userList = userMapper.selectList(new QueryWrapper<User>().select("id").in("department_id", mdids));
-                List<String> collect = userList.stream().map(User::getId).collect(Collectors.toList());
-                userIds.addAll(collect);
-                queryWrapper.in("owner_id", userIds);
-            } else {
-                //普通员工只能看自己的
-                sheet.setOwnerId(user.getId());
-            }
-        }
-        sheet.setCompanyId(user.getCompanyId());
-
-        HttpRespMsg httpRespMsg = new HttpRespMsg();
-        queryWrapper.eq("company_id", sheet.getCompanyId()).orderByDesc("id");
-
-        //增加状态
-        if (sheet.getStatus() != null) {
-            queryWrapper.eq("status", sheet.getStatus());
-        }
-        if (!StringUtils.isEmpty(sheet.getOwnerId())) {
-            queryWrapper.eq("owner_id", sheet.getOwnerId());
-        }
-        if (sheet.getLeaveType() != null) {
-            queryWrapper.eq("leave_type", sheet.getLeaveType());
-        }
-        if (sheet.getStartDate() != null && sheet.getEndDate() != null) {
-            queryWrapper.le("start_date", sheet.getEndDate()).ge("end_date", sheet.getStartDate());
-        }
-        IPage<LeaveSheet> listIPager = leaveSheetMapper.selectPage(new Page<>(pageIndex, pageSize),
-                queryWrapper);
-        List<LeaveSheet> records = listIPager.getRecords();
-        List<String> userIds = records.stream().map(LeaveSheet::getOwnerId).collect(Collectors.toList());
-        if (userIds.size() > 0) {
-            List<User> userList = userMapper.getUserWithDept(new QueryWrapper<User>().in("id", userIds));
-            records.stream().forEach(r->{
-                Optional<User> find = userList.stream().filter(u->u.getId().equals(r.getOwnerId())).findFirst();
-                if (find.isPresent()) {
-                    r.setDept(find.get().getDepartmentName());
-                }
-            });
-        }
-
-        Long total = listIPager.getTotal();
-
-        Map<String, Object> map = new HashMap<>();
-        map.put("records", records);
-        map.put("total", total);
-        httpRespMsg.data = map;
-        return httpRespMsg;
-    }
-
-    @Override
-    public HttpRespMsg approve(Integer id) {
-        String token = request.getHeader("TOKEN");
-        //检查操作人权限
-        User user = userMapper.selectById(token);
-        HttpRespMsg httpRespMsg = new HttpRespMsg();
-        LeaveSheet originSheet = leaveSheetMapper.selectById(id);
-        if (user.getId().equals(originSheet.getAuditorId())) {
-            //是当前的审核人，获取下个审核节点
-            AuditWorkflowSetting auditWorkflowSetting = auditWorkflowSettingMapper.selectById(originSheet.getCurAuditSettingId());
-            LeaveSheet sheet = new LeaveSheet();
-            sheet.setId(id);
-            if (auditWorkflowSetting == null) {
-                //当前审核节点已不存在，直接审核通过
-                sheet.setStatus(0);
-            } else {
-                Integer seq = auditWorkflowSetting.getSeq();
-                AuditWorkflowSetting nextAuditNode = auditWorkflowSettingMapper.selectOne(new QueryWrapper<AuditWorkflowSetting>().eq("type", 1).eq("seq", (seq + 1)).eq("dept_id", auditWorkflowSetting.getDeptId()));
-                if (nextAuditNode == null) {
-                    sheet.setStatus(0);
-                } else {
-                    //进入下个审核节点
-                    if (nextAuditNode.getAuditorType() == 1) {
-                        //部门负责人审核
-                        Department department = departmentMapper.selectById(nextAuditNode.getAuditDeptId());
-                        if (department == null) {
-                            //部门已被删除，直接审核通过
-                            sheet.setStatus(0);
-                        } else {
-                            if (department.getManagerId() == null) {
-                                httpRespMsg.setError("尚未设置下个节点的部门负责人，请联系管理员");
-                                return httpRespMsg;
-                            } else {
-                                sheet.setCurAuditSettingId(nextAuditNode.getId());
-                                sheet.setAuditorId(department.getManagerId());
-                                sheet.setAuditorName(userMapper.selectById(department.getManagerId()).getName());
-                                sheet.setAuditorType(nextAuditNode.getAuditorType());
-                            }
-                        }
-                    } else if (nextAuditNode.getAuditorType() == 2){
-                        //指定人员审核
-                        sheet.setCurAuditSettingId(nextAuditNode.getId());
-                        sheet.setAuditorId(nextAuditNode.getUserId());
-                        sheet.setAuditorName(nextAuditNode.getUserName());
-                        sheet.setAuditorType(nextAuditNode.getAuditorType());
-                    }
-                }
-            }
-            leaveSheetMapper.updateById(sheet);
-            //保存审核记录
-            saveAgreeLog(id, auditWorkflowSetting, user);
-            //最终审核通过，发送通过消息
-            sheet = leaveSheetMapper.selectById(id);
-            WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
-            if (wxCorpInfo != null) {
-                if (sheet.getStatus() == 0) {
-                    //最终通过
-                    sendAuditResult(wxCorpInfo, user, sheet, null);
-                } else {
-                    //通知下个节点的审核人去审核
-                    sendAuditNotifyMsg(wxCorpInfo, user, sheet);
-                }
-            }
-            if (sheet.getStatus() == 0) {
-                //最终通过
-                saveNotifyToApplier(sheet);
-            } else {
-                //通知下个节点的审核人去审核
-                saveNotifyToAuditor(sheet);
-            }
-        }
-        return httpRespMsg;
-    }
-
-    private void saveAgreeLog(int sheetId, AuditWorkflowSetting curAuditNode, User operator) {
-        LeaveAuditLog log = new LeaveAuditLog();
-        log.setSheetId(sheetId);
-        if (curAuditNode != null) {
-            log.setAuditNodeId(curAuditNode.getId());
-        }
-        log.setAuditorId(operator.getId());
-        log.setAuditorName(operator.getName());
-        log.setIsPass(1);
-        leaveAuditLogMapper.insert(log);
-    }
-    private void saveDenyLog(int sheetId, AuditWorkflowSetting curAuditNode, User operator, String reason) {
-        LeaveAuditLog log = new LeaveAuditLog();
-        log.setSheetId(sheetId);
-        if (curAuditNode != null) {
-            log.setAuditNodeId(curAuditNode.getId());
-        }
-        log.setAuditorId(operator.getId());
-        log.setAuditorName(operator.getName());
-        log.setIsPass(0);
-        log.setDenyReason(reason);
-        leaveAuditLogMapper.insert(log);
-    }
-
-
-    @Override
-    public HttpRespMsg deny(Integer id, String reason) {
-        String token = request.getHeader("TOKEN");
-        //检查操作人权限
-        User user = userMapper.selectById(token);
-        HttpRespMsg httpRespMsg = new HttpRespMsg();
-        LeaveSheet originSheet = leaveSheetMapper.selectById(id);
-        if (user.getId().equals(originSheet.getAuditorId())) {
-            //是当前的审核人，获取当前审核节点
-            AuditWorkflowSetting auditWorkflowSetting = auditWorkflowSettingMapper.selectById(originSheet.getCurAuditSettingId());
-            LeaveSheet sheet = new LeaveSheet();
-            sheet.setId(id);
-            sheet.setStatus(2);
-            leaveSheetMapper.updateById(sheet);
-            saveDenyLog(id, auditWorkflowSetting, user, reason);
-            sheet = leaveSheetMapper.selectById(id);
-            WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
-            if (wxCorpInfo != null) {
-                sendAuditResult(wxCorpInfo, user, sheet, reason);
-            }
-            saveNotifyToApplier(sheet);
-        }
-
-        return httpRespMsg;
-    }
-
-    @Override
-    public HttpRespMsg summaryData(String keyword, String startDate, String endDate, String userId) {
-        Integer companyId = userMapper.selectById(userId).getCompanyId();
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = leaveSheetMapper.summaryData(keyword, startDate, endDate, companyId);
-        return msg;
-    }
-
-    @Override
-    public HttpRespMsg getOTAvaiDays(String userId) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String startDate = null;
-        User user = userMapper.selectById(userId);
-
-        if (user.getCompanyId() == 7) {
-            //火石闪信，从2023年8月1日开始计算加班工时
-            startDate = "2023-08-01";
-            //获取startDate之前的，2023年的全部非工作日加班
-            String firstDay = "2023-01-01";
-            String endDate = startDate;
-            List<String> allHolidays = WorkDayCalculateUtils.getAllHolidays(firstDay, endDate);
-            double beforeHours = 0;
-            if (allHolidays.size() > 0) {
-                List<Report> reportList = reportMapper.selectList(new QueryWrapper<Report>().select("IFNULL(sum(overtime_hours),0) as working_time").in("create_date", allHolidays).eq("creator_id", userId));
-                double sum = reportList.stream().mapToDouble(Report::getWorkingTime).sum();
-                beforeHours = sum;
-            }
-
-            //只统计2023年1月1日之后的调休假
-            List<LeaveSheet> list = leaveSheetMapper.selectList(new QueryWrapper<LeaveSheet>()
-                    .eq("owner_id", userId).eq("leave_type", exLeaveDay).ne("status", 2).ne("status", 3).ge("start_date", firstDay));
-            double alreadyHours = list.stream().mapToDouble(LeaveSheet::getTimeHours).sum();
-            double overtime = reportMapper.getMyOvertime(userId, startDate);
-            double leftHours = beforeHours + overtime - alreadyHours;
-            if (leftHours < 0) {
-                leftHours = 0;
-            }
-            float allDayHours = timeTypeMapper.selectById(userMapper.selectById(userId).getCompanyId()).getAllday();
-            double d = leftHours/allDayHours;
-            msg.data = d;
-        } else {
-            //非驳回和撤回状态的都要统计进去
-            List<LeaveSheet> list = leaveSheetMapper.selectList(new QueryWrapper<LeaveSheet>().eq("owner_id", userId).eq("leave_type", exLeaveDay).ne("status", 2).ne("status", 3));
-            double alreadyHours = list.stream().mapToDouble(LeaveSheet::getTimeHours).sum();
-            double overtime = reportMapper.getMyOvertime(userId, startDate);
-            double leftHours = overtime - alreadyHours;
-            if (leftHours < 0) {
-                leftHours = 0;
-            }
-            float allDayHours = timeTypeMapper.selectById(userMapper.selectById(userId).getCompanyId()).getAllday();
-            double d = leftHours/allDayHours;
-            msg.data = d;
-        }
-
-        return msg;
-    }
-
-
-    @Override
-    public HttpRespMsg exportLeaveData(String userId,Integer status,Integer leaveType,String startTime,String endTime) {
-        HttpRespMsg httpRespMsg = new HttpRespMsg();
-        Integer companyId = userMapper.selectById(userId).getCompanyId();
-        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", companyId));
-        List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId).select("id","name","corpwx_userid"));
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        QueryWrapper<LeaveSheet> queryWrapper = new QueryWrapper<>();
-        LeaveSheet sheet = new LeaveSheet();
-        List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看全部请假单");
-        if (functionList.size() == 0) {
-            //部门负责人可以看这个部门的
-            List<Integer> mdids = departmentService.getAllManagedDeptIdList(user, null);
-//            List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("manager_id", user.getId()));
-            if (mdids.size() > 0) {
-                //负责的部门的人员
-                //先是自己的
-                List<String> userIds = new ArrayList<>();
-                userIds.add(user.getId());
-                List<User> deptUserList = userMapper.selectList(new QueryWrapper<User>().select("id").in("department_id", mdids));
-                List<String> collect = deptUserList.stream().map(User::getId).collect(Collectors.toList());
-                userIds.addAll(collect);
-                queryWrapper.in("owner_id", userIds);
-            } else {
-                //普通员工只能看自己的
-                sheet.setOwnerId(user.getId());
-            }
-        }
-        sheet.setCompanyId(user.getCompanyId());
-
-        queryWrapper.eq("company_id", sheet.getCompanyId()).orderByDesc("id");
-        //增加状态
-        if (sheet.getStatus() != null) {
-            queryWrapper.eq("status", sheet.getStatus());
-        }
-        if (!StringUtils.isEmpty(sheet.getOwnerId())) {
-            queryWrapper.eq("owner_id", sheet.getOwnerId());
-        }
-        if (sheet.getLeaveType() != null) {
-            queryWrapper.eq("leave_type", leaveType);
-        }
-        if (sheet.getStartDate() != null && sheet.getEndDate() != null) {
-            queryWrapper.le("start_date", startTime).ge("end_date", endTime);
-        }
-
-        List<LeaveSheet> leaveSheets = leaveSheetMapper.selectList(queryWrapper);
-        if (leaveSheets.size()==0){
-            return httpRespMsg;
-        };
-        List<List<String>> allList = new ArrayList<>();
-        List<String> headList = new ArrayList<String>();
-//        headList.add("请假人");
-//        headList.add("电话");
-//        headList.add("请假类型");
-//        headList.add("请假开始时间");
-//        headList.add("请假结束时间");
-//        headList.add("请假天数");
-//        headList.add("请假时长");
-//        headList.add("状态");
-//        headList.add("备注");
-        headList.add(MessageUtils.message("leave.perForLeave"));
-        headList.add(MessageUtils.message("leave.telephone"));
-        headList.add(MessageUtils.message("leave.leaveType"));
-        headList.add(MessageUtils.message("leave.LStartTime"));
-        headList.add(MessageUtils.message("leave.LEndTime"));
-        headList.add(MessageUtils.message("leave.LDays"));
-        headList.add(MessageUtils.message("leave.duration"));
-        headList.add(MessageUtils.message("leave.state"));
-        headList.add(MessageUtils.message("leave.remark"));
-        allList.add(headList);
-        for (LeaveSheet leaveSheet : leaveSheets) {
-            List<String> item = new ArrayList<>();
-            Boolean present = userList.stream().filter(ul -> ul.getId().equals(leaveSheet.getOwnerId())).findFirst().isPresent();
-            if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                if (present){
-                    User us = userList.stream().filter(ul -> ul.getId().equals(leaveSheet.getOwnerId())).findFirst().get();
-                    item.add("$userName="+(us.getCorpwxUserid()==null?"":us.getCorpwxUserid())+"$");
-                }else {
-                    item.add("");
-                }
-            }else {
-                item.add(leaveSheet.getOwnerName()==null?"":leaveSheet.getOwnerName());
-            }
-            item.add(leaveSheet.getTel()==null?"":leaveSheet.getTel());
-            String lts = "";
-            switch (leaveSheet.getLeaveType()){
-                case 0:
-                    lts = MessageUtils.message("leave.thing");
-                    break;
-                case 1:
-                    lts = MessageUtils.message("leave.illness");
-                    break;
-                case 2:
-                    lts = MessageUtils.message("leave.year");
-                    break;
-                case 3:
-                    lts = MessageUtils.message("leave.maternity");
-                    break;
-                case 4:
-                    lts = MessageUtils.message("leave.marry");
-                    break;
-                case 5:
-                    lts = MessageUtils.message("leave.die");
-                    break;
-                case 6:
-                    lts = MessageUtils.message("leave.compensatory");
-                    break;
-                case 7:
-                    lts = MessageUtils.message("leave.paternity");
-                    break;
-                case 8:
-                    lts = MessageUtils.message("leave.other");
-                    break;
-            }
-            item.add(lts);
-            DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            String sds = leaveSheet.getStartDate().format(df);
-            String eds = leaveSheet.getEndDate().format(df);
-            item.add(sds);
-            item.add(eds);
-            item.add(leaveSheet.getTimeDays()==null?"":leaveSheet.getTimeDays().toString());
-            item.add(leaveSheet.getTimeHours()==null?"":leaveSheet.getTimeHours().toString());
-            Optional<User> first = userList.stream().filter(u -> u.getId().equals(leaveSheet.getAuditorId())).findFirst();
-            String auditorName = first.isPresent()?first.get().getName():"";
-            //转译处理
-            if (wxCorpInfo != null && wxCorpInfo.getSaasSyncContact() == 1) {
-                auditorName = "$userName="+auditorName+"$";
-            }
-            String statusS = "";
-            switch (leaveSheet.getStatus()){
-                case 0:
-                    //statusS = "审核通过";
-                    statusS = MessageUtils.message("stages.approved");
-                    break;
-                case 1:
-                    //statusS = "待审核";
-                    statusS = MessageUtils.message("stages.reviewed")
-                            + "-" + auditorName;
-                    break;
-                case 2:
-                    //statusS = "驳回";
-                    statusS = MessageUtils.message("stages.reject");
-                    break;
-                case 3:
-                    //statusS = "已撤销";
-                    statusS = MessageUtils.message("stages.withdrawn");
-                    break;
-            }
-            item.add(statusS);
-            item.add(leaveSheet.getRemark());
-            allList.add(item);
-        }
-        //String fileName = "请假信息_"+System.currentTimeMillis();
-        String fileName = MessageUtils.message("fileName.leaveInfo")+System.currentTimeMillis();
-        try {
-            return excelExportService.exportGeneralExcelByTitleAndList(wxCorpInfo,fileName , allList, path);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return httpRespMsg;
-    }
-
-    @Override
-    public HttpRespMsg cancel(Integer id, String userId) {
-        HttpRespMsg msg = new HttpRespMsg();
-        LeaveSheet oldSheet = leaveSheetMapper.selectById(id);
-        if (oldSheet.getStatus() == 0) {
-            msg.setError("当前请假申请已通过，无法撤销");
-        } else if (oldSheet.getStatus() == 2) {
-            msg.setError("当前请假申请已驳回，无法撤销");
-        } else {
-            LeaveSheet sheet = new LeaveSheet();
-            sheet.setId(id);
-            sheet.setStatus(3);//撤销状态
-            leaveSheetMapper.updateById(sheet);
-            //删除相关的审批记录
-            leaveAuditLogMapper.delete(new QueryWrapper<LeaveAuditLog>().eq("sheet_id", id));
-        }
-        return msg;
-    }
-
-    @Override
-    public HttpRespMsg auditList(LeaveSheet sheet, Integer pageIndex, Integer pageSize) {
-        QueryWrapper<LeaveSheet> queryWrapper = new QueryWrapper<LeaveSheet>();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-
-        sheet.setCompanyId(user.getCompanyId());
-
-        HttpRespMsg httpRespMsg = new HttpRespMsg();
-        queryWrapper.eq("company_id", sheet.getCompanyId()).orderByDesc("id");
-        queryWrapper.eq("status", 1);
-        queryWrapper.eq("auditor_id", user.getId());
-
-        if (!StringUtils.isEmpty(sheet.getOwnerId())) {
-            queryWrapper.eq("owner_id", sheet.getOwnerId());
-        }
-        if (sheet.getLeaveType() != null) {
-            queryWrapper.eq("leave_type", sheet.getLeaveType());
-        }
-        if (sheet.getStartDate() != null && sheet.getEndDate() != null) {
-            queryWrapper.le("start_date", sheet.getEndDate()).ge("end_date", sheet.getStartDate());
-        }
-        IPage<LeaveSheet> listIPager = leaveSheetMapper.selectPage(new Page<>(pageIndex, pageSize),
-                queryWrapper);
-        List<LeaveSheet> records = listIPager.getRecords();
-        List<String> userIds = records.stream().map(LeaveSheet::getOwnerId).collect(Collectors.toList());
-        if (userIds.size() > 0) {
-            List<User> userList = userMapper.getUserWithDept(new QueryWrapper<User>().in("id", userIds));
-            records.stream().forEach(r->{
-                Optional<User> find = userList.stream().filter(u->u.getId().equals(r.getOwnerId())).findFirst();
-                if (find.isPresent()) {
-                    r.setDept(find.get().getDepartmentName());
-                }
-            });
-        }
-
-        Long total = listIPager.getTotal();
-
-        Map<String, Object> map = new HashMap<>();
-        map.put("records", records);
-        map.put("total", total);
-        httpRespMsg.data = map;
-        return httpRespMsg;
-    }
-
-    /**
-     * 返回某段时间内请假时间总和
-     * @param companyId
-     * @param startDate
-     * @param endDate
-     * @param standardHours 该月总工时
-     * @param allDay 该公司每天工时
-     * @param leaveSheets
-     * @return
-     */
-    @Override
-    public float leaveTimeSum(Integer companyId, String startDate, String endDate, float standardHours, float allDay, List<LeaveSheet> leaveSheets) {
-        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        LocalDate localStartDate = LocalDate.parse(startDate, dateTimeFormatter);
-        LocalDate localEndDate = LocalDate.parse(endDate, dateTimeFormatter);
-        float leaveTime = 0;
-        for (LeaveSheet leaveSheet : leaveSheets) {
-            //请假期间的工作日
-            int leaveDays = WorkDayCalculateUtils.getWorkDaysListInRange(leaveSheet.getStartDate().toString(), leaveSheet.getEndDate().toString(), 0).size();
-            //当请假时间在筛选时间段内
-            if ((leaveSheet.getStartDate().isEqual(localStartDate) || leaveSheet.getStartDate().isAfter(localStartDate)) && (leaveSheet.getEndDate().isEqual(localEndDate) || leaveSheet.getEndDate().isBefore(localEndDate))){
-                //请假期间的非工作日
-                int nonWorkDays = WorkDayCalculateUtils.getNonWorkDaysListInRange(leaveSheet.getStartDate().toString(), leaveSheet.getEndDate().toString()).size();
-                if (leaveSheet.getStartDate().isEqual(leaveSheet.getEndDate()) || nonWorkDays == 0){
-                    leaveTime+=leaveSheet.getTimeHours();
-                }else {
-                    leaveTime+= leaveDays * allDay;
-                }
-            }else{
-                //请假时间首尾超出
-                if(leaveSheet.getStartDate().isBefore(localStartDate) && leaveSheet.getEndDate().isAfter(localEndDate)){
-                    leaveTime+= standardHours;
-                }else {
-                    //当请假时间开始时间超出
-                    if (leaveSheet.getStartDate().isBefore(localStartDate)){
-                        //超出的天数
-                        int startDay = WorkDayCalculateUtils.getWorkDaysListInRange(leaveSheet.getStartDate().toString(), localStartDate.minusDays(1).toString(), 0).size();
-                        float DifDay = leaveDays - startDay;
-                        leaveTime+= allDay*DifDay;
-                    }else {
-                        //当请假时间结束时间超出
-                        //超出的天数
-                        int endDay = WorkDayCalculateUtils.getWorkDaysListInRange(localEndDate.plusDays(1).toString(),leaveSheet.getEndDate().toString(),  0).size();
-                        float DifDay = leaveDays - endDay;
-                        leaveTime+= allDay*DifDay;
-                    }
-                }
-            }
-        }
-        leaveTime = new BigDecimal(leaveTime).setScale(1,BigDecimal.ROUND_HALF_UP).floatValue();
-        return leaveTime;
-    }
-
-    /**
-     * 计算两个日期之间的工作日
-     * @param startDate
-     * @param endDate
-     * @return
-     */
-    @Override
-    public HttpRespMsg leaveDays(String startDate, String endDate) {
-        HttpRespMsg httpRespMsg = new HttpRespMsg();
-        Integer leaveDays = 0;
-        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        LocalDate localStartDate = LocalDate.parse(startDate, dateTimeFormatter);
-        LocalDate localEndDate = LocalDate.parse(endDate, dateTimeFormatter);
-        if (localStartDate.isBefore(localEndDate) || localStartDate.isEqual(localEndDate)){
-            leaveDays = WorkDayCalculateUtils.getWorkDaysListInRange(startDate, endDate, 0).size();
-        }
-        httpRespMsg.data = leaveDays;
-        return httpRespMsg;
-    }
-}

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

@@ -11,7 +11,6 @@ import com.management.platform.mapper.ProjectMainMapper;
 import com.management.platform.mapper.ProjectMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.ProjectMainService;
-import com.management.platform.service.ProjectService;
 import com.management.platform.util.HttpRespMsg;
 import com.management.platform.util.MessageUtils;
 import org.springframework.stereotype.Service;
@@ -39,8 +38,6 @@ public class ProjectMainServiceImpl extends ServiceImpl<ProjectMainMapper, Proje
     private ProjectCategoryMapper projectCategoryMapper;
     @Resource
     private ProjectMapper projectMapper;
-    @Resource
-    private ProjectService projectService;
     @Override
     public HttpRespMsg addOrMod(HttpServletRequest request,ProjectMain projectMain) {
         HttpRespMsg httpRespMsg=new HttpRespMsg();
@@ -76,9 +73,6 @@ public class ProjectMainServiceImpl extends ServiceImpl<ProjectMainMapper, Proje
                 updateP.setCategory(projectMain.getCategoryId());
                 updateP.setCategoryName(projectMain.getCategoryName());
             }
-            if (nameChanged || categoryChanged) {
-                projectService.update(updateP, new QueryWrapper<Project>().eq("project_main_id", projectMain.getId()));
-            }
         }else {
             Integer count2 = projectMainMapper.selectCount(new QueryWrapper<ProjectMain>().eq("company_id", projectMain.getCompanyId())
                     .eq("code", projectMain.getCode()));

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

@@ -13,15 +13,12 @@ import com.management.platform.service.WxCorpInfoService;
 import com.management.platform.util.ExcelUtil;
 import com.management.platform.util.HttpRespMsg;
 import com.management.platform.util.MessageUtils;
-import com.taobao.api.internal.util.StringUtils;
 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.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
@@ -52,8 +49,6 @@ public class ProjectPercentageServiceImpl extends ServiceImpl<ProjectPercentageM
     @Resource
     private ProjectMapper projectMapper;
     @Resource
-    private ReportMapper reportMapper;
-    @Resource
     private WxCorpInfoService wxCorpInfoService;
     @Resource
     private WxCorpInfoMapper wxCorpInfoMapper;

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

@@ -1,169 +0,0 @@
-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.management.platform.entity.*;
-import com.management.platform.mapper.*;
-import com.management.platform.service.PpMembsService;
-import com.management.platform.service.ProjectProfessionService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.MessageUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author Seyason
- * @since 2021-08-28
- */
-@Service
-@Transactional
-public class ProjectProfessionServiceImpl extends ServiceImpl<ProjectProfessionMapper, ProjectProfession> implements ProjectProfessionService {
-    @Resource
-    ProjectProfessionMapper projectProfessionMapper;
-    @Resource
-    UserMapper userMapper;
-    @Resource
-    PpMembsService ppMembsService;
-    @Resource
-    HttpServletRequest request;
-    @Resource
-    PpMembsMapper ppMembsMapper;
-    @Resource
-    ProfessionMapper professionMapper;
-    @Resource
-    ReportProfessionProgressMapper reportProfessionProgressMapper;
-
-
-
-    @Override
-    public HttpRespMsg modify(Integer projectId, String json) {
-        List<ProjectProfession> professionList = new ArrayList<>();
-        JSONArray array = JSONArray.parseArray(json);
-        for (int i=0;i<array.size(); i++) {
-            JSONObject jsonObject = array.getJSONObject(i);
-            ProjectProfession projectProfession = JSONObject.toJavaObject(jsonObject, ProjectProfession.class);
-            projectProfession.setProjectId(projectId);
-            professionList.add(projectProfession);
-        }
-        //比较差异
-        List<ProjectProfession> oldPPList = projectProfessionMapper.selectList(new QueryWrapper<ProjectProfession>().eq("project_id", projectId));
-        List<Integer> removedProfessionIds = oldPPList.stream().filter(old -> !professionList.stream().anyMatch(p -> p.getProfessionId().equals(old.getProfessionId()))).map(ProjectProfession::getProfessionId).collect(Collectors.toList());
-        //检查日报
-        if (removedProfessionIds.size() > 0) {
-            long cnt = reportProfessionProgressMapper.selectCount(new QueryWrapper<ReportProfessionProgress>().eq("project_id", projectId).in("profession_id", removedProfessionIds).eq("audit_state", 0));
-            if (cnt > 0) {
-                HttpRespMsg msg = new HttpRespMsg();
-                //msg.setError("尚存在日报在该专业上待审核，审核通过后才能移除");
-                msg.setError(MessageUtils.message("profession.toReviewed"));
-                return msg;
-            }
-        }
-
-//        //之前的数据都删掉
-        projectProfessionMapper.delete(new QueryWrapper<ProjectProfession>().eq("project_id", projectId));
-//        //插入新的数据
-        if (professionList.size() > 0) {
-            saveBatch(professionList);
-        }
-        ppMembsService.remove(new QueryWrapper<PpMembs>().eq("project_id", projectId));
-        //生成专业人员表数据
-        List<PpMembs> ppList = new ArrayList<>();
-        professionList.forEach(p->{
-            List<PpMembs> membList = p.getMembList();
-            for (int i=0;i<membList.size(); i++) {
-                PpMembs item = membList.get(i);
-                item.setPpId(p.getId());
-                item.setProjectId(projectId);
-                item.setProfessionId(p.getProfessionId());
-                ppList.add(item);
-            }
-        });
-        if (ppList.size() > 0) {
-            ppMembsService.saveBatch(ppList);
-        }
-        return get(projectId);
-    }
-
-    @Override
-    public HttpRespMsg get(Integer projectId) {
-        List<ProjectProfession> list = projectProfessionMapper.selectList(new QueryWrapper<ProjectProfession>().eq("project_id", projectId));
-        List<PpMembs> membsList = ppMembsService.list(new QueryWrapper<PpMembs>().eq("project_id", projectId));
-        list.forEach(p->{
-            p.setMembList(membsList.stream().filter(m -> m.getPpId().equals(p.getId())).collect(Collectors.toList()));
-            List<PpMembs> membList = p.getMembList();
-            //计算专业的进度
-            int totalProgress = 0;
-            for (int i = 0; i < membList.size(); i++) {
-                PpMembs m = membList.get(i);
-                totalProgress += m.getPercentage()*m.getProgress();
-            }
-            totalProgress = totalProgress/10000;
-            p.setProgress(totalProgress);
-        });
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = list;
-        return msg;
-    }
-
-    @Override
-    public HttpRespMsg getMyProfession(Integer projectId) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        List<PpMembs> membsList = ppMembsMapper.selectList(new QueryWrapper<PpMembs>().eq("project_id", projectId).eq("memb_id", token));
-        if (membsList.size() > 0) {
-            List<Integer> collect = membsList.stream().map(PpMembs::getProfessionId).collect(Collectors.toList());
-            List<Profession> professionList = professionMapper.selectList(new QueryWrapper<Profession>().in("id", collect));
-            membsList.stream().forEach(m->{
-                m.setProfessionName(professionList.stream().filter((p->p.getId().equals(m.getProfessionId()))).findFirst().get().getName());
-            });
-        }
-        msg.data = membsList;
-        return msg;
-    }
-
-    @Override
-    public HttpRespMsg getProgressData(Integer projectId) {
-        List<ProjectProfession> list = projectProfessionMapper.selectList(new QueryWrapper<ProjectProfession>().eq("project_id", projectId));
-        List<PpMembs> membsList = ppMembsService.list(new QueryWrapper<PpMembs>().eq("project_id", projectId));
-        int totalProjectProgress = 0;
-        for (ProjectProfession p: list) {
-            p.setMembList(membsList.stream().filter(m -> m.getPpId().equals(p.getId())).collect(Collectors.toList()));
-            List<PpMembs> membList = p.getMembList();
-            //计算专业的进度
-            int totalProgress = 0;
-            for (int i = 0; i < membList.size(); i++) {
-                PpMembs m = membList.get(i);
-                m.setProfessionName(m.getMembName());//前端会取professionName作为显示的列名称，此处进行设置
-                totalProgress += m.getPercentage()*m.getProgress();
-            }
-            totalProgress = totalProgress/100;
-            p.setProgress(totalProgress);
-            //计算总项目的进度
-            totalProjectProgress += totalProgress*p.getPercentage();
-        }
-        totalProjectProgress = totalProjectProgress/100;
-
-        HttpRespMsg msg = new HttpRespMsg();
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("totalProjectProgress", totalProjectProgress);
-        map.put("professionList", list);
-        msg.data = map;
-        return msg;
-
-    }
-
-}

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

@@ -1,162 +0,0 @@
-package com.management.platform.service.impl;
-
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.*;
-import com.management.platform.entity.vo.SysRichFunction;
-import com.management.platform.mapper.*;
-import com.management.platform.service.ReportBatchService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.ListUtil;
-import com.management.platform.util.MessageUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author Seyason
- * @since 2023-08-10
- */
-@Service
-public class ReportBatchServiceImpl extends ServiceImpl<ReportBatchMapper, ReportBatch> implements ReportBatchService {
-
-    @Resource
-    private UserFvTimeMapper userFvTimeMapper;
-    @Resource
-    private ReportBatchMapper reportBatchMapper;
-    @Resource
-    private UserMapper userMapper;
-    @Resource
-    private SysFunctionMapper sysFunctionMapper;
-    @Resource
-    private ReportMapper reportMapper;
-
-    @Override
-    public HttpRespMsg getAuditList(Integer state, Integer departmentId, Integer projectId, String date, String startDate, String endDate, String userId, HttpServletRequest request) {
-        HttpRespMsg httpRespMsg = new HttpRespMsg();
-        try {
-            User curUser = userMapper.selectById(request.getHeader("Token"));
-            Integer companyId = curUser.getCompanyId();
-            String leaderId = null;
-            List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(curUser.getRoleId(), "审核全员日报");
-            if (functionList.size() == 0) {//没有全员审核的权限
-                leaderId = curUser.getId();
-            }
-            List<String> targetUids = null;
-            if (!StringUtils.isEmpty(userId)) {
-                targetUids = ListUtil.convertLongIdsArrayToList(userId);
-            }
-            List<Map<String, Object>> auditReportList = reportMapper.getAuditReportList(date, companyId, departmentId, projectId, leaderId, 0, startDate, endDate, targetUids,null);
-            List<Integer> batchIds = new ArrayList<>();
-            for (Map<String, Object> map : auditReportList) {
-                Integer batchId = (Integer)map.get("batchId");
-                if (!batchIds.contains(batchId)) {
-                    batchIds.add(batchId);
-                }
-            }
-
-            DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            List<ReportBatch> reportBatches = new ArrayList<>();
-            if (batchIds.size() > 0) {
-                reportBatches = reportBatchMapper.selectList(new QueryWrapper<ReportBatch>().in("id", batchIds).orderByDesc("id"));
-                reportBatches.forEach(batch -> {
-                    batch.setReportTime(batch.getTotalWorkTime());
-                    List<Map> filterMapList = new ArrayList<>();
-                    //取第一天的所有项目日报
-                    String firstDate = null;
-                    StringBuilder reportIds = new StringBuilder();
-                    for (Map<String, Object> map : auditReportList) {
-                        Integer batchId = (Integer)map.get("batchId");
-                        String curDate = (String)map.get("date");
-                        if (batch.getId().equals(batchId)) {
-                            if (firstDate == null) {
-                                firstDate = curDate;
-                                filterMapList.add(map);
-                            } else if (curDate.equals(firstDate)){
-                                filterMapList.add(map);
-                            }
-                            reportIds.append((Integer)map.get("id")).append(",");
-                        }
-                    }
-                    batch.setData(filterMapList);
-                    reportIds.deleteCharAt(reportIds.length()-1);
-                    batch.setReportIds(reportIds.toString());
-                    batch.setDateStr(batch.getStartDate().format(dtf)+" 至 "+batch.getEndDate().format(dtf));
-                    if (filterMapList.size() > 0) {
-                        //取第一个的姓名和部门名称
-                        batch.setName((String)filterMapList.get(0).get("name"));
-                        batch.setDepartmentName((String)filterMapList.get(0).get("departmentName"));
-                    }
-                });
-            }
-
-//
-//            //抽取姓名，进行分组
-//            List<Map<String, Object>> nameList = new ArrayList<Map<String, Object>>();
-//            Map<String, Object> lastName = null;
-//            //某个用户某天下的各个项目日报列表
-//            List<Map<String, Object>> userDailyReportList = null;
-//            for (Map a : auditReportList) {
-//                String createDate = (String)a.get("date");
-//                String name = (String)a.get("name");
-//                String uid = (String)a.get("userId");
-//                String corpwxUserid = (String)a.get("corpwxUserid");
-//
-//                if (lastName == null || !(lastName.get("name").equals(name) && lastName.get("dateStr").equals(createDate))) {
-//                    lastName = new HashMap<String, Object>();
-//                    lastName.put("dateStr", createDate);
-//                    lastName.put("name", name);
-//                    lastName.put("userId", uid);
-//                    lastName.put("corpwxUserid", corpwxUserid);
-//                    nameList.add(lastName);
-//                    userDailyReportList = new ArrayList<>();
-//                    lastName.put("data", userDailyReportList);
-//                }
-//                //每组日报数据都加上去
-//                userDailyReportList.add(a);
-//            }
-//
-
-//            //设置每人每日考勤打卡时长
-//            QueryWrapper<UserFvTime> userFvTimeQueryWrapper = new QueryWrapper<>();
-//            if (nameList.size() > 0) {
-//                for (Map map : nameList) {
-//                    String itemUid = (String)map.get("userId");
-//                    String dateStr = (String)map.get("dateStr");
-//                    userFvTimeQueryWrapper.or(wrapper->wrapper.eq("user_id", itemUid).eq("work_date", dateStr));
-//                }
-//                List<UserFvTime> timeList = userFvTimeMapper.selectList(userFvTimeQueryWrapper);
-//                //过滤匹配当前的数据
-//                for (Map map : nameList) {
-//                    String itemUid = (String)map.get("userId");
-//                    String dateStr = (String)map.get("dateStr");
-//                    Optional<UserFvTime> first = timeList.stream().filter(time -> time.getUserId().equals(itemUid) && dtf.format(time.getWorkDate()).equals(dateStr)).findFirst();
-//                    if (first.isPresent()) {
-//                        double wh = first.get().getWorkHours();
-//                        //赋值打卡时长
-//                        map.put("cardHours", wh);
-//                    }
-//                }
-//            }
-            httpRespMsg.data = reportBatches;
-        } catch (NullPointerException e) {
-            //httpRespMsg.setError("验证失败");
-            e.printStackTrace();
-            httpRespMsg.setError(MessageUtils.message("access.verificationError"));
-            return httpRespMsg;
-        }
-        return httpRespMsg;
-    }
-}

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

@@ -1,184 +0,0 @@
-package com.management.platform.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.management.platform.entity.ReportExtraDegree;
-import com.management.platform.entity.TimeType;
-import com.management.platform.entity.User;
-import com.management.platform.entity.WxCorpInfo;
-import com.management.platform.mapper.ReportExtraDegreeMapper;
-import com.management.platform.mapper.TimeTypeMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.mapper.WxCorpInfoMapper;
-import com.management.platform.service.ExcelExportService;
-import com.management.platform.service.ReportExtraDegreeService;
-import com.management.platform.util.ExcelUtil;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.MessageUtils;
-import com.qq.weixin.mp.aes.WXBizMsgCrypt;
-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;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.io.*;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author Seyason
- * @since 2021-12-16
- */
-@Service
-public class ReportExtraDegreeServiceImpl extends ServiceImpl<ReportExtraDegreeMapper, ReportExtraDegree> implements ReportExtraDegreeService {
-    @Value(value = "${upload.path}")
-    String path;
-    @Resource
-    ReportExtraDegreeMapper reportExtraDegreeMapper;
-    @Resource
-    UserMapper userMapper;
-    @Resource
-    TimeTypeMapper timeTypeMapper;
-    @Resource
-    WxCorpInfoMapper wxCorpInfoMapper;
-    @Resource
-    ExcelExportService excelExportService;
-    @Override
-    public HttpRespMsg importData(HttpServletRequest request, MultipartFile multipartFile) {
-        HttpRespMsg msg=new HttpRespMsg();
-        String fileName=multipartFile.getOriginalFilename();
-        File file=new File(fileName == null?"file":fileName);
-        InputStream inputStream=null;
-        OutputStream outputStream=null;
-        Integer companyId=userMapper.selectById(request.getHeader("token")).getCompanyId();
-        try {
-            inputStream= multipartFile.getInputStream();
-            outputStream=new FileOutputStream(file);
-            byte[] buffer = new byte[4096];
-            int temp = 0;
-            while ((temp = inputStream.read(buffer, 0, 4096)) != -1) {
-                outputStream.write(buffer, 0, temp);
-            }
-            inputStream.close();
-            outputStream.close();
-
-            //然后解析表格
-            Workbook workbook = WorkbookFactory.create(new FileInputStream(file));
-            DateFormat df = new SimpleDateFormat("yyyy-MM");
-            //获取公司所有客户
-            List<ReportExtraDegree> allReportExtraDegree = reportExtraDegreeMapper.selectList(new QueryWrapper<ReportExtraDegree>().eq("company_id", companyId));
-            Sheet sheet = workbook.getSheetAt(0);
-            //由于第一行需要指明列对应的标题
-            int rowNum = sheet.getLastRowNum();
-            if (rowNum == 0) {
-                //msg.setError("请填写研究中心数据");
-                msg.setError(MessageUtils.message("research.addData"));
-                return msg;
-            }
-            List<String> nameList=new ArrayList<>();
-            int dataCount = 0;
-            for (int rowIndex = 1; rowIndex <= rowNum; rowIndex++) {
-                Row row = sheet.getRow(rowIndex);
-                dataCount++;
-                if (row == null) {
-                    continue;
-                }
-                if (ExcelUtil.isRowEmpty(row)) {
-                    continue;
-                }
-                if (row.getCell(0) == null) {
-                    //msg.setError("第"+dataCount+"行缺少中心名称");
-                    msg.setError(MessageUtils.message("research.nameNull",dataCount));
-                    return msg;
-                }
-                if(nameList.contains(row.getCell(0).toString())){
-                    //msg.setError("当前导入数据存在重复中心名称["+row.getCell(0).toString()+"]");
-                    msg.setError(MessageUtils.message("research.nameRepeat",row.getCell(0).toString()));
-                    return msg;
-                }
-                nameList.add(row.getCell(0).toString());
-                ReportExtraDegree reportExtraDegree=new ReportExtraDegree();
-                List<ReportExtraDegree> collect = allReportExtraDegree.stream().filter(ap -> ap.getName().equals(row.getCell(0).toString())).collect(Collectors.toList());
-                reportExtraDegree.setName(row.getCell(0).toString());
-                reportExtraDegree.setCompanyId(companyId);
-                if(collect.size()>0){
-                    Integer id=collect.get(0).getId();
-                    reportExtraDegree.setId(id);
-                    reportExtraDegreeMapper.updateById(reportExtraDegree);
-                }else{
-                    reportExtraDegreeMapper.insert(reportExtraDegree);
-                }
-            }
-            msg.data=dataCount;
-            return msg;
-        } catch (IOException e){
-            e.printStackTrace();
-            //msg.setError("文件处理出错");
-            msg.setError(MessageUtils.message("file.error"));
-            return msg;
-        } catch (InvalidFormatException e) {
-            e.printStackTrace();
-            //msg.setError("文件格式错误，如果安装了加密软件需要先解密再上传");
-            msg.setError(MessageUtils.message("file.FormatErrorAndDecrypt"));
-            return msg;
-        }catch (EncryptedDocumentException e) {
-            e.printStackTrace();
-            //msg.setError("文件加密状态，需要先解除加密状态再上传");
-            msg.setError(MessageUtils.message("file.encryption"));
-            return msg;
-        }finally {
-            //关闭流
-            try {
-                if (outputStream != null && inputStream != null) {
-                    outputStream.close();
-                    inputStream.close();
-                    System.out.println("流已关闭");
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-//            file.deleteOnExit();//程序退出时删除临时文件
-            System.out.println(file.delete());
-        }
-    }
-
-    @Override
-    public HttpRespMsg exportData(HttpServletRequest request) {
-        HttpRespMsg httpRespMsg=new HttpRespMsg();
-        User user = userMapper.selectById(request.getHeader("token"));
-        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
-        List<ReportExtraDegree> reportExtraDegreeList = reportExtraDegreeMapper.selectList(new QueryWrapper<ReportExtraDegree>().eq("company_id", user.getCompanyId()));
-        TimeType timeType = timeTypeMapper.selectById(user.getCompanyId());
-        List<String> titleList=new ArrayList<>();
-        titleList.add(timeType.getCustomDegreeName()+MessageUtils.message("excel.name"));
-        List<List<String>> dataList=new ArrayList<>();
-        dataList.add(titleList);
-        for (ReportExtraDegree reportExtraDegree : reportExtraDegreeList) {
-            List<String> itemList=new ArrayList<>();
-            itemList.add(reportExtraDegree.getName());
-            dataList.add(itemList);
-        }
-        //生成excel文件导出
-        String fileName = timeType.getCustomDegreeName()+"_"+System.currentTimeMillis();
-        try {
-            return excelExportService.exportGeneralExcelByTitleAndList(wxCorpInfo,fileName , dataList, path);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return httpRespMsg;
-    }
-}

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

@@ -1,20 +0,0 @@
-package com.management.platform.service.impl;
-
-import com.management.platform.entity.ReportImportLog;
-import com.management.platform.mapper.ReportImportLogMapper;
-import com.management.platform.service.ReportImportLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author Seyason
- * @since 2022-03-20
- */
-@Service
-public class ReportImportLogServiceImpl extends ServiceImpl<ReportImportLogMapper, ReportImportLog> implements ReportImportLogService {
-
-}

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

@@ -1,20 +0,0 @@
-package com.management.platform.service.impl;
-
-import com.management.platform.entity.ReportLogDetail;
-import com.management.platform.mapper.ReportLogDetailMapper;
-import com.management.platform.service.ReportLogDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author Seyason
- * @since 2022-09-19
- */
-@Service
-public class ReportLogDetailServiceImpl extends ServiceImpl<ReportLogDetailMapper, ReportLogDetail> implements ReportLogDetailService {
-
-}

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

@@ -1,20 +0,0 @@
-package com.management.platform.service.impl;
-
-import com.management.platform.entity.ReportLog;
-import com.management.platform.mapper.ReportLogMapper;
-import com.management.platform.service.ReportLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author Seyason
- * @since 2022-06-24
- */
-@Service
-public class ReportLogServiceImpl extends ServiceImpl<ReportLogMapper, ReportLog> implements ReportLogService {
-
-}

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

@@ -1,20 +0,0 @@
-package com.management.platform.service.impl;
-
-import com.management.platform.entity.ReportProfessionProgress;
-import com.management.platform.mapper.ReportProfessionProgressMapper;
-import com.management.platform.service.ReportProfessionProgressService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author Seyason
- * @since 2021-08-29
- */
-@Service
-public class ReportProfessionProgressServiceImpl extends ServiceImpl<ReportProfessionProgressMapper, ReportProfessionProgress> implements ReportProfessionProgressService {
-
-}

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

@@ -1,20 +0,0 @@
-package com.management.platform.service.impl;
-
-import com.management.platform.entity.ReportPushLog;
-import com.management.platform.mapper.ReportPushLogMapper;
-import com.management.platform.service.ReportPushLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author Seyason
- * @since 2023-11-17
- */
-@Service
-public class ReportPushLogServiceImpl extends ServiceImpl<ReportPushLogMapper, ReportPushLog> implements ReportPushLogService {
-
-}

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

@@ -143,16 +143,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Resource
     private ParticipationMapper participationMapper;
     @Resource
-    private ReportService reportService;
-    @Resource
     private HttpServletRequest request;
     @Resource
     private UserMapper userMapper;
     @Resource
     private AuditWorkflowTimeSettingMapper auditWorkflowTimeSettingMapper;
     @Resource
-    private ReportMapper reportMapper;
-    @Resource
     private CompanyMapper companyMapper;
     @Resource
     private DepartmentMapper departmentMapper;
@@ -184,8 +180,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     private TaskGroupMapper taskGroupMapper;
     @Resource
     private WxCorpInfoMapper wxCorpInfoMapper;
-    @Resource
-    private CompanyDingdingService companyDingdingService;
+//    @Resource
+//    private CompanyDingdingService companyDingdingService;
     @Resource
     private WxCorpInfoService wxCorpInfoService;
     @Resource
@@ -205,8 +201,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Resource
     private ReportFormMapper reportFormMapper;
     @Resource
-    private ProjectService projectService;
-    @Resource
     private ProjectAuditorService projectAuditorService;
     @Resource
     private TaskService taskService;
@@ -531,27 +525,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 }
                 userSalaryService.saveBatch(salaryChangeList);
             }
-            //更新该月份的日报相关的成本
-            if (!StringUtils.isEmpty(yearMonth)) {
-                List<Report> reportList = reportMapper.selectSimpleTime(companyId, startStr, endStr);
-                if (reportList.size() > 0) {
-                    List<Report> updateReportList = new ArrayList<>();
-                    for (Report r : reportList) {
-                        Optional<User> first = updateUserList.stream().filter(u -> u.getId().equals(r.getCreatorId())).findFirst();
-                        if (first.isPresent()) {
-                            BigDecimal hourCost = first.get().getCost();
-                            r.setCost(hourCost.multiply(new BigDecimal(r.getWorkingTime())));
-                            r.setCreatorId(null);
-                            r.setWorkingTime(null);
-                            updateReportList.add(r);
-                        }
-                    }
-                    //批量更新日报的成本
-                    if (updateReportList.size() > 0) {
-                        reportService.updateBatchById(updateReportList);
-                    }
-                }
-            }
         }catch (IOException e){
             e.printStackTrace();
             //msg.setError("文件处理错误");
@@ -810,16 +783,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             //设置用户的证书列表
             List<UserCert> certList = userCertMapper.selectList(new QueryWrapper<UserCert>().eq("user_id", user.getId()));
             user.setCertList(certList);
-            //获取相关日报数量
-            Integer reportCount = reportMapper.selectCount(new QueryWrapper<Report>().eq("creator_id", user.getId()));
             //获取是否存在任务
             Integer taskExecutorCount = taskMapper.selectCount(new QueryWrapper<Task>().like("executor_id", user.getId()));
             //获取是否存在项目
             Integer projectInchargerList = projectMapper.selectCount(new QueryWrapper<Project>().eq("incharger_id", user.getId()));
-            if (reportCount>0 || taskExecutorCount>0 || projectInchargerList>0){
-                reportCount = 1;
-            }
-            user.setIsExistsReport(reportCount);
             httpRespMsg.data = user;
         }
         return httpRespMsg;
@@ -1073,32 +1040,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     //超级管理员账号不能删除
                     //httpRespMsg.setError("超级管理员不可删除");
                     httpRespMsg.setError(MessageUtils.message("role.deleteRootError"));
-                } else {
-                    //检测是否该人员已填日报，已填写日报的不能删除
-                    Integer userReportNum = reportMapper.selectCount(new QueryWrapper<Report>().eq("creator_id", target.getId()));
-                    if (userReportNum > 0) {
-                        //httpRespMsg.setError("该员工存在填写的日报，无法删除。");
-                        httpRespMsg.setError(MessageUtils.message("staff.deleteErrorByDaily"));
-                    } else {
-                        //检测是否有已参与的任务
-                        Integer taskNum = taskMapper.selectCount(new QueryWrapper<Task>().like("executor_id", userId));
-                        if (taskNum > 0) {
-                            //httpRespMsg.setError("该员工存在参与的任务，无法删除");
-                            httpRespMsg.setError(MessageUtils.message("staff.deleteErrorByTask"));
-                        } else {
-                            //检测是否担任项目负责人
-                            Integer projectNum = projectMapper.selectCount(new QueryWrapper<Project>().eq("incharger_id", userId));
-                            if (projectNum > 0) {
-                                //httpRespMsg.setError("该员工存在负责的项目，无法删除");
-                                httpRespMsg.setError(MessageUtils.message("staff.deleteErrorByProject"));
-                            } else {
-                                userMapper.deleteById(userId);
-                                userSalaryMapper.delete(new QueryWrapper<UserSalary>().eq("user_id", userId));
-                                //项目参与人可以直接删除
-                                participationMapper.delete(new QueryWrapper<Participation>().eq("user_id", userId));
-                            }
-                        }
-                    }
                 }
             }
         } catch (NullPointerException e) {
@@ -1641,22 +1582,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     UserSalary userSalary = UserSalary.copyFromUser(oldUser);
                     userSalaryMapper.insert(userSalary);
                 }
-                if (superiorChange) {
-                    //检查是否有审核中的日报
-                    if (timeTypeMapper.selectById(oldUser.getCompanyId()).getReportAuditType() == 5) {
-                        QueryWrapper<Report> queryWrapper = new QueryWrapper<>();
-                        queryWrapper.eq("company_id", oldUser.getCompanyId())
-                                .eq("creator_id", oldUser.getId())
-                                .eq("state", 0)
-                                .eq("project_auditor_id", oldSuperiorId);
-                        Integer count = reportMapper.selectCount(queryWrapper);
-                        if (count > 0) {
-                            //更新日报审核人为新的superiorId
-                            Report updateReport = new Report().setProjectAuditorId(superiorId).setProjectAuditorName(userMapper.selectById(superiorId).getName());
-                            reportMapper.update(updateReport, queryWrapper);
-                        }
-                    }
-                }
+
                 //更新人员专业证书表
                 List<UserCert> oldCertList = userCertMapper.selectList(new QueryWrapper<UserCert>().eq("user_id", targetId));
                 List<Integer> removeCertList = new ArrayList<>();
@@ -1685,43 +1611,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
                 //薪资或者
                 DateTimeFormatter sdf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-                String now = sdf.format(LocalDateTime.now());
-                boolean shouldChangeOldReport = false;
-                QueryWrapper<Report> reportQueryWrapper = new QueryWrapper<Report>().ge("create_date", costApplyDate).eq("creator_id", targetId);
-                //日期发生改变
-                if (costApplyDate != null && !costApplyDate.equals(oldCostApplyDate)) {
-                    int cnt = reportMapper.selectCount(reportQueryWrapper);
-                    if (cnt > 0) {
-                        shouldChangeOldReport = true;
-                    }
-                }  else if (salaryChange && costApplyDate != null) {
-                    //成本发生改变
-                    int cnt = reportMapper.selectCount(reportQueryWrapper);
-                    if (cnt > 0) {
-                        shouldChangeOldReport = true;
-                    }
-                }
-                if (shouldChangeOldReport) {
-                    //更新已填写的日报
-                    List<Report> reports = reportMapper.selectList(reportQueryWrapper);
-                    List<Report> collection = new ArrayList<>();
-                    reports.forEach(r->{
-                        Report item = new Report();
-                        item.setId(r.getId());
-                        BigDecimal newCost = costValue.multiply(new BigDecimal(r.getWorkingTime()));
-                        //成本发生变化的需要更新
-                        if (newCost.compareTo(r.getCost()) != 0) {
-                            item.setCost(newCost);
-                            collection.add(item);
-                        }
-                    });
-                    if (collection.size() > 0) {
-                        boolean n = reportService.updateBatchById(collection);
-                        System.out.println("更新"+(n?"成功":"失败"));
-                    } else {
-                        System.out.println("没有更新");
-                    }
-                }
             }
         } catch (NullPointerException e) {
             e.printStackTrace();
@@ -2695,11 +2584,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 //钉钉消息推送  可优化批量发送消息
                 else if(code==1){
                     Integer companyId = u.getCompanyId();
-                    Long agentId = companyDingdingService.getOne(new QueryWrapper<CompanyDingding>().eq("company_id", companyId)).getAgentId();;
-                    String dingUid = (String) u.getDingdingUserid();
-                    //String alertMsg = "您"+(StringUtils.isEmpty(date)?"":date)+"的工时报告还未填写";
-                    String alertMsg = MessageUtils.message("report.hourReportNoFilled",StringUtils.isEmpty(date)?"":date);
-                    companyDingdingService.sendFillReportAlertMsg(companyId, agentId, alertMsg, dingUid);
+//                    Long agentId = companyDingdingService.getOne(new QueryWrapper<CompanyDingding>().eq("company_id", companyId)).getAgentId();;
+//                    String dingUid = (String) u.getDingdingUserid();
+//                    //String alertMsg = "您"+(StringUtils.isEmpty(date)?"":date)+"的工时报告还未填写";
+//                    String alertMsg = MessageUtils.message("report.hourReportNoFilled",StringUtils.isEmpty(date)?"":date);
+//                    companyDingdingService.sendFillReportAlertMsg(companyId, agentId, alertMsg, dingUid);
                 }
                 //微信公众号消息推送
                 else if(code==2){
@@ -3205,16 +3094,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         User sourceUser = userMapper.selectById(sourceId);
         //目标
         User targetUser = userMapper.selectById(targetId);
-        //转移日报
-        reportService.moveReport(sourceUser,targetUser);
-
         //转移用户负责的项目
         List<Project> projectInchargerList = projectMapper.selectList(new QueryWrapper<Project>().eq("incharger_id", sourceUser.getId()));
         if (projectInchargerList.size() != 0){
             for (Project project : projectInchargerList) {
                 project.setInchargerId(targetUser.getId());
             }
-            projectService.updateBatchById(projectInchargerList);
         }
 
         //转移用户创建的项目
@@ -3224,7 +3109,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 project.setCreatorId(targetUser.getId());
                 project.setCreatorName(targetUser.getName());
             }
-            projectService.updateBatchById(projectCreatorList);
         }
 
         //转移项目审核人

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

@@ -92,28 +92,6 @@ public class TimingTask {
     @Resource
     private CompanyMapper companyMapper;
     @Resource
-    private CompanyDingdingMapper companyDingdingMapper;
-    @Resource
-    private ScreenshotMapper screenshotMapper;
-    @Resource
-    private TimeTypeMapper timeTypeMapper;
-    @Resource
-    private UserMapper userMapper;
-    @Resource
-    private DepartmentMapper departmentMapper;
-    @Resource
-    private ReportMapper reportMapper;
-    @Resource
-    private TimeAutoExcludeMapper timeAutoExcludeMapper;
-    @Resource
-    private WxCorpInfoService wxCorpInfoService;
-    @Resource
-    private WxCorpInfoMapper wxCorpInfoMapper;
-    @Resource
-    private ReportLogMapper reportLogMapper;
-    @Resource
-    private ProjectService projectService;
-    @Resource
     private OperationRecordService operationRecordService;
     @Value(value = "${upload.path}")
     private String path;
@@ -121,59 +99,7 @@ public class TimingTask {
     @Resource
     private LeaveSheetMapper leaveSheetMapper;
     @Resource
-    private ReportService reportService;
-    @Resource
     private ProjectMapper projectMapper;
-    @Resource
-    private CompanyDingdingService companyDingdingService;
-    @Resource
-    private DingDingService dingDingService;
-    @Resource
-    private BusinessTripMapper businessTripMapper;
-    @Resource
-    private ReportPushLogService reportPushLogService;
-    @Resource
-    private SysConfigMapper sysConfigMapper;
-    @Resource
-    private ThirdPartyInterfaceMapper thirdPartyInterfaceMapper;
-    @Resource
-    private ThirdPartyInterfaceService thirdPartyInterfaceService;
-    @Resource
-    private UserFvTimeService userFvTimeService;
-    @Resource
-    private LeaveSheetService leaveSheetService;
-    @Resource
-    private BusinessTripService businessTripService;
-    @Resource
-    private TaskMapper taskMapper;
-    @Resource
-    private TaskExecutorMapper taskExecutorMapper;
-    @Resource
-    private TimeTypeService timeTypeService;
-    @Resource
-    private SysRoleMapper sysRoleMapper;
-    @Resource
-    private UserService userService;
-    @Resource
-    private ParticipationService participationService;
-    @Resource
-    private ProjectCategoryMapper projectCategoryMapper;
-    @Resource
-    private TaskService taskService;
-    @Resource
-    private StagesMapper stagesMapper;
-    @Resource
-    private TaskGroupService taskGroupService;
-    @Resource
-    private TaskGroupMapper taskGroupMapper;
-    @Resource
-    private StagesService stagesService;
-    @Resource
-    private SapProjectServiceService sapProjectServiceService;
-    @Resource
-    private SapSyncLogService sapSyncLogService;
-    @Resource
-    private UserWithBeisenService userWithBeisenService;
 
 
     private static final List<Integer> VALID_TOKEN_CHARS = new ArrayList<>();

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/util/OpenOfficeService.java

@@ -1,131 +1,131 @@
-package com.management.platform.util;
-
-import lombok.extern.slf4j.Slf4j;
-import org.artofsolving.jodconverter.OfficeDocumentConverter;
-import org.artofsolving.jodconverter.office.DefaultOfficeManagerConfiguration;
-import org.artofsolving.jodconverter.office.OfficeManager;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Random;
-import java.util.regex.Pattern;
-
-@Slf4j
-public class OpenOfficeService {
-	//64位windows系统默认安装路径
-	public static String OpenOffice_HOME_64 = "C://Program Files (x86)/OpenOffice 4/";
-	//32位windows系统默认安装路径
-	public static String OpenOffice_HOME_32 = "C://Program Files/OpenOffice 4/";
-	public static String OpenOffice_HOME_UNIX = "/opt/openoffice4/";
-	public static int PORT = 12312;
-	private static OfficeManager officeManager;
-
-	public static boolean canTransferToPdf(String suffix) {
-		if (".doc".equals(suffix) || ".docx".equals(suffix)
-				|| ".xls".equals(suffix) || ".xlsx".equals(suffix)
-				|| ".ppt".equals(suffix) || ".pptx".equals(suffix)
-				|| ".jpg".equals(suffix) || ".png".equals(suffix)
-				|| ".bmp".equals(suffix) || ".jpeg".equals(suffix)
-				|| ".txt".equals(suffix)) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-	/**
-	 * 启动openoffice服务
-	 */
-	public void start() {
-		try {
-			log.info("===Openoffice实例启动中...");
-			DefaultOfficeManagerConfiguration config = new DefaultOfficeManagerConfiguration();
-			String officeHome = getOfficeHome();
-			log.info("officeHome====="+officeHome);
-			config.setOfficeHome(officeHome);
-//	        int randomPort = new Random().nextInt(1000);
-//	        randomPort += 8000;
-			config.setPortNumber(PORT);
-			officeManager = config.buildOfficeManager();
-			officeManager.start();
-			log.info("Openoffice实例启动成功！");
-		} catch (Exception e) {
-			e.printStackTrace();
-			log.info("OpenOffice启动失败："+e.getMessage());
-		}
-	}
-
-	public static String getOfficeHome() {
-		String osName = System.getProperty("os.name");
-		if (Pattern.matches("Linux.*", osName)) {
-			return OpenOffice_HOME_UNIX;
-		} else if (Pattern.matches("Windows.*", osName)) {
-			String arch = System.getProperty("os.arch");
-			boolean is64bit = (System.getenv("ProgramFiles(x86)") != null);
-			if (is64bit) {
-				return OpenOffice_HOME_64;
-			} else {
-				return OpenOffice_HOME_32;
-			}
-		} else if (Pattern.matches("Mac.*", osName)) {
-			return "/Application/OpenOffice.org.app/Contents";
-		}
-		return null;
-	}
-
-	/**
-	 * 文档转换
-	 * @param inputFilePath
-	 * @param destFile
-	 * @return 0-转换成，-1转换失败
-	 */
-	public  int office2PDF(String inputFilePath, String destFile) {
-		//txt后缀需要改成odt再进行转换
-		if (inputFilePath.endsWith(".txt")) {
-			String tempFilePath = inputFilePath.replaceAll(".txt", ".odt");
-			try {
-				org.apache.commons.io.FileUtils.copyFile(new File(inputFilePath), new File(tempFilePath));
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-			inputFilePath = tempFilePath;
-		}
-		OfficeDocumentConverter converter = new OfficeDocumentConverter(officeManager);
-		File outputFile = new File(destFile);
-		if (!outputFile.getParentFile().exists()) {
-			outputFile.getParentFile().mkdirs();
-		}
-		File inputFile = new File(inputFilePath);
-		if (inputFile.exists()) {// 找不到源文件, 则返回
-			converter.convert(inputFile, outputFile);
-		} else {
-			return -1;
-		}
-		return 0;
-	}
-
-	/**
-	 * 停止服务
-	 */
-	public void shutdown() {
-		if (officeManager != null) {
-			officeManager.stop();
-			System.out.println("Openoffice实例停止！");
-		}
-	}
-
-
-	public static void main(String[] args) {
-		OpenOfficeService service = new OpenOfficeService();
-		String sFile = "D:\\1.pdf";
-		String dFile = "D:\\wttxls111000000000000000.pdf";
-		service.start();
-		File testFile = new File(dFile);
-		if(!testFile .exists()){
-			System.out.println("测试文件不存在，开始转换......");
-			service.office2PDF(sFile,dFile);
-		}else{
-			System.out.println("测试文件已存在");
-		}
-		service.shutdown();
-	}
-}
+//package com.management.platform.util;
+//
+//import lombok.extern.slf4j.Slf4j;
+//import org.artofsolving.jodconverter.OfficeDocumentConverter;
+//import org.artofsolving.jodconverter.office.DefaultOfficeManagerConfiguration;
+//import org.artofsolving.jodconverter.office.OfficeManager;
+//
+//import java.io.File;
+//import java.io.IOException;
+//import java.util.Random;
+//import java.util.regex.Pattern;
+//
+//@Slf4j
+//public class OpenOfficeService {
+//	//64位windows系统默认安装路径
+//	public static String OpenOffice_HOME_64 = "C://Program Files (x86)/OpenOffice 4/";
+//	//32位windows系统默认安装路径
+//	public static String OpenOffice_HOME_32 = "C://Program Files/OpenOffice 4/";
+//	public static String OpenOffice_HOME_UNIX = "/opt/openoffice4/";
+//	public static int PORT = 12312;
+//	private static OfficeManager officeManager;
+//
+//	public static boolean canTransferToPdf(String suffix) {
+//		if (".doc".equals(suffix) || ".docx".equals(suffix)
+//				|| ".xls".equals(suffix) || ".xlsx".equals(suffix)
+//				|| ".ppt".equals(suffix) || ".pptx".equals(suffix)
+//				|| ".jpg".equals(suffix) || ".png".equals(suffix)
+//				|| ".bmp".equals(suffix) || ".jpeg".equals(suffix)
+//				|| ".txt".equals(suffix)) {
+//			return true;
+//		} else {
+//			return false;
+//		}
+//	}
+//	/**
+//	 * 启动openoffice服务
+//	 */
+//	public void start() {
+//		try {
+//			log.info("===Openoffice实例启动中...");
+//			DefaultOfficeManagerConfiguration config = new DefaultOfficeManagerConfiguration();
+//			String officeHome = getOfficeHome();
+//			log.info("officeHome====="+officeHome);
+//			config.setOfficeHome(officeHome);
+////	        int randomPort = new Random().nextInt(1000);
+////	        randomPort += 8000;
+//			config.setPortNumber(PORT);
+//			officeManager = config.buildOfficeManager();
+//			officeManager.start();
+//			log.info("Openoffice实例启动成功！");
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//			log.info("OpenOffice启动失败："+e.getMessage());
+//		}
+//	}
+//
+//	public static String getOfficeHome() {
+//		String osName = System.getProperty("os.name");
+//		if (Pattern.matches("Linux.*", osName)) {
+//			return OpenOffice_HOME_UNIX;
+//		} else if (Pattern.matches("Windows.*", osName)) {
+//			String arch = System.getProperty("os.arch");
+//			boolean is64bit = (System.getenv("ProgramFiles(x86)") != null);
+//			if (is64bit) {
+//				return OpenOffice_HOME_64;
+//			} else {
+//				return OpenOffice_HOME_32;
+//			}
+//		} else if (Pattern.matches("Mac.*", osName)) {
+//			return "/Application/OpenOffice.org.app/Contents";
+//		}
+//		return null;
+//	}
+//
+//	/**
+//	 * 文档转换
+//	 * @param inputFilePath
+//	 * @param destFile
+//	 * @return 0-转换成，-1转换失败
+//	 */
+//	public  int office2PDF(String inputFilePath, String destFile) {
+//		//txt后缀需要改成odt再进行转换
+//		if (inputFilePath.endsWith(".txt")) {
+//			String tempFilePath = inputFilePath.replaceAll(".txt", ".odt");
+//			try {
+//				org.apache.commons.io.FileUtils.copyFile(new File(inputFilePath), new File(tempFilePath));
+//			} catch (IOException e) {
+//				e.printStackTrace();
+//			}
+//			inputFilePath = tempFilePath;
+//		}
+//		OfficeDocumentConverter converter = new OfficeDocumentConverter(officeManager);
+//		File outputFile = new File(destFile);
+//		if (!outputFile.getParentFile().exists()) {
+//			outputFile.getParentFile().mkdirs();
+//		}
+//		File inputFile = new File(inputFilePath);
+//		if (inputFile.exists()) {// 找不到源文件, 则返回
+//			converter.convert(inputFile, outputFile);
+//		} else {
+//			return -1;
+//		}
+//		return 0;
+//	}
+//
+//	/**
+//	 * 停止服务
+//	 */
+//	public void shutdown() {
+//		if (officeManager != null) {
+//			officeManager.stop();
+//			System.out.println("Openoffice实例停止！");
+//		}
+//	}
+//
+//
+//	public static void main(String[] args) {
+//		OpenOfficeService service = new OpenOfficeService();
+//		String sFile = "D:\\1.pdf";
+//		String dFile = "D:\\wttxls111000000000000000.pdf";
+//		service.start();
+//		File testFile = new File(dFile);
+//		if(!testFile .exists()){
+//			System.out.println("测试文件不存在，开始转换......");
+//			service.office2PDF(sFile,dFile);
+//		}else{
+//			System.out.println("测试文件已存在");
+//		}
+//		service.shutdown();
+//	}
+//}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/util/SyncSapUtils.java

@@ -1,18 +1,10 @@
 package com.management.platform.util;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.management.platform.entity.ReportPushLog;
 import com.management.platform.entity.SapSyncLog;
-import com.management.platform.entity.User;
-import com.management.platform.service.ReportPushLogService;
-import com.management.platform.service.ReportService;
-import com.management.platform.service.SapSyncLogService;
 import com.management.platform.webservice.po.*;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.StringUtils;
 
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/ReportBatchMapper.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.management.platform.mapper.ReportBatchMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.management.platform.entity.ReportBatch">
-        <id column="id" property="id" />
-        <result column="creator_id" property="creatorId" />
-        <result column="start_date" property="startDate" />
-        <result column="end_date" property="endDate" />
-        <result column="total_work_time" property="totalWorkTime" />
-        <result column="state" property="state" />
-        <result column="create_time" property="createTime" />
-        <result column="company_id" property="companyId" />
-        <result column="summary" property="summary" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, creator_id, start_date, end_date, total_work_time, state, create_time, company_id, summary
-    </sql>
-
-</mapper>

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/ReportExtraDegreeMapper.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.management.platform.mapper.ReportExtraDegreeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.management.platform.entity.ReportExtraDegree">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="name" property="name" />
-        <result column="code" property="code" />
-        <result column="rmark" property="rmark" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id, name, code, rmark
-    </sql>
-
-    <select id="getAll" resultMap="BaseResultMap">
-        select id, name,rmark,code from report_extra_degree where company_id = #{companyId}
-        ORDER BY id DESC
-    </select>
-</mapper>