代码同步 02.17 -3

yudao-module-identity/yudao-module-identity-biz/src/main/java/cn/iocoder/yudao/module/identity/dal/dataobject/code/CodeDO.java

@@ -1,9 +1,10 @@
 package cn.iocoder.yudao.module.identity.dal.dataobject.code;
 
-import lombok.*;
-import java.util.*;
-import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
 
 /**
  * 标识码 DO
@@ -33,10 +34,6 @@ public class CodeDO extends BaseDO {
      * 二维码url
      */
     private String identityCode;
-    /**
-     * 校验码（明暗码需要）
-     */
-    private String verfiyCode;
     /**
      * 字符长度
      */

yudao-module-identity/yudao-module-identity-biz/src/main/java/cn/iocoder/yudao/module/identity/dal/mysql/code/CodeMapper.java

@@ -1,15 +1,16 @@
 package cn.iocoder.yudao.module.identity.dal.mysql.code;
 
-import java.util.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.identity.controller.admin.code.vo.CodeExportReqVO;
+import cn.iocoder.yudao.module.identity.controller.admin.code.vo.CodePageReqVO;
 import cn.iocoder.yudao.module.identity.dal.dataobject.code.CodeDO;
 import org.apache.ibatis.annotations.Mapper;
-import cn.iocoder.yudao.module.identity.controller.admin.code.vo.*;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 标识码 Mapper
  *
@@ -22,7 +23,6 @@ public interface CodeMapper extends BaseMapperX<CodeDO> {
         return selectPage(reqVO, new LambdaQueryWrapperX<CodeDO>()
                 .eqIfPresent(CodeDO::getGenerateRecordId, reqVO.getGenerateRecordId())
                 .eqIfPresent(CodeDO::getIdentityCode, reqVO.getIdentityCode())
-                .eqIfPresent(CodeDO::getVerfiyCode, reqVO.getVerfiyCode())
                 .eqIfPresent(CodeDO::getCharLength, reqVO.getCharLength())
                 .eqIfPresent(CodeDO::getCharType, reqVO.getCharType())
                 .eqIfPresent(CodeDO::getBatchId, reqVO.getBatchId())
@@ -43,7 +43,6 @@ public interface CodeMapper extends BaseMapperX<CodeDO> {
         return selectList(new LambdaQueryWrapperX<CodeDO>()
                 .eqIfPresent(CodeDO::getGenerateRecordId, reqVO.getGenerateRecordId())
                 .eqIfPresent(CodeDO::getIdentityCode, reqVO.getIdentityCode())
-                .eqIfPresent(CodeDO::getVerfiyCode, reqVO.getVerfiyCode())
                 .eqIfPresent(CodeDO::getCharLength, reqVO.getCharLength())
                 .eqIfPresent(CodeDO::getCharType, reqVO.getCharType())
                 .eqIfPresent(CodeDO::getBatchId, reqVO.getBatchId())

yudao-module-identity/yudao-module-identity-biz/src/main/resources/mapper/generaterecord/GenerateRecordMapper.xml

@@ -21,7 +21,7 @@
             <if test="pageReqVO.codeRuleFormat != null and pageReqVO.codeRuleFormat != ''">and igr.code_rule_format like concat('%',#{pageReqVO.codeRuleFormat},'%') ESCAPE '/'</if>
             <if test="pageReqVO.belongBusinessName != null and pageReqVO.belongBusinessName != ''">and igr.belong_business_name like concat('%',#{pageReqVO.belongBusinessName},'%') ESCAPE '/'</if>
             <if test="pageReqVO.createTime != null and pageReqVO.createTime.length == 2">
-                and igr.belong_business_name BETWEEN #{pageReqVO.createTime[0]} AND #{pageReqVO.createTime[1]}
+                and igr.create_time BETWEEN #{pageReqVO.createTime[0]} AND #{pageReqVO.createTime[1]}
             </if>
             <if test="pageReqVO.batchId != null and pageReqVO.batchId != ''">and igb.batch_id = #{pageReqVO.batchId}</if>
         </where>