From 468f42f39f8e5df5d9d8c8982ac3a3c87859c97b Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 29 Dec 2020 09:26:14 +0800
Subject: [PATCH] 部门添加两个字段

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html                         |   30 ++++++++++++--
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/HospitalListVo.java   |    9 ++++
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java |   11 +++++
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html                                   |   12 +++++
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml               |    2 +
 5 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java
index aaa7938..5480135 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java
@@ -102,4 +102,15 @@
      */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date healthEndTime;
+
+    /**
+     * 部门联系人
+     */
+    private String departmentLink;
+
+    /**
+     * 部门联系人
+     */
+    private String departmentTel;
+
 }
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/HospitalListVo.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/HospitalListVo.java
index b4a11b6..e93021e 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/HospitalListVo.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/HospitalListVo.java
@@ -114,4 +114,13 @@
      * 是否试用,true正式,false试用
      */
     private Boolean OrderType;
+    /**
+     * 部门联系人
+     */
+    private String departmentLink;
+
+    /**
+     * 部门联系人
+     */
+    private String departmentTel;
 }
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml
index 6d4321c..7cfb392 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml
@@ -265,6 +265,8 @@
         DEP.is_del,
         DEP.is_pay,
         DEP.enabled,
+        DEP.department_link,
+        DEP.department_tel,
         hospitals.*
         FROM
         sys_department DEP
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
index aa1b656..e8dd898 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
@@ -106,7 +106,7 @@
                     },
                     {
                         field: 'hospitalLink',
-                        width: "6%",
+                        width: "7%",
                         title: '联系人'
                     },
                     {
@@ -115,6 +115,16 @@
                         title: '联系方式'
                     },
                     {
+                        field: 'departmentLink',
+                        width: "6%",
+                        title: '科室联系人'
+                    },
+                    {
+                        field: 'departmentTel',
+                        width: "8%",
+                        title: '科室联系方式'
+                    },
+                    {
                         field: 'orderType', width: 80,  title: '状态', templet: function (d) {
                             if(d.orderType==null){
                                 return "";
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
index 7bc7364..7c34ac0 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
@@ -19,6 +19,22 @@
     </div>
     <div class="layui-form-item">
         <div class="layui-row">
+            <div class="layui-col-sm5">
+                <label class="layui-form-label">医院联系人</label>
+                <div class="layui-input-block">
+                    <input name="hospitalLink" type="text" class="layui-input" maxlength="20" style="width: 200px;" />
+                </div>
+            </div>
+            <div class="layui-col-sm5">
+                <label class="layui-form-label">医院电话</label>
+                <div class="layui-input-block">
+                    <input name="hospitalTel" id="hospitalTel" type="text" class="layui-input" maxlength="20" />
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-row">
             <div class="layui-col-sm4">
                 <label class="layui-form-label">科室名称</label>
                 <div class="layui-input-block">
@@ -27,15 +43,15 @@
                     &emsp;</div>
             </div>
             <div class="layui-col-sm3">
-                <label class="layui-form-label">联系电话</label>
+                <label class="layui-form-label">科室电话</label>
                 <div class="layui-input-block">
-                    <input name="hospitalTel" id="hospitalTel" type="text" class="layui-input" maxlength="20" />
+                    <input name="departmentTel" id="departmentTel" type="text" class="layui-input" maxlength="20" />
                 </div>
             </div>
             <div class="layui-col-sm3">
-                <label class="layui-form-label">联系人</label>
+                <label class="layui-form-label">科室联系人</label>
                 <div class="layui-input-block">
-                    <input name="hospitalLink" type="text" class="layui-input" maxlength="20" style="width: 200px;" />
+                    <input name="departmentLink" id="departmentLink" type="text" class="layui-input" maxlength="20" style="width: 200px;" />
                 </div>
             </div>
         </div>
@@ -343,7 +359,9 @@
                             saleUserId: '' + $("#saleUserName").val(),
                             saleUserName: $("#saleUserName option:selected").text(),
                             saleUserTel: $("#saleUserTel").val(),
-                            accountsCount: $("#accountsCount").val()
+                            accountsCount: $("#accountsCount").val(),
+                            departmentTel: $("#departmentTel").val(),
+                            departmentLink: $("#departmentLink").val(),
                         };
                         admin.req('api-user/sysdepartment/'+data.data.id, JSON.stringify(departmentData),
                             function (data) {
@@ -469,6 +487,8 @@
                                         $("#accountsCount").val(departData[0]
                                             .accountsCount);
                                         $('#saleUserName').val(departData[0].saleUserId);
+                                        $('#departmentLink').val(departData[0].departmentLink);
+                                        $('#departmentTel').val(departData[0].departmentTel);
 
                                         if (hosIdForEdit != "") {
                                             $("#serverUserTel").val(departData[0]

--
Gitblit v1.8.0