Browse Source

xielianghe

lange 5 năm trước cách đây
mục cha
commit
222c7e9445

+ 6 - 5
whepi-doc/mrsb.sql

@@ -6,9 +6,10 @@ CREATE TABLE ms_report  (
   report_id         bigint(20) NOT NULL DEFAULT 0                           COMMENT '上报ID',
   house_id          bigint(20) NOT NULL DEFAULT 0                           COMMENT '门牌ID',
   safety_num        int(11) NOT NULL DEFAULT 0                              COMMENT '今日居家人数',
+  sure_num          int(11) NOT NULL DEFAULT 0                              COMMENT '确诊人数',
   suspected_num     int(11) NOT NULL DEFAULT 0                              COMMENT '疑似人数',
-  remarks           varchar(100)  NOT NULL DEFAULT ''                       COMMENT '异常备注',
-  report_date       date (0)                                                COMMENT '上报日期',
+  remarks           varchar(200)  NOT NULL DEFAULT ''                       COMMENT '异常备注',
+  report_date       date                                                    COMMENT '上报日期',
   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 '新增时间',
@@ -27,9 +28,9 @@ CREATE TABLE ms_suspected  (
   report_id         bigint(20) NOT NULL DEFAULT 0                           COMMENT '上报ID',
   user_name         varchar(50)  NOT NULL DEFAULT ''                        COMMENT '家人姓名',
   family_relative   int(11)    NOT NULL DEFAULT 1                           COMMENT '是否家庭成员:1是,2暂住亲友',
-  medical           int(11)    NOT NULL DEFAULT 1                           COMMENT '是否就医:1否,1是',
-  condition_status  varchar(50)  NOT NULL DEFAULT ''                        COMMENT '疑似情况:1咳嗽,2发烧,3腹泻,4胸痛,5咽痛,6其他 ',
-  remarks           varchar(100)  NOT NULL DEFAULT ''                       COMMENT '异常备注',
+  medical           int(11)    NOT NULL DEFAULT 1                           COMMENT '是否就医:0否,1是',
+  condition_status  varchar(50)  NOT NULL DEFAULT ''                        COMMENT '疑似情况:1咳嗽,2发烧,3腹泻,4酸痛,5乏力,6其他 ',
+  remarks           varchar(200)  NOT NULL DEFAULT ''                       COMMENT '异常备注',
   user_create       bigint(20) NOT NULL DEFAULT 0                           COMMENT '新增人',
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0)       COMMENT '新增时间',
   user_update       bigint(20) NOT NULL DEFAULT 0                           COMMENT '修改人',

+ 3 - 3
whepi-ui/templates/home/home.ftl

@@ -62,9 +62,9 @@
         ribao_cancel();
         ribao_commit();
 
-        <#--var msReport = ${msReport};-->
-        <#--$('#ribao_safety_num').val(msReport.safetyNum);-->
-        <#--ribaoInitialization(msReport.reportId);-->
+        var msReport = ${msReport};
+        $('#ribao_safety_num').val(msReport.safetyNum);
+        ribaoInitialization(msReport.reportId);
         /*submit_back();*/
         familyClick();
 

+ 19 - 1
whepi-ui/templates/home/ribao.ftl

@@ -74,7 +74,7 @@
                                             <i class="weui-icon-checked"></i>
                                         </div>
                                         <div class="weui-cell__bd">
-                                            <p>乏力</p>
+                                            <p>腹泻</p>
                                         </div>
                                     </label>
                                     <label class="weui-cell weui-cell_active weui-check__label" for="s14">
@@ -83,6 +83,24 @@
                                             <i class="weui-icon-checked"></i>
                                         </div>
                                         <div class="weui-cell__bd">
+                                            <p>酸痛</p>
+                                        </div>
+                                    </label>
+                                    <label class="weui-cell weui-cell_active weui-check__label" for="s14">
+                                        <div class="weui-cell__hd">
+                                            <input type="checkbox" name="checkbox5" class="weui-check" id="s15">
+                                            <i class="weui-icon-checked"></i>
+                                        </div>
+                                        <div class="weui-cell__bd">
+                                            <p>乏力</p>
+                                        </div>
+                                    </label>
+                                    <label class="weui-cell weui-cell_active weui-check__label" for="s14">
+                                        <div class="weui-cell__hd">
+                                            <input type="checkbox" name="checkbox6" class="weui-check" id="s16">
+                                            <i class="weui-icon-checked"></i>
+                                        </div>
+                                        <div class="weui-cell__bd">
                                             <p>其他</p>
                                         </div>
                                     </label>

+ 28 - 5
whepi-ui/templates/home/ribao.js

@@ -39,15 +39,19 @@ function helpValue(v) {
   if (conditionStatusList[1] > 0)
     conditionStatus += "&nbsp;&nbsp;&nbsp;发烧"
   if (conditionStatusList[2] > 0)
-    conditionStatus += "&nbsp;&nbsp;&nbsp;乏力"
+    conditionStatus += "&nbsp;&nbsp;&nbsp;腹泻"
   if (conditionStatusList[3] > 0)
+    conditionStatus += "&nbsp;&nbsp;&nbsp;酸痛"
+  if (conditionStatusList[4] > 0)
+    conditionStatus += "&nbsp;&nbsp;&nbsp;乏力"
+  if (conditionStatusList[5] > 0)
     conditionStatus += "&nbsp;&nbsp;&nbsp;其他"
   if (v.medical > 0)
     conditionStatus += "&nbsp;&nbsp;&nbsp;确诊"
   else
     conditionStatus += "&nbsp;&nbsp;&nbsp;未确诊"
   $('#rb_family').append($('<div class="weui-media-box weui-media-box_text">\n' +
-    '                                      <h4 class="weui-media-box__title">' + conditionStatus + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #2a62bc" onclick=\'deleteSuspected(' + JSON.stringify(v.suspectedId) + ')\'>删除</a></h4>\n' +
+    '                                      <h4 class="weui-media-box__title">' + conditionStatus + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #2a62bc" onclick=\'deleteSuspected(' + JSON.stringify(v.suspectedId,v.reportId)+ ')\'>删除</a></h4>\n' +
     '                                      <p class="weui-media-box__desc">' + v.remarks + '</p>\n' +
     '                                    </div>\n' +
     '                              '));
@@ -93,6 +97,11 @@ function ribao_commit() {
 
 function ribaoCommit() {
   var user_name = $("#js_input_user_name").val();
+  if(user_name==""){
+    alert("请填写家人姓名")
+  }if(user_name.length>25){
+    alert("请填写正确格式家人姓名")
+  }
   var remarks = $("#rb_remarks").val();
   var medical = "";
   if ($("input[name='medical']:checked").val() == "on")
@@ -116,6 +125,14 @@ function ribaoCommit() {
     conditionStatus += ",4";
   else
     conditionStatus += ",0";
+  if ($("input[name='checkbox5']:checked").val() == "on")
+    conditionStatus += ",5";
+  else
+    conditionStatus += ",0";
+  if ($("input[name='checkbox6']:checked").val() == "on")
+    conditionStatus += ",4";
+  else
+    conditionStatus += ",6";
 
   $.ajax({
     url: '/home/addRibao.json',
@@ -129,7 +146,7 @@ function ribaoCommit() {
   });
 }
 
-function deleteSuspected(suspectedId) {
+function deleteSuspected(suspectedId,reportId) {
   $.ajax({
     url: '/home/deleteSuspected.json',
     type: "post",
@@ -193,10 +210,16 @@ function helpValue1(v) {
       conditionStatus += "&nbsp;&nbsp;&nbsp;发烧"
   }
   if (conditionStatusList[2] > 0) {
-      conditionStatus += "&nbsp;&nbsp;&nbsp;乏力"
+      conditionStatus += "&nbsp;&nbsp;&nbsp;腹泻"
   }
   if (conditionStatusList[3] > 0) {
-      conditionStatus += "&nbsp;&nbsp;&nbsp;其他"
+      conditionStatus += "&nbsp;&nbsp;&nbsp;酸痛"
+  }
+  if (conditionStatusList[4] > 0) {
+    conditionStatus += "&nbsp;&nbsp;&nbsp;乏力"
+  }
+  if (conditionStatusList[5] > 0) {
+    conditionStatus += "&nbsp;&nbsp;&nbsp;其他"
   }
   if (v.medical > 0)
     conditionStatus += "&nbsp;&nbsp;&nbsp;确诊"

+ 9 - 1
whepi-web/src/main/java/com/bofeng/dao/MsReportMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.bofeng.entity.MsReport;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -16,6 +17,13 @@ import java.util.List;
 @Repository
 public interface MsReportMapper extends BaseMapper<MsReport> {
 
-    List<MsReport> selectByReportDate(@Param("reportDate") String reportDate);
+    List<MsReport> selectByReportDate(@Param("reportDate") String reportDate,@Param("userCreate") Long userCreate);
+
+    @Select("select property_id from sys_user_role where user_id=#{userId}")
+    long selectHouseIdByUserId(@Param("userId") Long userId);
+
+    //
+    @Select("select count(*) from ms_suspected where report_id=#{reportId} and  medical=#{medical}")
+    Integer selectSuspectedNum(@Param("reportId") Long reportId,@Param("medical") Integer medical);
 
 }

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

@@ -29,6 +29,9 @@ public class MsReport {
     @TableField("safety_num")
     private Integer safetyNum;
 
+    @TableField("sure_num")
+    private Integer sureNum;
+
     @TableField("suspected_num")
     private Integer suspectedNum;
 

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

@@ -34,22 +34,22 @@ public class MsReportService {
         return msSuspectedMapper.selectByReportId(reportId);
     }
 
-    public List<MsSuspected> getByReportReportDate(String reportDate) {
+    public List<MsSuspected> getByReportReportDate(String reportDate, Long userCreate) {
 
-        List<MsReport> listReport = msReportMapper.selectByReportDate(reportDate);
+        List<MsReport> listReport = msReportMapper.selectByReportDate(reportDate, userCreate);
         List<MsSuspected> listSuspected = null;
         if (listReport != null && listReport.size() > 0) {
             listSuspected = msSuspectedMapper.selectByReportId(Long.parseLong(listReport.get(0).getReportId().toString()));
         }
-        return  listSuspected;
+        return listSuspected;
     }
 
-    public MsReport getReportByDateNow(Long userId) {
+    public MsReport getReportByDateNow(Long userCreate) {
         Date t = new Date();
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
         String reportDate = df.format(t);
-        List<MsReport> listReport = msReportMapper.selectByReportDate(reportDate);
-        MsReport msReport= new MsReport();
+        List<MsReport> listReport = msReportMapper.selectByReportDate(reportDate, userCreate);
+        MsReport msReport = new MsReport();
         if (listReport != null && listReport.size() > 0) {
             msReport = msReportMapper.selectById(Long.parseLong(listReport.get(0).getReportId().toString()));
         }
@@ -57,29 +57,36 @@ public class MsReportService {
     }
 
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public void addReport(String safetyNum) {
+    public void addReport(String safetyNum, Long userCreate) {
         //如果是当前日期 已经添加
         Date t = new Date();
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
         String reportDate = df.format(t);
-        List<MsReport> listReport = msReportMapper.selectByReportDate(reportDate);
+        List<MsReport> listReport = msReportMapper.selectByReportDate(reportDate, userCreate);
+        Long houseId = msReportMapper.selectHouseIdByUserId(userCreate);
         if (listReport == null || listReport.size() == 0) {
             MsReport msReport = new MsReport();
             msReport.setReportId(IdWorker.getId());
-            msReport.setHouseId(0L);
+            msReport.setHouseId(houseId);
             msReport.setSafetyNum(Integer.parseInt(safetyNum));
             msReport.setSuspectedNum(0);
             msReport.setRemarks("");
             msReport.setReportDate(DateTime.now().toDate());
-            msReport.setMsStatus(0);
-            msReport.setUserCreate(0L);
+            msReport.setMsStatus(1);
+            msReport.setUserCreate(userCreate);
             msReport.setTimeCreate(DateTime.now());
-            msReport.setUserUpdate(0L);
+            msReport.setUserUpdate(userCreate);
             msReport.setTimeUpdate(DateTime.now());
             msReportMapper.insert(msReport);
-        } else{
+        } else {
             //更新居家成员
-            for(MsReport msReport : listReport){
+            MsReport msReport = msReportMapper.selectById(listReport.get(0).getReportId());
+            if (msReport != null) {
+                List<MsSuspected> list= msSuspectedMapper.selectByReportId(msReport.getReportId());
+                if(list==null || list.size()==0)
+                    msReport.setMsStatus(1);
+                else
+                    msReport.setMsStatus(2);
                 msReport.setSafetyNum(Integer.parseInt(safetyNum));
                 msReport.setUserUpdate(0L);
                 msReport.setTimeUpdate(DateTime.now());

+ 25 - 9
whepi-web/src/main/java/com/bofeng/service/MsSuspectedService.java

@@ -32,30 +32,32 @@ public class MsSuspectedService {
 
 
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public void addSuspected(String userName, String conditionStatus, Integer medical, String remarks) {
+    public void addSuspected(String userName, String conditionStatus, Integer medical, String remarks,Long userCreate) {
         Long reportId = 0L;
         //如果是当前日期 已经添加
         Date t = new Date();
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
         String reportDate = df.format(t);
-        List<MsReport> listReport = msReportMapper.selectByReportDate(reportDate);
+        List<MsReport> listReport = msReportMapper.selectByReportDate(reportDate,userCreate);
+        Long houseId=msReportMapper.selectHouseIdByUserId(userCreate);
         if (listReport == null || listReport.size() == 0) {
             MsReport msReport = new MsReport();
             msReport.setReportId(IdWorker.getId());
-            msReport.setHouseId(0L);
+            msReport.setHouseId(houseId);
             msReport.setSafetyNum(0);
             msReport.setSuspectedNum(0);
             msReport.setRemarks("");
             msReport.setReportDate(DateTime.now().toDate());
-            msReport.setMsStatus(0);
-            msReport.setUserCreate(0L);
+            msReport.setMsStatus(2);
+            msReport.setUserCreate(userCreate);
             msReport.setTimeCreate(DateTime.now());
-            msReport.setUserUpdate(0L);
+            msReport.setUserUpdate(userCreate);
             msReport.setTimeUpdate(DateTime.now());
             msReportMapper.insert(msReport);
             reportId = msReport.getReportId();
-        } else
+        } else{
             reportId = listReport.get(0).getReportId();
+        }
 
         //添加家人
         MsSuspected msSuspected = new MsSuspected();
@@ -66,11 +68,25 @@ public class MsSuspectedService {
         msSuspected.setConditionStatus(conditionStatus);
         msSuspected.setMedical(medical);
         msSuspected.setRemarks(remarks);
-        msSuspected.setUserCreate(0L);
+        msSuspected.setUserCreate(userCreate);
         msSuspected.setTimeCreate(DateTime.now());
-        msSuspected.setUserUpdate(0L);
+        msSuspected.setUserUpdate(userCreate);
         msSuspected.setTimeUpdate(DateTime.now());
         msSuspectedMapper.insert(msSuspected);
+
+        //确证人数
+        Integer isTrue=msReportMapper.selectSuspectedNum(reportId,medical);
+        MsReport msReport=msReportMapper.selectById(reportId);
+        if(msReport!=null){
+            if(medical==0)
+                msReport.setSuspectedNum(isTrue);
+            if(medical==1)
+                msReport.setSureNum(isTrue);
+            msReport.setUserUpdate(userCreate);
+            msReport.setTimeUpdate(DateTime.now());
+            msReportMapper.updateById(msReport);
+        }
+
     }
 
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)

+ 50 - 49
whepi-web/src/main/java/com/bofeng/wx/controller/HomeController.java

@@ -32,55 +32,56 @@ import java.util.Map;
 @RestController
 public class HomeController {
 
-  @Autowired
-  private HomeService homeService;
-
-  @Autowired
-  private QzTaskService qzTaskService;
-
-  @Autowired
-  private QzTaskReplyService qzTaskReplyService;
-
-  @Autowired
-  private MsReportService msReportService;
-
-
-  @GetMapping("/home/home.html")
-  public ModelAndView home(ModelMap model)throws JsonProcessingException {
-    //UserOpen userOpen = homeService.getUserOpen();
-    model.put("user", new JsonWapper("{\"www\": \"er\"}"));
-    //初始化今日日报
-    Long userId=0L;
-    MsReport msReport =msReportService.getReportByDateNow(userId);
-    model.put("msReport", new JsonWapper(msReport));
-    return new ModelAndView("/home/home.ftl", model);
-  }
-
-
-  //家庭求助
-  @GetMapping("/home/home/addFimaly")
-  public ModelOps family(@Pd(name = "taskTitle") String taskTitle,
-                         @Pd(name = "taskTarget") String taskTarget,
-                         @Pd(name = "remark") String remark,
-                         @Pd(name = "userId", required = false) Long userId) {
-    return ModelOps.newSuccess(qzTaskService.addHelp(taskTitle, taskTarget, remark, userId));
-  }
-
-  //我的在求助的展示
-  @GetMapping("/home/home/queryQzTask")
-  public Model<List<QzTask>> queryQzTask(@Pd(name = "taskStatus", required = false) Integer taskStatus,
-                                         @Pd(name = "taskTitle", required = false) String taskTitle,
-                                         @Pd(name = "userId", required = false) Long userId) {
-    return Model.newSuccess(qzTaskService.queryQzTask(taskStatus, taskTitle, userId));
-  }
-
-
-  //页面存储taskId
-  @GetMapping("/home/qiuzhu/reply.json")
-  public ModelOps taskQueryTaskId(@RequestParam(value = "taskId") Long taskId) {
-    int i = qzTaskService.taskQueryTaskId(taskId);
-    return ModelOps.newSuccess(i);
-  }
+    @Autowired
+    private HomeService homeService;
+
+    @Autowired
+    private QzTaskService qzTaskService;
+
+    @Autowired
+    private QzTaskReplyService qzTaskReplyService;
+
+    @Autowired
+    private MsReportService msReportService;
+
+
+    @GetMapping("/home/home.html")
+    public ModelAndView home(ModelMap model) throws JsonProcessingException {
+        model.put("user", new JsonWapper("{\"www\": \"er\"}"));
+        //初始化今日日报
+        //UserOpen userOpen = homeService.getUserOpen();
+        Long userId = 1224706869998772226L;
+        MsReport msReport = msReportService.getReportByDateNow(userId);
+        model.put("msReport", new JsonWapper(msReport));
+        return new ModelAndView("/home/home.ftl", model);
+    }
+
+
+    //家庭求助
+    @GetMapping("/home/home/addFimaly")
+    public ModelOps family(@Pd(name = "taskTitle") String taskTitle,
+                           @Pd(name = "taskTarget") String taskTarget,
+                           @Pd(name = "remark") String remark,
+                           @Pd(name = "userId", required = false) Long userId) {
+        return ModelOps.newSuccess(qzTaskService.addHelp(taskTitle, taskTarget, remark, userId));
+    }
+
+    //我的在求助的展示
+    @GetMapping("/home/home/queryQzTask")
+    public Model<List<QzTask>> queryQzTask(@Pd(name = "taskStatus", required = false) Integer taskStatus,
+                                           @Pd(name = "taskTitle", required = false) String taskTitle,
+                                           @Pd(name = "userId", required = false) Long userId) {
+        return Model.newSuccess(qzTaskService.queryQzTask(taskStatus, taskTitle, userId));
+    }
+
+
+    //页面存储taskId
+    @GetMapping("/home/qiuzhu/reply.json")
+    public ModelOps taskQueryTaskId(@RequestParam(value = "taskId") Long taskId) {
+        int i = qzTaskService.taskQueryTaskId(taskId);
+        return ModelOps.newSuccess(i);
+    }
+
     //小区求助的查看
     @GetMapping("/home/home/taskQuery")
     public Model<List<QzTaskReply>> taskQuery(@Pd(name = "taskId") Long taskId) {

+ 14 - 10
whepi-web/src/main/java/com/bofeng/wx/controller/MsReportController.java

@@ -2,14 +2,12 @@ package com.bofeng.wx.controller;
 
 
 import com.bofeng.entity.*;
+import com.bofeng.service.HomeService;
 import com.bofeng.service.MsReportService;
 import com.bofeng.service.MsSuspectedService;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.yvan.Model;
 import com.yvan.mvc.Pd;
-import com.yvan.platform.JsonWapper;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -17,7 +15,6 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Author: xielianghe
@@ -26,6 +23,8 @@ import java.util.Map;
 @RestController
 public class MsReportController {
 
+    @Autowired
+    private HomeService homeService;
 
     @Autowired
     private MsSuspectedService msSuspectedService;
@@ -35,18 +34,20 @@ public class MsReportController {
     //添加家人
     @PostMapping("/home/addRibao.json")
     public ModelAndView saveUser(HttpServletRequest request) {
+        //UserOpen userOpen = homeService.getUserOpen();
+        long userId = 1224706869998772226L;
         String userName = request.getParameter("userName");
         String conditionStatus = request.getParameter("conditionStatus");
-        Integer medical =Integer.parseInt( request.getParameter("medical"));
+        Integer medical = Integer.parseInt(request.getParameter("medical"));
         String remarks = request.getParameter("remarks");
-        msSuspectedService.addSuspected(userName, conditionStatus, medical, remarks);
+        msSuspectedService.addSuspected(userName, conditionStatus, medical, remarks, userId);
         return new ModelAndView("/home/home.ftl");
     }
 
     //删除家人
     @PostMapping("/home/deleteSuspected.json")
     public ModelAndView deleteSuspected(HttpServletRequest request) {
-        Long suspectedId =Long.parseLong( request.getParameter("suspectedId"));
+        Long suspectedId = Long.parseLong(request.getParameter("suspectedId"));
         msSuspectedService.deleteSuspected(suspectedId);
         return new ModelAndView("/home/home.ftl");
     }
@@ -60,15 +61,18 @@ public class MsReportController {
     //全家报平安
     @PostMapping("/home/addReport.json")
     public ModelAndView addReport(HttpServletRequest request) {
+        //UserOpen userOpen = homeService.getUserOpen();
+        long userId = 1224706869998772226L;
         String safetyNum = request.getParameter("safetyNum");
-        msReportService.addReport(safetyNum);
+        msReportService.addReport(safetyNum, userId);
         return new ModelAndView("/home/home.ftl");
     }
 
     //获取家人
     @GetMapping("/home/home/queryRibaoReportDate")
     public Model<List<MsSuspected>> queryRibaoReportDate(@Pd(name = "reportDate") String reportDate) {
-        String report_date=reportDate;
-        return Model.newSuccess(msReportService.getByReportReportDate(reportDate));
+        //UserOpen userOpen = homeService.getUserOpen();
+        long userId = 1224706869998772226L;
+        return Model.newSuccess(msReportService.getByReportReportDate(reportDate, userId));
     }
 }

+ 1 - 1
whepi-web/src/main/resources/mapper/MsReport.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bofeng.dao.MsReportMapper">
     <select id="selectByReportDate" resultType="com.bofeng.entity.MsReport">
-        select * from ms_report where report_date = #{reportDate}
+        select * from ms_report where report_date = #{reportDate} and  user_create = #{userCreate}
     </select>
 </mapper>