fix

dao/src/main/java/com/jbp/db/dao/DtsAdminMapper.java

+package com.wwdz.ch.db.dao;
+
+import com.wwdz.ch.db.domain.DtsAdmin;
+import com.wwdz.ch.db.domain.DtsAdminExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface DtsAdminMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    long countByExample(DtsAdminExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(DtsAdminExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    int insert(DtsAdmin record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    int insertSelective(DtsAdmin record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    DtsAdmin selectOneByExample(DtsAdminExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    DtsAdmin selectOneByExampleSelective(@Param("example") DtsAdminExample example, @Param("selective") DtsAdmin.Column ... selective);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    List<DtsAdmin> selectByExampleSelective(@Param("example") DtsAdminExample example, @Param("selective") DtsAdmin.Column ... selective);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    List<DtsAdmin> selectByExample(DtsAdminExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    DtsAdmin selectByPrimaryKeySelective(@Param("id") Integer id, @Param("selective") DtsAdmin.Column ... selective);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    DtsAdmin selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    DtsAdmin selectByPrimaryKeyWithLogicalDelete(@Param("id") Integer id, @Param("andLogicalDeleted") boolean andLogicalDeleted);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") DtsAdmin record, @Param("example") DtsAdminExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") DtsAdmin record, @Param("example") DtsAdminExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(DtsAdmin record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(DtsAdmin record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    int logicalDeleteByExample(@Param("example") DtsAdminExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    int logicalDeleteByPrimaryKey(Integer id);
+}
\ No newline at end of file

dao/src/main/java/com/jbp/db/domain/DtsAdmin.java

+package com.wwdz.ch.db.domain;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class DtsAdmin {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public static final Boolean NOT_DELETED = false;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public static final Boolean IS_DELETED = true;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dts_admin.id
+     *
+     * @mbg.generated
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dts_admin.username
+     *
+     * @mbg.generated
+     */
+    private String username;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dts_admin.password
+     *
+     * @mbg.generated
+     */
+    private String password;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dts_admin.last_login_ip
+     *
+     * @mbg.generated
+     */
+    private String lastLoginIp;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dts_admin.last_login_time
+     *
+     * @mbg.generated
+     */
+    private LocalDateTime lastLoginTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dts_admin.avatar
+     *
+     * @mbg.generated
+     */
+    private String avatar;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dts_admin.add_time
+     *
+     * @mbg.generated
+     */
+    private LocalDateTime addTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dts_admin.update_time
+     *
+     * @mbg.generated
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dts_admin.deleted
+     *
+     * @mbg.generated
+     */
+    private Boolean deleted;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dts_admin.role_ids
+     *
+     * @mbg.generated
+     */
+    private Integer[] roleIds;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dts_admin.desc
+     *
+     * @mbg.generated
+     */
+    private String desc;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dts_admin.tel
+     *
+     * @mbg.generated
+     */
+    private String tel;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dts_admin.mail
+     *
+     * @mbg.generated
+     */
+    private String mail;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dts_admin.id
+     *
+     * @return the value of dts_admin.id
+     *
+     * @mbg.generated
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dts_admin.id
+     *
+     * @param id the value for dts_admin.id
+     *
+     * @mbg.generated
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dts_admin.username
+     *
+     * @return the value of dts_admin.username
+     *
+     * @mbg.generated
+     */
+    public String getUsername() {
+        return username;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dts_admin.username
+     *
+     * @param username the value for dts_admin.username
+     *
+     * @mbg.generated
+     */
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dts_admin.password
+     *
+     * @return the value of dts_admin.password
+     *
+     * @mbg.generated
+     */
+    public String getPassword() {
+        return password;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dts_admin.password
+     *
+     * @param password the value for dts_admin.password
+     *
+     * @mbg.generated
+     */
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dts_admin.last_login_ip
+     *
+     * @return the value of dts_admin.last_login_ip
+     *
+     * @mbg.generated
+     */
+    public String getLastLoginIp() {
+        return lastLoginIp;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dts_admin.last_login_ip
+     *
+     * @param lastLoginIp the value for dts_admin.last_login_ip
+     *
+     * @mbg.generated
+     */
+    public void setLastLoginIp(String lastLoginIp) {
+        this.lastLoginIp = lastLoginIp;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dts_admin.last_login_time
+     *
+     * @return the value of dts_admin.last_login_time
+     *
+     * @mbg.generated
+     */
+    public LocalDateTime getLastLoginTime() {
+        return lastLoginTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dts_admin.last_login_time
+     *
+     * @param lastLoginTime the value for dts_admin.last_login_time
+     *
+     * @mbg.generated
+     */
+    public void setLastLoginTime(LocalDateTime lastLoginTime) {
+        this.lastLoginTime = lastLoginTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dts_admin.avatar
+     *
+     * @return the value of dts_admin.avatar
+     *
+     * @mbg.generated
+     */
+    public String getAvatar() {
+        return avatar;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dts_admin.avatar
+     *
+     * @param avatar the value for dts_admin.avatar
+     *
+     * @mbg.generated
+     */
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dts_admin.add_time
+     *
+     * @return the value of dts_admin.add_time
+     *
+     * @mbg.generated
+     */
+    public LocalDateTime getAddTime() {
+        return addTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dts_admin.add_time
+     *
+     * @param addTime the value for dts_admin.add_time
+     *
+     * @mbg.generated
+     */
+    public void setAddTime(LocalDateTime addTime) {
+        this.addTime = addTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dts_admin.update_time
+     *
+     * @return the value of dts_admin.update_time
+     *
+     * @mbg.generated
+     */
+    public LocalDateTime getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dts_admin.update_time
+     *
+     * @param updateTime the value for dts_admin.update_time
+     *
+     * @mbg.generated
+     */
+    public void setUpdateTime(LocalDateTime updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dts_admin.deleted
+     *
+     * @return the value of dts_admin.deleted
+     *
+     * @mbg.generated
+     */
+    public Boolean getDeleted() {
+        return deleted;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dts_admin.deleted
+     *
+     * @param deleted the value for dts_admin.deleted
+     *
+     * @mbg.generated
+     */
+    public void setDeleted(Boolean deleted) {
+        this.deleted = deleted;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dts_admin.role_ids
+     *
+     * @return the value of dts_admin.role_ids
+     *
+     * @mbg.generated
+     */
+    public Integer[] getRoleIds() {
+        return roleIds;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dts_admin.role_ids
+     *
+     * @param roleIds the value for dts_admin.role_ids
+     *
+     * @mbg.generated
+     */
+    public void setRoleIds(Integer[] roleIds) {
+        this.roleIds = roleIds;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dts_admin.desc
+     *
+     * @return the value of dts_admin.desc
+     *
+     * @mbg.generated
+     */
+    public String getDesc() {
+        return desc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dts_admin.desc
+     *
+     * @param desc the value for dts_admin.desc
+     *
+     * @mbg.generated
+     */
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dts_admin.tel
+     *
+     * @return the value of dts_admin.tel
+     *
+     * @mbg.generated
+     */
+    public String getTel() {
+        return tel;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dts_admin.tel
+     *
+     * @param tel the value for dts_admin.tel
+     *
+     * @mbg.generated
+     */
+    public void setTel(String tel) {
+        this.tel = tel;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dts_admin.mail
+     *
+     * @return the value of dts_admin.mail
+     *
+     * @mbg.generated
+     */
+    public String getMail() {
+        return mail;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dts_admin.mail
+     *
+     * @param mail the value for dts_admin.mail
+     *
+     * @mbg.generated
+     */
+    public void setMail(String mail) {
+        this.mail = mail;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", username=").append(username);
+        sb.append(", password=").append(password);
+        sb.append(", lastLoginIp=").append(lastLoginIp);
+        sb.append(", lastLoginTime=").append(lastLoginTime);
+        sb.append(", avatar=").append(avatar);
+        sb.append(", addTime=").append(addTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", roleIds=").append(roleIds);
+        sb.append(", desc=").append(desc);
+        sb.append(", tel=").append(tel);
+        sb.append(", mail=").append(mail);
+        sb.append("]");
+        return sb.toString();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        DtsAdmin other = (DtsAdmin) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getUsername() == null ? other.getUsername() == null : this.getUsername().equals(other.getUsername()))
+            && (this.getPassword() == null ? other.getPassword() == null : this.getPassword().equals(other.getPassword()))
+            && (this.getLastLoginIp() == null ? other.getLastLoginIp() == null : this.getLastLoginIp().equals(other.getLastLoginIp()))
+            && (this.getLastLoginTime() == null ? other.getLastLoginTime() == null : this.getLastLoginTime().equals(other.getLastLoginTime()))
+            && (this.getAvatar() == null ? other.getAvatar() == null : this.getAvatar().equals(other.getAvatar()))
+            && (this.getAddTime() == null ? other.getAddTime() == null : this.getAddTime().equals(other.getAddTime()))
+            && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
+            && (this.getDeleted() == null ? other.getDeleted() == null : this.getDeleted().equals(other.getDeleted()))
+            && (Arrays.equals(this.getRoleIds(), other.getRoleIds()))
+            && (this.getDesc() == null ? other.getDesc() == null : this.getDesc().equals(other.getDesc()))
+            && (this.getTel() == null ? other.getTel() == null : this.getTel().equals(other.getTel()))
+            && (this.getMail() == null ? other.getMail() == null : this.getMail().equals(other.getMail()));
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getUsername() == null) ? 0 : getUsername().hashCode());
+        result = prime * result + ((getPassword() == null) ? 0 : getPassword().hashCode());
+        result = prime * result + ((getLastLoginIp() == null) ? 0 : getLastLoginIp().hashCode());
+        result = prime * result + ((getLastLoginTime() == null) ? 0 : getLastLoginTime().hashCode());
+        result = prime * result + ((getAvatar() == null) ? 0 : getAvatar().hashCode());
+        result = prime * result + ((getAddTime() == null) ? 0 : getAddTime().hashCode());
+        result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
+        result = prime * result + ((getDeleted() == null) ? 0 : getDeleted().hashCode());
+        result = prime * result + (Arrays.hashCode(getRoleIds()));
+        result = prime * result + ((getDesc() == null) ? 0 : getDesc().hashCode());
+        result = prime * result + ((getTel() == null) ? 0 : getTel().hashCode());
+        result = prime * result + ((getMail() == null) ? 0 : getMail().hashCode());
+        return result;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public void andLogicalDeleted(boolean deleted) {
+        setDeleted(deleted ? IS_DELETED : NOT_DELETED);
+    }
+
+    /**
+     * This enum was generated by MyBatis Generator.
+     * This enum corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public enum Column {
+        id("id", "id", "INTEGER", false),
+        username("username", "username", "VARCHAR", false),
+        password("password", "password", "VARCHAR", true),
+        lastLoginIp("last_login_ip", "lastLoginIp", "VARCHAR", false),
+        lastLoginTime("last_login_time", "lastLoginTime", "TIMESTAMP", false),
+        avatar("avatar", "avatar", "VARCHAR", false),
+        addTime("add_time", "addTime", "TIMESTAMP", false),
+        updateTime("update_time", "updateTime", "TIMESTAMP", false),
+        deleted("deleted", "deleted", "BIT", false),
+        roleIds("role_ids", "roleIds", "VARCHAR", false),
+        desc("desc", "desc", "VARCHAR", true),
+        tel("tel", "tel", "VARCHAR", false),
+        mail("mail", "mail", "VARCHAR", false);
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private static final String BEGINNING_DELIMITER = "`";
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private static final String ENDING_DELIMITER = "`";
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String column;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final boolean isColumnNameDelimited;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String javaProperty;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String jdbcType;
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String value() {
+            return this.column;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getValue() {
+            return this.column;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getJavaProperty() {
+            return this.javaProperty;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getJdbcType() {
+            return this.jdbcType;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        Column(String column, String javaProperty, String jdbcType, boolean isColumnNameDelimited) {
+            this.column = column;
+            this.javaProperty = javaProperty;
+            this.jdbcType = jdbcType;
+            this.isColumnNameDelimited = isColumnNameDelimited;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String desc() {
+            return this.getEscapedColumnName() + " DESC";
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String asc() {
+            return this.getEscapedColumnName() + " ASC";
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public static Column[] excludes(Column ... excludes) {
+            ArrayList<Column> columns = new ArrayList<>(Arrays.asList(Column.values()));
+            if (excludes != null && excludes.length > 0) {
+                columns.removeAll(new ArrayList<>(Arrays.asList(excludes)));
+            }
+            return columns.toArray(new Column[]{});
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getEscapedColumnName() {
+            if (this.isColumnNameDelimited) {
+                return new StringBuilder().append(BEGINNING_DELIMITER).append(this.column).append(ENDING_DELIMITER).toString();
+            } else {
+                return this.column;
+            }
+        }
+    }
+}
\ No newline at end of file

dao/src/main/java/com/jbp/db/domain/DtsAdminExample.java

+package com.wwdz.ch.db.domain;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+public class DtsAdminExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    public DtsAdminExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public DtsAdminExample orderBy(String orderByClause) {
+        this.setOrderByClause(orderByClause);
+        return this;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public DtsAdminExample orderBy(String ... orderByClauses) {
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < orderByClauses.length; i++) {
+            sb.append(orderByClauses[i]);
+            if (i < orderByClauses.length - 1) {
+                sb.append(" , ");
+            }
+        }
+        this.setOrderByClause(sb.toString());
+        return this;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria(this);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public static Criteria newAndCreateCriteria() {
+        DtsAdminExample example = new DtsAdminExample();
+        return example.createCriteria();
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> roleIdsCriteria;
+
+        protected List<Criterion> allCriteria;
+
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+            roleIdsCriteria = new ArrayList<Criterion>();
+        }
+
+        public List<Criterion> getRoleIdsCriteria() {
+            return roleIdsCriteria;
+        }
+
+        protected void addRoleIdsCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            roleIdsCriteria.add(new Criterion(condition, value, "com.wwdz.ch.db.mybatis.JsonIntegerArrayTypeHandler"));
+            allCriteria = null;
+        }
+
+        protected void addRoleIdsCriterion(String condition, Integer[] value1, Integer[] value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            roleIdsCriteria.add(new Criterion(condition, value1, value2, "com.wwdz.ch.db.mybatis.JsonIntegerArrayTypeHandler"));
+            allCriteria = null;
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0
+                || roleIdsCriteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            if (allCriteria == null) {
+                allCriteria = new ArrayList<Criterion>();
+                allCriteria.addAll(criteria);
+                allCriteria.addAll(roleIdsCriteria);
+            }
+            return allCriteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+            allCriteria = null;
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+            allCriteria = null;
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+            allCriteria = null;
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdNotEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdGreaterThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdGreaterThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdLessThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdLessThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameIsNull() {
+            addCriterion("username is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameIsNotNull() {
+            addCriterion("username is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameEqualTo(String value) {
+            addCriterion("username =", value, "username");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUsernameEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("username = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameNotEqualTo(String value) {
+            addCriterion("username <>", value, "username");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUsernameNotEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("username <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameGreaterThan(String value) {
+            addCriterion("username >", value, "username");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUsernameGreaterThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("username > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameGreaterThanOrEqualTo(String value) {
+            addCriterion("username >=", value, "username");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUsernameGreaterThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("username >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameLessThan(String value) {
+            addCriterion("username <", value, "username");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUsernameLessThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("username < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameLessThanOrEqualTo(String value) {
+            addCriterion("username <=", value, "username");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUsernameLessThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("username <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameLike(String value) {
+            addCriterion("username like", value, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameNotLike(String value) {
+            addCriterion("username not like", value, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameIn(List<String> values) {
+            addCriterion("username in", values, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameNotIn(List<String> values) {
+            addCriterion("username not in", values, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameBetween(String value1, String value2) {
+            addCriterion("username between", value1, value2, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameNotBetween(String value1, String value2) {
+            addCriterion("username not between", value1, value2, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordIsNull() {
+            addCriterion("`password` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordIsNotNull() {
+            addCriterion("`password` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordEqualTo(String value) {
+            addCriterion("`password` =", value, "password");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andPasswordEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("`password` = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordNotEqualTo(String value) {
+            addCriterion("`password` <>", value, "password");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andPasswordNotEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("`password` <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordGreaterThan(String value) {
+            addCriterion("`password` >", value, "password");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andPasswordGreaterThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("`password` > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordGreaterThanOrEqualTo(String value) {
+            addCriterion("`password` >=", value, "password");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andPasswordGreaterThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("`password` >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordLessThan(String value) {
+            addCriterion("`password` <", value, "password");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andPasswordLessThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("`password` < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordLessThanOrEqualTo(String value) {
+            addCriterion("`password` <=", value, "password");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andPasswordLessThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("`password` <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordLike(String value) {
+            addCriterion("`password` like", value, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordNotLike(String value) {
+            addCriterion("`password` not like", value, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordIn(List<String> values) {
+            addCriterion("`password` in", values, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordNotIn(List<String> values) {
+            addCriterion("`password` not in", values, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordBetween(String value1, String value2) {
+            addCriterion("`password` between", value1, value2, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordNotBetween(String value1, String value2) {
+            addCriterion("`password` not between", value1, value2, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginIpIsNull() {
+            addCriterion("last_login_ip is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginIpIsNotNull() {
+            addCriterion("last_login_ip is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginIpEqualTo(String value) {
+            addCriterion("last_login_ip =", value, "lastLoginIp");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andLastLoginIpEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("last_login_ip = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginIpNotEqualTo(String value) {
+            addCriterion("last_login_ip <>", value, "lastLoginIp");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andLastLoginIpNotEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("last_login_ip <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginIpGreaterThan(String value) {
+            addCriterion("last_login_ip >", value, "lastLoginIp");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andLastLoginIpGreaterThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("last_login_ip > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginIpGreaterThanOrEqualTo(String value) {
+            addCriterion("last_login_ip >=", value, "lastLoginIp");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andLastLoginIpGreaterThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("last_login_ip >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginIpLessThan(String value) {
+            addCriterion("last_login_ip <", value, "lastLoginIp");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andLastLoginIpLessThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("last_login_ip < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginIpLessThanOrEqualTo(String value) {
+            addCriterion("last_login_ip <=", value, "lastLoginIp");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andLastLoginIpLessThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("last_login_ip <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginIpLike(String value) {
+            addCriterion("last_login_ip like", value, "lastLoginIp");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginIpNotLike(String value) {
+            addCriterion("last_login_ip not like", value, "lastLoginIp");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginIpIn(List<String> values) {
+            addCriterion("last_login_ip in", values, "lastLoginIp");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginIpNotIn(List<String> values) {
+            addCriterion("last_login_ip not in", values, "lastLoginIp");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginIpBetween(String value1, String value2) {
+            addCriterion("last_login_ip between", value1, value2, "lastLoginIp");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginIpNotBetween(String value1, String value2) {
+            addCriterion("last_login_ip not between", value1, value2, "lastLoginIp");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginTimeIsNull() {
+            addCriterion("last_login_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginTimeIsNotNull() {
+            addCriterion("last_login_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginTimeEqualTo(LocalDateTime value) {
+            addCriterion("last_login_time =", value, "lastLoginTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andLastLoginTimeEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("last_login_time = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginTimeNotEqualTo(LocalDateTime value) {
+            addCriterion("last_login_time <>", value, "lastLoginTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andLastLoginTimeNotEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("last_login_time <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginTimeGreaterThan(LocalDateTime value) {
+            addCriterion("last_login_time >", value, "lastLoginTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andLastLoginTimeGreaterThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("last_login_time > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginTimeGreaterThanOrEqualTo(LocalDateTime value) {
+            addCriterion("last_login_time >=", value, "lastLoginTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andLastLoginTimeGreaterThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("last_login_time >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginTimeLessThan(LocalDateTime value) {
+            addCriterion("last_login_time <", value, "lastLoginTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andLastLoginTimeLessThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("last_login_time < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginTimeLessThanOrEqualTo(LocalDateTime value) {
+            addCriterion("last_login_time <=", value, "lastLoginTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andLastLoginTimeLessThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("last_login_time <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginTimeIn(List<LocalDateTime> values) {
+            addCriterion("last_login_time in", values, "lastLoginTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginTimeNotIn(List<LocalDateTime> values) {
+            addCriterion("last_login_time not in", values, "lastLoginTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginTimeBetween(LocalDateTime value1, LocalDateTime value2) {
+            addCriterion("last_login_time between", value1, value2, "lastLoginTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastLoginTimeNotBetween(LocalDateTime value1, LocalDateTime value2) {
+            addCriterion("last_login_time not between", value1, value2, "lastLoginTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarIsNull() {
+            addCriterion("avatar is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarIsNotNull() {
+            addCriterion("avatar is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarEqualTo(String value) {
+            addCriterion("avatar =", value, "avatar");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andAvatarEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("avatar = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarNotEqualTo(String value) {
+            addCriterion("avatar <>", value, "avatar");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andAvatarNotEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("avatar <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarGreaterThan(String value) {
+            addCriterion("avatar >", value, "avatar");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andAvatarGreaterThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("avatar > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarGreaterThanOrEqualTo(String value) {
+            addCriterion("avatar >=", value, "avatar");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andAvatarGreaterThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("avatar >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarLessThan(String value) {
+            addCriterion("avatar <", value, "avatar");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andAvatarLessThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("avatar < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarLessThanOrEqualTo(String value) {
+            addCriterion("avatar <=", value, "avatar");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andAvatarLessThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("avatar <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarLike(String value) {
+            addCriterion("avatar like", value, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarNotLike(String value) {
+            addCriterion("avatar not like", value, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarIn(List<String> values) {
+            addCriterion("avatar in", values, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarNotIn(List<String> values) {
+            addCriterion("avatar not in", values, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarBetween(String value1, String value2) {
+            addCriterion("avatar between", value1, value2, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarNotBetween(String value1, String value2) {
+            addCriterion("avatar not between", value1, value2, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddTimeIsNull() {
+            addCriterion("add_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddTimeIsNotNull() {
+            addCriterion("add_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddTimeEqualTo(LocalDateTime value) {
+            addCriterion("add_time =", value, "addTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andAddTimeEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("add_time = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andAddTimeNotEqualTo(LocalDateTime value) {
+            addCriterion("add_time <>", value, "addTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andAddTimeNotEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("add_time <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andAddTimeGreaterThan(LocalDateTime value) {
+            addCriterion("add_time >", value, "addTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andAddTimeGreaterThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("add_time > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andAddTimeGreaterThanOrEqualTo(LocalDateTime value) {
+            addCriterion("add_time >=", value, "addTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andAddTimeGreaterThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("add_time >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andAddTimeLessThan(LocalDateTime value) {
+            addCriterion("add_time <", value, "addTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andAddTimeLessThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("add_time < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andAddTimeLessThanOrEqualTo(LocalDateTime value) {
+            addCriterion("add_time <=", value, "addTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andAddTimeLessThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("add_time <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andAddTimeIn(List<LocalDateTime> values) {
+            addCriterion("add_time in", values, "addTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddTimeNotIn(List<LocalDateTime> values) {
+            addCriterion("add_time not in", values, "addTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddTimeBetween(LocalDateTime value1, LocalDateTime value2) {
+            addCriterion("add_time between", value1, value2, "addTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddTimeNotBetween(LocalDateTime value1, LocalDateTime value2) {
+            addCriterion("add_time not between", value1, value2, "addTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(LocalDateTime value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("update_time = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(LocalDateTime value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeNotEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("update_time <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(LocalDateTime value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeGreaterThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("update_time > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(LocalDateTime value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeGreaterThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("update_time >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(LocalDateTime value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeLessThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("update_time < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(LocalDateTime value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeLessThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("update_time <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<LocalDateTime> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<LocalDateTime> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(LocalDateTime value1, LocalDateTime value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(LocalDateTime value1, LocalDateTime value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedIsNull() {
+            addCriterion("deleted is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedIsNotNull() {
+            addCriterion("deleted is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedEqualTo(Boolean value) {
+            addCriterion("deleted =", value, "deleted");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDeletedEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("deleted = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotEqualTo(Boolean value) {
+            addCriterion("deleted <>", value, "deleted");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDeletedNotEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("deleted <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedGreaterThan(Boolean value) {
+            addCriterion("deleted >", value, "deleted");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDeletedGreaterThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("deleted > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("deleted >=", value, "deleted");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDeletedGreaterThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("deleted >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedLessThan(Boolean value) {
+            addCriterion("deleted <", value, "deleted");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDeletedLessThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("deleted < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedLessThanOrEqualTo(Boolean value) {
+            addCriterion("deleted <=", value, "deleted");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDeletedLessThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("deleted <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedIn(List<Boolean> values) {
+            addCriterion("deleted in", values, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotIn(List<Boolean> values) {
+            addCriterion("deleted not in", values, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedBetween(Boolean value1, Boolean value2) {
+            addCriterion("deleted between", value1, value2, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("deleted not between", value1, value2, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdsIsNull() {
+            addCriterion("role_ids is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdsIsNotNull() {
+            addCriterion("role_ids is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdsEqualTo(Integer[] value) {
+            addRoleIdsCriterion("role_ids =", value, "roleIds");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andRoleIdsEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("role_ids = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdsNotEqualTo(Integer[] value) {
+            addRoleIdsCriterion("role_ids <>", value, "roleIds");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andRoleIdsNotEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("role_ids <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdsGreaterThan(Integer[] value) {
+            addRoleIdsCriterion("role_ids >", value, "roleIds");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andRoleIdsGreaterThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("role_ids > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdsGreaterThanOrEqualTo(Integer[] value) {
+            addRoleIdsCriterion("role_ids >=", value, "roleIds");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andRoleIdsGreaterThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("role_ids >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdsLessThan(Integer[] value) {
+            addRoleIdsCriterion("role_ids <", value, "roleIds");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andRoleIdsLessThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("role_ids < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdsLessThanOrEqualTo(Integer[] value) {
+            addRoleIdsCriterion("role_ids <=", value, "roleIds");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andRoleIdsLessThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("role_ids <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdsLike(Integer[] value) {
+            addRoleIdsCriterion("role_ids like", value, "roleIds");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdsNotLike(Integer[] value) {
+            addRoleIdsCriterion("role_ids not like", value, "roleIds");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdsIn(List<Integer[]> values) {
+            addRoleIdsCriterion("role_ids in", values, "roleIds");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdsNotIn(List<Integer[]> values) {
+            addRoleIdsCriterion("role_ids not in", values, "roleIds");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdsBetween(Integer[] value1, Integer[] value2) {
+            addRoleIdsCriterion("role_ids between", value1, value2, "roleIds");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdsNotBetween(Integer[] value1, Integer[] value2) {
+            addRoleIdsCriterion("role_ids not between", value1, value2, "roleIds");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescIsNull() {
+            addCriterion("`desc` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescIsNotNull() {
+            addCriterion("`desc` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescEqualTo(String value) {
+            addCriterion("`desc` =", value, "desc");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDescEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("`desc` = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDescNotEqualTo(String value) {
+            addCriterion("`desc` <>", value, "desc");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDescNotEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("`desc` <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDescGreaterThan(String value) {
+            addCriterion("`desc` >", value, "desc");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDescGreaterThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("`desc` > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDescGreaterThanOrEqualTo(String value) {
+            addCriterion("`desc` >=", value, "desc");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDescGreaterThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("`desc` >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDescLessThan(String value) {
+            addCriterion("`desc` <", value, "desc");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDescLessThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("`desc` < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDescLessThanOrEqualTo(String value) {
+            addCriterion("`desc` <=", value, "desc");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDescLessThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("`desc` <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDescLike(String value) {
+            addCriterion("`desc` like", value, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescNotLike(String value) {
+            addCriterion("`desc` not like", value, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescIn(List<String> values) {
+            addCriterion("`desc` in", values, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescNotIn(List<String> values) {
+            addCriterion("`desc` not in", values, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescBetween(String value1, String value2) {
+            addCriterion("`desc` between", value1, value2, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescNotBetween(String value1, String value2) {
+            addCriterion("`desc` not between", value1, value2, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andTelIsNull() {
+            addCriterion("tel is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTelIsNotNull() {
+            addCriterion("tel is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTelEqualTo(String value) {
+            addCriterion("tel =", value, "tel");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTelEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("tel = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTelNotEqualTo(String value) {
+            addCriterion("tel <>", value, "tel");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTelNotEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("tel <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTelGreaterThan(String value) {
+            addCriterion("tel >", value, "tel");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTelGreaterThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("tel > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTelGreaterThanOrEqualTo(String value) {
+            addCriterion("tel >=", value, "tel");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTelGreaterThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("tel >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTelLessThan(String value) {
+            addCriterion("tel <", value, "tel");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTelLessThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("tel < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTelLessThanOrEqualTo(String value) {
+            addCriterion("tel <=", value, "tel");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTelLessThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("tel <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTelLike(String value) {
+            addCriterion("tel like", value, "tel");
+            return (Criteria) this;
+        }
+
+        public Criteria andTelNotLike(String value) {
+            addCriterion("tel not like", value, "tel");
+            return (Criteria) this;
+        }
+
+        public Criteria andTelIn(List<String> values) {
+            addCriterion("tel in", values, "tel");
+            return (Criteria) this;
+        }
+
+        public Criteria andTelNotIn(List<String> values) {
+            addCriterion("tel not in", values, "tel");
+            return (Criteria) this;
+        }
+
+        public Criteria andTelBetween(String value1, String value2) {
+            addCriterion("tel between", value1, value2, "tel");
+            return (Criteria) this;
+        }
+
+        public Criteria andTelNotBetween(String value1, String value2) {
+            addCriterion("tel not between", value1, value2, "tel");
+            return (Criteria) this;
+        }
+
+        public Criteria andMailIsNull() {
+            addCriterion("mail is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMailIsNotNull() {
+            addCriterion("mail is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMailEqualTo(String value) {
+            addCriterion("mail =", value, "mail");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andMailEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("mail = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andMailNotEqualTo(String value) {
+            addCriterion("mail <>", value, "mail");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andMailNotEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("mail <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andMailGreaterThan(String value) {
+            addCriterion("mail >", value, "mail");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andMailGreaterThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("mail > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andMailGreaterThanOrEqualTo(String value) {
+            addCriterion("mail >=", value, "mail");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andMailGreaterThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("mail >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andMailLessThan(String value) {
+            addCriterion("mail <", value, "mail");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andMailLessThanColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("mail < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andMailLessThanOrEqualTo(String value) {
+            addCriterion("mail <=", value, "mail");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andMailLessThanOrEqualToColumn(DtsAdmin.Column column) {
+            addCriterion(new StringBuilder("mail <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andMailLike(String value) {
+            addCriterion("mail like", value, "mail");
+            return (Criteria) this;
+        }
+
+        public Criteria andMailNotLike(String value) {
+            addCriterion("mail not like", value, "mail");
+            return (Criteria) this;
+        }
+
+        public Criteria andMailIn(List<String> values) {
+            addCriterion("mail in", values, "mail");
+            return (Criteria) this;
+        }
+
+        public Criteria andMailNotIn(List<String> values) {
+            addCriterion("mail not in", values, "mail");
+            return (Criteria) this;
+        }
+
+        public Criteria andMailBetween(String value1, String value2) {
+            addCriterion("mail between", value1, value2, "mail");
+            return (Criteria) this;
+        }
+
+        public Criteria andMailNotBetween(String value1, String value2) {
+            addCriterion("mail not between", value1, value2, "mail");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table dts_admin
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private DtsAdminExample example;
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        protected Criteria(DtsAdminExample example) {
+            super();
+            this.example = example;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public DtsAdminExample example() {
+            return this.example;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIf(boolean ifAdd, ICriteriaAdd add) {
+            if (ifAdd) {
+                add.add(this);
+            }
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andLogicalDeleted(boolean deleted) {
+            return deleted ? andDeletedEqualTo(DtsAdmin.IS_DELETED) : andDeletedNotEqualTo(DtsAdmin.IS_DELETED);
+        }
+
+        /**
+         * This interface was generated by MyBatis Generator.
+         * This interface corresponds to the database table dts_admin
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public interface ICriteriaAdd {
+            /**
+             * This method was generated by MyBatis Generator.
+             * This method corresponds to the database table dts_admin
+             *
+             * @mbg.generated
+             * @project https://github.com/itfsw/mybatis-generator-plugin
+             */
+            Criteria add(Criteria add);
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table dts_admin
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file

web/src/main/java/com/jbp/dashboard/dao/CategorySellVo.java

-package com.jbp.dashboard.dao;
-
-import java.io.Serializable;
-import java.util.List;
-
-import com.jbp.db.bean.CategorySellAmts;
-
-public class CategorySellVo implements Serializable{
-	
-	private static final long serialVersionUID = 96458407347975166L;
-
-    private String[] categoryNames;//一级大类目录名称
-	
-	private List<CategorySellAmts> categorySellData;//大类销售金额集合
-
-	public String[] getCategoryNames() {
-		return categoryNames;
-	}
-
-	public void setCategoryNames(String[] categoryNames) {
-		this.categoryNames = categoryNames;
-	}
-
-	public List<CategorySellAmts> getCategorySellData() {
-		return categorySellData;
-	}
-
-	public void setCategorySellData(List<CategorySellAmts> categorySellData) {
-		this.categorySellData = categorySellData;
-	}
-
-	
-}

web/src/main/java/com/jbp/dashboard/dao/CategoryVo.java

-package com.jbp.dashboard.dao;
-
-import com.alibaba.druid.support.json.JSONUtils;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.springframework.util.StringUtils;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@ApiModel
-public class CategoryVo implements Serializable {
-
-    private static final long serialVersionUID = 96458407347975312L;
-
-    @ApiModelProperty(value = "分类Id")
-    private Integer id;
-
-    @ApiModelProperty(value = "分类名称")
-    private String name;
-
-
-    @ApiModelProperty(value = "分类图片")
-    private String icon;
-
-
-    @ApiModelProperty(value = "父类目ID")
-    private Integer pid;
-
-    @ApiModelProperty(value = "层级")
-    private Integer level;
-
-    @ApiModelProperty(value = "描述")
-    private String desc;
-
-    @ApiModelProperty(value = "面值")
-    private String parValue;
-
-    @ApiModelProperty(value = "命名来源")
-    private String nameSrc;
-
-    @ApiModelProperty(value = "造币厂")
-    private String mint;
-
-    @ApiModelProperty(value = "铸造时间")
-    private String publishTime;
-
-    @ApiModelProperty(value = "铸造者")
-    private String publisher;
-
-    @ApiModelProperty(value = "王朝")
-    private String dynasty;
-
-    @ApiModelProperty(value = "品种代码")
-    private String serialNo;
-
-    @ApiModelProperty(value = "分类路径")
-    private String categoryPath;
-
-    @ApiModelProperty(value = "扩展名称")
-    private String extendName;
-
-    @ApiModelProperty(value = "材质")
-    private String material;
-
-
-    @ApiModelProperty(value = "直径 （mm * 100）")
-    private Integer diameter;
-
-    @ApiModelProperty(value = " 厚度 （mm * 100）")
-    private Integer thickness;
-
-    @ApiModelProperty(value = "重量 （g * 100）")
-    private Integer weight;
-
-
-    @ApiModelProperty(value = "合金成分分析表图片路径")
-    private String caTableImage;
-
-
-    @ApiModelProperty(value = "是否叶子节点")
-    private Boolean isLeaf;
-
-
-    @ApiModelProperty(value = "存世量")
-    private Integer exiQuantity;
-
-
-
-    /**
-     * 子类目
-     */
-    private List<CategoryVo> children;
-
-
-    public String getCaTableImage() {
-        return caTableImage;
-    }
-
-    public void setCaTableImage(String caTableImage) {
-        this.caTableImage = caTableImage;
-    }
-
-    public Boolean getLeaf() {
-        return isLeaf;
-    }
-
-    public void setLeaf(Boolean leaf) {
-        isLeaf = leaf;
-    }
-
-    public String getParValue() {
-        return parValue;
-    }
-
-    public void setParValue(String parValue) {
-        this.parValue = parValue;
-    }
-
-    public String getNameSrc() {
-        return nameSrc;
-    }
-
-    public void setNameSrc(String nameSrc) {
-        this.nameSrc = nameSrc;
-    }
-
-    public String getMint() {
-        return mint;
-    }
-
-    public void setMint(String mint) {
-        this.mint = mint;
-    }
-
-    public String getMaterial() {
-        return material;
-    }
-
-    public void setMaterial(String material) {
-        this.material = material;
-    }
-
-    public CategoryVo(){}
-
-    public CategoryVo(Category category) {
-        this.id = category.getId();
-        this.name = category.getName();
-        this.icon = category.getIcon();
-        this.pid = category.getPid();
-        this.desc = category.getDesc();
-        this.level = category.getLevel();
-        this.isLeaf = category.getIsLeaf();
-        if (!StringUtils.isEmpty(category.getExtra())) {
-            Map<String, Object> extraData = (Map<String, Object>) JSONUtils.parse(category.getExtra());
-            this.publishTime = extractExtra(extraData, "publishTime");
-            this.publisher = extractExtra(extraData, "publisher");
-            this.exiQuantity = extractExtraInt(extraData, "exiQuantity");
-            this.dynasty = extractExtra(extraData, "dynasty");
-            this.diameter = extractExtraInt(extraData, "diameter");
-            this.thickness = extractExtraInt(extraData, "thickness");
-            this.weight = extractExtraInt(extraData, "weight");
-            this.extendName = extractExtra(extraData, "extendName");
-            this.serialNo = extractExtra(extraData, "serialNo");
-            this.caTableImage = extractExtra(extraData, "caTableImage");
-            this.nameSrc = extractExtra(extraData, "nameSrc");
-            this.mint = extractExtra(extraData, "mint");
-            this.parValue = extractExtra(extraData, "parValue");
-            this.material = extractExtra(extraData, "material");
-        }
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getIcon() {
-        return icon;
-    }
-
-    public void setIcon(String icon) {
-        this.icon = icon;
-    }
-
-    public Integer getPid() {
-        return pid;
-    }
-
-    public void setPid(Integer pid) {
-        this.pid = pid;
-    }
-
-    public List<CategoryVo> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<CategoryVo> children) {
-        this.children = children;
-    }
-
-    public Integer getLevel() {
-        return level;
-    }
-
-    public void setLevel(Integer level) {
-        this.level = level;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
-
-    public String getPublishTime() {
-        return publishTime;
-    }
-
-    public void setPublishTime(String publishTime) {
-        this.publishTime = publishTime;
-    }
-
-    public String getPublisher() {
-        return publisher;
-    }
-
-    public void setPublisher(String publisher) {
-        this.publisher = publisher;
-    }
-
-    public Integer getExiQuantity() {
-        return exiQuantity;
-    }
-
-    public void setExiQuantity(Integer exiQuantity) {
-        this.exiQuantity = exiQuantity;
-    }
-
-
-    public String getDynasty() {
-        return dynasty;
-    }
-
-    public void setDynasty(String dynasty) {
-        this.dynasty = dynasty;
-    }
-
-    public String getSerialNo() {
-        return serialNo;
-    }
-
-    public void setSerialNo(String serialNo) {
-        this.serialNo = serialNo;
-    }
-
-    public String getCategoryPath() {
-        return categoryPath;
-    }
-
-    public void setCategoryPath(String categoryPath) {
-        this.categoryPath = categoryPath;
-    }
-
-    public String getExtendName() {
-        return extendName;
-    }
-
-    public void setExtendName(String extendName) {
-        this.extendName = extendName;
-    }
-
-    public Integer getDiameter() {
-        return diameter;
-    }
-
-    public void setDiameter(Integer diameter) {
-        this.diameter = diameter;
-    }
-
-    public Integer getThickness() {
-        return thickness;
-    }
-
-    public void setThickness(Integer thickness) {
-        this.thickness = thickness;
-    }
-
-    public Integer getWeight() {
-        return weight;
-    }
-
-    public void setWeight(Integer weight) {
-        this.weight = weight;
-    }
-
-    private String extractExtra(Map<String, Object> extraData, String key) {
-        if (null != extraData.get(key)) {
-            return extraData.get(key).toString();
-        }
-        return "";
-    }
-
-    private Integer extractExtraInt(Map<String, Object> extraData, String key) {
-        if (!StringUtils.isEmpty(extraData.get(key))) {
-            return Integer.valueOf(extraData.get(key).toString());
-        }
-        return null;
-    }
-
-    public Category toDo() {
-        Category category = new Category();
-        category.setId(this.id);
-        category.setDesc(this.desc);
-        category.setIcon(this.icon);
-        category.setLevel(this.level);
-        category.setName(this.name);
-        category.setPid(this.pid);
-        category.setExtra(createExtra());
-        return category;
-    }
-
-    private String createExtra() {
-        Map<String, Object> extraObj = new HashMap<>();
-        extraObj.put("publishTime", this.publishTime);
-        extraObj.put("publisher", this.publisher);
-        extraObj.put("exiQuantity", this.exiQuantity);
-        extraObj.put("mint", this.mint);
-        extraObj.put("parValue", this.parValue);
-        extraObj.put("nameSrc",this.nameSrc);
-        extraObj.put("caTableImage", this.caTableImage);
-        extraObj.put("diameter", this.diameter);
-        extraObj.put("dynasty", this.dynasty);
-        extraObj.put("extendName", this.extendName);
-        extraObj.put("serialNo", this.serialNo);
-        extraObj.put("thickness", this.thickness);
-        extraObj.put("weight", this.weight);
-        extraObj.put("material", this.material);
-        return JSONUtils.toJSONString(extraObj);
-    }
-}

web/src/main/java/com/jbp/dashboard/dao/ItemVo.java

-package com.jbp.dashboard.dao;
-
-import com.qiniu.util.StringUtils;
-import com.jbp.core.util.PriceUtil;
-
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.Objects;
-
-public class ItemVo implements Serializable {
-
-    private static final long serialVersionUID = 3840196224538738818L;
-
-    /**
-     * 商品id
-     */
-    private Long id;
-
-    /**
-     * 类目id
-     */
-    private Integer cid;
-
-
-    /**
-     * 商品详情
-     */
-    private String detail;
-
-
-    /**
-     * 商品图片
-     */
-    private String[] images;
-
-    /**
-     * 商品标题
-     */
-    private String name;
-
-    /**
-     * 商品价格
-     */
-    private Double price;
-
-    /**
-     * 是否在架
-     */
-    private Boolean isOnSale;
-
-
-    /**
-     * 是否分类标准品
-     */
-    private Boolean isStd;
-
-
-    public Integer getCid() {
-        return cid;
-    }
-
-    public void setCid(Integer cid) {
-        this.cid = cid;
-    }
-
-    public String getDetail() {
-        return detail;
-    }
-
-    public void setDetail(String detail) {
-        this.detail = detail;
-    }
-
-    public String[] getImages() {
-        return images;
-    }
-
-    public void setImages(String[] images) {
-        this.images = images;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Double getPrice() {
-        return price;
-    }
-
-    public void setPrice(Double price) {
-        this.price = price;
-    }
-
-    public Boolean getIsOnSale() {
-        return isOnSale;
-    }
-
-    public void setIsOnSale(Boolean onSale) {
-        isOnSale = onSale;
-    }
-
-    public Boolean getIsStd() {
-        return isStd;
-    }
-
-    public void setIsStd(Boolean std) {
-        isStd = std;
-    }
-
-    public Item toItem() {
-        Item item = new Item();
-        item.setId(this.id);
-        item.setCid(this.cid);
-        item.setName(this.name);
-        item.setDetail(this.detail);
-        item.setImages(StringUtils.join(images, ";"));
-        item.setIsOnSale(this.isOnSale);
-        item.setIsStd(this.isStd);
-        item.setPrice((long)(this.price*100L));
-        return item;
-    }
-
-    public static final ItemVo fromItem(Item item) {
-        ItemVo itemVo = new ItemVo();
-        itemVo.setName(item.getName());
-        itemVo.setCid(item.getCid());
-        itemVo.setId(item.getId());
-        itemVo.setDetail(item.getDetail());
-        itemVo.setImages(item.getImages().split(";"));
-        itemVo.setIsStd(item.getIsStd());
-        itemVo.setIsOnSale(item.getIsOnSale());
-        itemVo.setPrice(Double.parseDouble(PriceUtil.convertPrice(item.getPrice())));
-        return itemVo;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        ItemVo itemVo = (ItemVo) o;
-        return Objects.equals(cid, itemVo.cid) && Objects.equals(detail, itemVo.detail) && Arrays.equals(images, itemVo.images) && Objects.equals(name, itemVo.name) && Objects.equals(price, itemVo.price) && Objects.equals(isOnSale, itemVo.isOnSale) && Objects.equals(isStd, itemVo.isStd);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = Objects.hash(cid, detail, name, price, isOnSale, isStd);
-        result = 31 * result + Arrays.hashCode(images);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "ItemVo{" +
-                "cid=" + cid +
-                ", detail='" + detail + '\'' +
-                ", images=" + Arrays.toString(images) +
-                ", name='" + name + '\'' +
-                ", price=" + price +
-                ", isOnSale=" + isOnSale +
-                ", isStd=" + isStd +
-                '}';
-    }
-}

web/src/main/java/com/jbp/dashboard/manager/ItemDetailsManager.java

-package com.jbp.dashboard.manager;
-
-
-import com.github.pagehelper.PageHelper;
-import com.jbp.dashboard.data.base.PageQueryResult;
-import com.jbp.dashboard.data.param.AppraisalItemDetailsParam;
-import com.wwdz.mall.common.util.TimeUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Component
-@Slf4j
-public class ItemDetailsManager {
-
-    @Resource
-    private ItemDetailsMapper itemDetailsMapper;
-
-
-    public void updateByOrderId(ItemDetails record) {
-        if (record.getOrdernumber() == null) {
-            return;
-        }
-        record.setUpdated(TimeUtil.getNowTimestamp());
-        ItemDetailsExample example = new ItemDetailsExample();
-        ItemDetailsExample.Criteria criteria = example.createCriteria();
-        criteria.andOrdernumberEqualTo(record.getOrdernumber());
-        itemDetailsMapper.updateByExampleSelective(record, example);
-    }
-
-    public PageQueryResult<ItemDetails> page(AppraisalItemDetailsParam detailsPara) {
-        ItemDetailsExample example = initAppraisalItemDetailsExample(detailsPara);
-        PageQueryResult<ItemDetails> pageQueryResult = new PageQueryResult<>();
-        long cnt = itemDetailsMapper.countByExample(example);
-        if (cnt > 0) {
-            List<ItemDetails> list = itemDetailsMapper.selectByExample(example);
-            pageQueryResult.setDataList(list);
-        }
-        pageQueryResult.setTotal((int)cnt);
-        pageQueryResult.setPageSize(detailsPara.getPageSize());
-        pageQueryResult.setPageIndex(detailsPara.getPageIndex());
-        return pageQueryResult;
-    }
-
-    private ItemDetailsExample initAppraisalItemDetailsExample(AppraisalItemDetailsParam detailsPara) {
-        ItemDetailsExample appraisalItemDetailsExample = new ItemDetailsExample();
-        appraisalItemDetailsExample.setOrderByClause("id desc");
-
-        if (null != detailsPara.getPageSize() && null != detailsPara.getPageIndex()) {
-            PageHelper.startPage(detailsPara.getStart(), detailsPara.getPageSize());
-        }
-
-        ItemDetailsExample.Criteria criteria = appraisalItemDetailsExample.createCriteria();
-        if (CollectionUtils.isNotEmpty(detailsPara.getExpressStatusList())) {
-            criteria.andExpressstatusIn(detailsPara.getExpressStatusList());
-        }
-        if (null != detailsPara.getItemStatus()) {
-            criteria.andItemstatusEqualTo(detailsPara.getItemStatus());
-        }
-        if (null != detailsPara.getTraceCode()) {
-            criteria.andTracecodeEqualTo(detailsPara.getTraceCode());
-        }
-        if (null != detailsPara.getItemName()) {
-            criteria.andItemnameEqualTo(detailsPara.getItemName());
-        }
-        if (null != detailsPara.getOrderNumber()) {
-            criteria.andOrdernumberEqualTo(detailsPara.getOrderNumber());
-        }
-        if (null != detailsPara.getExpressNumber()) {
-            criteria.andExpressnumberEqualTo(detailsPara.getExpressNumber());
-        }
-
-        if (null != detailsPara.getItemName()) {
-            criteria.andItemnameEqualTo(detailsPara.getItemName());
-        }
-        if (null != detailsPara.getSellerId()) {
-            criteria.andSelleridEqualTo(detailsPara.getSellerId());
-        }
-        if (null != detailsPara.getOrderExtraStatus()) {
-            criteria.andOrderextrastatusEqualTo(detailsPara.getOrderExtraStatus());
-        }
-        if (null != detailsPara.getReceiveTimeStart() && null != detailsPara.getReceiveTimeEnd()) {
-            criteria.andReceivetimeBetween(detailsPara.getReceiveTimeStart(), detailsPara.getReceiveTimeEnd());
-        }
-        if (null != detailsPara.getEndCreateTime() && null != detailsPara.getStartCreateTime()) {
-            criteria.andCreatedBetween(detailsPara.getStartCreateTime(), detailsPara.getEndCreateTime());
-        }
-        if (null != detailsPara.getSendStartTime() && null != detailsPara.getSendEndTime()) {
-            criteria.andSendtimeBetween(detailsPara.getSendStartTime(), detailsPara.getSendEndTime());
-        }
-        if (null != detailsPara.getInspectionSupportStaff()) {
-            criteria.andInspectionsupportstaffEqualTo(detailsPara.getInspectionSupportStaff());
-        }
-        if (null != detailsPara.getStartInspectionSupportTime() && null != detailsPara.getEndInspectionSupportTime()) {
-            criteria.andInspectionsupporttimeBetween(detailsPara.getStartInspectionSupportTime(), detailsPara.getEndInspectionSupportTime());
-        }
-        if (null != detailsPara.getInspectionUserId()) {
-            criteria.andInspectionuseridEqualTo(detailsPara.getInspectionUserId());
-        }
-        if (null != detailsPara.getIsTroubleOrder()) {
-            criteria.andIstroubleorderEqualTo(detailsPara.getIsTroubleOrder());
-        }
-        if (null != detailsPara.getReceiverId()) {
-            criteria.andReceiveridEqualTo(detailsPara.getReceiverId());
-        }
-        if (null != detailsPara.getSendExpressNumber()) {
-            criteria.andExpresssendnumberEqualTo(detailsPara.getSendExpressNumber());
-        }
-        if(CollectionUtils.isNotEmpty(detailsPara.getExpressNumbers())){
-            criteria.andExpressnumberIn(detailsPara.getExpressNumbers());
-        }
-        if(CollectionUtils.isNotEmpty(detailsPara.getNotInItemStatus())){
-            criteria.andItemstatusNotIn(detailsPara.getNotInItemStatus());
-        }
-        if(detailsPara.getSecondCategoryId() != null){
-            criteria.andSecondcategoryidEqualTo(detailsPara.getSecondCategoryId());
-        }
-
-        if(CollectionUtils.isNotEmpty(detailsPara.getInItemStatus())){
-            criteria.andItemstatusIn(detailsPara.getInItemStatus());
-        }
-        if(detailsPara.getSecondCategoryId() != null){
-            criteria.andSecondcategoryidEqualTo(detailsPara.getSecondCategoryId());
-        }
-        if(detailsPara.getExpressReturnNumber() != null){
-            criteria.andExpressreturnnumberEqualTo(detailsPara.getExpressReturnNumber());
-        }
-        if(detailsPara.getExpressSendCompany() != null){
-            criteria.andExpresssendcompanyEqualTo(detailsPara.getExpressSendCompany());
-        }
-        if(detailsPara.getExpressSendCompany() != null){
-            criteria.andExpresssendcompanyEqualTo(detailsPara.getExpressSendCompany());
-        }
-        if(CollectionUtils.isNotEmpty(detailsPara.getInspectionUserIds())){
-            criteria.andInspectionuseridIn(detailsPara.getInspectionUserIds());
-        }
-        if(CollectionUtils.isNotEmpty(detailsPara.getInspectionSupportStaffs())){
-            criteria.andInspectionsupportstaffIn(detailsPara.getInspectionSupportStaffs());
-        }
-        if(null!=detailsPara.getStatus()){
-            criteria.andStatusEqualTo(detailsPara.getStatus());
-        }
-        if(null!=detailsPara.getIsReceiveTrouble()){
-            criteria.andIsreceivetroubleEqualTo(detailsPara.getIsReceiveTrouble());
-        }
-        criteria.andIsdeletedEqualTo(false);
-
-        return appraisalItemDetailsExample;
-    }
-}

web/src/main/java/com/jbp/dashboard/manager/ReceiveGoodsManager.java

-package com.jbp.dashboard.manager;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.google.common.collect.Lists;
-import com.jbp.dashboard.data.base.PageQueryResult;
-import com.jbp.dashboard.data.constant.AppraisalStatus;
-import com.jbp.dashboard.data.constant.ExpressStatus;
-import com.jbp.dashboard.data.constant.ItemStatusEnum;
-import com.jbp.dashboard.data.constant.OperationTypeEnum;
-import com.jbp.dashboard.data.dto.ExpressReceiveInfo;
-import com.jbp.dashboard.data.param.AppraisalItemDetailsParam;
-import com.jbp.dashboard.data.param.ReceivePageParam;
-import com.jbp.dashboard.data.request.ReceiveGoodsByExpressRequest;
-import com.jbp.dashboard.data.request.ReceiveGoodsRequest;
-import com.jbp.dashboard.data.request.ReceiveQueryRequest;
-import com.jbp.dashboard.data.response.AppraisalReceiveTroubleResponse;
-import com.jbp.dashboard.data.response.ReceiveEndingInfoResponse;
-import com.wwdz.arch.util.collection.CollectionUtil;
-import com.wwdz.mall.api.appraisal.base.PageQueryResult;
-import com.wwdz.mall.api.appraisal.enums.AppraisalStatus;
-import com.wwdz.mall.api.appraisal.enums.ExpressStatus;
-import com.wwdz.mall.api.appraisal.enums.OperationTypeEnum;
-import com.wwdz.mall.api.appraisal.enums.PhysicalCheckStatusEnum;
-import com.wwdz.mall.api.appraisal.enums.appraisal.ItemStatusEnum;
-import com.wwdz.mall.api.appraisal.enums.appraisal.UserConfirmStatusEnum;
-import com.wwdz.mall.api.appraisal.enums.bag.BagStatusEnum;
-import com.wwdz.mall.api.appraisal.param.AppraisalExpressParam;
-import com.wwdz.mall.api.appraisal.param.AppraisalItemDetailsPara;
-import com.wwdz.mall.api.appraisal.param.AppraisalOrderParam;
-import com.wwdz.mall.api.appraisal.vo.request.ReceiveGoodsRequest;
-import com.wwdz.mall.api.appraisal.vo.request.ReceivePageParam;
-import com.wwdz.mall.api.appraisal.vo.request.bag.AppraisalReceiveBagListRequest;
-import com.wwdz.mall.api.appraisal.vo.request.warehouse.ReceiveGoodsByExpressRequest;
-import com.wwdz.mall.api.appraisal.vo.request.warehouse.ReceiveQueryRequest;
-import com.wwdz.mall.api.appraisal.vo.response.AppraisalWarehouseDetailResponse;
-import com.wwdz.mall.api.appraisal.vo.response.WarehouseUser;
-import com.wwdz.mall.api.appraisal.vo.response.warehouse.AppraisalReceiveTroubleResponse;
-import com.wwdz.mall.api.appraisal.vo.response.warehouse.ExpressReceiveInfo;
-import com.wwdz.mall.api.appraisal.vo.response.warehouse.ReceiveEndingInfoResponse;
-import com.wwdz.mall.common.exception.BizException;
-import com.wwdz.mall.common.util.TimeUtil;
-import com.wwdz.mall.common.vo.response.CloudResultCode;
-import com.wwdz.mall.common.vo.response.CloudServerResponse;
-import com.wwdz.mall.manager.express.AppraisalExpressSendManager;
-import com.wwdz.mall.manager.operation.log.AppraisalOperationLogManager;
-import com.wwdz.mall.manager.order.AppraisalItemDetailsManager;
-import com.wwdz.mall.manager.order.AppraisalOrderManager;
-import com.wwdz.mall.manager.order.OrderExpressPrintManager;
-import com.wwdz.mall.manager.receive.ReceivedReadManager;
-import com.wwdz.mall.manager.warehouse.AppraisalWarehouseManager;
-import com.wwdz.mall.manager.warehouse.WarehouseRightsManager;
-import com.wwdz.mall.model.*;
-import com.wwdz.mall.repository.customer.AppraisalItemDetailsCustomerRepository;
-import com.wwdz.mall.repository.express.AppraisalExpressRepository;
-import com.wwdz.mall.repository.inspection.AppraisalInspectionImgsRepository;
-import com.wwdz.mall.repository.nocompliance.NoComplianceRepository;
-import com.wwdz.mall.repository.operation.log.AppraisalOperationLogRepository;
-import com.wwdz.mall.repository.order.AppraisalCheckOrderRepository;
-import com.wwdz.mall.repository.order.AppraisalItemDetailsRepository;
-import com.wwdz.mall.repository.receive.bag.AppraisalReceiveBagDetailRepository;
-import com.wwdz.mall.repository.receive.bag.AppraisalReceiveBagRepository;
-import com.wwdz.mall.service.rpc.OrderRpcProxyService;
-import com.wwdz.mall.utils.TimeUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * @Description:
- * @Author: hairui
- * @Date: 2020/6/28 16:04
- */
-@Component
-@Slf4j
-public class ReceiveGoodsManager {
-
-    @Resource
-    private AppraisalOperationLogMapper appraisalOperationLogRepository;
-    @Resource
-    private AppraisalInspectionImgsMapper appraisalInspectionImgsRepository;
-    @Resource
-    private ItemDetailsManager appraisalItemDetailsManager;
-    @Resource
-    private AppraisalItemDetailsCustomerRepository appraisalItemDetailsCustomerRepository;
-    @Resource
-    private AppraisalReceiveBagDetailRepository appraisalReceiveBagDetailRepository;
-    @Resource
-    private AppraisalReceiveBagRepository appraisalReceiveBagRepository;
-    @Resource
-    private OrderRpcProxyService orderRpcProxyService;
-    @Resource
-    private NoComplianceReceiveMapper noComplianceReceiveMapper;
-    @Resource
-    private WarehouseRightsManager warehouseRightsManager;
-    @Resource
-    private AppraisalWarehouseManager appraisalWarehouseManager;
-    @Resource
-    private AppraisalOperationLogManager appraisalOperationLogManager;
-    @Resource
-    private ReceivedReadManager receivedReadManager;
-    @Resource
-    private AppraisalExpressRepository appraisalExpressRepository;
-    @Resource
-    private AppraisalCheckOrderRepository appraisalCheckOrderRepository;
-    @Resource
-    private OrderExpressPrintManager orderExpressPrintManager;
-    @Resource
-    private AppraisalExpressSendManager appraisalExpressSendManager;
-
-    public boolean receiveGoods(ReceiveGoodsRequest receiveGoodsRequest) {
-
-        log.info("仓库收货：{}",JSON.toJSONString(receiveGoodsRequest));
-        ItemDetails itemDetails = getAppraisalItemDetails(receiveGoodsRequest);
-        AppraisalOperationLog appraisalOperationLog = getAppraisalOperationLog(receiveGoodsRequest);
-        if(!receiveGoodsRequest.getNoComplianceReceive().equals(1)) {
-            //订单仓库收到货要同步状态
-            orderRpcProxyService.sureBatchAppraisalGoods(Lists.newArrayList(receiveGoodsRequest.getOrderNumber()));
-        }else {
-            //插入不合规记录表
-            NoComplianceReceive noComplianceReceive=new NoComplianceReceive();
-            noComplianceReceive.setCreated(TimeUtil.getNowTimestamp());
-            noComplianceReceive.setUpdated(TimeUtil.getNowTimestamp());
-            noComplianceReceive.setOperationuserid(receiveGoodsRequest.getOperationUserId());
-            noComplianceReceive.setOperationusername(receiveGoodsRequest.getOperationName());
-            noComplianceReceive.setDesc(receiveGoodsRequest.getReceiveRemark());
-            noComplianceReceive.setTracecode(receiveGoodsRequest.getTraceCode());
-            noComplianceReceive.setOrderid(receiveGoodsRequest.getOrderNumber());
-            noComplianceReceive.setType(receiveGoodsRequest.getNoComplianceReceiveType());
-            noComplianceReceiveMapper.insert(noComplianceReceive);
-        }
-        //? 仓内不需要再记录订单状态了
-//        appraisalOrderManager.updateAppraisalOrder(appraisalOrderParam);
-        appraisalItemDetailsManager.updateByOrderId(itemDetails);
-        appraisalOperationLogRepository.insert(appraisalOperationLog);
-        return true;
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    public boolean receiveGoodsByExpress(ReceiveGoodsByExpressRequest receiveGoodsRequest, ItemDetails itemDetails) {
-        log.info("分仓仓库物流收货：{}",JSON.toJSONString(receiveGoodsRequest));
-//        AppraisalOrderParam appraisalOrderParam = this.getAppraisalOrderParam(receiveGoodsRequest);
-//        appraisalOrderManager.updateAppraisalOrder(appraisalOrderParam);
-
-        ItemDetails appraisalItemDetails = this.getAppraisalItemDetails(receiveGoodsRequest,itemDetails);
-        appraisalItemDetailsManager.updateByOrderId(appraisalItemDetails);
-
-        // 收货异常处理
-        if(receiveGoodsRequest.getReceiveTrouble().equals(1)){
-            appraisalInspectionImgsRepository.batchInsert(receiveGoodsRequest.getOrderNumber(), receiveGoodsRequest.getUrlList(),ExpressStatus.RECEIVE_EXCEPTION.getCode());
-        }
-        //同步订单数据
-        orderRpcProxyService.sureAppraisalGoods(receiveGoodsRequest.getOrderNumber());
-        AppraisalOperationLog appraisalOperationLog = this.getAppraisalOperationLog(receiveGoodsRequest,itemDetails);
-        appraisalOperationLogRepository.insert(appraisalOperationLog);
-        return true;
-    }
-
-    private AppraisalOperationLog getAppraisalOperationLog(ReceiveGoodsByExpressRequest receiveGoodsRequest,ItemDetails itemDetails) {
-        AppraisalOperationLog appraisalOperationLog = new AppraisalOperationLog();
-        appraisalOperationLog.setOperationusername(receiveGoodsRequest.getOperationName());
-        appraisalOperationLog.setOperationuserid(receiveGoodsRequest.getOperationUserId());
-        appraisalOperationLog.setTracecode(receiveGoodsRequest.getTraceCode());
-        appraisalOperationLog.setOrderid(receiveGoodsRequest.getOrderNumber());
-        appraisalOperationLog.setDesc(receiveGoodsRequest.getReceiveRemark());
-        if(receiveGoodsRequest.getReceiveTrouble().equals(1)){
-            appraisalOperationLog.setOperationtype(OperationTypeEnum.RECEIVE_EXCEPTION.getCode());
-            JSONObject ext = new JSONObject();
-            ext.put("reason", receiveGoodsRequest.getReason());
-            appraisalOperationLog.setExtinfo(ext.toJSONString());
-        }
-        if(receiveGoodsRequest.getReceiveTrouble().equals(0)&&!itemDetails.getItemstatus().equals(ItemStatusEnum.RECEIVE_EXCEPTION.getCode())){
-            appraisalOperationLog.setOperationtype(OperationTypeEnum.RECEIVE.getCode());
-        }
-        if(itemDetails.getItemstatus().equals(ItemStatusEnum.RECEIVE_EXCEPTION.getCode())&&receiveGoodsRequest.getReceiveTrouble().equals(0)){
-            appraisalOperationLog.setOperationtype(OperationTypeEnum.CUSTOMER_RECEIVE.getCode());
-        }
-        return appraisalOperationLog;
-    }
-    private AppraisalOperationLog getAppraisalOperationLog(ReceiveGoodsRequest receiveGoodsRequest) {
-        AppraisalOperationLog appraisalOperationLog = new AppraisalOperationLog();
-        appraisalOperationLog.setOperationusername(receiveGoodsRequest.getOperationName());
-        appraisalOperationLog.setOperationuserid(receiveGoodsRequest.getOperationUserId());
-        appraisalOperationLog.setTracecode(receiveGoodsRequest.getTraceCode());
-        appraisalOperationLog.setOrderid(receiveGoodsRequest.getOrderNumber());
-        appraisalOperationLog.setDesc(receiveGoodsRequest.getReceiveRemark());
-        if(receiveGoodsRequest.getNoComplianceReceive().equals(1)){
-            appraisalOperationLog.setOperationtype(OperationTypeEnum.RECEIVE_NOT_IN_COMPLIANCE.getCode());
-        }else {
-            appraisalOperationLog.setOperationtype(OperationTypeEnum.RECEIVE.getCode());
-        }
-
-        return appraisalOperationLog;
-    }
-
-    public PageQueryResult<AppraisalReceiveTroubleResponse> receiveTroublePage(ReceivePageParam receivePageParam) {
-        AppraisalItemDetailsParam appraisalItemDetailsPara = this.getAppraisalItemDetailsPara(receivePageParam);
-        return pageQueryResult(appraisalItemDetailsPara);
-    }
-
-    @Override
-    public CloudServerResponse<ReceiveEndingInfoResponse> receiveResult(ReceiveQueryRequest receiveQueryRequest) {
-        ReceiveEndingInfoResponse receiveEndingInfoResponse = new ReceiveEndingInfoResponse();
-        receiveQueryRequest.setOrderStatus(ExpressStatus.WAITING_RECEIVE.getCode());
-        int waitNum = appraisalItemDetailsCustomerRepository.countByExpress(receiveQueryRequest);
-        receiveEndingInfoResponse.setWaitNum(waitNum);
-        receiveQueryRequest.setOrderStatus(ExpressStatus.RECEIVE_EXCEPTION.getCode());
-        int exceptionNum = appraisalItemDetailsCustomerRepository.countByExpress(receiveQueryRequest);
-        receiveEndingInfoResponse.setTroubleNum(exceptionNum);
-        receiveEndingInfoResponse.setExpressNumber(receiveQueryRequest.getExpressNumber());
-        Integer receiveNum = appraisalItemDetailsCustomerRepository.countReceiveByExpress(receiveQueryRequest);
-        receiveEndingInfoResponse.setReceiveNum(receiveNum-exceptionNum);
-        receiveEndingInfoResponse.setTotalNum(receiveNum+waitNum);
-        CloudServerResponse<ReceiveEndingInfoResponse> cloudServerResponse = new CloudServerResponse<>();
-        cloudServerResponse.setResult(receiveEndingInfoResponse);
-        return cloudServerResponse;
-    }
-
-    private AppraisalItemDetailsParam getAppraisalItemDetailsPara(ReceivePageParam receivePageParam) {
-        AppraisalItemDetailsParam appraisalItemDetailsPara = new AppraisalItemDetailsParam();
-        appraisalItemDetailsPara.setIsReceiveTrouble(Boolean.TRUE);
-        appraisalItemDetailsPara.setWarehouseId(receivePageParam.getWarehouseId());
-        appraisalItemDetailsPara.setReceiveTimeStart(receivePageParam.getStartReceiveTime());
-        appraisalItemDetailsPara.setReceiveTimeEnd(receivePageParam.getEndReceiveTime());
-        appraisalItemDetailsPara.setItemStatus(receivePageParam.getAppraisalStatus());
-        appraisalItemDetailsPara.setPhysicalCheckStatus(receivePageParam.getPhysicalCheckedStatus());
-        appraisalItemDetailsPara.setReceiverId(receivePageParam.getReceiveId());
-        appraisalItemDetailsPara.setOrderNumber(receivePageParam.getOrderNumber());
-        appraisalItemDetailsPara.setTraceCode(receivePageParam.getTraceCode());
-        appraisalItemDetailsPara.setPageIndex(receivePageParam.getPageIndex());
-        appraisalItemDetailsPara.setInspectionSupportStaff(receivePageParam.getInspectionSupportStaff());
-        appraisalItemDetailsPara.setPageSize(receivePageParam.getPageSize());
-        appraisalItemDetailsPara.setStartInspectionSupportTime(receivePageParam.getStartInspectionSupportTime());
-        appraisalItemDetailsPara.setEndInspectionSupportTime(receivePageParam.getEndInspectionSupportTime());
-        return appraisalItemDetailsPara;
-    }
-
-    public boolean receiveVerifyExpress(ReceiveQueryRequest receiveQueryRequest) {
-        this.verifyBagStatus(receiveQueryRequest);
-        return Boolean.TRUE;
-    }
-
-    public CloudServerResponse<PageQueryResult<ExpressReceiveInfo>> getInfoByExpress(ReceiveQueryRequest receiveQueryRequest) {
-
-        CloudServerResponse<PageQueryResult<ExpressReceiveInfo>> pageResponse = new CloudServerResponse<>();
-        /**
-         * 校验订单的包裹状态
-         */
-        this.verifyBagStatus(receiveQueryRequest);
-
-        List<ItemDetails> appraisalItemDetailsList =this.getAppraisalByExpress(receiveQueryRequest);
-        List<ExpressReceiveInfo> receiveInfoList = new ArrayList<>();
-        if(ItemStatusEnum.WAITING_RECEIVE.getCode()==receiveQueryRequest.getOrderStatus()&&CollectionUtils.isEmpty(appraisalItemDetailsList)){
-            throw  new BizException(CloudResultCode.DATA_NOT_FOUND.getCode(),"当前物流单没有待收货的商品");
-        }
-        for (AppraisalItemDetails appraisalItemDetails: appraisalItemDetailsList) {
-            ExpressReceiveInfo expressReceiveInfo = this.buildPage(appraisalItemDetails);
-            receiveInfoList.add(expressReceiveInfo);
-            }
-
-        Integer count = this.countAppraisalByExpress(receiveQueryRequest);
-        PageQueryResult pageQueryResult = new PageQueryResult();
-        pageQueryResult.setDataList(receiveInfoList);
-        pageQueryResult.setPageIndex(receiveQueryRequest.getPageIndex());
-        pageQueryResult.setPageSize(receiveQueryRequest.getPageSize());
-        pageQueryResult.setTotal(count);
-        pageResponse.setResult(pageQueryResult);
-        return pageResponse;
-    }
-
-    private void verifyBagStatus(ReceiveQueryRequest receiveQueryRequest) {
-
-        AppraisalExpressParam appraisalExpressParam = new AppraisalExpressParam();
-        appraisalExpressParam.setExpressNumber(receiveQueryRequest.getExpressNumber());
-        List<AppraisalExpress> expressList = appraisalExpressRepository.pageAppraisalExpressInfo(appraisalExpressParam);
-        if(CollectionUtils.isEmpty(expressList)){
-            throw  new BizException(CloudResultCode.DATA_NOT_FOUND.getCode(),"系统查询不到此物流单号，请查证后重试");
-        }
-        List<AppraisalReceiveBagDetails> byExpressNumber = appraisalReceiveBagDetailRepository.findByExpressNumber(receiveQueryRequest.getExpressNumber());
-        if(CollectionUtils.isEmpty(byExpressNumber)){
-            throw  new BizException(CloudResultCode.DATA_NOT_FOUND.getCode(),"当前物流单尚未做包裹签收，请查证后重试");
-        }
-        List<Integer> bagIdList = byExpressNumber.stream().map(AppraisalReceiveBagDetails::getBagId).collect(Collectors.toList());
-        AppraisalReceiveBagListRequest appraisalReceiveBagListRequest = new AppraisalReceiveBagListRequest();
-        appraisalReceiveBagListRequest.setIds(bagIdList);
-        appraisalReceiveBagListRequest.setWarehouseId(receiveQueryRequest.getWarehouseId());
-        List<AppraisalReceiveBag> appraisalReceiveBag = appraisalReceiveBagRepository.findAppraisalReceiveBag(appraisalReceiveBagListRequest);
-        if(CollectionUtils.isEmpty(appraisalReceiveBag)){
-            throw  new BizException(CloudResultCode.DATA_NOT_FOUND.getCode(),"当前物流单尚未做包裹签收，请查证后重试");
-        }
-        List<AppraisalReceiveBag> appraisalReceiveBagStream = appraisalReceiveBag.stream().filter(o -> o.getStatus().equals(BagStatusEnum.CLOSE.getCode())).collect(Collectors.toList());
-        if(CollectionUtils.isEmpty(appraisalReceiveBagStream)){
-            throw  new BizException(CloudResultCode.DATA_NOT_FOUND.getCode(),"当前物流单尚未做包裹签收，请查证后重试");
-        }
-    }
-
-    private ExpressReceiveInfo buildPage( AppraisalItemDetails appraisalItemDetails) {
-        ExpressReceiveInfo expressReceiveInfo = new ExpressReceiveInfo();
-        expressReceiveInfo.setItemName(appraisalItemDetails.getItemName());
-        ItemStatusEnum itemStatusEnum = ItemStatusEnum.getByCode(appraisalItemDetails.getItemStatus());
-        expressReceiveInfo.setOrderStatus(Objects.nonNull(itemStatusEnum) ? itemStatusEnum.getDes() : null);
-        expressReceiveInfo.setStatus(appraisalItemDetails.getItemStatus());
-        expressReceiveInfo.setTraceCode(appraisalItemDetails.getTraceCode());
-        expressReceiveInfo.setOrderNumber(appraisalItemDetails.getOrderNumber());
-        expressReceiveInfo.setReceiveTime(appraisalItemDetails.getReceiveTime());
-        expressReceiveInfo.setItemId(appraisalItemDetails.getItemId());
-        expressReceiveInfo.setIsPhysicalChecked(appraisalItemDetails.getIsPhysicalChecked());
-        return expressReceiveInfo;
-    }
-
-
-    private ItemDetails getAppraisalItemDetails(ReceiveGoodsRequest receiveGoodsRequest) {
-        ItemDetails itemDetails = new ItemDetails();
-        itemDetails.setOrdernumber(receiveGoodsRequest.getOrderNumber());
-        if(receiveGoodsRequest.getNoComplianceReceive().equals(1)){
-            itemDetails.setStatus(ExpressStatus.RECEIVE_NOT_IN_COMPLIANCE.getCode());
-            itemDetails.setExpressstatus(ExpressStatus.RECEIVE_NOT_IN_COMPLIANCE.getCode());
-        }else {
-            itemDetails.setItemstatus(ExpressStatus.FINISH_RECEIVE.getCode());
-            itemDetails.setStatus(AppraisalStatus.WAITING_AUDIT.getCode());
-            itemDetails.setExpressstatus(ExpressStatus.FINISH_RECEIVE.getCode());
-        }
-        itemDetails.setReceivetime(TimeUtil.getNowTimestamp());
-        itemDetails.setReceiverid(receiveGoodsRequest.getOperationUserId());
-        return itemDetails;
-    }
-
-    private ItemDetails getAppraisalItemDetails(ReceiveGoodsByExpressRequest receiveGoodsRequest,ItemDetails itemDetails) {
-        ItemDetails appraisalItemDetails = new ItemDetails();
-        appraisalItemDetails.setOrdernumber(receiveGoodsRequest.getOrderNumber());
-        if(receiveGoodsRequest.getReceiveTrouble().equals(1)){
-            appraisalItemDetails.setItemstatus(ExpressStatus.RECEIVE_EXCEPTION.getCode());
-            appraisalItemDetails.setExpressstatus(ExpressStatus.RECEIVE_EXCEPTION.getCode());
-            appraisalItemDetails.setIsreceivetrouble(Boolean.TRUE);
-            appraisalItemDetails.setReceivetroublereason(receiveGoodsRequest.getReason());
-        }else {
-            appraisalItemDetails.setItemstatus(ExpressStatus.FINISH_RECEIVE.getCode());
-            appraisalItemDetails.setStatus(AppraisalStatus.WAITING_AUDIT.getCode());
-            appraisalItemDetails.setExpressstatus(ExpressStatus.FINISH_RECEIVE.getCode());
-            appraisalItemDetails.setReceivetime(TimeUtil.getNowTimestamp());
-            appraisalItemDetails.setReceiverid(receiveGoodsRequest.getOperationUserId());
-        }
-
-        if(itemDetails.getItemstatus().equals(ItemStatusEnum.RECEIVE_EXCEPTION.getCode())){
-            appraisalItemDetails.setInspectionsupportstaff(receiveGoodsRequest.getOperationUserId());
-            appraisalItemDetails.setInspectionsupporttime(TimeUtil.getNowTimestamp());
-            appraisalItemDetails.setReceivetime(TimeUtil.getNowTimestamp());
-            appraisalItemDetails.setReceiverid(receiveGoodsRequest.getOperationUserId());
-        }
-        return appraisalItemDetails;
-    }
-
-    public PageQueryResult<AppraisalReceiveTroubleResponse> pageQueryResult(AppraisalItemDetailsParam appraisalItemDetailsPara) {
-        PageQueryResult<ItemDetails> page = appraisalItemDetailsManager.page(appraisalItemDetailsPara);
-        List<ItemDetails> itemDetailsDTOList = page.getDataList();
-        List<AppraisalReceiveTroubleResponse> appraisalInspectionDTOList = new ArrayList<>();
-        if(CollectionUtil.isNotEmpty(itemDetailsDTOList)){
-
-            Map<Long, String> operatorNameMap = this.getUserMap(appraisalItemDetailsPara, itemDetailsDTOList);
-            List<Long> orderNumbers = itemDetailsDTOList.stream().map(ItemDetails::getOrdernumber).collect(Collectors.toList());
-            Map<Long, Appraisalexpress> appraisalExpressMap = receivedReadManager.queryByOrderIds(orderNumbers);
-
-            List<Long> orderNumberList = itemDetailsDTOList.stream().map(ItemDetails::getOrdernumber).collect(Collectors.toList());
-            Map<String, Boolean> isShowAgainPrintMap = orderExpressPrintManager.againPrintExpress(orderNumberList);
-
-            List<Appraisalexpresssend> appraisalExpressSendList = appraisalExpressSendManager.queryByOrderId(orderNumberList);
-            Map<Long, Appraisalexpresssend> isShowComplementMap = new HashMap<>();
-            if (CollectionUtils.isNotEmpty(appraisalExpressSendList)) {
-                isShowComplementMap = appraisalExpressSendList.stream().collect(Collectors.toMap(AppraisalExpressSend::getOrderNumber, t -> t, (n1, n2) -> n1));
-            }
-
-            for (ItemDetails appraisalItemDetailsDTO: itemDetailsDTOList) {
-                AppraisalReceiveTroubleResponse appraisalInspectionDTO = new AppraisalReceiveTroubleResponse();
-                BeanUtils.copyProperties(appraisalItemDetailsDTO, appraisalInspectionDTO);
-                appraisalInspectionDTO.setAppraisalStatus(appraisalItemDetailsDTO.getItemstatus());
-                appraisalInspectionDTO.setReceiveTime(appraisalItemDetailsDTO.getReceivetime());
-                appraisalInspectionDTO.setReceiveId(appraisalItemDetailsDTO.getReceiverid());
-                appraisalInspectionDTO.setIsReceiveTroubleOrder(Boolean.TRUE);
-                appraisalInspectionDTO.setNoPassReason(appraisalItemDetailsDTO.getInspectionfailreason());
-                appraisalInspectionDTO.setReceiveTroubleReason(appraisalItemDetailsDTO.getReceivetroublereason());
-                appraisalInspectionDTO.setReturnExpressNo(appraisalItemDetailsDTO.getExpressreturnnumber());
-                if(operatorNameMap != null){
-                    if(appraisalItemDetailsDTO.getReceiverid() != null){
-                        appraisalInspectionDTO.setReceiveName(operatorNameMap.get(appraisalItemDetailsDTO.getReceiverid()));
-                    }
-                    if(appraisalItemDetailsDTO.getInspectionsupportstaff() != null){
-                        appraisalInspectionDTO.setInspectionSupportStaffName(operatorNameMap.get(appraisalItemDetailsDTO.getInspectionsupportstaff()));
-                    }
-                    if(!appraisalItemDetailsDTO.getItemstatus().equals(ItemStatusEnum.RECEIVE_EXCEPTION.getCode())){
-                        appraisalInspectionDTO.setInspectionSupportStaffName(operatorNameMap.get(appraisalItemDetailsDTO.getInspectionsupportstaff()));
-                        appraisalInspectionDTO.setInspectionSupportTime(appraisalItemDetailsDTO.getInspectionsupporttime());
-                    }
-                    }
-                if(null!=appraisalItemDetailsDTO.getExpresssendcompany()){
-                    appraisalInspectionDTO.setExpressSendCompany(appraisalItemDetailsDTO.getExpresssendcompany());
-                }
-                if(null!=appraisalItemDetailsDTO.getItemstatus()&& null!=ItemStatusEnum.getByCode(appraisalItemDetailsDTO.getItemstatus())) {
-                    ItemStatusEnum itemStatusEnum = ItemStatusEnum.getByCode(appraisalItemDetailsDTO.getItemstatus());
-                    appraisalInspectionDTO.setAppraisalStatusDesc(Objects.nonNull(itemStatusEnum) ? itemStatusEnum.getDes() : null);
-                }
-                Appraisalexpress appraisalExpress = appraisalExpressMap.get(appraisalItemDetailsDTO.getOrdernumber());
-                if(null != appraisalExpress){
-                    appraisalInspectionDTO.setExpressCompany(appraisalExpress.getExpresscompany());
-                    appraisalInspectionDTO.setExpressNumber(appraisalExpress.getExpressnumber());
-                }
-                // 查询用户待确认信息?? 收货这块未知
-                AppraisalCheckOrderExample example = new AppraisalCheckOrderExample();
-                example.createCriteria().andIsDeletedEqualTo(false).andOrderNumberEqualTo(appraisalItemDetailsDTO.getOrderNumber());
-                List<AppraisalCheckOrder> appraisalCheckOrderList = appraisalCheckOrderRepository.selectByExample(example);
-
-                final UserConfirmStatusEnum[] userConfirmStatusEnum = {UserConfirmStatusEnum.NULL};
-                if (CollectionUtils.isEmpty(appraisalCheckOrderList)) {
-                    appraisalInspectionDTO.setUserConfirmStatusCode(userConfirmStatusEnum[0].getCode());
-                    appraisalInspectionDTO.setUserConfirmStatusMessage(userConfirmStatusEnum[0].getDes());
-                } else {
-                    appraisalCheckOrderList.forEach(appraisalCheckOrder -> {
-                        userConfirmStatusEnum[0] = UserConfirmStatusEnum.getByCode(appraisalCheckOrder.getUserConfirmStatus());
-                        if (0 == appraisalCheckOrder.getTroubleSource()) {
-                            appraisalInspectionDTO.setUserConfirmStatusCode(userConfirmStatusEnum[0].getCode());
-                            appraisalInspectionDTO.setUserConfirmStatusMessage(userConfirmStatusEnum[0].getDes());
-                        }
-                    });
-                }
-
-                // 是否展示重新打印按钮
-                if (null != isShowAgainPrintMap && isShowAgainPrintMap.size() > 0) {
-                    appraisalInspectionDTO.setIsShowAgainPrint(isShowAgainPrintMap.get(appraisalInspectionDTO.getOrderNumber().toString()));
-                }
-
-                // 是否展示补打按钮
-                if (isShowComplementMap.size() > 0) {
-                    Appraisalexpresssend appraisalExpressSend = isShowComplementMap.get(appraisalInspectionDTO.getOrderNumber());
-                    if (Objects.nonNull(appraisalExpressSend)) {
-                        appraisalInspectionDTO.setIsShowComplement(Boolean.TRUE);
-                    }
-                }
-                appraisalInspectionDTOList.add(appraisalInspectionDTO);
-            }
-        }
-        PageQueryResult<AppraisalReceiveTroubleResponse> pageQueryResult = new PageQueryResult<>();
-        pageQueryResult.setDataList(appraisalInspectionDTOList);
-        pageQueryResult.setTotal(page.getTotal());
-        pageQueryResult.setPageIndex(page.getPageIndex());
-        pageQueryResult.setPageSize(page.getPageSize());
-        return pageQueryResult;
-    }
-
-    /**
-     * 用户这块逻辑待重新设计
-     * @param appraisalItemDetailsPara
-     * @param itemDetailsDTOList
-     * @return
-     */
-    private Map<Long, String> getUserMap(AppraisalItemDetailsParam appraisalItemDetailsPara, List<ItemDetails> itemDetailsDTOList) {
-        List<Long> receiveIds = itemDetailsDTOList.stream().map(ItemDetails::getReceiverid).distinct().collect(Collectors.toList());
-        List<Long> staffUserIds = itemDetailsDTOList.stream().map(ItemDetails::getInspectionsupportstaff).distinct().collect(Collectors.toList());
-        List<Long> userIds = new ArrayList<>();
-        if(CollectionUtil.isNotEmpty(receiveIds)){
-            userIds.addAll(receiveIds);
-        }
-        if(CollectionUtil.isNotEmpty(staffUserIds)){
-            userIds.addAll(staffUserIds);
-        }
-        Map<Long, String> operatorNameMap = null;
-        if(CollectionUtil.isNotEmpty(userIds)){
-            List<WarehouseUser> warehouseUserList = warehouseRightsManager.WarehouseUserList(appraisalItemDetailsPara.getWarehouseId());
-            if (CollectionUtils.isNotEmpty(warehouseUserList)) {
-                operatorNameMap = warehouseUserList.stream().collect(Collectors.toMap(WarehouseUser::getUserId, WarehouseUser::getUserName, (k1, k2) -> k1));
-            }
-        }
-        return operatorNameMap;
-    }
-}

web/src/main/java/com/jbp/dashboard/shiro/AdminAuthorizingRealm.java

@@ -3,6 +3,7 @@ package com.jbp.dashboard.shiro;
 import java.util.List;
 import java.util.Set;
 
+import com.jbp.db.domain.DtsAdmin;
 import org.apache.shiro.authc.AccountException;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;

web/src/main/java/com/jbp/dashboard/util/AuthSupport.java

 package com.jbp.dashboard.util;
 
+import com.jbp.db.domain.DtsAdmin;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
 

web/src/main/java/com/jbp/dashboard/util/PageQueryResultTransforUtil.java

 package com.jbp.dashboard.util;
 
-import com.wwdz.mall.api.appraisal.base.PageQueryResult;
+import com.jbp.appraisal.base.PageQueryResult;
 import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.List;

web/src/main/java/com/jbp/dashboard/vo/request/AppraisalOrderData/AppraisalStatisticsRequestVO.java

-package com.jbp.dashboard.vo.request.AppraisalOrderData;
-
-import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
-import lombok.Data;
-
-/**
- * @Author: luofei
- * @Description:
- * @date: 2020/5/26
- */
-@Data
-public class AppraisalStatisticsRequestVO extends KunlunBaseDTO {
-    /**
-     * 如果是直播间页面，必须传直播间id,
-     */
-    private Long roomId;
-
-    /**
-     * 店铺id,非直播间时必传
-     */
-    private Long shopId;
-
-    /**
-     * 如果是直播间页面，直播间分类必传
-     *
-     * @mbggenerated
-     */
-    private Long roomCid;
-}

web/src/main/java/com/jbp/dashboard/vo/request/certificate/AppraisalOrganizationRequestVO.java

 package com.jbp.dashboard.vo.request.certificate;
 
-import com.wwdz.mall.vo.request.PageParam;
+import com.jbp.appraisal.param.PageParam;
 import lombok.Data;
 
 /**

web/src/main/java/com/jbp/dashboard/vo/request/certificate/CertificateRequestVO.java

 package com.jbp.dashboard.vo.request.certificate;
 
-import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,7 +10,7 @@ import java.io.Serializable;
  * @date: 2021-02-02 16:50
  **/
 @Data
-public class CertificateRequestVO extends KunlunBaseDTO implements Serializable {
+public class CertificateRequestVO implements Serializable {
 
     /**
      * 鉴定证书图片地址

web/src/main/java/com/jbp/dashboard/vo/request/certificate/OrganizationOrderRequestVO.java

 package com.jbp.dashboard.vo.request.certificate;
 
-import com.wwdz.mall.vo.request.PageParam;
+import com.jbp.appraisal.param.PageParam;
 import lombok.Data;
 
 import java.util.Date;

web/src/main/java/com/jbp/dashboard/vo/request/clientAppraisal/AppointRequestVO.java

 package com.jbp.dashboard.vo.request.clientAppraisal;
 
-import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 
@@ -13,9 +13,9 @@ import lombok.Data;
 @Data
 @ApiModel("后台C端鉴别指派操作请求参数")
 public class AppointRequestVO {
-    @KunlunApiModel("指派订单主键id")
+    @ApiModelProperty("指派订单主键id")
     Long clientAppraisalOrderId;
 
-    @KunlunApiModel("被指派人id")
+    @ApiModelProperty("被指派人id")
     Integer appraiserNum;
 }

web/src/main/java/com/jbp/dashboard/vo/request/clientAppraisal/BackendClientAppraisalRequestVO.java

 package com.jbp.dashboard.vo.request.clientAppraisal;
 
-import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
-import com.wwdz.mall.vo.request.PageParam;
+import com.jbp.appraisal.param.PageParam;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,25 +13,25 @@ import lombok.Data;
 @Data
 @ApiModel("后台C端鉴别订单查询参数")
 public class BackendClientAppraisalRequestVO extends PageParam {
-    @KunlunApiModel("派单开始时间")
+    @ApiModelProperty("派单开始时间")
     private Integer startTime;
-    @KunlunApiModel("派单结束时间")
+    @ApiModelProperty("派单结束时间")
     private Integer endTime;
-    @KunlunApiModel("订单编号")
+    @ApiModelProperty("订单编号")
     private Long orderId;
-    @KunlunApiModel("鉴别状态")
+    @ApiModelProperty("鉴别状态")
     private Integer status;
-    @KunlunApiModel("鉴别结果")
+    @ApiModelProperty("鉴别结果")
     private Integer result;
-    @KunlunApiModel("二级类目")
+    @ApiModelProperty("二级类目")
     private Long categoryTwo;
-    @KunlunApiModel("支付开始时间")
+    @ApiModelProperty("支付开始时间")
     private Integer startPayTime;
-    @KunlunApiModel("支付结束时间")
+    @ApiModelProperty("支付结束时间")
     private Integer endPayTime;
-    @KunlunApiModel("原因")
+    @ApiModelProperty("原因")
     private String reason;
-    @KunlunApiModel("类目错放")
+    @ApiModelProperty("类目错放")
     private Integer isErrorCategory;
 
 }

web/src/main/java/com/jbp/dashboard/vo/request/clientAppraisal/CategoryRequestVO.java

 package com.jbp.dashboard.vo.request.clientAppraisal;
 
-import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,7 +10,7 @@ import java.io.Serializable;
  * @Date: 2020/11/12 21:07
  */
 @Data
-public class CategoryRequestVO extends KunlunBaseDTO implements Serializable {
+public class CategoryRequestVO implements Serializable {
 
     private Long categoryId;
 }

web/src/main/java/com/jbp/dashboard/vo/request/clientAppraisal/CheckFreePayRightRequestVO.java

 package com.jbp.dashboard.vo.request.clientAppraisal;
 
-import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
-import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 
 @Data
 @ApiModel("check用户免费支付权益入参")
-public class CheckFreePayRightRequestVO extends KunlunBaseDTO implements Serializable {
+public class CheckFreePayRightRequestVO implements Serializable {
 
-    @KunlunApiModel("支付方式")
+    @ApiModelProperty("支付方式")
     private Integer payType;
 
 }

web/src/main/java/com/jbp/dashboard/vo/request/clientAppraisal/CreateClientAppraisalRequestVO.java

 package com.jbp.dashboard.vo.request.clientAppraisal;
 
-import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
-import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
 @ApiModel("创建C端鉴定入参")
-public class CreateClientAppraisalRequestVO extends KunlunBaseDTO {
-    @KunlunApiModel("图片")
+public class CreateClientAppraisalRequestVO {
+    @ApiModelProperty("图片")
     private List<String> jsonPics;
-    @KunlunApiModel("标题")
+    @ApiModelProperty("标题")
     private String title;
-    @KunlunApiModel("文字描述")
+    @ApiModelProperty("文字描述")
     private String strDetail;
-    @KunlunApiModel("二级类目")
+    @ApiModelProperty("二级类目")
     private Long categoryTwo;
-    @KunlunApiModel("订单类型 0-默认 ，1-C2C")
+    @ApiModelProperty("订单类型 0-默认 ，1-C2C")
     private Integer orderType ;
-    @KunlunApiModel("商品id")
+    @ApiModelProperty("商品id")
     private Long itemId;
-    @KunlunApiModel("订单来源：4 支付宝小程序")
+    @ApiModelProperty("订单来源：4 支付宝小程序")
     private Integer orderSource;
 }

web/src/main/java/com/jbp/dashboard/vo/request/clientAppraisal/OrderRequestVO.java

 package com.jbp.dashboard.vo.request.clientAppraisal;
 
-import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
-import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -12,10 +11,10 @@ import java.io.Serializable;
  * @Date: 2020/11/12 21:07
  */
 @Data
-public class OrderRequestVO  extends KunlunBaseDTO implements Serializable {
+public class OrderRequestVO implements Serializable {
 
     private Long orderId;
 
-    @KunlunApiModel(value = "来源 4 支付宝小程序")
+    @ApiModelProperty(value = "来源 4 支付宝小程序")
     private Integer orderSource;
 }

web/src/main/java/com/jbp/dashboard/vo/request/clientAppraisal/PayAppraisalOrderRequestVO.java

 package com.jbp.dashboard.vo.request.clientAppraisal;
 
-import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -12,7 +11,7 @@ import java.io.Serializable;
  */
 
 @Data
-public class PayAppraisalOrderRequestVO extends KunlunBaseDTO implements Serializable {
+public class PayAppraisalOrderRequestVO implements Serializable {
 
     private Long orderId;
     private Integer type;

web/src/main/java/com/jbp/dashboard/vo/request/clientAppraisal/QueryClientAppraisalOrdersRequestVO.java

 package com.jbp.dashboard.vo.request.clientAppraisal;
 
-import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
 @Data
 @ApiModel
-public class QueryClientAppraisalOrdersRequestVO extends KunlunBaseDTO {
+public class QueryClientAppraisalOrdersRequestVO {
     private Integer pageIndex;
     private Integer pageSize;
     private Integer status;

web/src/main/java/com/jbp/dashboard/vo/request/clientAppraisal/SellerAppraisalRequestVO.java

 package com.jbp.dashboard.vo.request.clientAppraisal;
 
-import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,26 +13,26 @@ import lombok.Data;
 @ApiModel("商家端鉴定结果入参")
 public class SellerAppraisalRequestVO {
 
-    @KunlunApiModel("任务id")
+    @ApiModelProperty("任务id")
     private Long taskId;
 
-    @KunlunApiModel("鉴别结果")
+    @ApiModelProperty("鉴别结果")
     private Integer operateResult;
 
-    @KunlunApiModel("鉴别报告")
+    @ApiModelProperty("鉴别报告")
     private String resultCategory;
 
-    @KunlunApiModel("鉴别意见")
+    @ApiModelProperty("鉴别意见")
     private String resultDetail;
-    @KunlunApiModel("原因")
+    @ApiModelProperty("原因")
     private String reason;
-    @KunlunApiModel("一级类目")
+    @ApiModelProperty("一级类目")
     private Long adviceCategoryOne;
-    @KunlunApiModel("一级类目名称")
+    @ApiModelProperty("一级类目名称")
     private String adviceCategoryOneName;
-    @KunlunApiModel("二级类目")
+    @ApiModelProperty("二级类目")
     private Long adviceCategoryTwo;
-    @KunlunApiModel("二级类目名称")
+    @ApiModelProperty("二级类目名称")
     private String adviceCategoryTwoName;
 
     private Long evaluateLowPrice;

web/src/main/java/com/jbp/dashboard/vo/request/clientAppraisal/SellerClientAppraisalRequestVO.java

 package com.jbp.dashboard.vo.request.clientAppraisal;
 
-import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
-import com.wwdz.mall.vo.request.PageParam;
+import com.jbp.appraisal.param.PageParam;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,21 +13,21 @@ import lombok.Data;
 @Data
 @ApiModel("后台C端鉴别订单查询参数")
 public class SellerClientAppraisalRequestVO extends PageParam {
-    @KunlunApiModel("派单开始时间")
+    @ApiModelProperty("派单开始时间")
     private Integer startTime;
 
-    @KunlunApiModel("派单结束时间")
+    @ApiModelProperty("派单结束时间")
     private Integer endTime;
 
-    @KunlunApiModel("订单编号")
+    @ApiModelProperty("订单编号")
     private Long orderId;
 
-    @KunlunApiModel("鉴别状态")
+    @ApiModelProperty("鉴别状态")
     private Integer status;
 
-    @KunlunApiModel("鉴别结果")
+    @ApiModelProperty("鉴别结果")
     private Integer operateResult;
 
-    @KunlunApiModel("鉴定师工号")
+    @ApiModelProperty("鉴定师工号")
     private Long appraiserNum;
 }

web/src/main/java/com/jbp/dashboard/vo/request/clientAppraisal/SubmitAppraisalOrderRequestVO.java

 package com.jbp.dashboard.vo.request.clientAppraisal;
 
-import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
-import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
-import com.wwdz.mall.api.appraisal.vo.request.client.v2.ClientCategoryPropertyRequest;
+import com.jbp.appraisal.vo.request.client.v2.ClientCategoryPropertyRequest;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,30 +15,30 @@ import java.util.List;
  */
 @Data
 @ApiModel("提交鉴别单入参")
-public class SubmitAppraisalOrderRequestVO extends KunlunBaseDTO implements Serializable {
+public class SubmitAppraisalOrderRequestVO implements Serializable {
 
-    @KunlunApiModel("订单ID")
+    @ApiModelProperty("订单ID")
     private Long orderId;
 
-    @KunlunApiModel("商品图片")
+    @ApiModelProperty("商品图片")
     private List<String> picList;
 
-    @KunlunApiModel("描述")
+    @ApiModelProperty("描述")
     private String itemDetail;
 
-    @KunlunApiModel("类目")
+    @ApiModelProperty("类目")
     private Long categoryTwo;
 
-    @KunlunApiModel("商品ItemId 非必传")
+    @ApiModelProperty("商品ItemId 非必传")
     private Long itemId;
 
-    @KunlunApiModel("商品标题")
+    @ApiModelProperty("商品标题")
     private String title;
 
-    @KunlunApiModel("单据来源")
+    @ApiModelProperty("单据来源")
     private Integer orderSource;
 
-    @KunlunApiModel("订单类型")
+    @ApiModelProperty("订单类型")
     private Integer orderType = 0;
 
     /**

web/src/main/java/com/jbp/dashboard/vo/request/config/AppraisalPriceConfigRequestVO.java

 package com.jbp.dashboard.vo.request.config;
 
-import com.wwdz.mall.vo.common.config.AppraisalSectionPriceConfigVO;
+import com.jbp.dashboard.vo.config.AppraisalSectionPriceConfigVO;
 import lombok.Data;
 
 import java.util.List;

web/src/main/java/com/jbp/dashboard/vo/request/config/DomainAppraisalConfigRequestVO.java

 package com.jbp.dashboard.vo.request.config;
 
-import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
-import com.wwdz.mall.api.appraisal.param.appraisalItem.CategoryPropertyConfigParam;
-import com.wwdz.mall.api.appraisal.result.config.LowPriceConfigDTO;
-import com.wwdz.mall.api.appraisal.result.config.StaffReviewConfigDTO;
+import com.jbp.appraisal.param.appraisalItem.CategoryPropertyConfigParam;
+import com.jbp.appraisal.result.config.LowPriceConfigDTO;
+import com.jbp.appraisal.result.config.StaffReviewConfigDTO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -15,7 +14,7 @@ import java.util.List;
  * @date: 2021-03-04 13:52
  **/
 @Data
-public class DomainAppraisalConfigRequestVO extends KunlunBaseDTO implements Serializable {
+public class DomainAppraisalConfigRequestVO implements Serializable {
 
     private static final long serialVersionUID = -1040056861709350090L;
     /**

web/src/main/java/com/jbp/dashboard/vo/request/evaluate/EvaluateMatrixRequestVO.java

 package com.jbp.dashboard.vo.request.evaluate;
 
-import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,7 +10,7 @@ import java.io.Serializable;
  * @date: 2020/11/23
  */
 @Data
-public class EvaluateMatrixRequestVO extends KunlunBaseDTO implements Serializable {
+public class EvaluateMatrixRequestVO implements Serializable {
     private static final long serialVersionUID = 618297843664179724L;
 
     private Integer categoryId;

web/src/main/java/com/jbp/dashboard/vo/request/evaluate/EvaluatePropertyRequestVO.java

 package com.jbp.dashboard.vo.request.evaluate;
 
-import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,7 +10,7 @@ import java.io.Serializable;
  * @date: 2020/11/23
  */
 @Data
-public class EvaluatePropertyRequestVO extends KunlunBaseDTO implements Serializable {
+public class EvaluatePropertyRequestVO implements Serializable {
     private static final long serialVersionUID = -6712213349594141851L;
 
     private Integer cid;

web/src/main/java/com/jbp/dashboard/vo/request/evaluate/EvaluateUserInfoRequest.java

 package com.jbp.dashboard.vo.request.evaluate;
 
-import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,7 +10,7 @@ import java.io.Serializable;
  * @date: 2020/11/26
  */
 @Data
-public class EvaluateUserInfoRequest extends KunlunBaseDTO implements Serializable {
+public class EvaluateUserInfoRequest implements Serializable {
     private static final long serialVersionUID = 3421554206277544576L;
 
 

web/src/main/java/com/jbp/dashboard/vo/request/evaluate/EvaluateUserInfoRequestVO.java

 package com.jbp.dashboard.vo.request.evaluate;
 
-import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
-import com.wwdz.mall.api.appraisal.result.evaluate.OptionDTO;
+import com.jbp.appraisal.result.evaluate.OptionDTO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -13,7 +12,7 @@ import java.util.List;
  * @date: 2020/11/26
  */
 @Data
-public class EvaluateUserInfoRequestVO extends KunlunBaseDTO implements Serializable {
+public class EvaluateUserInfoRequestVO implements Serializable {
     private static final long serialVersionUID = -5620874790669609484L;
 
     private Long id;

web/src/main/java/com/jbp/dashboard/vo/request/handover/AddHandoverItemRequestVO.java

 package com.jbp.dashboard.vo.request.handover;
 
-import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -12,9 +12,9 @@ import lombok.Data;
 @Data
 @ApiModel
 public class AddHandoverItemRequestVO {
-    @KunlunApiModel("交接单ID")
+    @ApiModelProperty("交接单ID")
     private String handoverListId;
 
-    @KunlunApiModel("溯源码")
+    @ApiModelProperty("溯源码")
     private String tracecode;
 }

web/src/main/java/com/jbp/dashboard/vo/request/handover/CloseHandoverListRequestVO.java

 package com.jbp.dashboard.vo.request.handover;
 
-import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -12,6 +12,6 @@ import lombok.Data;
 @Data
 @ApiModel
 public class CloseHandoverListRequestVO {
-    @KunlunApiModel("交接单ID")
+    @ApiModelProperty("交接单ID")
     private String handoverListId;
 }

web/src/main/java/com/jbp/dashboard/vo/request/handover/CreateHandoverListRequestVO.java

 package com.jbp.dashboard.vo.request.handover;
 
-import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
@@ -15,11 +15,11 @@ import javax.validation.constraints.NotNull;
 @ApiModel
 public class CreateHandoverListRequestVO {
 
-    @KunlunApiModel("仓库ID")
+    @ApiModelProperty("仓库ID")
     @NotNull
     private Integer warehouseId;
 
-    @KunlunApiModel("交接单类型: 1 收货台到实验室，2 实验室收货，3 实验室到发货，4 流水线收货")
+    @ApiModelProperty("交接单类型: 1 收货台到实验室，2 实验室收货，3 实验室到发货，4 流水线收货")
     @NotNull
     private Integer handoverType;
 }

web/src/main/java/com/jbp/dashboard/vo/request/handover/HandoverItemQueryVO.java

 package com.jbp.dashboard.vo.request.handover;
 
-import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
-import com.wwdz.mall.api.appraisal.base.BasePageQueryParam;
+
+import com.jbp.appraisal.base.BasePageQueryParam;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,6 +14,6 @@ import lombok.Data;
 @Data
 @ApiModel
 public class HandoverItemQueryVO extends BasePageQueryParam {
-    @KunlunApiModel("交接单ID")
+    @ApiModelProperty("交接单ID")
     private String handoverListId;
 }

web/src/main/java/com/jbp/dashboard/vo/request/handover/HandoverListQueryVO.java

 package com.jbp.dashboard.vo.request.handover;
 
-import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
-import com.wwdz.mall.api.appraisal.base.BasePageQueryParam;
+import com.jbp.appraisal.base.BasePageQueryParam;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -15,24 +15,24 @@ import java.util.List;
 @Data
 @ApiModel
 public class HandoverListQueryVO extends BasePageQueryParam {
-    @KunlunApiModel("仓库ID")
+    @ApiModelProperty("仓库ID")
     private Integer warehouseId;
 
     /**
      * @see com.wwdz.mall.api.appraisal.enums.handover.HandoverTypeEnum
      */
-    @KunlunApiModel("交接单类型: 1 收货台到实验室，2 实验室收货，3 实验室到发货，4 流水线收货")
+    @ApiModelProperty("交接单类型: 1 收货台到实验室，2 实验室收货，3 实验室到发货，4 流水线收货")
     private Integer handoverType;
 
-    @KunlunApiModel("交接单类型：批量")
+    @ApiModelProperty("交接单类型：批量")
     private List<Integer> handoverTypeList;
 
-    @KunlunApiModel("创建日期，格式：2020-09-10")
+    @ApiModelProperty("创建日期，格式：2020-09-10")
     private String createDate;
 
-    @KunlunApiModel("创建人工号")
+    @ApiModelProperty("创建人工号")
     private Long creatorId;
 
-    @KunlunApiModel("交接单状态：0 新建，1 交接中，2 关闭")
+    @ApiModelProperty("交接单状态：0 新建，1 交接中，2 关闭")
     private Integer status;
 }

web/src/main/java/com/jbp/dashboard/vo/request/handover/RemoveHandoverItemRequestVO.java

 package com.jbp.dashboard.vo.request.handover;
 
-import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -12,9 +12,9 @@ import lombok.Data;
 @Data
 @ApiModel
 public class RemoveHandoverItemRequestVO {
-    @KunlunApiModel("交接单ID")
+    @ApiModelProperty("交接单ID")
     private String handoverListId;
 
-    @KunlunApiModel("溯源码")
+    @ApiModelProperty("溯源码")
     private String tracecode;
 }

web/src/main/java/com/jbp/dashboard/vo/request/handover/backend/BackendHandoverQueryVO.java

 package com.jbp.dashboard.vo.request.handover.backend;
 
-import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
-import com.wwdz.mall.api.appraisal.base.BasePageQueryParam;
+import com.jbp.appraisal.base.BasePageQueryParam;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -15,39 +15,39 @@ import java.util.List;
 @Data
 @ApiModel
 public class BackendHandoverQueryVO extends BasePageQueryParam {
-    @KunlunApiModel("交接单ID")
+    @ApiModelProperty("交接单ID")
     private String handoverListId;
 
-    @KunlunApiModel("仓库ID")
+    @ApiModelProperty("仓库ID")
     private Integer warehouseId;
 
-    @KunlunApiModel("交接单类型: 1 收货台到实验室，2 实验室收货，3 实验室到发货，4 流水线收货")
+    @ApiModelProperty("交接单类型: 1 收货台到实验室，2 实验室收货，3 实验室到发货，4 流水线收货")
     private Integer handoverType;
 
-    @KunlunApiModel("交接单类型，多选")
+    @ApiModelProperty("交接单类型，多选")
     private List<Integer> handoverTypeList;
 
-    @KunlunApiModel("交接单状态：0 新建，1 交接中，2 关闭")
+    @ApiModelProperty("交接单状态：0 新建，1 交接中，2 关闭")
     private Integer status;
 
-    @KunlunApiModel("溯源码")
+    @ApiModelProperty("溯源码")
     private String traceCode;
 
-    @KunlunApiModel("创建人工号")
+    @ApiModelProperty("创建人工号")
     private Long creatorId;
 
-    @KunlunApiModel("创建时间开始值：秒时间戳")
+    @ApiModelProperty("创建时间开始值：秒时间戳")
     private Long startCreateTime;
 
-    @KunlunApiModel("创建时间结束值：秒时间戳")
+    @ApiModelProperty("创建时间结束值：秒时间戳")
     private Long endCreateTime;
 
-    @KunlunApiModel("关闭人工号")
+    @ApiModelProperty("关闭人工号")
     private Long closerId;
 
-    @KunlunApiModel("创建时间开始值：秒时间戳")
+    @ApiModelProperty("创建时间开始值：秒时间戳")
     private Long startCloseTime;
 
-    @KunlunApiModel("创建时间结束值：秒时间戳")
+    @ApiModelProperty("创建时间结束值：秒时间戳")
     private Long endCloseTime;
 }

web/src/main/java/com/jbp/dashboard/vo/request/offlineAppraisal/NormalEvaluationRequestVO.java

 package com.jbp.dashboard.vo.request.offlineAppraisal;
 
-import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
-import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -12,23 +11,23 @@ import java.io.Serializable;
  * Copyright © 2021 WanWuDeZhi.com. All rights reserved.
  */
 @Data
-public class NormalEvaluationRequestVO extends KunlunBaseDTO implements Serializable {
+public class NormalEvaluationRequestVO implements Serializable {
 
     private static final long serialVersionUID = -3573551149099476935L;
 
-    @KunlunApiModel("主键id")
+    @ApiModelProperty("主键id")
     private Long id;
 
-    @KunlunApiModel("原因")
+    @ApiModelProperty("原因")
     private Integer reason;
 
-    @KunlunApiModel("备注")
+    @ApiModelProperty("备注")
     private String remark;
 
-    @KunlunApiModel("估价金额")
+    @ApiModelProperty("估价金额")
     private Integer evaluationPrice;
 
-    @KunlunApiModel("鉴别师id")
+    @ApiModelProperty("鉴别师id")
     private Integer appraiserId;
 
 }

web/src/main/java/com/jbp/dashboard/vo/request/offlineAppraisal/PopupInfoRequestVO.java

 package com.jbp.dashboard.vo.request.offlineAppraisal;
 
-import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
-import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -12,10 +11,10 @@ import java.io.Serializable;
  * Copyright © 2021 WanWuDeZhi.com. All rights reserved.
  */
 @Data
-public class PopupInfoRequestVO extends KunlunBaseDTO implements Serializable {
+public class PopupInfoRequestVO implements Serializable {
 
     private static final long serialVersionUID = -1709284867874671340L;
 
-    @KunlunApiModel("溯源码")
+    @ApiModelProperty("溯源码")
     private String traceCode;
 }

web/src/main/java/com/jbp/dashboard/vo/request/offlineAppraisal/SaveEvaluationRequestVO.java

 package com.jbp.dashboard.vo.request.offlineAppraisal;
 
-import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
-import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -13,16 +12,16 @@ import java.util.List;
  * Copyright © 2021 WanWuDeZhi.com. All rights reserved.
  */
 @Data
-public class SaveEvaluationRequestVO extends KunlunBaseDTO implements Serializable {
+public class SaveEvaluationRequestVO implements Serializable {
 
     private static final long serialVersionUID = 3437905689508105058L;
 
-    @KunlunApiModel("订单id")
+    @ApiModelProperty("订单id")
     private Long orderId;
 
-    @KunlunApiModel("商品id")
+    @ApiModelProperty("商品id")
     private Long itemId;
 
-    @KunlunApiModel("图片数组")
+    @ApiModelProperty("图片数组")
     private List<String> evaluationImageList;
 }

web/src/main/java/com/jbp/dashboard/vo/request/offlineAppraisal/UnableToValueRequestVO.java

 package com.jbp.dashboard.vo.request.offlineAppraisal;
 
-import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
-import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -12,19 +11,19 @@ import java.io.Serializable;
  * Copyright © 2021 WanWuDeZhi.com. All rights reserved.
  */
 @Data
-public class UnableToValueRequestVO extends KunlunBaseDTO implements Serializable {
+public class UnableToValueRequestVO implements Serializable {
 
     private static final long serialVersionUID = 1781994331504677537L;
 
-    @KunlunApiModel("主键id")
+    @ApiModelProperty("主键id")
     private Long id;
 
-    @KunlunApiModel("无法估价原因")
+    @ApiModelProperty("无法估价原因")
     private Integer reason;
 
-    @KunlunApiModel("无法估价备注")
+    @ApiModelProperty("无法估价备注")
     private String remark;
 
-    @KunlunApiModel("鉴别师id")
+    @ApiModelProperty("鉴别师id")
     private Integer appraiserId;
 }

web/src/main/java/com/jbp/dashboard/vo/request/order/AppraisalFeeRefundOrderRequestVO.java

 package com.jbp.dashboard.vo.request.order;
 
-import com.wwdz.mall.vo.request.PageParam;
+import com.jbp.appraisal.param.PageParam;
 import lombok.Data;
 
 import java.util.Date;

web/src/main/java/com/jbp/dashboard/vo/request/physical/PhysicalCheckAttributeRequestVO.java

 package com.jbp.dashboard.vo.request.physical;
 
-import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,7 +10,7 @@ import java.io.Serializable;
  * @Date: 2020/12/14 16:01
  */
 @Data
-public class PhysicalCheckAttributeRequestVO  extends KunlunBaseDTO implements Serializable {
+public class PhysicalCheckAttributeRequestVO implements Serializable {
 
     private static final long serialVersionUID= -5620874790669609481L;
 

web/src/main/java/com/jbp/dashboard/vo/request/traceCode/QueryTraceCodeBatchRequestVO.java

@@ -2,22 +2,23 @@ package com.jbp.dashboard.vo.request.traceCode;
 
 import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 @ApiModel
 public class QueryTraceCodeBatchRequestVO {
-    @KunlunApiModel("批次号")
+    @ApiModelProperty("批次号")
     private String batchNum;
-    @KunlunApiModel("溯源码")
+    @ApiModelProperty("溯源码")
     private String traceCode;
-    @KunlunApiModel("生成时间开始")
+    @ApiModelProperty("生成时间开始")
     private Integer createStart;
-    @KunlunApiModel("生成时间结束")
+    @ApiModelProperty("生成时间结束")
     private Integer createEnd;
-    @KunlunApiModel("重打时间开始")
+    @ApiModelProperty("重打时间开始")
     private Integer reprintStart;
-    @KunlunApiModel("重打时间结束")
+    @ApiModelProperty("重打时间结束")
     private Integer reprintEnd;
     private Integer pageSize;
     private Integer pageIndex;

web/src/main/java/com/jbp/dashboard/web/backend/SellerWarehouseController.java

 package com.jbp.dashboard.web.backend;
 
 import com.alibaba.fastjson.JSON;
+import com.jbp.dashboard.export.SellerWarehouseApplyExportDescribe;
 import com.wwdz.appraisal.api.sellerwarehouse.request.ApproveWarehouseApplyRequest;
 import com.wwdz.appraisal.api.sellerwarehouse.request.OperateWarehouseChangeRequest;
 import com.wwdz.appraisal.api.sellerwarehouse.request.SellerWarehouseApplyQuery;
@@ -54,6 +55,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.jbp.dashboard.constant.WebConstant.CONTEXT_PATH_ADMIN;
 import static com.wwdz.mall.constant.WebConstant.CONTEXT_PATH_ADMIN;
 
 /**

web/src/main/java/com/jbp/dashboard/web/backend/SubCertificateController.java

 package com.jbp.dashboard.web.backend;
 
+import com.jbp.appraisal.base.PageQueryResult;
+import com.jbp.appraisal.param.*;
+import com.jbp.appraisal.result.SubCertificatePageResult;
+import com.jbp.appraisal.result.certificate.CertificateSecondCategoryDTO;
+import com.jbp.appraisal.result.certificate.SubCertificateDetailDTO;
+import com.jbp.appraisal.server.AppraisalWarehouseService;
+import com.jbp.appraisal.server.certificate.AppraisalCertificateReadService;
+import com.jbp.appraisal.server.certificate.SubCertificateReadService;
+import com.jbp.appraisal.server.certificate.SubCertificateUpdateService;
+import com.jbp.appraisal.vo.response.AppraisalWarehouseResponse;
+import com.jbp.dashboard.vo.request.SubCertificatePageQueryRequestVO;
 import com.wwdz.knife.context.KnifeACLContextHolder;
 import com.wwdz.knife.dto.ACLEmployeeDTO;
 import com.wwdz.mall.api.appraisal.base.PageQueryResult;
@@ -20,11 +31,13 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.Reference;
 import org.springframework.beans.BeanUtils;
+import org.springframework.data.annotation.Reference;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
 import java.util.List;
 
+import static com.jbp.dashboard.constant.WebConstant.CONTEXT_PATH_ADMIN;
 import static com.wwdz.mall.constant.WebConstant.CONTEXT_PATH_ADMIN;
 
 /**

web/src/main/java/com/jbp/dashboard/web/bag/AppraisalReceiveBagController.java

 package com.jbp.dashboard.web.bag;
 
+import com.jbp.appraisal.base.PageQueryResult;
+import com.jbp.appraisal.server.bag.AppraisalReceiveBagDetailsService;
+import com.jbp.appraisal.server.bag.AppraisalReceiveBagService;
+import com.jbp.appraisal.vo.response.bag.AppraisalReceiveBagListResponse;
 import com.wwdz.knife.apiConfig.KnifeApi;
 import com.wwdz.knife.context.KnifeACLContextHolder;
 import com.wwdz.knife.dto.ACLEmployeeDTO;
@@ -21,11 +25,13 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.Reference;
+import org.springframework.data.annotation.Reference;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
+import static com.jbp.dashboard.constant.WebConstant.CONTEXT_PATH_ADMIN;
 import static com.wwdz.mall.constant.WebConstant.CONTEXT_PATH_ADMIN;
 
 /**
@@ -47,14 +53,12 @@ public class AppraisalReceiveBagController {
 
     @ApiOperation("获取包裹签收单号")
     @GetMapping("/getReceiveBagId")
-    @KnifeApi
     public CloudServerResponse<String> getReceiveBagId() {
         return receiveBagService.getReceiveBagId();
     }
 
     @ApiOperation("获取包裹签收单列表")
     @GetMapping("/findReceiveBagList")
-    @KnifeApi
     public CloudServerResponse<PageQueryResult<AppraisalReceiveBagListResponse>> findReceiveBagList(
             @RequestParam(required = false, value = "expressCompany") String expressCompany,
             @RequestParam(required = false, value = "createrNo") String createrNo) {