1.完善部分查询接口逻辑，添加重复添加校验

src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java

@@ -62,6 +62,10 @@ public class BasicBusTypeChangeController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
+        boolean result = basicBusTypeChangeService.verifyExists(basicBusTypeChangeEntity);
+        if (result) {
+            return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加");
+        }
         basicBusTypeChangeEntity.setUpdateTime(new Date());
         basicBusTypeChangeService.insert(basicBusTypeChangeEntity);
         return ResultVOUtils.success("更新成功");
@@ -79,6 +83,10 @@ public class BasicBusTypeChangeController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
+        boolean result = basicBusTypeChangeService.verifyExists(basicBusTypeChangeEntity);
+        if (result) {
+            return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加");
+        }
         basicBusTypeChangeEntity.setUpdateTime(new Date());
         basicBusTypeChangeService.updateBasicBusTypeChange(basicBusTypeChangeEntity);
         return ResultVOUtils.success("更新成功");

src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java

@@ -162,6 +162,12 @@ public class BasicBusTypePreController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         if (basicBusTypePreEntity != null) {
+            //判断是否重复添加
+            boolean result = basicBusTypePreService.verifyExists(basicBusTypePreEntity);
+            if (result) {
+                return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加！");
+            }
+            
             basicBusTypePreService.updateBusChangeType(basicBusTypePreEntity);
         } else {
             ResultVOUtils.error(999, "参数错误");
@@ -183,7 +189,7 @@ public class BasicBusTypePreController {
         }
         if (basicBusTypePreEntity != null) {
             //判断是否重复添加
-            boolean result = basicBusTypePreService.checkExists(basicBusTypePreEntity);
+            boolean result = basicBusTypePreService.verifyExists(basicBusTypePreEntity);
             if (result) {
                 return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加！");
             }

src/main/java/com/glxp/api/controller/basic/BasicCorpController.java

@@ -108,6 +108,11 @@ public class BasicCorpController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
 
+        boolean result = basicUnitMaintainService.verifyExists(basicUnitMaintainSaveRequest);
+        if (result) {
+            return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加");
+        }
+
         BasicCorpEntity basicUnitMaintainEntity = new BasicCorpEntity();
         BeanUtils.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity);
         basicUnitMaintainEntity.setErpId(CustomUtil.getId());
@@ -127,6 +132,12 @@ public class BasicCorpController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
+
+        boolean result = basicUnitMaintainService.verifyExists(basicUnitMaintainSaveRequest);
+        if (result) {
+            return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加");
+        }
+
         basicUnitMaintainService.updateById(basicUnitMaintainSaveRequest);
         return ResultVOUtils.success("修改成功");
     }

src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java

@@ -36,4 +36,13 @@ public interface BasicCorpDao {
     boolean importBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity);
 
     List<BasicCorpEntity> batchSelectByErpIdsAndName(@Param("erpIds") List<String> erpIds, @Param("name") String name);
+
+    /**
+     * 根据往来单位名称和社会信用号查询列表
+     *
+     * @param name
+     * @param creditNo
+     * @return
+     */
+    List<BasicCorpEntity> selectByNameAndCreditNo(@Param("name") String name, @Param("creditNo") String creditNo);
 }

src/main/java/com/glxp/api/service/basic/BasicCorpService.java

@@ -1,8 +1,6 @@
 package com.glxp.api.service.basic;
 
 
-
-
 import com.glxp.api.entity.basic.BasicCorpEntity;
 import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest;
 
@@ -40,4 +38,12 @@ public interface BasicCorpService {
     List<BasicCorpEntity> batchSelectByErpIds(List<String> erpIds);
 
     List<BasicCorpEntity> batchSelectByErpIdsAndName(List<String> erpIds, String name);
+
+    /**
+     * 验证数据是否重复
+     *
+     * @param basicCorpEntity
+     * @return
+     */
+    boolean verifyExists(BasicCorpEntity basicCorpEntity);
 }

src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java

@@ -40,4 +40,12 @@ public interface IBasicBusTypeChangeService {
      * @param id
      */
     boolean deleteById(String id);
+
+    /**
+     * 校验数据是否存在
+     *
+     * @param basicBusTypeChangeEntity
+     * @return
+     */
+    boolean verifyExists(BasicBusTypeChangeEntity basicBusTypeChangeEntity);
 }

src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java

@@ -79,5 +79,5 @@ public interface IBasicBusTypePreService {
      * @param basicBusTypePreEntity
      * @return
      */
-    boolean checkExists(BasicBusTypePreEntity basicBusTypePreEntity);
+    boolean verifyExists(BasicBusTypePreEntity basicBusTypePreEntity);
 }

src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java

@@ -1,5 +1,7 @@
 package com.glxp.api.service.basic.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.basic.BasicBusTypeChangeDao;
 import com.glxp.api.entity.basic.BasicBusTypeChangeEntity;
@@ -54,6 +56,27 @@ public class BasicBusTypeChangeServiceImpl implements IBasicBusTypeChangeService
         return basicBusTypeChangeDao.deleteById(id) != 0;
     }
 
+    @Override
+    public boolean verifyExists(BasicBusTypeChangeEntity basicBusTypeChangeEntity) {
+        QueryWrapper<BasicBusTypeChangeEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("originAction", basicBusTypeChangeEntity.getOriginAction())
+                .eq("targetAction", basicBusTypeChangeEntity.getTargetAction())
+                .eq("originName", basicBusTypeChangeEntity.getOriginName());
+        List<BasicBusTypeChangeEntity> list = basicBusTypeChangeDao.selectList(wrapper);
+        if (CollUtil.isNotEmpty(list)) {
+            if (null != basicBusTypeChangeEntity.getId()) {
+                for (BasicBusTypeChangeEntity busTypeChangeEntity : list) {
+                    if (busTypeChangeEntity.getId() != basicBusTypeChangeEntity.getId()) {
+                        return true;
+                    }
+                }
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private void setUpdateInfo(BasicBusTypeChangeEntity basicBusTypeChangeEntity) {
         Date now = new Date();
         String userId = String.valueOf(customerService.getUserBean().getId());

src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java

@@ -81,7 +81,7 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService {
     }
 
     @Override
-    public boolean checkExists(BasicBusTypePreEntity basicBusTypePreEntity) {
+    public boolean verifyExists(BasicBusTypePreEntity basicBusTypePreEntity) {
         QueryWrapper<BasicBusTypePreEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("action", basicBusTypePreEntity.getAction())
                 .eq("originAction", basicBusTypePreEntity.getOriginAction())
@@ -94,7 +94,9 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService {
         if (CollUtil.isNotEmpty(list)) {
             if (null != basicBusTypePreEntity.getId()) {
                 for (BasicBusTypePreEntity busTypePreEntity : list) {
-                    return busTypePreEntity.getId() == basicBusTypePreEntity.getId() ? false : true;
+                    if (busTypePreEntity.getId() != basicBusTypePreEntity.getId()) {
+                        return true;
+                    }
                 }
             } else {
                 return true;

src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java

@@ -1,5 +1,6 @@
 package com.glxp.api.service.basic.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.basic.BasicCorpDao;
 import com.glxp.api.entity.basic.BasicCorpEntity;
@@ -92,6 +93,23 @@ public class BasicCorpServiceImpl implements BasicCorpService {
         return basicCorpDao.batchSelectByErpIdsAndName(erpIds, name);
     }
 
+    @Override
+    public boolean verifyExists(BasicCorpEntity basicCorpEntity) {
+        List<BasicCorpEntity> list = basicCorpDao.selectByNameAndCreditNo(basicCorpEntity.getName(), basicCorpEntity.getCreditNo());
+        if (CollUtil.isNotEmpty(list)) {
+            if (null != basicCorpEntity.getId()) {
+                for (BasicCorpEntity corpEntity : list) {
+                    if (corpEntity.getId() != basicCorpEntity.getId()) {
+                        return true;
+                    }
+                }
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
     @Override
     public BasicCorpEntity selectById(String id) {
         return basicCorpDao.selectById(id);

src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml

@@ -292,4 +292,16 @@
             </if>
         </where>
     </select>
+
+    <select id="selectByNameAndCreditNo" resultType="com.glxp.api.entity.basic.BasicCorpEntity">
+        select * from basic_corp
+        <where>
+            <if test="name != null and name != ''">
+                AND name = #{name}
+            </if>
+            <if test="creditNo != null and creditNo != ''">
+                AND creditNo = #{creditNo}
+            </if>
+        </where>
+    </select>
 </mapper>

src/main/resources/mybatis/mapper/monitor/SysLogininforMapper.xml

@@ -18,27 +18,26 @@
 
     <select id="selectLogininforList" parameterType="com.glxp.api.req.monitor.FilterLoginLogRequest"
             resultMap="SysLogininforResult">
-
         select *
         FROM monitor_login_log
         <where>
-            <if test="infoId != null ">
+            <if test="infoId != null">
                 and info_id = #{infoId}
             </if>
-            <if test="userName != null and userName != '' ">
-                AND `user_name` = #{userName}
+            <if test="userName != null and userName != ''">
+                AND `user_name` like concat('%', #{userName}, '%')
             </if>
-            <if test="status != null and status != '' ">
+            <if test="status != null and status != ''">
                 AND `status` = #{status}
             </if>
-            <if test="ipaddr != null  ">
+            <if test="ipaddr != null">
                 AND `ipaddr` = #{ipaddr}
             </if>
-            <if test="loginLocation != null  ">
+            <if test="loginLocation != null">
                 AND `login_location` = #{loginLocation}
             </if>
-
         </where>
+        order by login_time desc
     </select>
 
 

src/main/resources/mybatis/mapper/monitor/SysOperLogMapper.xml

@@ -37,7 +37,7 @@
                 and oper_id = #{operId}
             </if>
             <if test="title != null and title != '' ">
-                AND `title` = #{title}
+                AND `title` like concat('%', #{title}, '%')
             </if>
             <if test="businessType != null and businessType != '' ">
                 AND `business_type` = #{businessType}
@@ -68,6 +68,7 @@
                 AND `status` = #{status}
             </if>
         </where>
+        order by monitor_oper_log.oper_time desc
     </select>