Merge remote-tracking branch 'origin/master'

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/CwProjectReportMapper.java

@@ -32,7 +32,7 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
      * @return
      */
     //@InterceptorIgnore(tenantLine = "true")
-    IPage<CwProjectReportData> findList(Page<CwProjectReportData> page, @Param("currentUser") UserDTO currentUser, @Param("isBmzr") String isBmzr, @Param("officeIds") String officeIds, @Param(Constants.WRAPPER) QueryWrapper<CwProjectReportData> queryWrapper);
+    IPage<CwProjectReportData> findList(Page<CwProjectReportData> page, @Param("isBmzr") String isBmzr, @Param("officeIds") String officeIds, @Param(Constants.WRAPPER) QueryWrapper<CwProjectReportData> queryWrapper);
 
     @InterceptorIgnore(tenantLine = "true")
     List<WorkAttachmentInfo> findFileList(@Param("id") String id);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportService.java

@@ -28,6 +28,7 @@ import com.jeeplus.finance.projectReport.service.mapstruct.CwProjectReportFileWr
 import com.jeeplus.finance.projectReportArchive.domain.CwProjectReportArchive;
 import com.jeeplus.finance.projectReportArchive.mapper.CwProjectReportArchiveMapper;
 import com.jeeplus.finance.projectReportArchive.service.dto.CwProjectReportArchiveDTO;
+import com.jeeplus.finance.reportCancellApply.service.dto.ReportInfoDto;
 import com.jeeplus.finance.utils.Global;
 import com.jeeplus.finance.workClientInfo.domain.CwWorkClientBase;
 import com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientBaseDTO;
@@ -515,12 +516,16 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         }
         String isBmzr = "0";
         StringBuilder officeIds = new StringBuilder();
-        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
+        //UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
 //        UserDTO userDTO = UserUtils.getCurrentUserDTO();
         List<String> manageOfficeIdList= Lists.newArrayList();
 
 
-        IPage<CwProjectReportData> list = reportMapper.findList(page,userDTO,isBmzr, officeIds.toString(), queryWrapper);
+
+        long l1 = System.currentTimeMillis();
+        IPage<CwProjectReportData> list = reportMapper.findList(page,isBmzr, officeIds.toString(), queryWrapper);
+        long l2 = System.currentTimeMillis();
+        System.out.println("报告列表查询service方法消耗时间:" + (l2-l1));
         List<UserDTO> allUserInfo = SpringUtil.getBean(IUserApi.class).getAllUserInfo();
         list.getRecords().forEach(li->{
             if (StringUtils.isBlank(li.getProjectMasterName())){

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApply/service/ReportCancellApplyService.java

@@ -137,8 +137,10 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
             }
         }*/
 
-
+        long l1 = System.currentTimeMillis();
         IPage<ReportInfoDto> list = applyMapper.getList(page, queryWrapper,officeIds.toString());
+        long l2 = System.currentTimeMillis();
+        System.out.println("报告作废列表查询service方法消耗时间:" + (l2-l1));
         list.getRecords().stream().forEach(i -> {
             // 复核
             if (StringUtils.isNotBlank(i.getTaskId()) && StringUtils.isNotBlank(i.getStatus())) {
@@ -147,7 +149,11 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
                 }
             }
         });
+        long l3 = System.currentTimeMillis();
+        System.out.println("报告作废列表查询service方法获取审核人数据消耗时间:" + (l3-l2));
         List<UserDTO> allUserInfo = SpringUtil.getBean(IUserApi.class).getAllUserInfo();
+        long l4 = System.currentTimeMillis();
+        System.out.println("报告作废列表查询service方法获取所有审核人数据消耗时间:" + (l4-l3));
         list.getRecords().forEach(li -> {
             if (StringUtils.isBlank(li.getProjectMasterName())){
                 //根据项目经理1的id去查项目经理去名称