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

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

@@ -1,8 +1,10 @@
 package com.management.platform.controller;
 
 
+import com.management.platform.service.CompanyService;
+import com.management.platform.util.HttpRespMsg;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -16,6 +18,11 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/company")
 public class CompanyController {
-
+    @Autowired
+    private CompanyService companyService;
+    @RequestMapping("/dataMigration")
+    public HttpRespMsg dataMigration(Integer oldCompanyId,Integer targetCompanyId){
+       return companyService.dataMigration(oldCompanyId,targetCompanyId);
+    }
 }
 

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

@@ -488,5 +488,13 @@ public class ProjectController {
     public HttpRespMsg getProjectByCustomer(Integer customerId,HttpServletRequest request){
         return projectService.getProjectByCustomer(customerId,request);
     }
+    @RequestMapping("/getUserReportTimelinessRate")
+    public HttpRespMsg getUserReportTimelinessRate(HttpServletRequest request,String startDate,String endDate,Integer departmentId,String userId,Integer pageIndex,Integer pageSize){
+        return projectService.getUserReportTimelinessRate(request,startDate,endDate,departmentId,userId,pageIndex,pageSize);
+    }
+    @RequestMapping("/exportReportTimelinessRate")
+    public HttpRespMsg exportReportTimelinessRate(HttpServletRequest request,String startDate,String endDate){
+        return projectService.exportReportTimelinessRate(request,startDate,endDate);
+    }
 }
 

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

@@ -204,5 +204,9 @@ public class ReportExtraDegreeController {
     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-platform/src/main/java/com/management/platform/entity/vo/TimelinessRateVO.java

@@ -0,0 +1,14 @@
+package com.management.platform.entity.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class TimelinessRateVO {
+    private String userName;
+    private String departmentName;
+    private String timelinessRate;
+}

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

@@ -129,4 +129,6 @@ public interface ReportMapper extends BaseMapper<Report> {
 
     @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);
 }

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

@@ -2,6 +2,7 @@ package com.management.platform.service;
 
 import com.management.platform.entity.Company;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.management.platform.util.HttpRespMsg;
 
 /**
  * <p>
@@ -12,5 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2020-01-13
  */
 public interface CompanyService extends IService<Company> {
-
+    HttpRespMsg dataMigration(Integer oldCompanyId, Integer targetCompanyId);
 }

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

@@ -135,4 +135,8 @@ public interface ProjectService extends IService<Project> {
     HttpRespMsg getUserWorkingTimeList(String userId, Integer projectId, String startDate, String endDate, Integer pageIndex, Integer pageSize,HttpServletRequest request);
 
     HttpRespMsg exportUserWorkingTimeList(String userId, Integer projectId, String startDate, String endDate,HttpServletRequest request);
+
+    HttpRespMsg getUserReportTimelinessRate(HttpServletRequest request, String startDate, String endDate, Integer departmentId, String userId,Integer pageIndex,Integer pageSize);
+
+    HttpRespMsg exportReportTimelinessRate(HttpServletRequest request, String startDate, String endDate);
 }

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

@@ -18,4 +18,6 @@ import javax.servlet.http.HttpServletRequest;
 public interface ReportExtraDegreeService extends IService<ReportExtraDegree> {
 
     HttpRespMsg importData(HttpServletRequest request, MultipartFile file);
+
+    HttpRespMsg exportData(HttpServletRequest request);
 }

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

@@ -1,11 +1,20 @@
 package com.management.platform.service.impl;
 
-import com.management.platform.entity.Company;
-import com.management.platform.mapper.CompanyMapper;
-import com.management.platform.service.CompanyService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.management.platform.entity.*;
+import com.management.platform.mapper.*;
+import com.management.platform.service.*;
+import com.management.platform.util.HttpRespMsg;
+import com.mysql.cj.util.StringUtils;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  *  服务实现类
@@ -16,5 +25,165 @@ import org.springframework.stereotype.Service;
  */
 @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;
+    @Resource
+    private ParticipationService participationService;
+    @Resource
+    private DepartmentMapper departmentMapper;
+    @Resource
+    private DepartmentService departmentService;
+    @Resource
+    private ProjectAuditorMapper projectAuditorMapper;
+    @Resource
+    private ProjectAuditorService projectAuditorService;
+    @Resource
+    private UserService userService;
+    @Resource
+    private ReportService reportService;
+    @Override
+    public HttpRespMsg dataMigration(Integer oldCompanyId,Integer targetCompanyId) {
+        HttpRespMsg msg=new HttpRespMsg();
+        List<User> oldUserList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", oldCompanyId));
+        List<User> targetUserList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", targetCompanyId));
+        List<Department> oldDepartmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", oldCompanyId));
+        List<Department> targetDepartmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", targetCompanyId));
+        //处理部门负责人
+        List<User> updateUserList=new ArrayList<>();
+        List<Department> updateDepartmentList=new ArrayList<>();
+        for (Department oldDepartment : oldDepartmentList) {
+            for (Department targetDepartment : targetDepartmentList) {
+                if(oldDepartment.getDepartmentName().equals(targetDepartment.getDepartmentName())){
+                    if(oldDepartment.getManagerId()!=null){
+                        Optional<User> oldUser = oldUserList.stream().filter(ou -> ou.getId().equals(oldDepartment.getManagerId())).findFirst();
+                        Optional<User> targetUser = targetUserList.stream().filter(tu -> tu.getDingdingUserid().equals(oldUser.get().getDingdingUserid())).findFirst();
+                        targetDepartment.setManagerId(targetUser.get().getId());
+                        targetUser.get().setDepartmentId(targetDepartment.getDepartmentId());
+                        targetUser.get().setDepartmentName(targetDepartment.getDepartmentName());
+                        updateUserList.add(targetUser.get());
+                        updateDepartmentList.add(targetDepartment);
+                    }
+                }
+            }
+        }
+        userService.updateBatchById(updateUserList);
+        departmentService.updateBatchById(updateDepartmentList);
+        List<String> ids=new ArrayList<>();
+        //获取在目标公司也存在的人员
+        for (User targetUser : targetUserList) {
+            for (User oldUser : oldUserList) {
+                if(targetUser.getDingdingUserid().equals(oldUser.getDingdingUserid())){
+                    ids.add(oldUser.getId());
+                }
+            }
+        }
+        List<Participation> participationList = participationMapper.selectList(new QueryWrapper<Participation>().in("user_id", ids));
+        //取项目id  按照项目参与人
+        List<Integer> projectIds = participationList.stream().map(pc -> pc.getProjectId()).collect(Collectors.toList());
+        List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().in("id", projectIds));
+        List<Project> targetProjectList = projectMapper.selectList(new QueryWrapper<Project>().eq("company_id", targetCompanyId));
+        List<String> list = targetProjectList.stream().map(tp -> tp.getProjectCode()).collect(Collectors.toList());
+        List<ProjectAuditor> oldProjectAuditorList = projectAuditorMapper.selectList(new QueryWrapper<ProjectAuditor>().in("project_id", projectIds));
+        //处理相关项目
+        List<Project> newProjectList=new ArrayList<>();
+        List<ProjectAuditor> newProjectAuditorList=new ArrayList<>();
+        List<Participation> newParticipationList=new ArrayList<>();
+        for (Project pro: projectList) {
+            //此前的项目负责人不存在当前组织架构
+            Optional<User> inchargerUser = oldUserList.stream().filter(ou -> ou.getId().equals(pro.getInchargerId())).findFirst();
+            boolean flag = targetUserList.stream().anyMatch(tu -> tu.getDingdingUserid().equals(inchargerUser.get().getDingdingUserid()));
+            if(!flag){
+                msg.setError("当前项目["+pro.getProjectName()+"]负责人["+inchargerUser.get().getName()+"]不存在");
+                return msg;
+            }else {
+                Optional<User> targetInchargerUser = targetUserList.stream().filter(tu -> tu.getDingdingUserid().equals(inchargerUser.get().getDingdingUserid())).findFirst();
+                pro.setInchargerId(targetInchargerUser.get().getId());
+            }
+            //在新公司创建相同的客户信息
+            /*CustomerInfo customerInfo = customerInfoMapper.selectById(pro.getCustomerId());
+            customerInfo.setId(null);
+            customerInfo.setCompanyId(targetCompanyId);
+            customerInfoMapper.insert(customerInfo);
+            pro.setCustomerId(customerInfo.getId());*/
+            List<ProjectAuditor> projectAuditorList = oldProjectAuditorList.stream().filter(pa -> pa.getProjectId().equals(pro.getId())).collect(Collectors.toList());
+            Optional<User> creatorUser = oldUserList.stream().filter(ou -> ou.getName().equals("李婷婷")).findFirst();
+            Optional<User> targetCreatorUser = targetUserList.stream().filter(tu -> tu.getDingdingUserid().equals(creatorUser.get().getDingdingUserid())).findFirst();
+            pro.setCreatorId(targetCreatorUser.get().getId());
+            //当前项目的相关参与人
+            List<String> userList = participationList.stream().filter(pc -> pc.getProjectId().equals(pro.getId())).collect(Collectors.toList()).stream().map(o -> o.getUserId()).collect(Collectors.toList());
+            pro.setId(null);
+            pro.setCompanyId(targetCompanyId);
+            if(list.contains(pro.getProjectCode())){
+                continue;
+            }
+            newProjectList.add(pro);
+            //处理项目审核人
+            for (ProjectAuditor projectAuditor : projectAuditorList) {
+                projectAuditor.setProjectId(pro.getId());
+                projectAuditor.setId(null);
+                Optional<User> first = targetUserList.stream().filter(tu -> tu.getName().equals(projectAuditor.getAuditorName())).findFirst();
+                if(first.isPresent()){
+                    projectAuditor.setAuditorId(first.get().getId());
+                    projectAuditor.setAuditorName(first.get().getName());
+                    newProjectAuditorList.add(projectAuditor);
+                }
+            }
+            for(String s:userList){
+               Participation participation=new Participation();
+               participation.setProjectId(pro.getId());
+                Optional<User> user = oldUserList.stream().filter(ou -> ou.getId().equals(s)).findFirst();
+                Optional<User> targetUser = targetUserList.stream().filter(tu -> tu.getDingdingUserid().equals(user.get().getDingdingUserid())).findFirst();
+                participation.setUserId(targetUser.get().getId());
+                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-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -33,10 +33,12 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
-import java.text.SimpleDateFormat;
+import java.sql.Timestamp;
+import java.text.*;
+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;
@@ -3081,9 +3083,116 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         return msg;
     }
 
+    @Override
+    public HttpRespMsg getUserReportTimelinessRate(HttpServletRequest request, String startDate, String endDate, Integer departmentId, String userId,Integer pageIndex,Integer pageSize) {
+        HttpRespMsg msg=new HttpRespMsg();
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        LocalDateTime sDate = LocalDate.parse(startDate).atTime(LocalTime.now());
+        LocalDateTime eDate = LocalDate.parse(endDate).atTime(LocalTime.now());
+        Duration duration=Duration.between(sDate,eDate);
+        long days = duration.toDays();
+        Integer companyId= userMapper.selectById(request.getHeader("token")).getCompanyId();
+        TimeType timeType = timeTypeMapper.selectById(companyId);
+        String alertTime = timeType.getAlertTime();
+        Integer alertType = timeType.getAlertType();
+        LocalTime alert = LocalTime.parse(alertTime);
+        List<Map<String,Object>> reportList=reportMapper.getUserReportTimelinessRate(companyId,startDate,endDate);
+        System.out.println(reportList);
+        QueryWrapper<User> queryWrapper=new QueryWrapper();
+        queryWrapper.eq("company_id",companyId);
+        if(departmentId!=null){
+            queryWrapper.eq("department_id",departmentId);
+        }
+        if(userId!=null){
+            queryWrapper.eq("id",userId);
+        }
+        queryWrapper.orderByAsc("department_id");
+        List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", companyId));
+        List<User> userList;
+        long total=0;
+        if(pageIndex!=null&&pageSize!=null){
+            IPage<User>  userIPage = userMapper.selectPage(new Page<>(pageIndex,pageSize),queryWrapper);
+            userList=userIPage.getRecords();
+            total=userIPage.getTotal();
+        }else {
+            userList = userMapper.selectList(queryWrapper);
+        }
+        Map<Object, List<Map<String, Object>>> listMap = reportList.stream().collect(Collectors.groupingBy(rp -> rp.get("userName")));
+        List<TimelinessRateVO> resultList=new ArrayList<>();
+        for (User user : userList){
+            TimelinessRateVO timelinessRateVO=new TimelinessRateVO();
+            timelinessRateVO.setUserName(user.getName());
+            Optional<Department> first = departmentList.stream().filter(dp -> dp.getDepartmentId().equals(user.getDepartmentId())).findFirst();
+            if(first.isPresent()){
+                timelinessRateVO.setDepartmentName(first.get().getDepartmentName());
+            }
+            List<Map<String, Object>> mapList = listMap.get(user.getName());
+            if(mapList!=null){
+                int num=0;
+                for (Map<String, Object> map : mapList) {
+                    Object date = map.get("createDate");
+                    //去掉sql返回的毫秒值
+                    Timestamp timestamp = (Timestamp) map.get("createTime");
+                    LocalDate createDate = LocalDate.parse(String.valueOf(date));
+                    LocalDate createTimeDate =timestamp.toLocalDateTime().toLocalDate();
+                    LocalTime createTime =timestamp.toLocalDateTime().toLocalTime();
+                    //根据提醒类型 判断比较昨天还是今天
+                    if(alertType==1){
+                         createDate=createDate.plusDays(1);
+                    }
+                    if(createTimeDate.isBefore(createDate)||(createTimeDate.isEqual(createDate)&&createTime.isBefore(alert))){
+                        num++;
+                    }
+                }
+                BigDecimal bigDecimal=new BigDecimal(num);
+                BigDecimal divide;
+                if(days!=0){
+                     divide = bigDecimal.divide(BigDecimal.valueOf(days), 2, BigDecimal.ROUND_HALF_UP);
+                }else if(days==0&&num!=0){
+                    divide=new BigDecimal(1);
+                }else{
+                    divide=new BigDecimal(0);
+                }
+                DecimalFormat dft =  new DecimalFormat("0%");
+                String number = dft.format(divide);
+                timelinessRateVO.setTimelinessRate(String.valueOf(number));
+            }
+            resultList.add(timelinessRateVO);
+        }
+        HashMap map=new HashMap();
+        map.put("total",total);
+        map.put("list",resultList);
+        msg.data=map;
+        return msg;
+    }
+
+    @Override
+    public HttpRespMsg exportReportTimelinessRate(HttpServletRequest request, String startDate, String endDate) {
+        HttpRespMsg httpRespMsg=new HttpRespMsg();
+        HttpRespMsg msg = getUserReportTimelinessRate(request, startDate, endDate, null, null, null, null);
+        HashMap map= (HashMap) msg.data;
+        List<TimelinessRateVO> list = (List<TimelinessRateVO>) map.get("list");
+        String[] s={"人员","部门","填报及时率"};
+        List<String> titleString = Arrays.asList(s);
+        List<List<String>> dataList=new ArrayList<>();
+        dataList.add(titleString);
+        for (TimelinessRateVO timelinessRateVO : list) {
+            List<String> item=new ArrayList<>();
+            item.add(timelinessRateVO.getUserName());
+            item.add(timelinessRateVO.getDepartmentName());
+            item.add(timelinessRateVO.getTimelinessRate());
+            dataList.add(item);
+        }
+        //生成excel文件导出
+        String fileName = "人员填报及时率统计_"+System.currentTimeMillis();
+        String resp = ExcelUtil.exportGeneralExcelByTitleAndList(fileName , dataList, path);
+        httpRespMsg.data = resp;
+        return httpRespMsg;
+    }
+
 
     private List<Department> getSubDepts(Department dp, List<Department> list) {
-        List<Department> collect = list.stream().filter(l -> dp.getDepartmentId().equals(l.getSuperiorId())).collect(Collectors.toList());;
+        List<Department> collect = list.stream().filter(l -> dp.getDepartmentId().equals(l.getSuperiorId())).collect(Collectors.toList());
         List<Department> allList = new ArrayList<>();
         allList.addAll(collect);
         if (collect.size() > 0) {

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

@@ -3,7 +3,10 @@ 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.mapper.ReportExtraDegreeMapper;
+import com.management.platform.mapper.TimeTypeMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.ReportExtraDegreeService;
 import com.management.platform.util.ExcelUtil;
@@ -14,6 +17,7 @@ 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;
 
@@ -36,10 +40,14 @@ import java.util.stream.Collectors;
  */
 @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;
     @Override
     public HttpRespMsg importData(HttpServletRequest request, MultipartFile multipartFile) {
         HttpRespMsg msg=new HttpRespMsg();
@@ -132,4 +140,26 @@ public class ReportExtraDegreeServiceImpl extends ServiceImpl<ReportExtraDegreeM
             System.out.println(file.delete());
         }
     }
+
+    @Override
+    public HttpRespMsg exportData(HttpServletRequest request) {
+        HttpRespMsg httpRespMsg=new HttpRespMsg();
+        User user = userMapper.selectById(request.getHeader("token"));
+        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()+"名称");
+        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();
+        String resp = ExcelUtil.exportGeneralExcelByTitleAndList(fileName , dataList, path);
+        httpRespMsg.data = resp;
+        return httpRespMsg;
+    }
 }

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -624,4 +624,13 @@
     <select id="getOneProjectBaseCost" resultType="java.util.HashMap">
         SELECT basecost_id as basecostId, IFNULL(SUM(cost), 0) AS cost FROM report WHERE state = 1 and basecost_id > 0 AND project_id = #{projectId} group by basecost_id
     </select>
+
+    <select id="getUserReportTimelinessRate" resultType="java.util.Map">
+        select `user`.name as userName,report.create_date as createDate,report.create_time as createTime from report
+        left join `user` on `user`.id=report.creator_id
+        where report.company_id=#{companyId}
+        and report.state=1
+        and report.create_date between #{startDate} and #{endDate}
+        group by `user`.id,report.create_date
+    </select>
 </mapper>

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

@@ -1,31 +1,31 @@
 package com.management.platform.controller;
 
 
-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.management.platform.entity.Company;
 import com.management.platform.entity.CompanyDingding;
-import com.management.platform.entity.VcompanyCustomerContact;
 import com.management.platform.entity.WxCorpInfo;
 import com.management.platform.mapper.CompanyDingdingMapper;
 import com.management.platform.mapper.CompanyMapper;
 import com.management.platform.mapper.WxCorpInfoMapper;
 import com.management.platform.service.CompanyService;
 import com.management.platform.util.HttpRespMsg;
-import org.apache.el.parser.BooleanNode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.*;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 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.client.RestTemplate;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
@@ -167,5 +167,10 @@ public class CompanyController {
             return error;
         }
     }
+    //数据迁移
+    @RequestMapping("/dataMigration")
+    public HttpRespMsg dataMigration(HttpServletRequest request, Integer oldCompanyId, Integer targetCompanyId,String oldUserName,String targetUserName){
+        return companyService.dataMigration(request,oldCompanyId,targetCompanyId,oldUserName,targetUserName);
+    }
 }
 

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

@@ -0,0 +1,21 @@
+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-06-20
+ */
+@RestController
+@RequestMapping("/report")
+public class ReportController {
+
+}
+

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

@@ -8,15 +8,9 @@ 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>
@@ -24,12 +18,13 @@ import org.springframework.format.annotation.DateTimeFormat;
  * </p>
  *
  * @author Seyason
- * @since 2022-03-13
+ * @since 2022-06-20
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 public class Report extends Model<Report> {
+
     private static final long serialVersionUID=1L;
 
     /**
@@ -54,8 +49,6 @@ public class Report extends Model<Report> {
      * 日期
      */
     @TableField("create_date")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate createDate;
 
     /**
@@ -65,13 +58,13 @@ public class Report extends Model<Report> {
     private Double workingTime;
 
     /**
-     * 报告内容
+     * 报告内容； 根据multi_worktime的取值，形式有差别
      */
     @TableField("content")
     private String content;
 
     /**
-     * 审查状态 0-未审核 1-已通过 2-未通过
+     * 审查状态 0-未审核 1-已通过 2-未通过, -1-导入待审核， 3草稿
      */
     @TableField("state")
     private Integer state;
@@ -136,54 +129,30 @@ public class Report extends Model<Report> {
     @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;
     /**
      * 驳回原因
      */
@@ -202,16 +171,12 @@ public class Report extends Model<Report> {
     @TableField("reject_userid")
     private String rejectUserid;
 
-
     /**
      * 选择的自定义维度
      */
     @TableField("degree_id")
     private Integer degreeId;
 
-
-    @TableField(exist = false)
-    private List<HashMap> degreeList;
     /**
      * 公司id
      */
@@ -247,24 +212,19 @@ public class Report extends Model<Report> {
      */
     @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;
     /**
      * 自定义的数值
      */
@@ -277,11 +237,42 @@ public class Report extends Model<Report> {
     @TableField("project_auditor_id")
     private String projectAuditorId;
 
-    @TableField(exist = false)
-    private List<ProjectAuditor> auditUserList;
+    /**
+     * 工时日报所属部门id
+     */
+    @TableField("dept_id")
+    private Integer deptId;
+
+    /**
+     * 加班时长
+     */
+    @TableField("overtime_hours")
+    private Double overtimeHours;
+
+    /**
+     * 加班薪资
+     */
+    @TableField("overtime_cost")
+    private BigDecimal overtimeCost;
+
+    /**
+     * 自定义文本信息内容
+     */
+    @TableField("custom_text")
+    private String customText;
+
+    /**
+     * 对应成本项的id
+     */
+    @TableField("basecost_id")
+    private Integer basecostId;
+
+    /**
+     * 项目日报审核时间
+     */
+    @TableField("project_audit_time")
+    private LocalDateTime projectAuditTime;
 
-    @TableField(exist = false)
-    private String projectAuditorName;
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/mapper/CustomerInfoMapper.java

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

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/mapper/ProjectAuditorMapper.java

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

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/service/CompanyService.java

@@ -4,6 +4,8 @@ import com.management.platform.entity.Company;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.management.platform.util.HttpRespMsg;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
  *  服务类
@@ -21,4 +23,6 @@ public interface CompanyService extends IService<Company> {
     HttpRespMsg setExpDate(Integer companyId, String date);
 
     HttpRespMsg setPackageList(Company company);
+
+    HttpRespMsg dataMigration(HttpServletRequest request,Integer oldCompanyId, Integer targetCompanyId,String oldUserName,String targetUserName);
 }

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

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

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

@@ -1,20 +1,24 @@
 package com.management.platform.service.impl;
 
-import com.management.platform.entity.Company;
-import com.management.platform.entity.OperationLog;
-import com.management.platform.entity.User;
-import com.management.platform.mapper.CompanyMapper;
-import com.management.platform.mapper.OperationLogMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.CompanyService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.management.platform.entity.*;
+import com.management.platform.mapper.*;
+import com.management.platform.service.*;
 import com.management.platform.util.HttpRespMsg;
+import com.mysql.cj.util.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -34,6 +38,22 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     HttpServletRequest request;
     @Resource
     UserMapper userMapper;
+    @Resource
+    ProjectMapper projectMapper;
+    @Resource
+    ReportMapper reportMapper;
+    @Resource
+    ReportService reportService;
+    @Resource
+    CustomerInfoMapper customerInfoMapper;
+    @Resource
+    ParticipationMapper participationMapper;
+    @Resource
+    DepartmentMapper departmentMapper;
+    @Resource
+    ProjectAuditorMapper projectAuditorMapper;
+    @Resource
+    UserService userService;
 
     @Override
     public HttpRespMsg addMembCount(Integer companyId, int addCount) {
@@ -115,4 +135,162 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         saveLog(str);
         return new HttpRespMsg();
     }
+
+    @Override
+    @Transactional
+    public HttpRespMsg dataMigration(HttpServletRequest request,Integer oldCompanyId, Integer targetCompanyId,String oldUserName,String targetUserName) {
+        HttpRespMsg msg=new HttpRespMsg();
+        User oldManager = userMapper.selectOne(new QueryWrapper<User>().eq("name", oldUserName).eq("company_id",oldCompanyId));
+        User targetManager = userMapper.selectOne(new QueryWrapper<User>().eq("name", targetUserName).eq("company_id",targetCompanyId));
+        if(oldManager==null){
+            msg.setError("管理员["+oldUserName+"]不存在");
+            return msg;
+        }
+        if(targetManager==null){
+            msg.setError("管理员["+targetManager+"]不存在");
+            return msg;
+        }
+        if(!oldManager.getRoleName().equals("超级管理员")){
+            msg.setError("原公司超级管理员不正确");
+            return msg;
+        }
+        if(!targetManager.getRoleName().equals("超级管理员")){
+            msg.setError("目标公司超级管理员不正确,当前角色是："+targetManager.getRoleName());
+            return msg;
+        }
+        List<User> oldUserList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", oldCompanyId));
+        List<User> targetUserList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", targetCompanyId));
+        List<Department> oldDepartmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", oldCompanyId));
+        List<Department> targetDepartmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", targetCompanyId));
+        //处理部门负责人
+        List<User> updateUserList=new ArrayList<>();
+        for (Department oldDepartment : oldDepartmentList) {
+            for (Department targetDepartment : targetDepartmentList) {
+                if(oldDepartment.getDepartmentName().equals(targetDepartment.getDepartmentName())){
+                    if(oldDepartment.getManagerId()!=null){
+                        Optional<User> oldUser = oldUserList.stream().filter(ou -> ou.getId().equals(oldDepartment.getManagerId())).findFirst();
+                        Optional<User> targetUser = targetUserList.stream().filter(tu -> tu.getDingdingUserid().equals(oldUser.get().getDingdingUserid())).findFirst();
+                        targetDepartment.setManagerId(targetUser.get().getId());
+                        targetUser.get().setDepartmentId(targetDepartment.getDepartmentId());
+                        targetUser.get().setDepartmentName(targetDepartment.getDepartmentName());
+                        updateUserList.add(targetUser.get());
+                        departmentMapper.updateById(targetDepartment);
+                    }
+                }
+            }
+        }
+        List<String> ids=new ArrayList<>();
+        //获取在目标公司也存在的人员
+        for (User targetUser : targetUserList) {
+            for (User oldUser : oldUserList) {
+                if(targetUser.getDingdingUserid().equals(oldUser.getDingdingUserid())){
+                    ids.add(oldUser.getId());
+                }
+            }
+        }
+        List<Participation> participationList = participationMapper.selectList(new QueryWrapper<Participation>().in("user_id", ids));
+        //取项目id  按照项目参与人
+        List<Integer> projectIds = participationList.stream().map(pc -> pc.getProjectId()).collect(Collectors.toList());
+        List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().in("id", projectIds));
+        List<Project> targetProjectList = projectMapper.selectList(new QueryWrapper<Project>().eq("company_id", targetCompanyId));
+        List<String> list = targetProjectList.stream().map(tp -> tp.getProjectCode()).collect(Collectors.toList());
+        List<ProjectAuditor> oldProjectAuditorList = projectAuditorMapper.selectList(new QueryWrapper<ProjectAuditor>().in("project_id", projectIds));
+        //处理相关项目
+        for (Project pro: projectList) {
+            //此前的项目负责人不存在当前组织架构
+            Optional<User> inchargerUser = oldUserList.stream().filter(ou -> ou.getId().equals(pro.getInchargerId())).findFirst();
+            boolean flag = targetUserList.stream().anyMatch(tu -> tu.getDingdingUserid().equals(inchargerUser.get().getDingdingUserid()));
+            if(!flag){
+                msg.setError("当前项目["+pro.getProjectName()+"]负责人["+inchargerUser.get().getName()+"]不存在");
+                return msg;
+            }else {
+                Optional<User> targetInchargerUser = targetUserList.stream().filter(tu -> tu.getDingdingUserid().equals(inchargerUser.get().getDingdingUserid())).findFirst();
+                pro.setInchargerId(targetInchargerUser.get().getId());
+            }
+            /*//在新公司创建相同的客户信息
+            CustomerInfo customerInfo = customerInfoMapper.selectById(pro.getCustomerId());
+            customerInfo.setId(null);
+            customerInfo.setCompanyId(targetCompanyId);
+            customerInfoMapper.insert(customerInfo);
+            pro.setCustomerId(customerInfo.getId());*/
+            List<ProjectAuditor> projectAuditorList = oldProjectAuditorList.stream().filter(pa -> pa.getProjectId().equals(pro.getId())).collect(Collectors.toList());
+            Optional<User> creatorUser = oldUserList.stream().filter(ou -> ou.getName().equals("李婷婷")).findFirst();
+            Optional<User> targetCreatorUser = targetUserList.stream().filter(tu -> tu.getDingdingUserid().equals(creatorUser.get().getDingdingUserid())).findFirst();
+            pro.setCreatorId(targetCreatorUser.get().getId());
+            //当前项目的相关参与人
+            List<String> userList = participationList.stream().filter(pc -> pc.getProjectId().equals(pro.getId())).collect(Collectors.toList()).stream().map(o -> o.getUserId()).collect(Collectors.toList());
+            pro.setId(null);
+            pro.setCompanyId(targetCompanyId);
+            if(list.contains(pro.getProjectCode())){
+                continue;
+            }
+            projectMapper.insert(pro);
+            //处理项目审核人
+            for (ProjectAuditor projectAuditor : projectAuditorList) {
+                projectAuditor.setProjectId(pro.getId());
+                projectAuditor.setId(null);
+                Optional<User> first = targetUserList.stream().filter(tu -> tu.getName().equals(projectAuditor.getAuditorName())).findFirst();
+                if(first.isPresent()){
+                    projectAuditor.setAuditorId(first.get().getId());
+                    projectAuditor.setAuditorName(first.get().getName());
+                    projectAuditorMapper.insert(projectAuditor);
+                }
+            }
+            for(String s:userList){
+                Participation participation=new Participation();
+                participation.setProjectId(pro.getId());
+                Optional<User> user = oldUserList.stream().filter(ou -> ou.getId().equals(s)).findFirst();
+                Optional<User> targetUser = targetUserList.stream().filter(tu -> tu.getDingdingUserid().equals(user.get().getDingdingUserid())).findFirst();
+                participation.setUserId(targetUser.get().getId());
+                participationMapper.insert(participation);
+            }
+        }
+        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> updateReportList = 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);
+//            reportMapper.updateById(report);
+            Report newReport = new Report();
+            newReport.setId(report.getId());
+            newReport.setCompanyId(targetCompanyId);
+            newReport.setProjectId(report.getProjectId());
+            newReport.setCreatorId(report.getCreatorId());
+            newReport.setDeptId(report.getDeptId());
+            newReport.setAuditDeptid(report.getAuditDeptid());
+            newReport.setAuditDeptManagerid(report.getAuditDeptManagerid());
+            newReport.setRejectUserid(report.getRejectUserid());
+            updateReportList.add(newReport);
+        }
+        //改成批量更新
+        if (updateReportList.size() > 0) {
+            reportService.updateBatchById(updateReportList);
+        }
+        return msg;
+    }
 }

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

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