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

Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

Browse Source
This commit is contained in:
pserimal
2023-06-27 15:39:34 +08:00
parent 7999401b14 7ff1dd85b0
commit 945616ae0c
25 changed files with 417 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerTaskInfoLogDAO.java
View File

@@ -1,6 +1,8 @@
package com.cool.store.dao;
import com.cool.store.dto.log.LineLogInfo;
import com.cool.store.entity.HyPartnerTaskInfoLogDO;
import com.cool.store.enums.OperateTypeEnum;
import com.cool.store.mapper.HyPartnerTaskInfoLogMapper;
import org.springframework.stereotype.Repository;
@@ -23,8 +25,20 @@ public class HyPartnerTaskInfoLogDAO {
return hyPartnerTaskInfoLogMapper.updateByPrimaryKeySelective(hyPartnerTaskInfoLogDO);
}
public int insertSelective( HyPartnerTaskInfoLogDO record){
public int insertSelective( HyPartnerTaskInfoLogDO record){
return hyPartnerTaskInfoLogMapper.insertSelective(record);
}
/**
* 新增操作日志
* @param lineLogInfo
*/
public void addOperateLog(LineLogInfo lineLogInfo){
if(!LineLogInfo.checkParams(lineLogInfo)){
return;
}
HyPartnerTaskInfoLogDO logInfo = LineLogInfo.convertDO(lineLogInfo);
insertSelective(logInfo);
}
}

2
coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
View File

@@ -270,7 +270,7 @@
<select id="getInterviewCount" resultType="com.cool.store.dto.partner.SpecialDateRangeInterviewCountDTO">
select
ifnull(sum(if(start_time>now() or (start_time<![CDATA[<]]>now() and room_status!=2),1,0)),0) as currentDayInterviewCount,
ifnull(sum(if(interview_date = #{currentDate} and (start_time>now() or (start_time <![CDATA[<]]> now() and room_status!=2)),1,0)),0) as currentDayInterviewCount,
ifnull(sum(if(start_time>#{startTime} and end_time <![CDATA[<]]> #{endTime},1,0)),0) as lastSevenDayInterviewCount
FROM hy_partner_interview_plan
where interviewer = #{userId}

4
coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
View File

@@ -307,10 +307,12 @@
hpuinfo.want_shop_area as wantShopArea,
hpuinfo.accept_adjust_type as acceptAdjustType,
hpuinfo.mobile as partnerUserPhone,
hpuinfo.username as partnerUserName
hpuinfo.username as partnerUserName,
hpuc.channel_name as channelName
from hy_partner_line_info a
left join hy_partner_base_info b on a.id = b.partner_line_id
LEFT JOIN hy_partner_user_info hpuinfo ON a.partner_id = hpuinfo.partner_id
LEFT JOIN hy_partner_user_channel hpuc ON a.user_channel_id = hpuc.channel_id
<where>
<if test="lineId!=null">
and a.id = #{lineId}

257
coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml
View File

@@ -1,129 +1,136 @@
<?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.HyPartnerTaskInfoLogMapper">
<resultMap id="BaseResultMap" type="com.cool.store.entity.HyPartnerTaskInfoLogDO">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="partner_line_id" jdbcType="BIGINT" property="partnerLineId" />
<result column="operate_user_id" jdbcType="VARCHAR" property="operateUserId" />
<result column="operate_username" jdbcType="VARCHAR" property="operateUsername" />
<result column="workflow_stage" jdbcType="VARCHAR" property="workflowStage" />
<result column="workflow_status" jdbcType="VARCHAR" property="workflowStatus" />
<result column="message" jdbcType="VARCHAR" property="message" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="partner_id" jdbcType="VARCHAR" property="partnerId" />
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.cool.store.entity.HyPartnerTaskInfoLogDO">
<result column="field_copy" jdbcType="LONGVARCHAR" property="fieldCopy" />
</resultMap>
<sql id="Base_Column_List">
id, partner_line_id, operate_user_id, operate_username, workflow_stage, workflow_status,
message, create_time, update_time, partner_id
</sql>
<sql id="Blob_Column_List">
field_copy
</sql>
<insert id="insertSelective" keyColumn="id" keyProperty="record.id" useGeneratedKeys="true">
insert into hy_partner_task_info_log
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="record.partnerLineId != null">
partner_line_id,
</if>
<if test="record.operateUserId != null">
operate_user_id,
</if>
<if test="record.operateUsername != null">
operate_username,
</if>
<if test="record.workflowStage != null">
workflow_stage,
</if>
<if test="record.workflowStatus != null">
workflow_status,
</if>
<if test="record.message != null">
message,
</if>
<if test="record.createTime != null">
create_time,
</if>
<if test="record.updateTime != null">
update_time,
</if>
<if test="record.partnerId != null">
partner_id,
</if>
<if test="record.fieldCopy != null">
field_copy,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="record.partnerLineId != null">
#{record.partnerLineId},
</if>
<if test="record.operateUserId != null">
#{record.operateUserId},
</if>
<if test="record.operateUsername != null">
#{record.operateUsername},
</if>
<if test="record.workflowStage != null">
#{record.workflowStage},
</if>
<if test="record.workflowStatus != null">
#{record.workflowStatus},
</if>
<if test="record.message != null">
#{record.message},
</if>
<if test="record.createTime != null">
#{record.createTime},
</if>
<if test="record.updateTime != null">
#{record.updateTime},
</if>
<if test="record.partnerId != null">
#{record.partnerId},
</if>
<if test="record.fieldCopy != null">
#{record.fieldCopy},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective">
update hy_partner_task_info_log
<set>
<if test="record.partnerLineId != null">
partner_line_id = #{record.partnerLineId},
</if>
<if test="record.operateUserId != null">
operate_user_id = #{record.operateUserId},
</if>
<if test="record.operateUsername != null">
operate_username = #{record.operateUsername},
</if>
<if test="record.workflowStage != null">
workflow_stage = #{record.workflowStage},
</if>
<if test="record.workflowStatus != null">
workflow_status = #{record.workflowStatus},
</if>
<if test="record.message != null">
message = #{record.message},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime},
</if>
<if test="record.updateTime != null">
update_time = #{record.updateTime},
</if>
<if test="record.partnerId != null">
partner_id = #{record.partnerId},
</if>
<if test="record.fieldCopy != null">
field_copy = #{record.fieldCopy},
</if>
</set>
where id = #{record.id}
</update>
<resultMap id="BaseResultMap" type="com.cool.store.entity.HyPartnerTaskInfoLogDO">
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="partner_line_id" jdbcType="BIGINT" property="partnerLineId"/>
<result column="operate_user_id" jdbcType="VARCHAR" property="operateUserId"/>
<result column="operate_username" jdbcType="VARCHAR" property="operateUsername"/>
<result column="operate_type" jdbcType="VARCHAR" property="operateType"/>
<result column="workflow_stage" jdbcType="VARCHAR" property="workflowStage"/>
<result column="workflow_status" jdbcType="VARCHAR" property="workflowStatus"/>
<result column="message" jdbcType="VARCHAR" property="message"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="partner_id" jdbcType="VARCHAR" property="partnerId"/>
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.cool.store.entity.HyPartnerTaskInfoLogDO">
<result column="field_copy" jdbcType="LONGVARCHAR" property="fieldCopy"/>
</resultMap>
<sql id="Base_Column_List">
id, partner_line_id, operate_user_id, operate_username, workflow_stage, workflow_status,
message, create_time, update_time, partner_id
</sql>
<sql id="Blob_Column_List">
field_copy
</sql>
<insert id="insertSelective" keyColumn="id" keyProperty="record.id" useGeneratedKeys="true">
insert into hy_partner_task_info_log
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="record.partnerLineId != null">
partner_line_id,
</if>
<if test="record.operateUserId != null">
operate_user_id,
</if>
<if test="record.operateUsername != null">
operate_username,
</if>
<if test="record.operateType != null">
operate_type,
</if>
<if test="record.workflowStage != null">
workflow_stage,
</if>
<if test="record.workflowStatus != null">
workflow_status,
</if>
<if test="record.message != null">
message,
</if>
<if test="record.createTime != null">
create_time,
</if>
<if test="record.updateTime != null">
update_time,
</if>
<if test="record.partnerId != null">
partner_id,
</if>
<if test="record.fieldCopy != null">
field_copy,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="record.partnerLineId != null">
#{record.partnerLineId},
</if>
<if test="record.operateUserId != null">
#{record.operateUserId},
</if>
<if test="record.operateUsername != null">
#{record.operateUsername},
</if>
<if test="record.operateType != null">
#{record.operateType},
</if>
<if test="record.workflowStage != null">
#{record.workflowStage},
</if>
<if test="record.workflowStatus != null">
#{record.workflowStatus},
</if>
<if test="record.message != null">
#{record.message},
</if>
<if test="record.createTime != null">
#{record.createTime},
</if>
<if test="record.updateTime != null">
#{record.updateTime},
</if>
<if test="record.partnerId != null">
#{record.partnerId},
</if>
<if test="record.fieldCopy != null">
#{record.fieldCopy},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective">
update hy_partner_task_info_log
<set>
<if test="record.partnerLineId != null">
partner_line_id = #{record.partnerLineId},
</if>
<if test="record.operateUserId != null">
operate_user_id = #{record.operateUserId},
</if>
<if test="record.operateUsername != null">
operate_username = #{record.operateUsername},
</if>
<if test="record.workflowStage != null">
workflow_stage = #{record.workflowStage},
</if>
<if test="record.workflowStatus != null">
workflow_status = #{record.workflowStatus},
</if>
<if test="record.message != null">
message = #{record.message},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime},
</if>
<if test="record.updateTime != null">
update_time = #{record.updateTime},
</if>
<if test="record.partnerId != null">
partner_id = #{record.partnerId},
</if>
<if test="record.fieldCopy != null">
field_copy = #{record.fieldCopy},
</if>
</set>
where id = #{record.id}
</update>
</mapper>