我的承办

src/main/java/com/xjrsoft/module/oa/dto/OfficialDocumentReceivedHandlePageDto.java

@@ -52,5 +52,5 @@ public class OfficialDocumentReceivedHandlePageDto extends PageInput {
     private LocalDate handleDateEnd;
 
     @ApiModelProperty("登录人id")
-    private Long longUserId;
+    private Long loginUserId;
 }

src/main/java/com/xjrsoft/module/oa/service/impl/OfficialDocumentReceivedHandleServiceImpl.java

@@ -33,7 +33,7 @@ public class OfficialDocumentReceivedHandleServiceImpl extends MPJBaseServiceImp
 
     @Override
     public Page<OfficialDocumentReceivedHandlePageVo> getPage(Page<OfficialDocumentReceivedHandlePageVo> page, OfficialDocumentReceivedHandlePageDto dto) {
-        dto.setLongUserId(StpUtil.getLoginIdAsLong());
+        dto.setLoginUserId(StpUtil.getLoginIdAsLong());
         return this.baseMapper.getPage(page, dto);
     }
 

src/main/java/com/xjrsoft/module/oa/vo/OfficialDocumentReceivedHandlePageVo.java

@@ -3,6 +3,7 @@ package com.xjrsoft.module.oa.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -14,70 +15,40 @@ import java.time.LocalDateTime;
 @Data
 public class OfficialDocumentReceivedHandlePageVo {
 
-    /**
-    * 主键编号
-    */
     @ApiModelProperty("主键编号")
     private String id;
-    /**
-    * 创建人
-    */
-    @ApiModelProperty("创建人")
-    private Long createUserId;
-    /**
-    * 创建时间
-    */
-    @ApiModelProperty("创建时间")
-    private LocalDateTime createDate;
-    /**
-    * 修改人
-    */
-    @ApiModelProperty("修改人")
-    private Long modifyUserId;
-    /**
-    * 修改时间
-    */
-    @ApiModelProperty("修改时间")
-    private LocalDateTime modifyDate;
-    /**
-    * 删除标记
-    */
-    @ApiModelProperty("删除标记")
-    private Integer deleteMark;
-    /**
-    * 有效标志
-    */
-    @ApiModelProperty("有效标志")
-    private Integer enabledMark;
-    /**
-    * 公文收文id(official_document_post)
-    */
-    @ApiModelProperty("公文收文id(official_document_post)")
-    private Long officialDocumentReceivedId;
-    /**
-    * 转办人id(xjr_user)
-    */
-    @ApiModelProperty("转办人id(xjr_user)")
-    private Long receiveUserId;
-    /**
-    * 是否落实
-    */
-    @ApiModelProperty("是否落实")
+
+    @ApiModelProperty("收文类型")
+    private String receivedTypeCn;
+
+    @ApiModelProperty("收文标题")
+    private String receivedTitle;
+
+    @ApiModelProperty("收文文号/序号")
+    private String receivedNumber;
+
+    @ApiModelProperty("收文日期")
+    private LocalDate receivedDate;
+
+    @ApiModelProperty("来文机关")
+    private String communicationOrg;
+
+    @ApiModelProperty("来文文号")
+    private String communicationNumber;
+
+    @ApiModelProperty("落实负责人")
+    private String handleDutyUserName;
+
+    @ApiModelProperty("转办人")
+    private String receiveUserNames;
+
+    @ApiModelProperty("是否落实(0:未落实 1:已落实)")
     private Integer isHandle;
-    /**
-    * 落实时间
-    */
+
+    @ApiModelProperty("落实人")
+    private String handleUserName;
+
     @ApiModelProperty("落实时间")
     private LocalDateTime handleTime;
-    /**
-    * 提醒时间
-    */
-    @ApiModelProperty("提醒时间")
-    private LocalDateTime alertTime;
-    /**
-    * 是否转办
-    */
-    @ApiModelProperty("是否转办")
-    private Integer isTransfer;
 
 }

src/main/resources/mapper/oa/OfficialDocumentReceivedHandleMapper.xml

@@ -3,15 +3,15 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjrsoft.module.oa.mapper.OfficialDocumentReceivedHandleMapper">
-    <select id="getPage" resultType="com.xjrsoft.module.oa.dto.OfficialDocumentReceivedHandlePageDto" parameterType="com.xjrsoft.module.oa.vo.OfficialDocumentReceivedHandlePageVo">
-        SELECT DISTINCT t1.id, t6.name AS received_type_cn, t1.received_title,t1.received_number,
+    <select id="getPage" parameterType="com.xjrsoft.module.oa.dto.OfficialDocumentReceivedHandlePageDto" resultType="com.xjrsoft.module.oa.vo.OfficialDocumentReceivedHandlePageVo">
+        SELECT DISTINCT t1.id, t6.name AS receivedTypeCn, t1.received_title,t1.received_number,
         t1.received_date,t1.communication_org,t1.communication_number,t3.name AS handle_duty_user_name,
         REPLACE((
         SELECT GROUP_CONCAT(c2.name) FROM official_document_received_handle c1
         INNER JOIN xjr_user c2 ON c1.receive_user_id = c2.id
         WHERE c1.delete_mark = 0 AND c1.official_document_received_id = t1.id and c1.is_transfer = 1
-        ),',', '>') AS receive_user_name,t1.is_handle,t4.name as handle_user_name,t1.handle_time FROM official_document_received t1
-        INNER JOIN xjr_workflow_form_relation t2 ON t1.id =  CAST(t2.form_key_value AS SIGNED)
+        ),',', '>') AS receive_user_names,t1.is_handle,t4.name as handle_user_name,t1.handle_time FROM official_document_received t1
+        INNER JOIN xjr_workflow_form_relation t2 ON t1.id = CAST(t2.form_key_value AS SIGNED)
         LEFT JOIN xjr_user t3 ON t1.handle_duty_user_id = t3.id
         LEFT JOIN xjr_user t4 ON t1.handle_user_id = t4.id
         LEFT JOIN official_document_received_handle t5 ON t1.id = t5.official_document_received_id