Merge branch 'dev/20200612_1.3.4' into debug

doc/009.20200612v1.3.4/qc_initv1.3.4.sql

@@ -18,7 +18,8 @@ CREATE TABLE `sys_user_pageset` (
   `status` int(11) NOT NULL DEFAULT '1' COMMENT '是否启用(0:停用，1：启用)',
   `order_no` int(11) NOT NULL DEFAULT '0' COMMENT '排序号',
   `remark` varchar(255) DEFAULT NULL COMMENT '备注',
-  PRIMARY KEY (`id`)
+  PRIMARY KEY (`id`),
+  KEY `idx_userId_pageType` (`user_id`,`page_type`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8 COMMENT='用户页面设定表';
 
 -- ----------------------------

src/main/java/com/diagbot/facade/SysUserPagesetFacade.java

@@ -33,6 +33,12 @@ public class SysUserPagesetFacade extends SysUserPagesetServiceImpl {
     @Qualifier("sysUserPagesetServiceImpl")
     private SysUserPagesetServiceImpl sysUserPagesetService;
 
+    /**
+     * 获取用户对应页面设置
+     *
+     * @param sysUserPagesetQueryVO 获取用户对应页面设置参数
+     * @return 对应页面设置列表
+     */
     public List<SysUserPagesetDTO> getPageSet(SysUserPagesetQueryVO sysUserPagesetQueryVO) {
         List<SysUserPageset> sysUserPagesetList = sysUserPagesetService.list(
                 new QueryWrapper<SysUserPageset>()
@@ -58,6 +64,12 @@ public class SysUserPagesetFacade extends SysUserPagesetServiceImpl {
         return sysUserPagesetDTOList;
     }
 
+    /**
+     * 保存用户对应页面设置
+     *
+     * @param sysUserPagesetSaveVO 保存用户对应页面设置参数
+     * @return 是否成功
+     */
     public Boolean savePageSet(SysUserPagesetSaveVO sysUserPagesetSaveVO) {
         if (ListUtil.isEmpty(sysUserPagesetSaveVO.getSysUserPagesetVOList())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "列名输入列表不能为空");

src/main/java/com/diagbot/web/SysUserPagesetController.java

@@ -45,7 +45,7 @@ public class SysUserPagesetController {
     }
 
 
-    @ApiOperation(value = "获取用户对应页面设置[by:gaodm]",
+    @ApiOperation(value = "保存用户对应页面设置[by:gaodm]",
             notes = "pageType：页面分组，必填<br>" +
                     "name： 列名，必填<br>" +
                     "val： 列名值，必填<br>" +

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -2042,6 +2042,7 @@
         AND b.cases_id = c.cases_id
         AND c.cases_id = d.cases_id
         AND c.cases_entry_id = d.id
+        AND a.beh_dept_id = e.dept_id
         AND a.is_placefile = '1'
         AND d.cases_id = 243
         <![CDATA[AND a.qc_type_id <>0 ]]>