suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 装修测量阶段+设计阶段流程优化

Browse Source
This commit is contained in:
ryan.xu
2025-04-24 09:36:12 +08:00
parent c75523cd80
commit 3edcd3b4a2
31 changed files with 1039 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
coolstore-partner-dao/src/main/resources/mapper/DecorationMeasureMapper.xml Normal file
View 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.cool.store.mapper.DecorationMeasureMapper">
<resultMap id="BaseResultMap" type="com.cool.store.entity.DecorationMeasureDO">
<!--
WARNING - @mbg.generated
-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="shop_id" jdbcType="BIGINT" property="shopId" />
<result column="measure_user_id" jdbcType="VARCHAR" property="measureUserId" />
<result column="design_user_id" jdbcType="VARCHAR" property="designUserId" />
<result column="measure_date" jdbcType="TIMESTAMP" property="measureDate" />
<result column="diagram_date" jdbcType="TIMESTAMP" property="diagramDate" />
<result column="measure_url" jdbcType="VARCHAR" property="measureUrl" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="submit_time" jdbcType="TIMESTAMP" property="submitTime" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="deleted" jdbcType="BIT" property="deleted" />
<result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
<result column="update_user_id" jdbcType="VARCHAR" property="updateUserId" />
</resultMap>
<select id="selectByShopId" resultMap="BaseResultMap">
select
id,shop_id,measure_user_id,design_user_id,measure_date,diagram_date,measure_url,remark,
submit_time,create_time,update_time,deleted,create_user_id,update_user_id
from xfsg_decoration_measure where shop_id = #{shopId} and deleted = 0
</select>
</mapper>

18
coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml
View File

@@ -179,4 +179,22 @@
and( name like concat('%',#{keyword},'%') or mobile like concat('%',#{keyword},'%'))
</if>
</select>
<select id="searchUserByUserIdsAndKeyword" resultMap="BaseResultMap">
select
user_id, name, mobile
from
enterprise_user_${enterpriseId}
<where>
active = true
<if test="userIdList !=null and userIdList.size>0">
<foreach collection="userIdList" item="userId" open="and user_id in (" close=")" separator=",">
#{userId}
</foreach>
</if>
<if test="keyword!=null and keyword!=''">
and( name like concat('%',#{keyword},'%'))
</if>
</where>
</select>
</mapper>