Browse Source

xielianghe

lange 5 years ago
parent
commit
d4b23bdb48

+ 45 - 4
whepi-ui/templates/home/ribao.ftl

@@ -7,6 +7,9 @@
             <a class="weui-navbar__item" target="#rb_nav2" module="ri_bao">
                 健康日历
             </a>
+            <a class="weui-navbar__item" target="#rb_nav3" module="ri_bao">
+                模板
+            </a>
         </div>
         <div class="weui-tab__panel">
             <div id="rb_nav1" class="weui-tab__bd-item ri_bao_weui_tab_bd_item_active">
@@ -21,7 +24,7 @@
                             </div>
                             <div class="weui-cell__ft">
                                 <a id="btnAdd" href="javascript:"
-                                   class="weui-btn weui-btn_mini weui-btn_primary">病情描述</a>
+                                   class="weui-btn weui-btn_mini weui-btn_primary">添加家人</a>
                             </div>
                         </div>
                     </div>
@@ -66,7 +69,7 @@
                                 <div class="weui-cell weui-cell_active" id="js_cell">
                                     <div class="weui-cell__hd"><label class="weui-label">家人</label></div>
                                     <div class="weui-cell__bd weui-flex">
-                                        <input id="js_input" class="weui-input" autofocus="" type="text"
+                                        <input id="js_input_xingming" class="weui-input" autofocus="" type="text"
                                                placeholder="请输入姓名" maxlength="20">
                                     </div>
                                 </div>
@@ -110,7 +113,7 @@
                                 </div>
                                 <div class="weui-cell ">
                                     <div class="weui-cell__bd">
-                                        <textarea class="weui-textarea" placeholder="请输入病情描述" rows="3"></textarea>
+                                        <textarea id="rb_remarks",class="weui-textarea" placeholder="请输入病情描述" rows="3"></textarea>
                                         <div class="weui-textarea-counter"><span>0</span>/200</div>
                                     </div>
                                 </div>
@@ -128,7 +131,7 @@
                     </span></div>
                     <div class="button-sp-area">
                         <a id="cancel" href="javascript:;" class="weui-btn weui-btn_default">取消</a>
-                        <a id="commit" href="javascript:;" class="weui-btn weui-btn_primary">提交</a>
+                        <a id="commit" href="javascript:;"  onclick="ribaoCommit();" class="weui-btn weui-btn_primary">提交</a>
                     </div>
                 </div>
                 </br>
@@ -171,6 +174,44 @@
                     </div>
                 </div>
             </div>
+            <div id="rb_nav3" class="weui-tab__bd-item ">
+                <div class="weui-flex">
+                    <div class="weui-flex__item"><div class="placeholder">01</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">02</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">03</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">04</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">05</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">06</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">07</div></div>
+                </div>
+                <div class="weui-flex">
+                    <div class="weui-flex__item"><div class="placeholder">01</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">02</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">03</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">04</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">05</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">06</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">07</div></div>
+                </div>
+                <div class="weui-flex">
+                    <div class="weui-flex__item"><div class="placeholder">01</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">02</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">03</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">04</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">05</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">06</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">07</div></div>
+                </div>
+                <div class="weui-flex">
+                    <div class="weui-flex__item"><div class="placeholder">01</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">02</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">03</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">04</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">05</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">06</div></div>
+                    <div class="weui-flex__item"><div class="placeholder">07</div></div>
+                </div>
+            </div>
         </div>
     </div>
 </div>

+ 22 - 0
whepi-ui/templates/home/ribao.js

@@ -32,6 +32,7 @@ function ribao_cancel() {
 
 function ribao_commit() {
   $('#commit').on('click', function () {
+
     if ($('#ribao')[0].style.display == 'none') {
       $('#notOpenRibao').toggle();
       $('#ribao')[0].style.display = '';
@@ -41,3 +42,24 @@ function ribao_commit() {
     }
   });
 }
+
+
+function ribaoCommit() {
+  var userType = $('input:radio:checked').val();
+  var linkman = $("#linkman").val();
+  var phone = $("#phone").val();
+  console.log(userType)
+  console.log(linkman)
+  console.log(phone)
+
+  $.ajax({
+    url: '/home/addRibao.json',
+    type: "post",
+    data: {
+      "userId": 123,
+      "userType": userType,
+      "linkman": '',
+      "phone": '',
+    },
+  });
+}

+ 11 - 0
whepi-web/src/main/java/com/bofeng/dao/MsReportMapper.java

@@ -0,0 +1,11 @@
+package com.bofeng.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.bofeng.entity.MsReport;
+
+/**
+ * @Author: xielianghe
+ * @Date: 2020/2/4 15:45
+ */
+public interface MsReportMapper extends BaseMapper<MsReport> {
+}

+ 16 - 0
whepi-web/src/main/java/com/bofeng/dao/MsSuspectedMapper.java

@@ -0,0 +1,16 @@
+package com.bofeng.dao;
+
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.bofeng.entity.MsSuspected;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: xielianghe
+ * @Date: 2020/2/4 15:39
+ */
+@Mapper
+@Repository
+public interface MsSuspectedMapper extends BaseMapper<MsSuspected> {
+}

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

@@ -0,0 +1,50 @@
+package com.bofeng.entity;
+
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import io.swagger.models.auth.In;
+import lombok.Getter;
+import lombok.Setter;
+import org.joda.time.DateTime;
+
+/**
+ * @Author: xielianghe
+ * @Date: 2020/2/4 14:54
+ */
+@Getter
+@Setter
+@TableName("ms_report")
+public class MsReport {
+
+    @TableId("report_id")
+    private Long reportId;
+
+    @TableField("house_id")
+    private Long houseId;
+
+    @TableField("safety_num")
+    private Integer safetyNum;
+
+    @TableField("suspected_num")
+    private Integer suspectedNum;
+
+    @TableField("remarks")
+    private String remarks;
+
+    @TableField("ms_status")
+    private Integer msStatus;
+
+    @TableField("user_create")
+    private Long userCreate;
+
+    @TableField("time_create")
+    private DateTime timeCreate;
+
+    @TableField("user_update")
+    private Long userUpdate;
+
+    @TableField("time_update")
+    private DateTime timeUpdate;
+}

+ 50 - 0
whepi-web/src/main/java/com/bofeng/entity/MsSuspected.java

@@ -0,0 +1,50 @@
+package com.bofeng.entity;
+
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Getter;
+import lombok.Setter;
+import org.joda.time.DateTime;
+
+/**
+ * @Author: xielianghe
+ * @Date: 2020/2/4 14:54
+ */
+@Getter
+@Setter
+@TableName("ms_suspected")
+public class MsSuspected {
+
+
+    @TableId("suspected_id")
+    private Long suspectedId;
+
+    @TableField("report_id")
+    private Long reportId;
+
+    @TableField("family_relative")
+    private Integer familyRelative;
+
+    @TableField("medical")
+    private Integer medical;
+
+    @TableField("condition_status")
+    private Integer conditionStatus;
+
+    @TableField("remarks")
+    private String remarks;
+
+    @TableField("user_create")
+    private Long userCreate;
+
+    @TableField("time_create")
+    private DateTime timeCreate;
+
+    @TableField("user_update")
+    private Long userUpdate;
+
+    @TableField("time_update")
+    private DateTime timeUpdate;
+}

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

@@ -0,0 +1,9 @@
+package com.bofeng.service;
+
+
+/**
+ * @Author: xielianghe
+ * @Date: 2020/2/4 15:44
+ */
+public class MsReportService {
+}

+ 46 - 0
whepi-web/src/main/java/com/bofeng/service/MsSuspectedService.java

@@ -0,0 +1,46 @@
+package com.bofeng.service;
+
+
+import com.baomidou.mybatisplus.toolkit.IdWorker;
+import com.bofeng.dao.MsSuspectedMapper;
+import com.bofeng.dao.UserOpenMapper;
+import com.bofeng.entity.MsSuspected;
+import com.bofeng.entity.Owner;
+import com.bofeng.entity.UptownHome;
+import com.bofeng.entity.UserRole;
+import org.joda.time.DateTime;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * @Author: xielianghe
+ * @Date: 2020/2/4 15:44
+ */
+
+@Service
+@Transactional(readOnly = true)
+public class MsSuspectedService {
+
+    @Autowired
+    private MsSuspectedMapper msSuspectedMapper;
+
+
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public void addRibao(Long userId, Integer userType, String linkman, String phone) {
+        MsSuspected msSuspected = new MsSuspected();
+        msSuspected.setSuspectedId(IdWorker.getId());
+        msSuspected.setReportId(userId);
+        msSuspected.setFamilyRelative(userType);
+        msSuspected.setConditionStatus(0);
+        msSuspected.setMedical(0);
+        msSuspected.setRemarks("测试");
+        msSuspected.setUserCreate(userId);
+        msSuspected.setTimeCreate(DateTime.now());
+        msSuspected.setUserUpdate(userId);
+        msSuspected.setTimeUpdate(DateTime.now());
+        msSuspectedMapper.insert(msSuspected);
+    }
+
+}

+ 33 - 0
whepi-web/src/main/java/com/bofeng/wx/controller/MsReportController.java

@@ -0,0 +1,33 @@
+package com.bofeng.wx.controller;
+
+
+import com.bofeng.service.HomeService;
+import com.bofeng.service.MsSuspectedService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Author: xielianghe
+ * @Date: 2020/2/4 15:38
+ */
+@RestController
+public class MsReportController {
+
+
+    @Autowired
+    private MsSuspectedService msSuspectedService;
+
+    @PostMapping("/home/addRibao.json")
+    public ModelAndView saveUser(HttpServletRequest request) {
+        Long userId = Long.parseLong(request.getParameter("userId"));
+        Integer userType = Integer.parseInt(request.getParameter("userType"));
+        String linkman = request.getParameter("linkman");
+        String phone = request.getParameter("phone");
+        msSuspectedService.addRibao(userId, userType, linkman, phone);
+        return new ModelAndView("/home/home.ftl");
+    }
+}