From 68bd7b3b4733b27291c844fbfb93685843ddc42b Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Wed, 19 Aug 2020 11:39:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=84=BF=E7=AB=A5=E4=BD=93?=
 =?UTF-8?q?=E6=A3=80=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 13 ++++---
 .../src/views/benyi/healthcheck/index.vue     | 34 +++++++++++++++----
 .../ByChildHealthCheckController.java         |  3 ++
 .../benyi/domain/ByChildHealthCheck.java      | 13 +++----
 4 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8629a49f2..d7d1ce10d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="67083fd5-67d0-4b58-9beb-0b0decab008a" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ruoyi-ui/public/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/public/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ruoyi-ui/src/components/BenYi/Doc/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/components/BenYi/Doc/index.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ruoyi-ui/src/layout/components/Navbar.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/layout/components/Navbar.vue" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/ruoyi-ui/node_modules/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -26,6 +28,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -83,14 +86,13 @@
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1592562925554" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/ruoyi/pom.xml" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="project.structure.last.edited" value="Project" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
@@ -121,16 +123,17 @@
       <workItem from="1588661609569" duration="59000" />
       <workItem from="1592562464381" duration="132000" />
       <workItem from="1592562689854" duration="303000" />
+      <workItem from="1593334102655" duration="17000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="494000" />
+    <option name="totallyTimeSpent" value="511000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-7" y="-7" width="1294" height="694" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25809062" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26213592" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Image Layers" order="2" />
       <window_info id="Designer" order="3" />
diff --git a/ruoyi-ui/src/views/benyi/healthcheck/index.vue b/ruoyi-ui/src/views/benyi/healthcheck/index.vue
index ba08893f0..e507101e6 100644
--- a/ruoyi-ui/src/views/benyi/healthcheck/index.vue
+++ b/ruoyi-ui/src/views/benyi/healthcheck/index.vue
@@ -114,8 +114,8 @@
     <el-table v-loading="loading" :data="healthcheckList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="体检表编号" align="center" prop="id" />
-      <el-table-column label="幼儿ID" align="center" prop="childId" />
-      <el-table-column label="班级信息" align="center" prop="classInfo" />
+      <el-table-column label="幼儿姓名" align="center" prop="byChild.name" />
+      <el-table-column label="班级信息" align="center" prop="byClass.bjmc" />
       <el-table-column label="检查日期" align="center" prop="checkTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d}') }}</span>
@@ -148,7 +148,7 @@
       />
       <el-table-column label="创建时间" align="center" prop="createtime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createtime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.createtime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -242,7 +242,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="体重" prop="weight">
+        <el-form-item label="体重(kg)" prop="weight">
           <el-input v-model="form.weight" placeholder="请输入体重" />
         </el-form-item>
         <el-form-item label="体重评价">
@@ -255,7 +255,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="身高" prop="height">
+        <el-form-item label="身高(cm)" prop="height">
           <el-input v-model="form.height" placeholder="请输入身高" />
         </el-form-item>
         <el-form-item label="身高评价">
@@ -359,7 +359,29 @@ export default {
       form: {},
       
       // 表单校验
-      rules: {}
+      rules: {
+        classInfo: [
+          { required: true, message: "班级信息不能为空", trigger: "blur" }
+        ],
+        childId: [
+          { required: true, message: "幼儿姓名不能为空", trigger: "blur" }
+        ],
+        checkTime: [
+          { required: true, message: "检查时间不能为空", trigger: "blur" }
+        ],
+        doctorName: [
+          { required: true, message: "保健医不能为空", trigger: "blur" }
+        ],
+        totalAssessment: [
+          { required: true, message: "总评价不能为空", trigger: "blur" }
+        ],
+        weight: [
+          { required: true, message: "输入内容必须是数字,且不能超过五位数", max: 6, trigger: "blur" }
+        ],
+        height: [
+          { required: true, message: "输入内容必须是数字,且不能超过三位数", max: 3, trigger: "blur" }
+        ],
+      }
     };
   },
   created() {
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByChildHealthCheckController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByChildHealthCheckController.java
index f4e2317ac..09d03d949 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByChildHealthCheckController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByChildHealthCheckController.java
@@ -1,5 +1,6 @@
 package com.ruoyi.project.benyi.controller;
 
+import java.util.Date;
 import java.util.List;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -76,6 +77,7 @@ public class ByChildHealthCheckController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody ByChildHealthCheck byChildHealthCheck)
     {
+        byChildHealthCheck.setCreatetime(new Date());
         return toAjax(byChildHealthCheckService.insertByChildHealthCheck(byChildHealthCheck));
     }
 
@@ -87,6 +89,7 @@ public class ByChildHealthCheckController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody ByChildHealthCheck byChildHealthCheck)
     {
+
         return toAjax(byChildHealthCheckService.updateByChildHealthCheck(byChildHealthCheck));
     }
 
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByChildHealthCheck.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByChildHealthCheck.java
index 36220c367..b5e28940c 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByChildHealthCheck.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByChildHealthCheck.java
@@ -82,7 +82,7 @@ public class ByChildHealthCheck extends BaseEntity {
      * 体重
      */
     @Excel(name = "体重")
-    private Integer weight;
+    private Double weight;
 
     /**
      * 体重评价
@@ -94,7 +94,7 @@ public class ByChildHealthCheck extends BaseEntity {
      * 身高
      */
     @Excel(name = "身高")
-    private Double height;
+    private Long height;
 
     /**
      * 身高评价
@@ -112,6 +112,7 @@ public class ByChildHealthCheck extends BaseEntity {
      * 创建时间
      */
     @Excel(name = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createtime;
 
 
@@ -206,11 +207,11 @@ public class ByChildHealthCheck extends BaseEntity {
         return decayedTooth;
     }
 
-    public void setWeight(Integer weight) {
+    public void setWeight(Double weight) {
         this.weight = weight;
     }
 
-    public Integer getWeight() {
+    public Double getWeight() {
         return weight;
     }
 
@@ -222,11 +223,11 @@ public class ByChildHealthCheck extends BaseEntity {
         return weightAssessment;
     }
 
-    public void setHeight(Double height) {
+    public void setHeight(Long height) {
         this.height = height;
     }
 
-    public Double getHeight() {
+    public Long getHeight() {
         return height;
     }