Merge remote-tracking branch 'origin/dev/20220228_v3.0.1通用版_渠道管理第一期' into dev/20220228_v3.0.1通用版_渠道管理第一期

daqe-center/src/main/java/com/lantone/daqe/dto/GetBlockLossPageDTO.java

@@ -42,7 +42,7 @@ public class GetBlockLossPageDTO implements Serializable {
     private String lossWay;
 
     @ApiModelProperty(value = "更新时间")
-    private Date auditTime;
+    private Date gmtModified;
 
     @ApiModelProperty(value = "状态: 0:已丢失,1:已恢复")
     private String status;

daqe-center/src/main/java/com/lantone/daqe/facade/BlockLossManagementFacade.java

@@ -93,6 +93,7 @@ public class BlockLossManagementFacade {
         BeanUtils.copyProperties(upBlockLossByIdVO, blocklossResult);
         blocklossResult.setModifier(SysUserUtils.getCurrentPrinciple() == null ? "0" : SysUserUtils.getCurrentPrinciple());
         blocklossResult.setGmtModified(DateUtil.now());
+        blocklossResult.setAuditTime(DateUtil.now());
         return blocklossResultFacade.updateById(blocklossResult);
     }
 

daqe-center/src/main/java/com/lantone/daqe/facade/RegularManagementFacade.java

@@ -1,6 +1,7 @@
 package com.lantone.daqe.facade;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.enums.IsDeleteEnum;
@@ -9,9 +10,11 @@ import com.lantone.common.util.BeanUtil;
 import com.lantone.common.util.DateUtil;
 import com.lantone.common.util.SysUserUtils;
 import com.lantone.daqe.dto.GetRegularPageDTO;
+import com.lantone.daqe.entity.ColumnVerify;
 import com.lantone.daqe.entity.RegularInfo;
 import com.lantone.daqe.entity.RegularMapping;
 import com.lantone.daqe.entity.RegularResult;
+import com.lantone.daqe.facade.base.ColumnVerifyFacade;
 import com.lantone.daqe.facade.base.RegularInfoFacade;
 import com.lantone.daqe.facade.base.RegularMappingFacade;
 import com.lantone.daqe.facade.base.RegularResultFacade;
@@ -40,6 +43,9 @@ public class RegularManagementFacade {
     @Autowired
     private RegularMappingFacade regularMappingFacade;
 
+    @Autowired
+    private ColumnVerifyFacade columnVerifyFacade;
+
     /**
      * 获取正则式维护分页列表
      *
@@ -47,6 +53,9 @@ public class RegularManagementFacade {
      * @Return com.baomidou.mybatisplus.core.metadata.IPage<com.lantone.daqe.dto.GetRegularPageDTO>
      */
     public IPage<GetRegularPageDTO> getRegularPage(GetRegularPageVO getRegularPageVO) {
+        QueryWrapper<RegularInfo> wrapper = new QueryWrapper();
+        wrapper.like("name",getRegularPageVO.getName());
+        regularInfoFacade.list(wrapper);
         return regularInfoFacade.getBaseMapper().getRegularPage(getRegularPageVO);
     }
 
@@ -84,7 +93,7 @@ public class RegularManagementFacade {
         regularInfo.setGmtModified(DateUtil.now());
         //修改表字段的正则式校验结果表中的正则式
         if (regularInfoFacade.updateById(regularInfo)) {
-            return regularResultFacade.update(new UpdateWrapper<RegularResult>()
+            if(regularResultFacade.update(new UpdateWrapper<RegularResult>()
                     .eq(upRegularByIdVO.getHospitalId() != null, "hospital_id", upRegularByIdVO.getHospitalId())
                     .eq("regular_id", upRegularByIdVO.getId())
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -92,8 +101,15 @@ public class RegularManagementFacade {
                     .set("regular_val", upRegularByIdVO.getVal())
                     .set("modifier", SysUserUtils.getCurrentPrinciple() == null ? "0" : SysUserUtils.getCurrentPrinciple())
                     .set("gmt_modified", DateUtil.now())
-                    .set("regular_des", upRegularByIdVO.getDescription()));
-        }
+                    .set("regular_des", upRegularByIdVO.getDescription()))){
+                return columnVerifyFacade.update(new UpdateWrapper<ColumnVerify>()
+                        .eq("verify_id", upRegularByIdVO.getId())
+                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .set("verify_val", upRegularByIdVO.getName())
+                        .set("modifier", SysUserUtils.getCurrentPrinciple() == null ? "0" : SysUserUtils.getCurrentPrinciple())
+                        .set("gmt_modified", DateUtil.now()));
+            }
+            }
         return false;
     }
 
@@ -130,12 +146,13 @@ public class RegularManagementFacade {
         regularInfo.setIsDeleted(IsDeleteEnum.Y.getKey());
         if (regularInfoFacade.updateById(regularInfo)) {
             //删除表字段的实际值与正则式关联关系
-            return regularMappingFacade.update(new UpdateWrapper<RegularMapping>()
+            if(regularMappingFacade.remove(new UpdateWrapper<RegularMapping>()
                     .eq("regular_id", id)
-                    .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .set("modifier", SysUserUtils.getCurrentPrinciple() == null ? "0" : SysUserUtils.getCurrentPrinciple())
-                    .set("gmt_modified", DateUtil.now())
-                    .set("is_deleted", IsDeleteEnum.Y.getKey()));
+                    .eq("is_deleted", IsDeleteEnum.N.getKey()))){
+                return columnVerifyFacade.remove(new UpdateWrapper<ColumnVerify>()
+                        .eq("verify_id", id)
+                        .eq("is_deleted", IsDeleteEnum.N.getKey()));
+            }
             //删除表字段的正则式校验结果表中的正则式
 //            return regularResultFacade.update(new UpdateWrapper<RegularResult>()
 //                    .eq(hospitalId != null, "hospital_id", hospitalId)

daqe-center/src/main/resources/mapper/BlocklossResultMapper.xml

@@ -28,10 +28,10 @@
             <![CDATA[ AND behospital_date <= #{getBlockLossPageVO.endDate}]]>
         </if>
         <if test="getBlockLossPageVO.behospitalCode != null and getBlockLossPageVO.behospitalCode != ''">
-            AND behospital_code = #{getBlockLossPageVO.behospitalCode}
+            AND behospital_code LIKE CONCAT('%',#{getBlockLossPageVO.behospitalCode},'%')
         </if>
         <if test="getBlockLossPageVO.recId != null and getBlockLossPageVO.recId != ''">
-            AND rec_id = #{getBlockLossPageVO.recId}
+            AND rec_id LIKE CONCAT('%',#{getBlockLossPageVO.recId},'%')
         </if>
         <if test="getBlockLossPageVO.recTitle != null and getBlockLossPageVO.recTitle != ''">
             AND rec_title LIKE CONCAT('%',#{getBlockLossPageVO.recTitle},'%')

daqe-center/src/main/resources/upgrade/V3__daqe_init_addtable.sql

@@ -101,3 +101,10 @@ CREATE TABLE `str_leave_hospital` (
   `modifier` varchar(60) DEFAULT NULL COMMENT '修改人',
   PRIMARY KEY (`rec_id`,`hospital_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='出院小结';
+
+
+-- ----------------------------
+-- 3.修改`dc_regular_info`表-正则式值和描述大小
+-- ----------------------------
+ALTER TABLE `dc_regular_info` MODIFY COLUMN `description` varchar(256) DEFAULT NULL COMMENT '描述';
+ALTER TABLE `dc_regular_info` MODIFY COLUMN `val` varchar(512) DEFAULT NULL COMMENT '正则式值';

dblayer-mbg/src/main/java/com/lantone/dblayermbg/config/DruidConfig.java

@@ -1,6 +1,7 @@
 package com.lantone.dblayermbg.config;
 
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.lantone.dblayermbg.config.mybatisLike.MybatisLikeSqlInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -28,4 +29,8 @@ public class DruidConfig {
         return paginationInterceptor;
     }
 
+    @Bean
+    public MybatisLikeSqlInterceptor mybatisSqlInterceptor() {
+        return new MybatisLikeSqlInterceptor();
+    }
 }

security-center/src/main/java/com/lantone/security/facade/LogManagementFacade.java

@@ -7,19 +7,20 @@ import com.lantone.common.dto.AbnormalLogDTO;
 import com.lantone.common.dto.GetOperationLogDTO;
 import com.lantone.common.dto.LoginLogDTO;
 import com.lantone.common.dto.OperationLogDTO;
+import com.lantone.common.enums.IsDeleteEnum;
 import com.lantone.common.util.ListUtil;
 import com.lantone.common.util.StringUtil;
 import com.lantone.common.vo.BlockLossTypeGatherVO;
 import com.lantone.common.vo.DataCompareVO;
+import com.lantone.security.entity.OperationLog;
+import com.lantone.security.facade.base.AbnormalLogFacade;
+import com.lantone.security.facade.base.LoginLogFacade;
+import com.lantone.security.facade.base.OperationLogFacade;
 import com.lantone.security.vo.GetAbnormalLogVO;
 import com.lantone.security.vo.GetAbnormalWayAndIpVO;
 import com.lantone.security.vo.GetLoginLogVO;
 import com.lantone.security.vo.GetLoginNameAndIpVO;
 import com.lantone.security.vo.GetOperationLogVO;
-import com.lantone.security.entity.OperationLog;
-import com.lantone.security.facade.base.AbnormalLogFacade;
-import com.lantone.security.facade.base.LoginLogFacade;
-import com.lantone.security.facade.base.OperationLogFacade;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -138,6 +139,7 @@ public class LogManagementFacade {
         List<GetOperationLogDTO> out = new ArrayList<>();
         List<String> operationParams = operationLogFacade.list(new QueryWrapper<OperationLog>()
                 .select("operation_param")
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .ge(dataCompareVO.getStartDate() != null && StringUtil.isBlank(dataCompareVO.getBehospitalCode()) && ListUtil.isEmpty(dataCompareVO.getBehospitalCodes()), "gmt_create", dataCompareVO.getStartDate())
                 .le(dataCompareVO.getEndDate() != null && StringUtil.isBlank(dataCompareVO.getBehospitalCode()) && ListUtil.isEmpty(dataCompareVO.getBehospitalCodes()), "gmt_create", dataCompareVO.getEndDate())
                 .eq(StringUtil.isNotBlank(dataCompareVO.getBehospitalCode()), "behospital_code", dataCompareVO.getBehospitalCode())

security-center/src/main/java/com/lantone/security/facade/UserManagementFacade.java

@@ -167,10 +167,12 @@ public class UserManagementFacade {
         userQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         List<User> userList = userFacade.list(userQueryWrapper);
         if (userList.size() == 0) {
-            Asserts.fail("用户不存在！");
+            CommonResult.failed("用户不存在！");
+//            Asserts.fail("用户不存在！");
         }
         if (userList.size() > 1) {
-            Asserts.fail("当前账号异常！");
+            CommonResult.failed("当前账号异常！");
+//            Asserts.fail("当前账号异常！");
         }
 
         UserDto userDTO = new UserDto();