验光师

无关风月

2024-12-25 ececefa206f15e8cd16926c47c8804700918a138

验光师

 manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java

@@ -156,6 +156,11 @@
        PageInfo<TFrameWarehousingDetailVO> frameWarehousingDetailVOPageInfo = warehousingService.detailList(query);
        return ApiResult.success(frameWarehousingDetailVOPageInfo);
    }
    @ApiOperation(value = "镜片出入库记录列表")
    @PostMapping(value = "/detailLensList")
    public ApiResult<PageInfo<TLensWarehousingDetailVO>> detailLensList(@RequestBody TWarehousingDetailLensQuery query) {
        return ApiResult.success(warehousingService.detailListLens(query));
    }
    /**
     * 库存明细记录列表
     */

 manage/src/main/java/com/jilongda/manage/service/TWarehousingService.java

@@ -37,4 +37,5 @@
    PageInfo<TWarehousingLensVO> inventoryReceiptLensList(TWarehousingDetailLensQuery query);

    PageInfo<TLensWarehousingDetailVO> detailListLens(TWarehousingDetailLensQuery query);

}

 manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java

@@ -67,6 +67,9 @@
        pageInfo.setRecords(list);
        return pageInfo;
    }



    @Override
    public PageInfo<TWarehousingVO> inventoryReceiptList(TWarehousingDetailQuery query) {
        PageInfo<TWarehousingVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());

 manage/src/main/resources/mapping/TOptometristMapper.xml

@@ -55,7 +55,6 @@
            <if test="req.startTime != null and req.startTime!=''">
                and (t1.createTime between #{req.startTime} and #{req.endTime})
            </if>
            AND  t3.type=1
            AND isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        </where>
        ORDER BY createTime DESC

 optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java

@@ -8,18 +8,17 @@
import com.jilongda.optometrist.authority.service.SecUserService;
import com.jilongda.optometrist.model.*;
import com.jilongda.optometrist.query.TOptometristQuery;
import com.jilongda.optometrist.query.TOptometryQuery;
import com.jilongda.optometrist.query.TicketQuery;
import com.jilongda.optometrist.service.*;
import com.jilongda.optometrist.utils.LoginInfoUtil;
import com.jilongda.optometrist.vo.TAddOptometryVO;
import com.jilongda.optometrist.vo.TLineUpDetailVO;
import com.jilongda.optometrist.vo.TOptometristVO;
import com.jilongda.optometrist.vo.TOptometryDetailVO;
import com.jilongda.optometrist.vo.*;
import com.sun.org.apache.bcel.internal.generic.NEW;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;

import java.time.LocalDateTime;
@@ -56,6 +55,20 @@
    private TOrderService orderService;
    @Autowired
    private TOptometryDetailService optometryDetailService;
    @ApiOperation(value = "获取验光单分页列表",tags = "验光单")
    @PostMapping(value = "/pageList")
    public ApiResult<PageInfo<TOptometryVO>> pageList(@RequestBody TOptometryQuery query) {
        String startTime = null;
        String endTime = null;
        if (StringUtils.hasLength(query.getTime())){
            startTime = query.getTime()+" 00:00:00";
            endTime = query.getTime()+" 23:59:59";
        }
        query.setStartTime(startTime);
        query.setEndTime(endTime);
        PageInfo<TOptometryVO> tOptometryVOPageInfo = optometristService.pageList(query);
        return ApiResult.success(tOptometryVOPageInfo);
    }
    @ApiOperation(value = "首页")
    @PostMapping(value = "/index")
    public ApiResult<TOptometristVO> index() {
@@ -178,18 +191,5 @@
        return ApiResult.success();
    }

    @ApiOperation(value = "验光师编辑")
    @PostMapping(value = "/update")
    public ApiResult<String> update(@RequestBody TOptometrist dto) {
        optometristService.updateById(dto);
        return ApiResult.success();
    }

    @ApiOperation(value = "验光师上下架")
    @GetMapping(value = "/upAndDown")
    public ApiResult<Boolean> upAndDown(@RequestParam Integer id,
                                        @RequestParam Integer status) {
        return ApiResult.success(optometristService.upAndDown(id,status));
    }
}


 optometrist/src/main/java/com/jilongda/optometrist/controller/TWarehousingController.java

@@ -13,10 +13,13 @@
import com.jilongda.optometrist.dto.GetCurrentByParamLens;
import com.jilongda.optometrist.dto.TWarehousingDTO;
import com.jilongda.optometrist.dto.TWarehousingLensDTO;
import com.jilongda.optometrist.model.*;
import com.jilongda.optometrist.query.TFrameGoodsQuery;
import com.jilongda.optometrist.query.TLensGoodsQuery;
import com.jilongda.optometrist.query.TWarehousingDetailLensQuery;
import com.jilongda.optometrist.query.TWarehousingDetailQuery;
import com.jilongda.optometrist.service.*;
import com.jilongda.optometrist.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
@@ -149,6 +152,7 @@
        PageInfo<TFrameWarehousingDetailVO> frameWarehousingDetailVOPageInfo = warehousingService.detailList(query);
        return ApiResult.success(frameWarehousingDetailVOPageInfo);
    }

    /**
     * 库存明细记录列表
     */

 optometrist/src/main/java/com/jilongda/optometrist/model/TLensWarehousingDetail.java

@@ -76,6 +76,9 @@
    @ApiModelProperty(value = "入库编号")
    @TableField("code")
    private String code;
    @ApiModelProperty(value = "门店名称")
    @TableField(exist = false)
    private String storeName;


}

 optometrist/src/main/java/com/jilongda/optometrist/query/TOptometryQuery.java

@@ -6,25 +6,17 @@
import lombok.Data;

@Data
@ApiModel(value = "验光单查询参数")
@ApiModel(value = "验光单记录参数")
public class TOptometryQuery extends BasePage {

    @ApiModelProperty(value = "微信昵称")
    private String name;
    @ApiModelProperty(value = "姓名")
    private String realName;
    @ApiModelProperty(value = "手机号")
    private String phone;
    @ApiModelProperty(value = "出单日期 2020-11-11 - 2022-11-11")
    private String createTime;
    @ApiModelProperty(value = "店铺id")
    private Integer storeId;
    @ApiModelProperty(value = "验光师id")
    private Integer optometristId;
    @ApiModelProperty(value = "用户id")
    private Integer userId;
    @ApiModelProperty(value = "姓名或电话")
    private String nameOrPhone;

    @ApiModelProperty(value = "出单日期 2020-11-11")
    private String time;
    @ApiModelProperty(value = "开始时间 前端忽略")
    private String startTime;
    @ApiModelProperty(value = "结束时间 前端忽略")
    private String endTime;

}

 optometrist/src/main/java/com/jilongda/optometrist/query/TWarehousingDetailLensQuery.java

@@ -6,7 +6,7 @@
import lombok.Data;

@Data
@ApiModel(value = "镜片明细记录查询/出入库单Query")
@ApiModel(value = "镜片明细记录查询-出入库单Query")
public class TWarehousingDetailLensQuery extends TimeRangePageDTO {
    @ApiModelProperty(value = "品牌")
    private String brand;

 optometrist/src/main/java/com/jilongda/optometrist/service/impl/TWarehousingServiceImpl.java

@@ -39,6 +39,8 @@
    @Autowired
    private TStoreMapper storeMapper;
    @Autowired
    private TWarehousingMapper warehousingMapper;
    @Autowired
    private TFrameWarehousingDetailMapper frameWarehousingDetailMapper;
    @Autowired
    private TLensWarehousingDetailMapper lensWarehousingDetailMapper;

 optometrist/src/main/java/com/jilongda/optometrist/vo/TOptometryVO.java

@@ -1,5 +1,6 @@
package com.jilongda.optometrist.vo;

import com.jilongda.common.pojo.BaseModel;
import com.jilongda.optometrist.model.TOptometry;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -7,18 +8,13 @@

@Data
@ApiModel(value = "验光单VO")
public class TOptometryVO extends TOptometry {
public class TOptometryVO extends BaseModel {
    @ApiModelProperty(value = "门店名称")
    private String storeName;
    @ApiModelProperty(value = "微信名称")
    private String name;
    @ApiModelProperty(value = "R值")
    private String rValue;
    @ApiModelProperty(value = "L值")
    private String lValue;
    @ApiModelProperty(value = "瞳距")
    private String pupilDistance;
    @ApiModelProperty(value = "验光师名称")
    private String optometristName;
    private String wxName;
    @ApiModelProperty(value = "电话")
    private String phone;


}

 optometrist/src/main/resources/mapping/OperLogMapper.xml

New file
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.OperLogMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.common.model.OperLog">
        <id column="id" property="id"/>
        <result column="oper_user_name" property="operUserName"/>
        <result column="oper_account" property="operAccount"/>
        <result column="oper_operation_time" property="operOperationTime"/>
        <result column="oper_ip" property="operIp"/>
        <result column="oper_model" property="operModel"/>
        <result column="oper_type" property="operType"/>
        <result column="oper_desc" property="operDesc"/>
        <result column="oper_uri" property="operUri"/>
        <result column="oper_method" property="operMethod"/>
        <result column="oper_req_param" property="operReqParam"/>
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id
        , oper_user_name, oper_account, oper_operation_time, oper_ip, oper_model, oper_type, oper_desc, oper_uri, oper_method,oper_req_param
    </sql>

    <select id="pageList" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List">
        </include>
        from oper_log
        <where>
            <if test="query.account != null and query.account != ''">
                AND oper_account like concat('%',#{query.account},'%')
            </if>
            <if test="query.shortName != null and query.shortName != ''">
                AND oper_user_name like concat('%',#{query.shortName},'%')
            </if>
            <if test="query.startTime != null and query.endTime != null">
                AND DATE_FORMAT(oper_operation_time, '%Y-%m-%d %H:%i:%s') &gt;= #{query.startTime}
                AND DATE_FORMAT(oper_operation_time, '%Y-%m-%d %H:%i:%s') &lt;= #{query.endTime}
            </if>
        </where>
        ORDER BY oper_operation_time DESC
    </select>
</mapper>

 optometrist/src/main/resources/mapping/SecFeeItemsMapper.xml

New file
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.SecFeeItemsMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.SecFeeItems">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="percent" property="percent" />
        <result column="status" property="status" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, name, percent, status, createTime, updateTime, createBy, updateBy, isDelete
    </sql>

</mapper>

 optometrist/src/main/resources/mapping/SecResourcesMapper.xml

New file
@@ -0,0 +1,109 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.authority.mapper.SecResourcesMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.authority.model.SecResources">
        <id column="id" property="id"/>
        <result column="createBy" property="createBy"/>
        <result column="createTime" property="createTime"/>
        <result column="updateBy" property="updateBy"/>
        <result column="updateTime" property="updateTime"/>
        <result column="isDelete" property="isDelete"/>
        <result column="parent_id" property="parentId"/>
        <result column="title" property="title"/>
        <result column="descriptions" property="descriptions"/>
        <result column="sort" property="sort"/>
        <result column="icon" property="icon"/>
        <result column="name" property="name"/>
        <result column="menu" property="menu"/>
        <result column="component" property="component"/>
        <result column="permit" property="permit"/>
        <result column="cate" property="cate"/>
        <result column="type" property="type"/>
        <result column="hidden" property="hidden"/>
        <result column="env_port" property="envPort"/>
        <result column="path" property="path"/>
        <result column="api_url" property="apiUrl"/>
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        createBy
        ,
        createTime,
        updateBy,
        updateTime,
        isDelete,
        id, parent_id, title, descriptions, sort, icon, `name`, menu, component, permit, cate, `type`, hidden, env_port, `path`, api_url
    </sql>

    <sql id="Base_Column_List_By_Uid">
        re.id, re.parent_id, title, re.descriptions, re.sort, re.icon, re.name, re.menu, re.component, re.permit,
        re.cate, re.type, re.hidden, re.env_port, re.path, re.api_url,
        re.isDelete, re.createTime, re.updateTime
    </sql>

    <select id="selectResourceByUid" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List_By_Uid"/>
        from sec_user_role ur left join sec_role sr on ur.role_id = sr.id
        left join sec_role_resource rr on sr.id = rr.role_id
        left join sec_resources re on rr.resource_id = re.id
        where
        ur.user_id = #{uid,jdbcType=INTEGER}
        AND re.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        ORDER BY re.sort
    </select>

    <select id="getList" resultType="com.jilongda.optometrist.authority.vo.SecResourceVO">
        select sr.createBy,
               sr.createTime,
               sr.updateBy,
               sr.updateTime,
               sr.isDelete,
               sr.id,
               sr.parent_id,
               sr.title,
               sr.descriptions,
               sr.sort,
               sr.icon,
               sr.name,
               sr.menu,
               sr.component,
               sr.permit,
               sr.cate,
               sr.type,
               sr.hidden,
               sr.env_port,
               sr.path,
               sr.api_url
        from sec_role_resource srr
                 left join sec_resources sr on srr.resource_id = sr.id
        where srr.role_id = #{rid,jdbcType=VARCHAR}
    </select>
    <select id="allList" resultType="com.jilongda.optometrist.authority.vo.SecResourceVO">
        select createBy,
               createTime,
               updateBy,
               updateTime,
               isDelete,
               id,
               parent_id AS parentId,
               title,
               descriptions,
               sort,
               icon,
               `name`,
               menu,
               component,
               permit,
               cate,
               `type`,
               hidden,
               env_port  AS envPort,
               `path`,
               api_url  AS apiUrl
        from sec_resources
        ORDER BY parent_id
    </select>
</mapper>

 optometrist/src/main/resources/mapping/SecRoleMapper.xml

New file
@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.authority.mapper.SecRoleMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.authority.model.SecRole">
        <id column="id" property="id" />
        <result column="createBy" property="createBy"/>
        <result column="createTime" property="createTime"/>
        <result column="updateBy" property="updateBy"/>
        <result column="updateTime" property="updateTime"/>
        <result column="isDelete" property="isDelete"/>
        <result column="rolename" property="rolename" />
        <result column="role_desc" property="roleDesc" />
        <result column="role_state" property="roleState" />
        <result column="sortBy" property="sortBy" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        createBy,
        createTime,
        updateBy,
        updateTime,
        isDelete,
        id, rolename, role_desc, role_state
    </sql>

    <!--根据用户id查询所有集合-->
    <select id="selectRolesByUid" resultMap="BaseResultMap">
        select
        r.createBy,
        r.createTime,
        r.updateBy,
        r.updateTime,
        r.isDelete,
        r.id, r.rolename, r.role_desc AS roleDesc, r.role_state AS roleState,r.sortBy
        from sec_role r,sec_user_role u
        <where>
            r.id = u.role_id
            and u.user_id = #{uid,jdbcType=INTEGER}
            and r.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
            ORDER BY r.sortBy DESC
        </where>
    </select>
    <!--通过角色查找人员-->
    <select id="getUserByRole" resultType="com.jilongda.optometrist.authority.vo.SecUserVO">
        SELECT sr.id AS roleId,su.id AS userId,su.account
        FROM sec_role sr
        LEFT JOIN sec_user_role sur ON sr.id = sur.role_id
        LEFT JOIN sec_user su ON sur.user_id = su.id
        <where>
            <if test="dto.id != null">
                sr.id = #{dto.id}
            </if>
            and sr.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        </where>
    </select>

    <select id="selectResByRid" resultType="java.lang.Long">
        SELECT
        resource_id
        FROM sec_resources r,sec_role_resource srr
        <where>
            r.id = srr.resource_id
            AND srr.role_id = #{rid,jdbcType=INTEGER}
            AND r.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
            GROUP BY r.id
        </where>
    </select>
</mapper>

 optometrist/src/main/resources/mapping/SecSettingMapper.xml

New file
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.SecSettingMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.SecSetting">
        <id column="id" property="id" />
        <result column="lensThreshold" property="lensThreshold" />
        <result column="frameThreshold" property="frameThreshold" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, lensThreshold, frameThreshold, createTime, updateTime, createBy, updateBy, isDelete
    </sql>

</mapper>

 optometrist/src/main/resources/mapping/SecUserMapper.xml

New file
@@ -0,0 +1,167 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.authority.mapper.SecUserMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.authority.model.SecUser">
        <id column="id" property="id"/>
        <result column="createBy" property="createBy"/>
        <result column="createTime" property="createTime"/>
        <result column="updateBy" property="updateBy"/>
        <result column="updateTime" property="updateTime"/>
        <result column="isDelete" property="isDelete"/>
        <result column="account" property="account"/>
        <result column="description" property="description"/>
        <result column="password" property="password"/>
        <result column="phone" property="phone"/>
        <result column="state" property="state"/>
        <result column="last_login_time" property="lastLoginTime"/>
        <result column="nick_name" property="nickName"/>
        <result column="avatar_url" property="avatarUrl"/>
        <result column="province" property="province"/>
        <result column="city" property="city"/>
        <result column="area" property="area"/>
        <result column="address" property="address"/>
        <result column="birthday" property="birthday"/>
        <result column="gender" property="gender"/>
        <result column="deptId" property="deptId"/>
        <result column="userType" property="userType"/>
        <result column="storeId" property="storeId"/>
        <result column="provinceCode" property="provinceCode"/>
        <result column="cityCode" property="cityCode"/>
        <result column="areaCode" property="areaCode"/>
        <result column="pictures" property="pictures"/>
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        createBy
        ,
        createTime,
        updateBy,
        updateTime,
        isDelete,
        id, account, description, password, phone, `state`, last_login_time AS lastLoginTime,
        nick_name AS nickName, avatar_url AS avatarUrl, province, city, area, address, birthday, gender,deptId,userType,
            provinceCode, cityCode, areaCode,storeId,pictures
    </sql>

    <sql id="Base_Column_List_Other">
        su.createBy,
        su.createTime,
        su.updateBy,
        su.updateTime,
        su.isDelete,
        su.id, su.account, su.description, su.password, su.phone, su.`state`, su.last_login_time AS lastLoginTime,
        su.nick_name AS nickName, su.avatar_url AS avatarUrl, su.province, su.city, su.area, su.address, su.birthday, su.gender,su.deptId,su.userType,
            su.provinceCode, su.cityCode, su.areaCode,su.pictures
    </sql>

    <select id="getSecUserList" resultType="com.jilongda.optometrist.authority.vo.SecUsersVO">
        SELECT
        su.createBy,
        su.createTime,
        su.updateBy,
        su.updateTime,
        su.isDelete,
        su.id,
        su.`account`,
        su.`description`,
        su.`password`,
        su.phone,
        su.state,
        su.roleType,
        su.last_login_time AS lastLoginTime, su.nick_name AS nickName, su.avatar_url AS avatarUrl, su.province, su.city, su.area, su.address,
        su.birthday, su.gender,sr.id AS roleId,sr.rolename AS rolename,su.deptId,su.userType,su.provinceCode, su.cityCode, su.areaCode,su.pictures
        FROM sec_user su
        LEFT JOIN sec_user_role sur ON su.id = sur.user_id
        LEFT JOIN sec_role sr ON sur.role_id = sr.id
        <where>
            <if test="dto.nickName != null and dto.nickName != ''">
                AND su.nick_name LIKE concat('%', #{dto.nickName,jdbcType=VARCHAR}, '%')
            </if>
            <if test="dto.phone != null and dto.phone != ''">
                AND su.phone LIKE concat('%', #{dto.phone,jdbcType=VARCHAR}, '%')
            </if>
            <if test="dto.state != null">
                AND su.state = #{dto.state}
            </if>
            <if test="dto.storeId != null">
                AND su.storeId = #{dto.storeId}
            </if>
            <if test="dto.roleId != null">
                AND sr.id = #{dto.roleId}
            </if>
            AND su.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        </where>
        ORDER BY su.createTime DESC
    </select>

    <select id="queryLower" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List">
        </include>
        from sec_user
        <where>
            <if test="query.userType != null and query.userType == 6">
                AND user_type = #{query.userType}
                and personnel_structure_id like concat('%','DR','%')
            </if>
            <if test="query.userType != null and query.userType == 7">
                AND user_type = #{query.userType}
                and personnel_structure_id like concat('%','HC','%')
            </if>
            AND isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        </where>
    </select>
    <select id="getUserByRoleId" resultType="com.jilongda.optometrist.authority.model.SecUser">
        select <include refid="Base_Column_List_Other"></include>
        from sec_user_role sur
                 left join sec_user su on sur.user_id = su.id
        where sur.role_id = #{id,jdbcType=VARCHAR}
          and su.id is not null
    </select>

    <select id="selectListByNamePhoneDeptId" resultType="com.jilongda.optometrist.authority.model.SecUser">
        select <include refid="Base_Column_List"></include>
            from sec_user
        WHERE isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        <if test="name != null and name != ''">
            AND (nick_name LIKE concat('%',#{name},'%')
            OR phone LIKE concat('%',#{name},'%'))
        </if>
        <if test="deptId != null">
            AND deptId = #{deptId}
        </if>
    </select>

    <select id="selectListByNamePhoneDeptIds" resultType="com.jilongda.optometrist.authority.model.SecUser">
        select <include refid="Base_Column_List"></include>
        from sec_user
        WHERE isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        <if test="name != null and name != ''">
            AND (nick_name LIKE concat('%',#{name},'%')
            OR phone LIKE concat('%',#{name},'%'))
        </if>
        <if test="deptIds != null and deptIds.size()>0">
            AND deptId IN
            <foreach collection="deptIds" close=")" open="(" item="id" separator=",">
                #{id}
            </foreach>
        </if>
    </select>
    <select id="selectUserById" resultType="com.jilongda.optometrist.authority.model.SecUser">
        select <include refid="Base_Column_List"></include>
        from sec_user
        where id = #{orderingPersonId}
    </select>
    <select id="queryList" resultType="com.jilongda.optometrist.authority.model.SecUser">
        select <include refid="Base_Column_List"></include>
        from sec_user
    </select>

    <delete id="removeById">
        delete
        from sec_user
        where id = #{uid}
    </delete>
</mapper>

 optometrist/src/main/resources/mapping/SecUserRoleMapper.xml

New file
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.authority.mapper.SecUserRoleMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.authority.model.SecUserRole">
        <result column="role_id" property="roleId"/>
        <result column="user_id" property="userId"/>
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        role_id
        , user_id
    </sql>
    <select id="getRoleByUserId" resultType="com.jilongda.optometrist.authority.model.SecRole">
        select sr.id,
               sr.rolename,
               sr.role_desc,
               sr.createBy,
               sr.createTime,
               sr.updateBy,
               sr.updateTime,
               sr.isDelete,
               sr.role_state
        from sec_user su
                 left join sec_user_role sur on su.id = sur.user_id
                 left join sec_role sr on sur.role_id = sr.id
        where su.id = #{userId,jdbcType=VARCHAR}
          AND su.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
    </select>
</mapper>

 optometrist/src/main/resources/mapping/TAppUserMapper.xml

New file
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TAppUserMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TAppUser">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="phone" property="phone" />
        <result column="realName" property="realName" />
        <result column="age" property="age" />
        <result column="gender" property="gender" />
        <result column="registerTime" property="registerTime" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, name, phone, realName, age, gender, registerTime, createTime, updateTime, createBy, updateBy, isDelete
    </sql>
    <select id="pageList" resultType="com.jilongda.optometrist.vo.TAppUserVO">
        select * from
            t_app_user
        where 1=1
        <if test="query.name != null and query.name != ''">
            and name like concat('%',#{query.name},'%')
        </if>
        <if test="query.phone != null and query.phone != ''">
            and phone like concat('%',#{query.phone},'%')
        </if>
        <if test="query.realName != null and query.realName != ''">
            and realName like concat('%',#{query.realName},'%')
        </if>
          <if test="query.startTime != null and query.startTime != ''">
              and (createTime between #{query.startTime} and #{query.endTime})
        </if>
        and isDelete =  ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}

    </select>

</mapper>

 optometrist/src/main/resources/mapping/TBrandMapper.xml

New file
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TBrandMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TBrand">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="type" property="type" />
        <result column="status" property="status" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
        <result column="isMain" property="isMain" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, `name`, `type`, status, createTime, updateTime, createBy, updateBy, isDelete, isMain
    </sql>
    <select id="pageList" resultType="com.jilongda.optometrist.vo.TBrandVO">
        select <include refid="Base_Column_List"></include>
        from t_brand
        where isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        <if test="query.type != null">
            AND `type` = #{query.type}
        </if>
        ORDER BY createTime DESC
    </select>

</mapper>

 optometrist/src/main/resources/mapping/TCouponMapper.xml

New file
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TCouponMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TCoupon">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="type" property="type" />
        <result column="amount" property="amount" />
        <result column="storeId" property="storeId" />
        <result column="time" property="time" />
        <result column="amountCondition" property="amountCondition" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
        <result column="grantStatus" property="grantStatus" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, name, type, amount, storeId, time, amountCondition, createTime, updateTime, createBy, updateBy, isDelete, grantStatus
    </sql>
    <select id="pageList" resultType="com.jilongda.optometrist.vo.TCouponVO">
        select t1.* from
            t_coupon t1
        where 1=1
        <if test="query.name != null and query.name != ''">
            and t1.name like concat('%',#{query.name},'%')
        </if>
        <if test="query.type != null and query.type != ''">
            and t1.type =#{query.type}
        </if>
        <if test="query.grantStatus != null and query.grantStatus != ''">
            and t1.grantStatus =#{query.grantStatus}
        </if>
    </select>

</mapper>

 optometrist/src/main/resources/mapping/TCouponReceiveMapper.xml

New file
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TCouponReceiveMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TCouponReceive">
        <id column="id" property="id" />
        <result column="couponId" property="couponId" />
        <result column="userId" property="userId" />
        <result column="type" property="type" />
        <result column="amount" property="amount" />
        <result column="storeId" property="storeId" />
        <result column="endTime" property="endTime" />
        <result column="amountCondition" property="amountCondition" />
        <result column="status" property="status" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, couponId, userId, type, amount, storeId, endTime, amountCondition, status, createTime, updateTime, createBy, updateBy, isDelete
    </sql>
    <select id="pageList" resultType="com.jilongda.optometrist.vo.TAppUserCouponVO">
        select t1.* ,t2.name as couponName from
            t_coupon_receive t1
        left join t_coupon t2 on t1.couponId = t2.id
        where t1.userId = #{query.id}
        and t1.isDelete =  ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
    </select>

</mapper>

 optometrist/src/main/resources/mapping/TFrameGoods.xml

New file
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TFrameGoodsMapper">


    <select id="lensReceiptList" resultType="com.jilongda.optometrist.vo.TFrameGoodsVO">
        select t1.*,t2.name as model,t5.name as supplier,t3.name as material,t4.name as store,
               t2.sale as sale,t2.cost as cost,t6.name as brand,t7.frameThreshold
        from
            t_frame_goods t1
        left join t_model t2 on t1.modelId=t2.id
        left join t_material t3 on t2.materialId = t3.id
        left join t_store t4 on t1.storeId = t4.id
        left join t_supplier t5 on t2.supplierId = t5.id
        left join t_brand t6 on t2.brandId=t6.id
        left join sec_setting t7 on 1=1
        where 1=1
        <if test="query.brandId != null ">
            and t2.brandId = #{query.brandId}
        </if>
        <if test="query.supplierId != null ">
            and t2.supplierId = #{query.supplierId}
        </if>
        <if test="query.color != null and query.color != ''">
            and t1.color = #{query.color}
        </if>
        <if test="query.storeId != null ">
            and t1.storeId = #{query.storeId}
        </if>
        <if test="query.model != null and query.model != ''">
            and t2.name = #{query.model}
        </if>
        <if test="query.materialId != null ">
            and t2.materialId = #{query.materialId}
        </if>
        <if test="query.status != null ">
            and t1.status = #{query.status}
        </if>
        <if test="query.isWarning != null and query.isWarning = 1">
            and t1.total &lt; t7.frameThreshold
        </if>
        <if test="query.isWarning != null and query.isWarning = 2">
            and t1.total >= t7.frameThreshold
        </if>
        <if test="query.startCount != null and query.endCount != null">
            and t1.total between #{query.startCount} and #{query.endCount}
        </if>
        and t1.isDelete =  ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}

        order by t1.id
    </select>
</mapper>

 optometrist/src/main/resources/mapping/TFrameWarehousingDetailMapper.xml

New file
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TFrameWarehousingDetailMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TFrameWarehousingDetail">
        <id column="id" property="id" />
        <result column="warehousingId" property="warehousingId" />
        <result column="brand" property="brand" />
        <result column="supplier" property="supplier" />
        <result column="material" property="material" />
        <result column="total" property="total" />
        <result column="color" property="color" />
        <result column="model" property="model" />
        <result column="code" property="code" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
        <result column="modelId" property="modelId" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, warehousingId, brand, supplier, material, total, color, model, code, createTime, updateTime, createBy, updateBy, isDelete, modelId
    </sql>
    <select id="pageList" resultType="com.jilongda.optometrist.vo.TFrameWarehousingDetailVO">
        select tfwd.id, tfwd.warehousingId, tfwd.brand, tfwd.supplier, tfwd.material, tfwd.total, tfwd.color, tfwd.model, tfwd.code, tfwd.createTime,
               tfwd.updateTime, tfwd.createBy, tfwd.updateBy, tfwd.isDelete, tfwd.modelId
        from t_frame_warehousing_detail tfwd
        left join t_warehousing tw on tfwd.warehousingId = tw.id
        <where>
            <if test="query.brand != null and query.brand != ''">
                and tfwd.brand = #{query.brand}
            </if>
            <if test="query.supplier != null and query.supplier != ''">
                and tfwd.supplier = #{query.supplier}
            </if>
            <if test="query.color != null and query.color != ''">
                and tfwd.color = #{query.color}
            </if>
            <if test="query.model != null and query.model != ''">
                and tfwd.model like concat('%',#{query.model},'%')
            </if>
            <if test="query.storeId != null">
                and tw.storeId = #{query.storeId}
            </if>
            <if test="query.status != null">
                and tw.status = #{query.status}
            </if>
            <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
                and tfwd.createTime between #{query.startTime} and #{query.endTime}
            </if>
            and tfwd.isDelete =  ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        </where>
        ORDER BY tfwd.createTime DESC
    </select>

</mapper>

 optometrist/src/main/resources/mapping/TInventoryFrameDetailMapper.xml

New file
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TInventoryFrameDetailMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TInventoryFrameDetail">
        <id column="id" property="id" />
        <result column="inventoryId" property="inventoryId" />
        <result column="brand" property="brand" />
        <result column="supplier" property="supplier" />
        <result column="material" property="material" />
        <result column="total" property="total" />
        <result column="category" property="category" />
        <result column="color" property="color" />
        <result column="model" property="model" />
        <result column="count" property="count" />
        <result column="diff" property="diff" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, inventoryId, brand, supplier, material, total, category, color, model, count, diff, createTime, updateTime, createBy, updateBy, isDelete
    </sql>

</mapper>

 optometrist/src/main/resources/mapping/TInventoryLensDetailMapper.xml

New file
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TInventoryLensDetailMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TInventoryLensDetail">
        <id column="id" property="id" />
        <result column="inventoryId" property="inventoryId" />
        <result column="series" property="series" />
        <result column="type" property="type" />
        <result column="total" property="total" />
        <result column="count" property="count" />
        <result column="diff" property="diff" />
        <result column="refractiveIndex" property="refractiveIndex" />
        <result column="ballMirror" property="ballMirror" />
        <result column="columnMirror" property="columnMirror" />
        <result column="category" property="category" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, inventoryId, series, type, total, count, diff, refractiveIndex, ballMirror, columnMirror, category, createTime, updateTime, createBy, updateBy, isDelete
    </sql>

</mapper>

 optometrist/src/main/resources/mapping/TInventoryMapper.xml

New file
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TInventoryMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TInventory">
        <id column="id" property="id" />
        <result column="status" property="status" />
        <result column="type" property="type" />
        <result column="storeId" property="storeId" />
        <result column="remark" property="remark" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, status, type, storeId, remark, createTime, updateTime, createBy, updateBy, isDelete
    </sql>
    <select id="pageList" resultType="com.jilongda.optometrist.vo.TInventoryVO">
        select t1.*,t2.name as store from
            t_inventory t1
                    left join t_store t2 on t1.storeId = t2.id
        where 1=1
        <if test="query.status != null ">
            and t1.status = #{query.status}
        </if>
          <if test="query.createBy != null ">
            and t1.createBy = #{query.createBy}
        </if>
        <if test="query.type != null ">
            and t1.type = #{query.type}
        </if>
        <if test="query.storeId != null ">
            and t1.storeId = #{query.storeId}
        </if>
        <if test="query.startTime != null and query.startTime != ''">
            and t1.createTime between #{query.startTime} and #{query.endTime}
        </if>
        and t1.isDelete =  ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}

    </select>

</mapper>

 optometrist/src/main/resources/mapping/TLensGoods.xml

New file
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TLensGoodsMapper">


    <select id="lensReceiptList" resultType="com.jilongda.optometrist.vo.TLensGoodsVO">
        select t1.*,t2.name as series,t4.name as store,
        t2.sphere as sphere,t2.asphericSurface as asphericSurface
        ,t2.doubleNon as doubleNon
             ,t6.name as brand,t7.frameThreshold
        from
        t_lens_goods t1
        left join t_lens_series t2 on t1.seriesId=t2.id
        left join t_store t4 on t1.storeId = t4.id
        left join t_brand t6 on t2.brandId=t6.id
        left join sec_setting t7 on 1=1
        <where>
            <if test="query.brandId != null ">
                and t2.brandId = #{query.brandId}
            </if>
            <if test="query.seriesId != null ">
                and t2.id = #{query.seriesId}
            </if>
            <if test="query.lensType != null ">
                and t1.lensType = #{query.lensType}
            </if>
            <if test="query.storeId != null ">
                and t1.storeId = #{query.storeId}
            </if>
            <if test="query.refractiveIndex != null and query.refractiveIndex != ''">
                and t1.refractiveIndex = #{query.refractiveIndex}
            </if>
            <if test="query.type != null ">
                and t2.type = #{query.type}
            </if>
            <if test="query.isWarning !=null and query.isWarning==1">
                and t1.total &lt;= t7.lensThreshold
            </if>
            <if test="query.isWarning !=null and query.isWarning ==2">
                and t1.total >= t7.lensThreshold
            </if>

            and t1.isDelete =  0
        </where>
        order by t1.id
    </select>
</mapper>

 optometrist/src/main/resources/mapping/TLensSeriesMapper.xml

New file
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TLensSeriesMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TLensSeries">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="brandId" property="brandId" />
        <result column="supplierId" property="supplierId" />
        <result column="type" property="type" />
        <result column="sphere" property="sphere" />
        <result column="asphericSurface" property="asphericSurface" />
        <result column="doubleNon" property="doubleNon" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
        <result column="status" property="status" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, name, brandId, supplierId, type, sphere, asphericSurface, doubleNon, createTime, updateTime, createBy, updateBy, isDelete
    </sql>
    <select id="pageList" resultType="com.jilongda.optometrist.vo.TLensSeriesVO">
        select t1.*,t2.name as brandName
        from t_lens_series t1
        left join t_brand t2 on t1.brandId = t2.id
              where 1=1
              <if test="query.brandId != null and query.brandId != ''">
                  and t1.brandId = #{query.brandId}
              </if>
              <if test="query.type != null and query.type != ''">
                  and t1.type = #{query.type}
              </if>
              and t2.type = 2
              and t2.status = 1
        and t1.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        and t2.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        order by t1.id asc
    </select>

</mapper>

 optometrist/src/main/resources/mapping/TLensWarehousingDetailMapper.xml

New file
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TLensWarehousingDetailMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TLensWarehousingDetail">
        <id column="id" property="id" />
        <result column="brand" property="brand" />
        <result column="supplier" property="supplier" />
        <result column="series" property="series" />
        <result column="refractiveIndex" property="refractiveIndex" />
        <result column="ballMirror" property="ballMirror" />
        <result column="columnMirror" property="columnMirror" />
        <result column="type" property="type" />
        <result column="total" property="total" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
        <result column="count" property="count" />
        <result column="seriesId" property="seriesId" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, brand, supplier, series, refractiveIndex, ballMirror, columnMirror, `type`, total, createTime, updateTime, createBy, updateBy, isDelete, `count`, seriesId
    </sql>
    <select id="pageLensList" resultType="com.jilongda.optometrist.vo.TLensWarehousingDetailVO">
        select tlwd.id, tlwd.warehousingId, tlwd.brand, tlwd.supplier, tlwd.series, tlwd.total, tlwd.refractiveIndex, tlwd.ballMirror, tlwd.code, tlwd.createTime,tlwd.columnMirror,
        tlwd.updateTime, tlwd.createBy, tlwd.updateBy, tlwd.isDelete, tlwd.`type`
        from t_lens_warehousing_detail tlwd
        left join t_warehousing tw on tlwd.warehousingId = tw.id
        <where>
            <if test="query.brand != null and query.brand != ''">
                and tlwd.brand = #{query.brand}
            </if>
            <if test="query.series != null and query.series != ''">
                and tlwd.series = #{query.series}
            </if>
            <if test="query.type != null and query.type != ''">
                and tlwd.`type` = #{query.type}
            </if>
            <if test="query.refractiveIndex != null and query.refractiveIndex != ''">
                and tlwd.refractiveIndex = #{query.refractiveIndex}
            </if>
            <if test="query.ballMirror != null and query.ballMirror != ''">
                and tlwd.ballMirror = #{query.ballMirror}
            </if>
            <if test="query.columnMirror != null and query.columnMirror != ''">
                and tlwd.columnMirror = #{query.columnMirror}
            </if>
            <if test="query.storeId != null">
                and tw.storeId = #{query.storeId}
            </if>
            <if test="query.status != null">
                and tw.status = #{query.status}
            </if>
            <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
                and tlwd.createTime between #{query.startTime} and #{query.endTime}
            </if>
            and tlwd.isDelete =  ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        </where>
        ORDER BY tlwd.createTime DESC
    </select>

</mapper>

 optometrist/src/main/resources/mapping/TLineUpMapper.xml

New file
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TLineUpMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TLineUp">
        <id column="id" property="id" />
        <result column="code" property="code" />
        <result column="userId" property="userId" />
        <result column="optometristId" property="optometristId" />
        <result column="storeId" property="storeId" />
        <result column="status" property="status" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, code, userId, optometristId, storeId, status, createTime, updateTime, createBy, updateBy, isDelete
    </sql>
    <select id="pageList" resultType="com.jilongda.optometrist.model.TLineUp">
        select t.*,u.name,u.phone,u.age,u.gender,u.realName,s.name storeName,o.name optometrist
        from t_line_up t
        left join t_user u on t.userId = u.id
        left join t_optometrist o on t.optometristId = o.id
        left join t_store s on t.storeId = s.id
        <where>
            <if test="query.status != null">
                and t.status = #{query.status}
            </if>
            <if test="query.phone != null and query.phone != ''">
                AND u.phone like concat('%',#{query.phone},'%')
            </if>
            <if test="query.name != null and query.name != ''">
                AND u.name like concat('%',#{query.name},'%')
            </if>
            <if test="query.storeId != null">
                and s.id = #{query.storeId}
            </if>
            and t1.isDelete =  ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}

        </where>
        order by t.createTime desc
    </select>

</mapper>

 optometrist/src/main/resources/mapping/TMaterialMapper.xml

New file
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TMaterialMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TMaterial">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="status" property="status" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, `name`, status, createTime, updateTime, createBy, updateBy, isDelete
    </sql>
    <select id="pageList" resultType="com.jilongda.optometrist.vo.TMaterialVO">
        select <include refid="Base_Column_List"></include>
        from t_material
        where isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        order by createTime DESC
    </select>

</mapper>

 optometrist/src/main/resources/mapping/TModelMapper.xml

New file
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TModelMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TModel">
        <id column="id" property="id" />
        <result column="brandId" property="brandId" />
        <result column="supplierId" property="supplierId" />
        <result column="materialId" property="materialId" />
        <result column="color" property="color" />
        <result column="sale" property="sale" />
        <result column="cost" property="cost" />
        <result column="name" property="name" />
        <result column="status" property="status" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
        <result column="inventory" property="inventory" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, brandId, supplierId, materialId, color, sale, cost, `name`, status, createTime, updateTime, createBy, updateBy, isDelete,inventory
    </sql>
    <select id="pageList" resultType="com.jilongda.optometrist.vo.TModelVO">
        select <include refid="Base_Column_List"></include>
        from t_model
        <where>
            <if test="query.name != null and query.name != ''">
                and `name` like concat('%',#{query.name},'%')
            </if>
            <if test="query.brandId != null">
                and brandId = #{query.brandId}
            </if>
            <if test="query.supplierId != null">
                and supplierId = #{query.supplierId}
            </if>
            AND isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        </where>
        GROUP BY `name`
        ORDER BY createTime DESC
    </select>

</mapper>

 optometrist/src/main/resources/mapping/TOptometristMapper.xml

New file
@@ -0,0 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TOptometristMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TOptometrist">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="phone" property="phone" />
        <result column="status" property="status" />
        <result column="storeId" property="storeId" />
        <result column="img" property="img" />
        <result column="registerTime" property="registerTime" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, `name`, phone, status, storeId, img, registerTime, createTime, updateTime, createBy, updateBy, isDelete
    </sql>
    <select id="pageList" resultType="com.jilongda.optometrist.vo.TOptometryVO">
        select t1.*,t2.name as wxName,t3.name as storeName
        from t_optometry t1
        left join t_app_user t2 on t1.userId = t2.id
        left join t_store t3 on t1.storeId = t3.id
        <where>
            <if test="query.nameOrPhone != null and query.nameOrPhone != ''">
                and (t2.`name` like  concat('%',#{query.nameOrPhone},'%')
                         or
                     t2.phone like  concat('%',#{query.nameOrPhone},'%')
                    )
            </if>
            <if test="req.startTime != null and req.startTime!=''">
                and (t1.createTime between #{req.startTime} and #{req.endTime})
            </if>
            AND t1.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        </where>
        ORDER BY t1.createTime DESC
    </select>
    <select id="pageList1" resultType="com.jilongda.optometrist.vo.TOptometristVO">
        select <include refid="Base_Column_List"></include>
        from t_optometrist
        <where>
            <if test="query.name != null and query.name != ''">
                and `name` like concat('%',#{query.name},'%')
            </if>
            <if test="query.phone != null and query.phone != ''">
                and phone like concat('%',#{query.phone},'%')
            </if>
            <if test="query.status != null">
                and status = #{query.status}
            </if>
            <if test="query.storeId != null">
                and storeId = #{query.storeId}
            </if>
            and isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        </where>
        ORDER BY createTime DESC
    </select>

</mapper>

 optometrist/src/main/resources/mapping/TOptometryDetailMapper.xml

New file
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TOptometryDetailMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TOptometryDetail">
        <id column="id" property="id" />
        <result column="type" property="type" />
        <result column="optometryId" property="optometryId" />
        <result column="ballMirror" property="ballMirror" />
        <result column="columnMirror" property="columnMirror" />
        <result column="axis" property="axis" />
        <result column="add" property="add" />
        <result column="pupilHeight" property="pupilHeight" />
        <result column="pupilDistance" property="pupilDistance" />
        <result column="correct" property="correct" />
        <result column="storeId" property="storeId" />
        <result column="status" property="status" />
        <result column="registerTime" property="registerTime" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, type, optometryId, ballMirror, columnMirror, axis, add, pupilHeight, pupilDistance, correct, storeId, status, registerTime, createTime, updateTime, createBy, updateBy, isDelete
    </sql>

</mapper>

 optometrist/src/main/resources/mapping/TOptometryMapper.xml

New file
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TOptometryMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TOptometry">
        <id column="id" property="id" />
        <result column="code" property="code" />
        <result column="userId" property="userId" />
        <result column="age" property="age" />
        <result column="gender" property="gender" />
        <result column="realName" property="realName" />
        <result column="phone" property="phone" />
        <result column="optometristId" property="optometristId" />
        <result column="storeId" property="storeId" />
        <result column="status" property="status" />
        <result column="registerTime" property="registerTime" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, code, userId, age, gender, realName, phone, optometristId, storeId, status, registerTime, createTime, updateTime, createBy, updateBy, isDelete
    </sql>

</mapper>

 optometrist/src/main/resources/mapping/TOrderMapper.xml

New file
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TOrderMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TOrder">
        <id column="id" property="id" />
        <result column="code" property="code" />
        <result column="userId" property="userId" />
        <result column="optometryId" property="optometryId" />
        <result column="storeId" property="storeId" />
        <result column="modelId" property="modelId" />
        <result column="color" property="color" />
        <result column="series" property="series" />
        <result column="rLens" property="rLens" />
        <result column="lLens" property="lLens" />
        <result column="type" property="type" />
        <result column="refractiveIndex" property="refractiveIndex" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
        <result column="sysId" property="sysId" />
        <result column="couponId" property="couponId" />
        <result column="itemsId" property="itemsId" />
        <result column="remark" property="remark" />
        <result column="isMail" property="isMail" />
        <result column="mailName" property="mailName" />
        <result column="mailPhone" property="mailPhone" />
        <result column="mailAddress" property="mailAddress" />
        <result column="orderMoney" property="orderMoney" />
        <result column="couponMoney" property="couponMoney" />
        <result column="payMoney" property="payMoney" />
        <result column="isMachining" property="isMachining" />
        <result column="machiningCode" property="machiningCode" />
        <result column="isAccounting" property="isAccounting" />
        <result column="accountingName" property="accountingName" />
        <result column="accountingTime" property="accountingTime" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, code, userId, optometryId, storeId, modelId, color, series, rLens, lLens, type, refractiveIndex, createTime, updateTime, createBy, updateBy, isDelete, sysId, couponId, itemsId, remark, isMail, mailName, mailPhone, mailAddress, orderMoney, couponMoney, payMoney, isMachining, machiningCode, isAccounting, accountingName, accountingTime
    </sql>

</mapper>

 optometrist/src/main/resources/mapping/TStoreMapper.xml

New file
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TStoreMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TStore">
        <id column="id" property="id" />
        <result column="`name`" property="name" />
        <result column="province" property="province" />
        <result column="provinceCode" property="provinceCode" />
        <result column="city" property="city" />
        <result column="cityCode" property="cityCode" />
        <result column="area" property="area" />
        <result column="areaCode" property="areaCode" />
        <result column="address" property="address" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
        <result column="lon" property="lon" />
        <result column="lat" property="lat" />
        <result column="img" property="img" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, `name`, province, provinceCode, city, cityCode, area, areaCode, address, createTime, updateTime, createBy, updateBy, isDelete, lon, lat, img,status
    </sql>
    <select id="pageList" resultType="com.jilongda.optometrist.vo.TStoreVO">
        select <include refid="Base_Column_List"></include>
        from t_store
        <where>
            <if test="query.name != null and query.name != ''">
                and `name` like concat('%',#{name},'%')
            </if>
            <if test="query.status != null">
                and `status` = #{query.status}
            </if>
            AND isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        </where>
        ORDER BY createTime DESC
    </select>

</mapper>

 optometrist/src/main/resources/mapping/TSupplierMapper.xml

New file
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TSupplierMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TSupplier">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="status" property="status" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, `name`, status, createTime, updateTime, createBy, updateBy, isDelete
    </sql>
    <select id="pageList" resultType="com.jilongda.optometrist.vo.TSupplierVO">
        select <include refid="Base_Column_List"></include>
        from t_supplier
        <where>
            <if test="query.name != null and query.name != ''">
                and `name` like  concat('%',#{query.name},'%')
            </if>
            AND isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        </where>
        ORDER BY createTime DESC
    </select>

</mapper>

 optometrist/src/main/resources/mapping/TTicketMapper.xml

New file
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TTicketMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TTicket">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="type" property="type" />
        <result column="storeId" property="storeId" />
        <result column="cloudId" property="cloudId" />
        <result column="secret" property="secret" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
        <result column="status" property="status" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, `name`, `type`, storeId, cloudId, secret, createTime, updateTime, createBy, updateBy, isDelete,status
    </sql>
    <select id="pageList" resultType="com.jilongda.optometrist.vo.TTicketVO">
        select <include refid="Base_Column_List"></include>
        from t_ticket
        <where>
            <if test="query.storeId != null">
                and storeId = #{query.storeId}
            </if>
            <if test="query.type != null">
                and `type` = #{query.type}
            </if>
            and  isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        </where>
        order by createTime desc
    </select>

</mapper>

 optometrist/src/main/resources/mapping/TUserMapper.xml

New file
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TUserMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.common.model.TUser">
        <id column="id" property="id" />
        <result column="nickName" property="nickName" />
        <result column="userName" property="userName" />
        <result column="userPhone" property="userPhone" />
        <result column="password" property="password" />
        <result column="vipType" property="vipType" />
        <result column="insertTime" property="insertTime" />
        <result column="graduationInstitution" property="graduationInstitution" />
        <result column="selfIntroduction" property="selfIntroduction" />
        <result column="firstVipTime" property="firstVipTime" />
        <result column="startTime" property="startTime" />
        <result column="endTime" property="endTime" />
        <result column="consumptionAmount" property="consumptionAmount" />
        <result column="vipLevel" property="vipLevel" />
        <result column="sex" property="sex" />
        <result column="birthday" property="birthday" />
        <result column="weight" property="weight" />
        <result column="height" property="height" />
        <result column="provinceName" property="provinceName" />
        <result column="provinceCode" property="provinceCode" />
        <result column="cityName" property="cityName" />
        <result column="cityCode" property="cityCode" />
        <result column="performerCover" property="performerCover" />
        <result column="detailPicture" property="detailPicture" />
        <result column="openId" property="openId" />
        <result column="status" property="status" />
        <result column="auditStatus" property="auditStatus" />
        <result column="auditRemark" property="auditRemark" />
        <result column="lastLoginTime" property="lastLoginTime" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
        <result column="hot" property="hot" />
        <result column="performerStatus" property="performerStatus" />
        <result column="vedio" property="vedio" />
        <result column="hasPay" property="hasPay" />
        <result column="advatar" property="advatar" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, nickName, userName, userPhone, password, vipType, insertTime, graduationInstitution, selfIntroduction, firstVipTime, startTime, endTime, consumptionAmount, vipLevel, sex, birthday, weight, height, provinceName, provinceCode, cityName, cityCode, performerCover, detailPicture, openId, status, auditStatus, auditRemark, lastLoginTime, createTime, updateTime, createBy, updateBy, isDelete, hot, performerStatus, vedio, hasPay, advatar
    </sql>

</mapper>

 optometrist/src/main/resources/mapping/TWarehousingMapper.xml

New file
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jilongda.optometrist.mapper.TWarehousingMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TWarehousing">
        <id column="id" property="id" />
        <result column="status" property="status" />
        <result column="type" property="type" />
        <result column="storeId" property="storeId" />
        <result column="remark" property="remark" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, status, `type`, storeId, remark, createTime, updateTime, createBy, updateBy, isDelete
    </sql>
    <select id="inventoryReceiptList" resultType="com.jilongda.optometrist.vo.TWarehousingVO">
        select <include refid="Base_Column_List"></include>
        from t_warehousing
        <where>
            <if test="query.storeId != null">
                and storeId = #{query.storeId}
            </if>
            <if test="query.status != null">
                and status = #{query.status}
            </if>
            <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
                and createTime between #{query.startTime} and #{query.endTime}
            </if>
            and isDelete =  ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
            and `type` = 1
        </where>
        ORDER BY createTime DESC
    </select>
    <select id="inventoryReceiptLensList" resultType="com.jilongda.optometrist.vo.TWarehousingLensVO">
        select <include refid="Base_Column_List"></include>
        from t_warehousing
        <where>
            <if test="query.storeId != null">
                and storeId = #{query.storeId}
            </if>
            <if test="query.status != null">
                and status = #{query.status}
            </if>
            <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
                and createTime between #{query.startTime} and #{query.endTime}
            </if>
        and `type` = 2
            and isDelete =  ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        </where>
        ORDER BY createTime DESC
    </select>

</mapper>