Commit 9fbd85ac authored by 王琮's avatar 王琮

访客的受邀记录

parent 02597b25
...@@ -215,5 +215,9 @@ public class VisitInfoMation extends CyIdIncreEntity<VisitInfoMation> { ...@@ -215,5 +215,9 @@ public class VisitInfoMation extends CyIdIncreEntity<VisitInfoMation> {
// 同步状态(0:未同步,1:已同步) // 同步状态(0:未同步,1:已同步)
private String synStatus; private String synStatus;
@Transient // 查询输入的多选事由
@TableField(exist = false)
private String state;
} }
...@@ -105,19 +105,14 @@ public class InvitedPersonServiceImpl extends ServiceImpl<InvitedPersonRepositor ...@@ -105,19 +105,14 @@ public class InvitedPersonServiceImpl extends ServiceImpl<InvitedPersonRepositor
*/ */
@Override @Override
public IPage<VisitInfoMation> getVisitInfoListByPagination(CyPageInfo<VisitInfoMation> paginationUtility, VisitInfoMation visitInfomation, HttpServletRequest request) { public IPage<VisitInfoMation> getVisitInfoListByPagination(CyPageInfo<VisitInfoMation> paginationUtility, VisitInfoMation visitInfomation, HttpServletRequest request) {
//获取当前用户手机号 //获取当前用户手机号
String phone = CyUserUtil.getUserInfoStrProp(cyJwtUtil.getToken(request), CyUserUtil.USER_PHONE); String phone = CyUserUtil.getUserInfoStrProp(cyJwtUtil.getToken(request), CyUserUtil.USER_PHONE);
// System.out.println("用户手机号" + phone);
// 设置默认排序方式 // 设置默认排序方式
if (visitInfomation.getSort() == null || visitInfomation.getSort().equals("")){ if (visitInfomation.getSort() == null || visitInfomation.getSort().equals("")){
visitInfomation.setSort("3"); visitInfomation.setSort("3");
} }
//查找对象 //查找对象
IPage<VisitInfoMation> visitInfoMationIPage = invitedPersonRepository.queryVisitInfomationsPaged(paginationUtility, visitInfomation, phone); IPage<VisitInfoMation> visitInfoMationIPage = invitedPersonRepository.queryVisitInfomationsPaged(paginationUtility, visitInfomation, phone);
return visitInfoMationIPage; return visitInfoMationIPage;
} }
......
...@@ -13,41 +13,56 @@ ...@@ -13,41 +13,56 @@
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
<result column="remarks" jdbcType="VARCHAR" property="remarks"/> <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
<result column="flag" jdbcType="VARCHAR" property="flag"/> <result column="flag" jdbcType="VARCHAR" property="flag"/>
<collection property="visitInfo" ofType="org.rcisoft.sys.visit.entity.VisitInfoMation" column="visit_id" select="getVisitInfo"/> <collection property="visitInfo" ofType="org.rcisoft.sys.visit.entity.VisitInfoMation" column="visit_id"
select="getVisitInfo"/>
</resultMap> </resultMap>
<select id="getVisitInfo" resultType="org.rcisoft.sys.visit.entity.VisitInfoMation"> <select id="getVisitInfo" resultType="org.rcisoft.sys.visit.entity.VisitInfoMation">
select business_id,user_id,user_name,dept_name,post_name,visit_reason_code,visit_reason,visit_region,visit_date,visit_real_time,visit_time,visit_status,create_date info_create_date select business_id,
user_id,
user_name,
dept_name,
post_name,
visit_reason_code,
visit_reason,
visit_region,
visit_date,
visit_real_time,
visit_time,
visit_status,
create_date info_create_date
from visit_infomation from visit_infomation
where del_flag = 0 where del_flag = 0
and business_id = #{visit_id} and business_id = #{visit_id}
</select> </select>
<select id="getVisitUserByPhone" resultMap="BaseResultMap"> <select id="getVisitUserByPhone" resultMap="BaseResultMap">
select * from visit_user select *
from visit_user
where del_flag = 0 where del_flag = 0
and visit_phone = #{visitPhone} and visit_phone = #{visitPhone}
</select> </select>
<select id="queryVisitInfomationsPaged" resultType="org.rcisoft.sys.visit.entity.VisitInfoMation"> <select id="queryVisitInfomationsPaged" resultType="org.rcisoft.sys.visit.entity.VisitInfoMation">
select select
vi.business_id, vi.business_id,
vi.user_name, vi.user_name,
vi.dept_name, vi.dept_name,
vi.post_name, vi.post_name,
vi.create_date, vi.create_date,
vi.visit_reason, vi.visit_reason,
vi.visit_region, vi.visit_region,
vi.visit_real_time, vi.visit_real_time,
vi.visit_date, vi.visit_date,
vi.visit_time, vi.visit_time,
vi.visit_status, vi.visit_status,
vi.visit_real_time vi.visit_real_time
vu.state
from visit_infomation vi from visit_infomation vi
left join visit_user vu on vu.visit_id = vi.business_id left join visit_user vu on vu.visit_id = vi.business_id
where 1=1 and vi.del_flag = 0 and vu.visit_phone = #{phone} where vi.del_flag = 0 and vu.visit_phone = #{phone}
<if test="entity.visitStatus !=null and entity.visitStatus != ''"> <if test="entity.visitStatus !=null and entity.visitStatus != ''">
and vi.visit_status = #{entity.visitStatus} and vu.state = #{entity.visitStatus}
</if> </if>
<if test="entity.selectTime !=null and entity.selectTime != ''"> <if test="entity.selectTime !=null and entity.selectTime != ''">
<if test="entity.selectTime == '0'.toString()"> <if test="entity.selectTime == '0'.toString()">
...@@ -87,7 +102,8 @@ ...@@ -87,7 +102,8 @@
<select id="getVisitUserById" resultMap="BaseResultMap"> <select id="getVisitUserById" resultMap="BaseResultMap">
select * from visit_user select *
from visit_user
where del_flag = 0 where del_flag = 0
and business_id = #{businessId} and business_id = #{businessId}
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment