归档导出现场负责人 改为 发起归档人

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/controller/CwProjectReportArchiveController.java

@@ -236,11 +236,11 @@ public class CwProjectReportArchiveController {
         AtomicInteger counter = new AtomicInteger(1);
         result.forEach(re -> {
             //项目经理处理
-            if(StringUtils.isNotBlank(re.getProjectMasterName())){
-                re.setProjectCreateName(re.getProjectMasterName());
-            }else{
-                re.setProjectCreateName(re.getRealHeaderName());
-            }
+            //if(StringUtils.isNotBlank(re.getProjectMasterName())){
+            //    re.setProjectCreateName(re.getProjectMasterName());
+            //}else{
+            //    re.setProjectCreateName(re.getRealHeaderName());
+            //}
             //字典值处理
             if(StringUtils.isNotBlank(re.getEntrustType())){
                 for (String key : cwReimbursementSourceTypeValueDTOs.keySet()) {

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/mapper/xml/CwProjectReportArchiveMapper.xml

@@ -351,7 +351,7 @@
         left join sys_user su1 on cw_pr.project_master_id = su1.id and su1.del_flag = '0'
         left join sys_user su2 on cw_pr.real_header = su2.id and su2.del_flag = '0'
         left join cw_project_report_new_line cw_prnl on cw_prnl.report_id = cw_pa.report_id and cw_prnl.del_flag = '0'
-        left join sys_user su3 on su3.id = cw_pr.create_by_id and su3.del_flag = '0'
+        left join sys_user su3 on su3.id = cw_pa.create_by_id and su3.del_flag = '0'
 
         left join cw_project_report pr on cw_pa.report_id=pr.id and pr.del_flag = '0'
         left join cw_project_report_review cprr on cprr.report_id=pr.id and cprr.del_flag = '0'

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/service/CwProjectReportArchiveService.java

@@ -783,7 +783,6 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
         }
 
         IPage<CwProjectReportArchiveExportDTO> list = cwProjectReportArchiveMapper.findExportList(page, userDTO, isBmzr, officeIds.toString(), queryWrapper, cwProjectReportArchiveDTO.getArchiveSta());
-        List<CwProjectReportArchiveExportDTO> records = list.getRecords();
         return list;
     }