修改报表列表

boman-api/boman-domain/src/main/java/com/boman/domain/entity/vo/StatisticReportVo.java

@@ -5,6 +5,8 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
+import java.sql.Date;
+import java.sql.Timestamp;
 import java.util.List;
 import java.util.Map;
 
@@ -12,10 +14,6 @@ import java.util.Map;
  * @author tjf
  * @Date: 2021/08/24/14:26
  */
-@Getter
-@Setter
-@ToString
-@Builder
 public class StatisticReportVo {
     private Long id;
     private String reportName;
@@ -38,4 +36,172 @@ public class StatisticReportVo {
     private List<Map<String,Object>> filledInList;
     //未填报单位
     private List<Map<String,Object>> filledOutList;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getReportName() {
+        return reportName;
+    }
+
+    public void setReportName(String reportName) {
+        this.reportName = reportName;
+    }
+
+    public String getReportId() {
+        return reportId;
+    }
+
+    public void setReportId(String reportId) {
+        this.reportId = reportId;
+    }
+
+    public String getTemplateName() {
+        return templateName;
+    }
+
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getReportStatus() {
+        return reportStatus;
+    }
+
+    public void setReportStatus(String reportStatus) {
+        this.reportStatus = reportStatus;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getRepUploadFile() {
+        return repUploadFile;
+    }
+
+    public void setRepUploadFile(String repUploadFile) {
+        this.repUploadFile = repUploadFile;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public Timestamp getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Timestamp createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public Timestamp getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Timestamp updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(String isDel) {
+        this.isDel = isDel;
+    }
+
+    public List<Map<String, Object>> getPersonnelList() {
+        return personnelList;
+    }
+
+    public void setPersonnelList(List<Map<String, Object>> personnelList) {
+        this.personnelList = personnelList;
+    }
+
+    public List<Map<String, Object>> getFilledInList() {
+        return filledInList;
+    }
+
+    public void setFilledInList(List<Map<String, Object>> filledInList) {
+        this.filledInList = filledInList;
+    }
+
+    public List<Map<String, Object>> getFilledOutList() {
+        return filledOutList;
+    }
+
+    public void setFilledOutList(List<Map<String, Object>> filledOutList) {
+        this.filledOutList = filledOutList;
+    }
+
+    @Override
+    public String toString() {
+        return "StatisticReportVo{" +
+                "id=" + id +
+                ", reportName='" + reportName + '\'' +
+                ", reportId='" + reportId + '\'' +
+                ", templateName='" + templateName + '\'' +
+                ", startTime=" + startTime +
+                ", endTime=" + endTime +
+                ", reportStatus='" + reportStatus + '\'' +
+                ", status='" + status + '\'' +
+                ", repUploadFile='" + repUploadFile + '\'' +
+                ", remark='" + remark + '\'' +
+                ", createBy='" + createBy + '\'' +
+                ", createTime=" + createTime +
+                ", updateBy='" + updateBy + '\'' +
+                ", updateTime=" + updateTime +
+                ", isDel='" + isDel + '\'' +
+                ", personnelList=" + personnelList +
+                ", filledInList=" + filledInList +
+                ", filledOutList=" + filledOutList +
+                '}';
+    }
 }

boman-report/src/main/java/com/boman/report/controller/StatisticReportController.java

@@ -59,7 +59,6 @@ public class StatisticReportController extends BaseController {
     @GetMapping(value = "/reportInfo/{id}")
     public AjaxResult getReportInfo(@PathVariable Long id)
     {
-        statisticReportService.getReportInfo(id);
-        return AjaxResult.success();
+        return statisticReportService.getReportInfo(id);
     }
 }

boman-report/src/main/java/com/boman/report/service/impl/StatisticReportServiceImpl.java

@@ -14,6 +14,7 @@ import com.boman.report.mapper.StatisticReportPersonnelMapper;
 import com.boman.report.service.StatisticReportService;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.report.service.StatisticReportPersonnelService;
+import org.apache.commons.lang3.SerializationUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

boman-report/src/main/resources/mapper/StatisticReportMapper.xml

@@ -22,12 +22,32 @@
         <result property="isDel" column="is_del"/>
     </resultMap>
 
+    <resultMap type="com.boman.domain.entity.vo.StatisticReportVo" id="StatisticReportVoResult">
+        <id property="id" column="id"/>
+        <result property="reportName" column="report_name"/>
+        <result property="reportId" column="report_id"/>
+        <result property="templateName" column="template_name"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="reportStatus" column="report_status"/>
+        <result property="status" column="status"/>
+        <result property="repUploadFile" column="rep_upload_file"/>
+        <result property="remark" column="remark"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="isDel" column="is_del"/>
+    </resultMap>
+
+
+
     <sql id="selectStatisticReportVo">
         select id, report_name, report_id, template_name, start_time, end_time, report_status, status, rep_upload_file, remark, create_by, create_time, update_by, update_time, is_del
         from statistic_report
     </sql>
 
-    <select id="getReportInfo" parameterType="Long" resultMap="StatisticReportResult">
+    <select id="getReportInfo" parameterType="Long" resultMap="StatisticReportVoResult">
         <include refid="selectStatisticReportVo"/>
         where id = #{id} and is_del = "N"
     </select>