xielianghe

whepi-doc/mrsb.sql

@@ -10,6 +10,7 @@ CREATE TABLE ms_report  (
   suspected_num     int(11) NOT NULL DEFAULT 0                              COMMENT '疑似人数',
   remarks           varchar(200)  NOT NULL DEFAULT ''                       COMMENT '异常备注',
   report_date       date                                                    COMMENT '上报日期',
+  report_status     int(11) NOT NULL DEFAULT 1                              COMMENT '上报状态:0草稿,1正常',
   ms_status         int(11) NOT NULL DEFAULT 1                              COMMENT '健康状态:1正常,2异常',
   user_create       bigint(20) NOT NULL DEFAULT 0                           COMMENT '新增人',
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0)       COMMENT '新增时间',

whepi-web/src/main/java/com/bofeng/entity/MsReport.java

@@ -41,6 +41,9 @@ public class MsReport {
     @TableField("report_date")
     private Date reportDate;
 
+    @TableField("report_status")
+    private Integer reportStatus;
+
     @TableField("ms_status")
     private Integer msStatus;
 

whepi-web/src/main/java/com/bofeng/service/MsReportService.java

@@ -71,6 +71,7 @@ public class MsReportService {
             msReport.setSuspectedNum(0);
             msReport.setRemarks("");
             msReport.setReportDate(DateTime.now().toDate());
+            msReport.setReportStatus(1);
             msReport.setMsStatus(1);
             msReport.setUserCreate(userCreate);
             msReport.setTimeCreate(DateTime.now());
@@ -86,6 +87,7 @@ public class MsReportService {
                     msReport.setMsStatus(1);
                 else
                     msReport.setMsStatus(2);
+                msReport.setReportStatus(1);
                 msReport.setSafetyNum(Integer.parseInt(safetyNum));
                 msReport.setUserUpdate(0L);
                 msReport.setTimeUpdate(DateTime.now());