导出功能修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/mapper/xml/CwProjectRecordsMapper.xml

@@ -42,6 +42,7 @@
         <result property="clientContactsName" column="client_contacts_name" jdbcType="VARCHAR"/>
         <result property="reportType" column="report_type" jdbcType="VARCHAR"/>
         <result property="memberCount" column="member_count" jdbcType="VARCHAR"/>
+        <result property="realHeaderName" column="real_header_name" jdbcType="VARCHAR"/>
         <collection property="cwProjectClientInfoDTOList" ofType="com.jeeplus.test.cw.workClientInfo.service.dto.CwWorkClientBaseDTO" column="id" select="getProjectClient"></collection>
         <collection property="workAttachmentDtoList" ofType="com.jeeplus.test.workContract.service.dto.WorkAttachmentDto" column="id" select="getFileList"></collection>
         <collection property="cwProjectClientContactDTOList" ofType="com.jeeplus.test.cw.projectRecords.service.dto.CwProjectClientContactDTO" column="id" select="getContact"></collection>
@@ -216,6 +217,7 @@
         <include refid="Base_Column_List"></include>,
         su.name as user_name,
         su2.name as project_master_name,
+        su3.name as real_header_name,
         cw_wci.contract_name,
         cw_wci.contract_amount,
         cw_wci.contract_num,
@@ -227,6 +229,7 @@
         from cw_project_records a
         left join sys_user su on su.id = a.create_by and su.del_flag = '0'
         left join sys_user su2 on su2.id = a.project_master_id and su2.del_flag = '0'
+        left join sys_user su3 on su3.id = a.real_header and su3.del_flag = '0'
         left join cw_work_contract_info cw_wci on cw_wci.id = a.contract_id and cw_wci.del_flag = '0'
         left join cw_work_client_base cw_wcb on cw_wci.client_contacts = cw_wcb.id and cw_wcb.del_flag = '0'
         left join cw_project_business_type cw_pbt on cw_pbt.id = a.business_type and cw_pbt.del_flag = '0'
@@ -263,6 +266,7 @@
         <include refid="Base_Column_List"></include>,
         su.name as user_name,
         su2.name as project_master_name,
+        su3.name as real_header_name,
         cw_wci.contract_name,
         cw_wci.contract_amount,
         cw_wci.contract_num,
@@ -273,6 +277,7 @@
         from cw_project_records a
         left join sys_user su on su.id = a.create_by and su.del_flag = '0'
         left join sys_user su2 on su2.id = a.project_master_id and su2.del_flag = '0'
+        left join sys_user su3 on su3.id = a.real_header and su3.del_flag = '0'
         left join cw_work_contract_info cw_wci on cw_wci.id = a.contract_id and cw_wci.del_flag = '0'
         left join cw_work_client_base cw_wcb on cw_wci.client_contacts = cw_wcb.id and cw_wcb.del_flag = '0'
         left join cw_project_business_type cw_pbt on cw_pbt.id = a.business_type and cw_pbt.del_flag = '0'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/service/CwProjectRecordsService.java

@@ -112,6 +112,15 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
                     return new Page<>();
                 }
             }
+            if (StringUtils.isNotBlank(cwProjectRecordsDTO.getRealHeaderName())) {
+                List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwProjectRecordsDTO.getRealHeaderName()));
+                List<String> ids = userList.stream().distinct().map(User::getId).collect(Collectors.toList());
+                if (CollectionUtil.isNotEmpty(ids)) {
+                    queryWrapper.in("a.real_header", ids);
+                } else {
+                    return new Page<>();
+                }
+            }
             if (StringUtils.isNotBlank(cwProjectRecordsDTO.getCreateId())){
                 queryWrapper.eq("a.create_by", cwProjectRecordsDTO.getCreateId());
             }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/service/dto/CwProjectRecordsDTO.java

@@ -97,7 +97,6 @@ public class CwProjectRecordsDTO extends BaseDTO {
     /**
      * 状态
      */
-    @Excel(name = "审核状态",width = 25,orderNum = "5")
     private String status;
 
 
@@ -114,7 +113,7 @@ public class CwProjectRecordsDTO extends BaseDTO {
     /**
      * 项目经理姓名
      */
-    @Excel(name = "项目经理",width = 25,orderNum = "2")
+    @Excel(name = "项目经理",width = 25,orderNum = "3")
     private String projectMasterName;
 
     /**
@@ -150,6 +149,7 @@ public class CwProjectRecordsDTO extends BaseDTO {
     /**
      * 合同名称
      */
+    @Excel(name = "合同名称",width = 25,orderNum = "2")
     private String contractName;
 
     /**
@@ -160,13 +160,13 @@ public class CwProjectRecordsDTO extends BaseDTO {
     /**
      * 创建人姓名
      */
-    @Excel(name = "创建人",width = 25,orderNum = "3")
+    @Excel(name = "创建人",width = 25,orderNum = "5")
     private String createName;
 
     /**
      * 创建时间
      */
-    @Excel(name = "创建时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "4")
+    @Excel(name = "创建时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "6")
     private String createDateT;
 
     /**
@@ -195,6 +195,12 @@ public class CwProjectRecordsDTO extends BaseDTO {
     private String realHeader;
 
     /**
+     * 项目实际责任人
+     */
+    @Excel(name = "项目经理2",width = 25,orderNum = "4")
+    private String realHeaderName;
+
+    /**
      * 合同委托人
      */
     private String clientContactsName;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/service/dto/CwProjectReportArchiveDTO.java

@@ -26,6 +26,200 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
      */
     private String projectId;
 
+    /**
+     * 档案名称
+     */
+//    @Excel(name = "档案名称",width = 25,orderNum = "0")
+    private String name;
+
+    /**
+     * 被审计单位
+     */
+    private String auditedUnits;
+
+    /**
+     * 报告册数
+     */
+    @Excel(name = "报告册数",width = 25,orderNum = "5")
+    private String reportNum;
+
+    /**
+     * 底稿册数
+     */
+    @Excel(name = "底稿册数",width = 25,orderNum = "6")
+    private String papersNum;
+
+    /**
+     * 档案年度
+     */
+    @Excel(name = "档案年度",width = 25,orderNum = "7")
+    private String year;
+
+    /**
+     * 案卷号
+     */
+    @Excel(name = "案卷号",width = 25,orderNum = "8")
+    private String number;
+
+    /**
+     * 确认案卷号
+     */
+    private String isNumber;
+
+    /**
+     * 归档时间
+     */
+    @Excel(name = "归档时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "10")
+    private Date auditDate;
+
+    /**
+     * 流程id
+     */
+    private String procInsId;
+
+    /**
+     * 流程信息
+     */
+    private String processDefinitionId;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 项目信息
+     */
+    private CwProjectRecordsDTO cwProjectRecordsDTO;
+
+    /**
+     * 其他附件
+     */
+    private List<WorkAttachmentArchiveDto> WorkAttachmentDtoList;
+
+    /**
+     * 审计报告
+     */
+    private List<CwProjectReportArchiveReportDTO> cwProjectReportArchiveReportDTOList;
+
+    /**
+     * 被审计单位名称
+     */
+    @Excel(name = "被审计单位",width = 25,orderNum = "4")
+    private String auditedUnitsName;
+
+    /**
+     * 归档时间区间
+     */
+    private String[] auditDates;
+
+    /**
+     * 创建时间区间
+     */
+    private String[] createDates;
+
+    /**
+     * 报告文号
+     */
+    @Excel(name = "报告文号",width = 25,orderNum = "2")
+    private String reportNo;
+
+    /**
+     * 档案号
+     */
+    @Excel(name = "档案号",width = 25,orderNum = "0")
+    private String fileNumber;
+
+    /**
+     * 项目名称
+     */
+    @Excel(name = "项目名称",width = 25,orderNum = "1")
+    private String projectName;
+
+    /**
+     * 项目经理
+     */
+    @Excel(name = "项目经理",width = 25,orderNum = "3")
+    private String projectMasterName;
+
+    /**
+     * 创建人姓名
+     */
+    @Excel(name = "创建人",width = 25,orderNum = "13")
+    private String createName;
+
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "14")
+    private String createDateT;
+
+    /**
+     * 报告id
+     */
+    private String reportId;
+
+    /**
+     * 审计意见
+     */
+    private String reportRemarks;
+
+    /**
+     * 报告日期
+     */
+    @Excel(name = "报告日期",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "9")
+    private Date reportDate;
+
+    /**
+     * 报告主办人
+     */
+    private String reportCreateName;
+
+    /**
+     * 签字注师1
+     */
+    private String signatureAnnotator1Name;
+
+    /**
+     * 签字注师2
+     */
+    private String signatureAnnotator2Name;
+
+    /**
+     * 归档状态
+     */
+    @Excel(name = "归档状态",width = 25,orderNum = "11")
+    private String archiveSta;
+
+    /**
+     * 报告到归档时间差（天数）
+     */
+    private Integer archiveDay;
+
+    /**
+     * 报告时间区间
+     */
+    private String[] reportDates;
+
+    /**
+     * 罚款金额
+     */
+    private String fineMoney;
+
+    /**
+     * 超期天数
+     */
+    private String overDueDay;
+
+    /**
+     * 逾期天数（天数）
+     */
+    @Excel(name = "超期天数",width = 25,orderNum = "12")
+    private String overdueDay;
+
+
+    private static final long serialVersionUID = 1L;
+
     public String getRemarks() {
         return remarks;
     }
@@ -329,195 +523,4 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
-
-    /**
-     * 档案名称
-     */
-    @Excel(name = "档案名称",width = 25,orderNum = "0")
-    private String name;
-
-    /**
-     * 被审计单位
-     */
-    private String auditedUnits;
-
-    /**
-     * 报告册数
-     */
-    @Excel(name = "报告册数",width = 25,orderNum = "5")
-    private String reportNum;
-
-    /**
-     * 底稿册数
-     */
-    @Excel(name = "底稿册数",width = 25,orderNum = "6")
-    private String papersNum;
-
-    /**
-     * 档案年度
-     */
-    @Excel(name = "档案年度",width = 25,orderNum = "7")
-    private String year;
-
-    /**
-     * 案卷号
-     */
-    @Excel(name = "案卷号",width = 25,orderNum = "8")
-    private String number;
-
-    /**
-     * 确认案卷号
-     */
-    private String isNumber;
-
-    /**
-     * 归档时间
-     */
-    @Excel(name = "归档时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "10")
-    private Date auditDate;
-
-    /**
-     * 流程id
-     */
-    private String procInsId;
-
-    /**
-     * 流程信息
-     */
-    private String processDefinitionId;
-
-    /**
-     * 状态
-     */
-    private String status;
-
-    /**
-     * 项目信息
-     */
-    private CwProjectRecordsDTO cwProjectRecordsDTO;
-
-    /**
-     * 其他附件
-     */
-    private List<WorkAttachmentArchiveDto> WorkAttachmentDtoList;
-
-    /**
-     * 审计报告
-     */
-    private List<CwProjectReportArchiveReportDTO> cwProjectReportArchiveReportDTOList;
-
-    /**
-     * 被审计单位名称
-     */
-    @Excel(name = "被审计单位",width = 25,orderNum = "4")
-    private String auditedUnitsName;
-
-    /**
-     * 归档时间区间
-     */
-    private String[] auditDates;
-
-    /**
-     * 创建时间区间
-     */
-    private String[] createDates;
-
-    /**
-     * 报告文号
-     */
-    @Excel(name = "报告文号",width = 25,orderNum = "9")
-    private String reportNo;
-
-    /**
-     * 档案号
-     */
-    @Excel(name = "档案号",width = 25,orderNum = "1")
-    private String fileNumber;
-
-    /**
-     * 项目名称
-     */
-    @Excel(name = "项目名称",width = 25,orderNum = "2")
-    private String projectName;
-
-    /**
-     * 项目经理
-     */
-    @Excel(name = "项目经理",width = 25,orderNum = "3")
-    private String projectMasterName;
-
-    /**
-     * 创建人姓名
-     */
-    @Excel(name = "创建人",width = 25,orderNum = "11")
-    private String createName;
-
-    /**
-     * 创建时间
-     */
-    @Excel(name = "创建时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "12")
-    private String createDateT;
-
-    /**
-     * 报告id
-     */
-    private String reportId;
-
-    /**
-     * 审计意见
-     */
-    private String reportRemarks;
-
-    /**
-     * 报告日期
-     */
-    private Date reportDate;
-
-    /**
-     * 报告主办人
-     */
-    private String reportCreateName;
-
-    /**
-     * 签字注师1
-     */
-    private String signatureAnnotator1Name;
-
-    /**
-     * 签字注师2
-     */
-    private String signatureAnnotator2Name;
-
-    /**
-     * 归档状态
-     */
-    private String archiveSta;
-
-    /**
-     * 报告到归档时间差（天数）
-     */
-    private Integer archiveDay;
-
-    /**
-     * 报告时间区间
-     */
-    private String[] reportDates;
-
-    /**
-     * 罚款金额
-     */
-    private String fineMoney;
-
-    /**
-     * 超期天数
-     */
-    private String overDueDay;
-
-    /**
-     * 逾期天数（天数）
-     */
-    private String overdueDay;
-
-
-    private static final long serialVersionUID = 1L;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/workClientInfo/service/dto/CwWorkClientBaseDTO.java

@@ -119,7 +119,7 @@ public class CwWorkClientBaseDTO extends BaseDTO {
     /**
      * 客户报备类型
      */
-    @Excel(name = "客户报备类型",width = 25,orderNum = "10")
+//    @Excel(name = "客户报备类型",width = 25,orderNum = "10")
     private String reportType;
 
     /**
@@ -155,7 +155,7 @@ public class CwWorkClientBaseDTO extends BaseDTO {
     /**
      * 状态
      */
-    @Excel(name = "审核状态",width = 25,orderNum = "13")
+    @Excel(name = "修改申请状态",width = 25,orderNum = "14")
     private String status;
 
     /**
@@ -266,6 +266,7 @@ public class CwWorkClientBaseDTO extends BaseDTO {
     /**
      * 拥有人姓名
      */
+    @Excel(name = "拥有人",width = 25,orderNum = "13")
     private String updateUserName;
 
     /**