增加科室编码

power-admin/src/main/resources/config/config.properties

@@ -27,7 +27,7 @@ EMRMEDICALRECORD_PORT = 8082
 #\u75C5\u6848\u7BA1\u7406\u7CFB\u7EDFip
 EMRRECORD_IP = ${SERVER_IP}
 #\u75C5\u6848\u7BA1\u7406\u7CFB\u7EDF\u7AEF\u53E3
-EMRRECORD_PORT = ${SERVER_PORT}
+EMRRECORD_PORT = 8083
 
 #\u75C5\u6848\u590D\u5370\u9884\u7EA6ip
 EMRAPPLYCOPY_IP = ${SERVER_IP}

power-admin/src/main/resources/config/jdbc.properties

@@ -1,21 +1,11 @@
-#\u6570\u636E\u5E93IP
+jdbc.url=jdbc\:mysql\://200.100.104.40\:3306/power?useUnicode\=true&characterEncoding\=utf-8
-dataBaseIp=localhost
+jdbc.password=AbcXyz123
-#\u6570\u636E\u5E93\u540D\u79F0
-dataBaseName=gmpower
-#\u6570\u636E\u5E93\u5BC6\u7801
-dataBasePassword=docus702
 
-#\u6570\u636E\u5E93IP
+#jdbc.url=jdbc\:mysql\://localhost\:3306/gmpower?useUnicode\=true&characterEncoding\=utf-8
-#dataBaseIp=200.100.104.40
+#jdbc.password=docus702
-##\u6570\u636E\u5E93\u540D\u79F0
-#dataBaseName=power
-##\u6570\u636E\u5E93\u5BC6\u7801
-#dataBasePassword=AbcXyz123
 
 jdbc.driver=com.mysql.jdbc.Driver
 jdbc.username=root
-jdbc.url=jdbc\:mysql\://${dataBaseIp}\:3306/${dataBaseName}?useUnicode\=true&characterEncoding\=utf-8
-jdbc.password=${dataBasePassword}
 
 filters: stat
 maxActive: 20
@@ -31,5 +21,4 @@ testOnReturn: false
 maxOpenPreparedStatements: 20
 removeAbandoned: true
 removeAbandonedTimeout: 1800
-logAbandoned: true
+logAbandoned: true
-

power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp

@@ -317,7 +317,7 @@
 </script>
 <script src="${path}/static/zTree_v3-master/js/jquery.ztree.core.js"></script>
 <script src="${path}/static/zTree_v3-master/js/jquery.ztree.excheck.js"></script>
-<script src="${path}/static/js/user.js?t=2020-11-13"></script>
+<script src="${path}/static/js/user.js?t=2020-11-18"></script>
 <%@ include file="/WEB-INF/jspf/importExcelJsp.jspf" %>
 </body>
 </html>

power-admin/src/main/webapp/static/js/user.js

@@ -37,7 +37,7 @@ $(function(){
                 name:$("#searchName").val(),
                 searchRoleId:$("#roleId").val(),
                 deptId : $("#dept_id option:selected").val(),
-                effective : $("#effective option:selected").val(),
+                effective : $("#effective option:selected").val()
             };
             return temp;
         },
@@ -60,11 +60,11 @@ $(function(){
             },
             {
                 title:'账号',
-                field:'userName',
+                field:'userName'
             },
             {
                 title:'姓名',
-                field:'name',
+                field:'name'
             },
             {
                 title:'性别',
@@ -79,29 +79,33 @@ $(function(){
             },
             {
                 title:'年龄',
-                field:'userAge',
+                field:'userAge'
             },
             {
                 title:'移动电话',
-                field:'userTel',
+                field:'userTel'
             },
             {
                 title:'邮箱地址',
-                field:'userEmail',
+                field:'userEmail'
             },
             {
                 title:'用户职位',
-                field:'userPosition',
+                field:'userPosition'
             },
             {
                 title:'所属角色',
-                field:'roleName',
+                field:'roleName'
             },
             {
                 title:'所属科室',
                 field:'powerDepts',
-                formatter:paramsMatter,
+                formatter:paramsMatter
             },
+            /*{
+                title:'同步科室编号',
+                field:'deptCode'
+            },*/
             {
                 title:'是否有效',
                 field:'effective',
@@ -115,19 +119,19 @@ $(function(){
             },
             {
                 title:'创建时间',
-                field:'createDate',
+                field:'createDate'
             },
             {
                 title:'创建人',
-                field:'creater',
+                field:'creater'
             },
             {
                 title:'修改时间',
-                field:'updateDate',
+                field:'updateDate'
             },
             {
                 title:'修改人',
-                field:'updater',
+                field:'updater'
             },
             {
                 title:'操作',
@@ -177,8 +181,8 @@ $(function(){
             var userNames = '';
             for(var i=0;i<rows.length;i++)
             {
-                checks += rows[i].userId + ","
+                checks += rows[i].userId + ",";
-                userNames += rows[i].userName + ","
+                userNames += rows[i].userName + ",";
             }
             $("#checks").val(checks);
             $("#userNames").val(userNames);
@@ -192,7 +196,7 @@ $(function(){
 });
 //格式化科室列
 function paramsMatter(value, row, index) {
-    value = '<p class="hidden-xs" title="'+value+'">'+value+'</p>'
+    value = '<p class="hidden-xs" title="'+value+'">'+value+'</p>';
     return value;
 }
 

power-dao/src/main/java/com/manage/vo/Power_UserVo.java

@@ -46,6 +46,16 @@ public class Power_UserVo extends Power_User {
 
     private List<User> userList;
 
+    private String deptCode;
+
+    public String getDeptCode() {
+        return deptCode;
+    }
+
+    public void setDeptCode(String deptCode) {
+        this.deptCode = deptCode;
+    }
+
     public Integer getShowPrint() {
         return showPrint;
     }

power-dao/src/main/resources/mapper/Power_UserMapper.xml

@@ -21,6 +21,7 @@
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="role_name" jdbcType="VARCHAR" property="roleName" />
     <result column="dict_id" jdbcType="INTEGER" property="dictId" />
+    <result column="dept_code" jdbcType="VARCHAR" property="deptCode" />
   </resultMap>
   <resultMap id="BaseResultMapVo" type="com.manage.vo.User">
     <id column="user_id" jdbcType="INTEGER" property="userId" />
@@ -289,6 +290,7 @@
     power_user.updater,
     power_user.update_date,
     power_role.role_name,
+    power_user.dept_code,
     GROUP_CONCAT(power_dept.dept_name) powerDepts
     FROM
     power_user

power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java

@@ -144,6 +144,8 @@ public class Power_UserServiceImpl implements Power_UserService {
             powerUser.setRoleId(powerUser1.getRoleId());
         }
         List<Power_UserVo> someByMore = powerUserMapper.findSomeByMore(powerUser);
+        //查询科室集合
+
         for (Power_UserVo power_user : someByMore) {
             //设置编辑和删除权限
             int isUpdate = 0;