Commit a74b0add authored by yangshuxing's avatar yangshuxing

易发布 bug修改

parent 33c92722
...@@ -14,4 +14,6 @@ public class CmptTemplate { ...@@ -14,4 +14,6 @@ public class CmptTemplate {
private String templateName; private String templateName;
private String templateBg; private String templateBg;
private String bgColor;
} }
...@@ -83,4 +83,7 @@ public interface CmptMapper { ...@@ -83,4 +83,7 @@ public interface CmptMapper {
Map<String, String> getEnrollUsersByUserMapId(int userMapId); Map<String, String> getEnrollUsersByUserMapId(int userMapId);
RoadUser getEnrollUsersByPhone(@Param("cmptId") Integer cmptId,@Param("callPhone") String phone); RoadUser getEnrollUsersByPhone(@Param("cmptId") Integer cmptId,@Param("callPhone") String phone);
List<Cmpt> queryMyCmpt(@Param("userId") String userId);
} }
...@@ -151,11 +151,12 @@ ...@@ -151,11 +151,12 @@
and now() >= c.startTime and c.endTime >= now() and now() >= c.startTime and c.endTime >= now()
</if> </if>
<if test="param.userId > 0"> <if test="param.userId > 0">
and c.createUserId=#{param.userId} and a.cmpt_status = 2 and c.createUserId=#{param.userId} and a.cmpt_status = 2
</if> </if>
<if test="param.userId lt 0"> <if test="param.userId lt 0">
and c.createUserId <![CDATA[ <> ]]> 427744 and c.createUserId <![CDATA[ <> ]]> 427744
and c.createUserId <![CDATA[ <> ]]> 2148892 and c.createUserId <![CDATA[ <> ]]> 2148892
and c.createUserId <![CDATA[ <> ]]> 14866
and a.cmpt_status = 2 and a.cmpt_status = 2
</if> </if>
</sql> </sql>
...@@ -277,6 +278,7 @@ ...@@ -277,6 +278,7 @@
<if test="0 > userId"> <if test="0 > userId">
and c.createUserId <![CDATA[ <> ]]> 427744 and c.createUserId <![CDATA[ <> ]]> 427744
and c.createUserId <![CDATA[ <> ]]> 2148892 and c.createUserId <![CDATA[ <> ]]> 2148892
and c.createUserId <![CDATA[ <> ]]> 14866
</if> </if>
<if test="userId > 0"> <if test="userId > 0">
and c.createUserId = #{userId} and c.createUserId = #{userId}
...@@ -289,6 +291,7 @@ ...@@ -289,6 +291,7 @@
<if test="userId lt 0"> <if test="userId lt 0">
and c.createUserId <![CDATA[ <> ]]> 427744 and c.createUserId <![CDATA[ <> ]]> 427744
and c.createUserId <![CDATA[ <> ]]> 2148892 and c.createUserId <![CDATA[ <> ]]> 2148892
and c.createUserId <![CDATA[ <> ]]> 14866
</if> </if>
<if test="userId > 0"> <if test="userId > 0">
and c.createUserId = #{userId} and c.createUserId = #{userId}
...@@ -302,6 +305,7 @@ ...@@ -302,6 +305,7 @@
<if test="userId lt 0"> <if test="userId lt 0">
and c.createUserId <![CDATA[ <> ]]> 427744 and c.createUserId <![CDATA[ <> ]]> 427744
and c.createUserId <![CDATA[ <> ]]> 2148892 and c.createUserId <![CDATA[ <> ]]> 2148892
and c.createUserId <![CDATA[ <> ]]> 14866
</if> </if>
<if test="userId > 0"> <if test="userId > 0">
and c.createUserId = #{userId} and c.createUserId = #{userId}
...@@ -323,4 +327,23 @@ ...@@ -323,4 +327,23 @@
from common.neucmpt a inner join raceenroll.competitionusermap b on a.gcmptid=b.cmptid from common.neucmpt a inner join raceenroll.competitionusermap b on a.gcmptid=b.cmptid
where a.gtcmptid = #{cmptId} and b.callPhone = #{callPhone} and isdelete=0 and enrollstatus=1 limit 1 where a.gtcmptid = #{cmptId} and b.callPhone = #{callPhone} and isdelete=0 and enrollstatus=1 limit 1
</select> </select>
<select id="queryMyCmpt" resultType="com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt">
select a.cmpt_id,
a.cmpt_name as cmptName,
a.logo,
date_format(start_time,'%Y-%m-%d') startTime,
a.bg_color as cmptbgColor,
a.create_by AS "createBy",
a.create_date AS "createDate",
a.update_by AS "updateBy",
a.update_date AS "updateDate",
a.del_flag AS "delFlag"
from gk_cmpt a left join common.neucmpt b on a.cmpt_id=b.gtCmptId
left join raceenroll.competition c on b.gcmptid=c.cmptid
where a.del_flag=0
and c.createUserId = #{userId}
order by c.startTime desc
</select>
</mapper> </mapper>
\ No newline at end of file
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<select id="queryAllTemplate" resultType="com.dlbridge.jadp.plugins.cmpt.bean.CmptTemplate"> <select id="queryAllTemplate" resultType="com.dlbridge.jadp.plugins.cmpt.bean.CmptTemplate">
select template_id templateId,cmpt_id cmptId, select template_id templateId,cmpt_id cmptId,
template_name templateName, template_name templateName,
template_bg template_bg,template_color bgColor
from gk_cmpt_template from gk_cmpt_template
where del_flag=0 where del_flag=0
</select> </select>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<select id="queryTemplateById" resultType="com.dlbridge.jadp.plugins.cmpt.bean.CmptTemplate" parameterType="int"> <select id="queryTemplateById" resultType="com.dlbridge.jadp.plugins.cmpt.bean.CmptTemplate" parameterType="int">
select template_id templateId,cmpt_id cmptId, select template_id templateId,cmpt_id cmptId,
template_name templateName, template_name templateName,
template_bg template_bg,template_color bgColor
from gk_cmpt_template from gk_cmpt_template
where del_flag=0 where del_flag=0
and template_id = #{_parameter} and template_id = #{_parameter}
...@@ -28,17 +28,45 @@ ...@@ -28,17 +28,45 @@
<!--复制raceenroll下的赛事主表 competition--> <!--复制raceenroll下的赛事主表 competition-->
<insert id="copyRaceCompetition" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "cmptId" keyColumn = "cmptId"> <insert id="copyRaceCompetition" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "cmptId" keyColumn = "cmptId">
insert into raceenroll.competition select null,#{userId},cmptName,NOW(),isClose,isDelete,NOW(),imageUrl,wxImageUrl,cmptStatus,cmptAuditLevel,hotIndex,compressImageUrl,type,deadLine,0,0,area,province,city,location,showIndex,openTime,startTime,cmptUrl,runIsValide,isPreparatory,settlementStatus,toCmptId,step,projectId,hotline,setTimeByRoad,endTime,isAide,isPublic,cmptDesc,origin,isShow,uniqueIdCard,null,0,timerCmptId,auditTime,refundStartTime,refundEndTime,isRefund,refundTip from raceenroll.competition where cmptId = #{compId} insert into raceenroll.competition
( cmptId,createUserId,cmptName,createTime,isClose,isDelete,updateTime,
imageUrl,wxImageUrl,cmptStatus,cmptAuditLevel,hotIndex,
compressImageUrl,type,deadLine,area,province,city,
location,showIndex,openTime,startTime,cmptUrl,runIsValide,
isPreparatory,settlementStatus,toCmptId,step,projectId,
hotline,setTimeByRoad,endTime,isAide,isPublic,cmptDesc,origin,
isShow,uniqueIdCard, timerCmptId,auditTime,refundStartTime,
refundEndTime,isRefund,refundTip)
select null,#{userId},cmptName,NOW(),isClose,isDelete,NOW(),
imageUrl,wxImageUrl,cmptStatus,cmptAuditLevel,hotIndex,
compressImageUrl,type,deadLine,area,province,city,
location,showIndex,openTime,startTime,cmptUrl,runIsValide,
isPreparatory,settlementStatus,toCmptId,step,projectId,
hotline,setTimeByRoad,endTime,isAide,isPublic,cmptDesc,origin,
isShow,uniqueIdCard, timerCmptId,auditTime,refundStartTime,
refundEndTime,isRefund,refundTip from raceenroll.competition
where cmptId = #{compId}
</insert> </insert>
<!--复制raceenroll下的 cmpt_partner_map--> <!--复制raceenroll下的 cmpt_partner_map-->
<insert id="copyRaceCmptPartnerMap" parameterType="java.util.Map"> <!--<insert id="copyRaceCmptPartnerMap" parameterType="java.util.Map">
insert into raceenroll.cmpt_partner_map select null,#{new_race_cmptId},partner_code ,NOW(),null,isDelete from raceenroll.cmpt_partner_map where cmptId = #{compId} insert into raceenroll.cmpt_partner_map
</insert> select null,#{new_race_cmptId},partner_code ,NOW(),null,isDelete
from raceenroll.cmpt_partner_map where cmptId = #{compId}
</insert>-->
<!--复制raceenroll下的 competitioncustom--> <!--复制raceenroll下的 competitioncustom-->
<insert id="copyRaceCompetitioncustom" parameterType="java.util.Map"> <insert id="copyRaceCompetitioncustom" parameterType="java.util.Map">
insert into raceenroll.competitioncustom select null,#{new_race_cmptId},customId ,customName,customContent,customContentForApp,customContentPropertyValue,customContentProperty,customRoadId,customType,customIsRequired,customIndex,isDelete,isOpen,isFirstPage,NOW(),null from raceenroll.competitioncustom where cmptId = #{compId} insert into raceenroll.competitioncustom
(id,cmptId,customId ,customName,
customContent,customContentForApp,customContentPropertyValue,
customContentProperty,customRoadId,customType,customIsRequired,
customIndex,isDelete,isOpen,isFirstPage,createTime)
select null,#{new_race_cmptId},customId ,customName,
customContent,customContentForApp,customContentPropertyValue,
customContentProperty,customRoadId,customType,customIsRequired,
customIndex,isDelete,isOpen,isFirstPage,NOW()
from raceenroll.competitioncustom where cmptId = #{compId}
</insert> </insert>
<select id="queryRaceCompetitionroadmapByCompId" resultType="java.util.Map" parameterType="int"> <select id="queryRaceCompetitionroadmapByCompId" resultType="java.util.Map" parameterType="int">
...@@ -50,12 +78,34 @@ ...@@ -50,12 +78,34 @@
<!--复制raceenroll下的赛事项目表 competitionroadmap--> <!--复制raceenroll下的赛事项目表 competitionroadmap-->
<insert id="copyRaceCompetitionroadmap" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "roadId" keyColumn = "roadId"> <insert id="copyRaceCompetitionroadmap" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "roadId" keyColumn = "roadId">
insert into raceenroll.competitionroadmap select null, roadName, roadType, genderLimit, ageLimit, floorOfTeam, numberOfTeam, floorOfFNum, ceilOfFNum, typeOfTeam, userLimit, listIsOpen, deadLine, NOW(), isDelete, #{new_race_cmptId}, null, seperatePay, unitPrice, otherPrice, foreignPrice, teamPrice, isCharge, isOnePay, toRoadId, canOut, accIns, openTime, payByTeam, sort, remark, minAge, maxAge, isPayOffline, isAudit, inviteCodeType, roadShow, effectiveTime, isPrePay, #{new_timerRoadId}, null, miles, isRefund from raceenroll.competitionroadmap where cmptId = #{compId} and roadId = #{roadId} insert into raceenroll.competitionroadmap
(roadName, roadType, genderLimit, ageLimit,
floorOfTeam, numberOfTeam, floorOfFNum, ceilOfFNum,
typeOfTeam, userLimit, listIsOpen, deadLine, createTime,
isDelete, cmptId, seperatePay,
unitPrice, otherPrice, foreignPrice, teamPrice, isCharge,
isOnePay, toRoadId, canOut, accIns, openTime, payByTeam,
sort, remark, minAge, maxAge, isPayOffline, isAudit,
inviteCodeType, roadShow, effectiveTime, isPrePay, timerRoadId, miles, isRefund)
select roadName, roadType, genderLimit, ageLimit,
floorOfTeam, numberOfTeam, floorOfFNum, ceilOfFNum,
typeOfTeam, userLimit, listIsOpen, deadLine, NOW(),
isDelete, #{new_race_cmptId}, seperatePay,
unitPrice, otherPrice, foreignPrice, teamPrice, isCharge,
isOnePay, toRoadId, canOut, accIns, openTime, payByTeam,
sort, remark, minAge, maxAge, isPayOffline, isAudit,
inviteCodeType, roadShow, effectiveTime, isPrePay, #{new_timerRoadId}, miles, isRefund
from raceenroll.competitionroadmap
where cmptId = #{compId} and roadId = #{roadId}
</insert> </insert>
<!--复制raceenroll下的赛事项目表 competitionroadrole--> <!--复制raceenroll下的赛事项目表 competitionroadrole-->
<insert id="copyRaceCompetitionroadrole" parameterType="java.util.Map"> <insert id="copyRaceCompetitionroadrole" parameterType="java.util.Map">
insert into raceenroll.competitionroadrole select null, #{new_race_roadId}, name, genderLimit, ageLimit, minNum, maxNum, price, isDelete, #{userId}, null, NOW(), null, isDefault from raceenroll.competitionroadrole where roadId = #{roadId} insert into raceenroll.competitionroadrole
select null, #{new_race_roadId}, name, genderLimit,
ageLimit, minNum, maxNum, price, isDelete, #{userId},
null, NOW(), null, isDefault
from raceenroll.competitionroadrole where roadId = #{roadId}
</insert> </insert>
<select id="queryRaceDiscountByCompId" resultType="java.util.Map" parameterType="int"> <select id="queryRaceDiscountByCompId" resultType="java.util.Map" parameterType="int">
...@@ -66,17 +116,28 @@ ...@@ -66,17 +116,28 @@
<!--复制raceenroll下的表 discount--> <!--复制raceenroll下的表 discount-->
<insert id="copyRaceDiscount" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "id" keyColumn = "id"> <insert id="copyRaceDiscount" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "id" keyColumn = "id">
insert into raceenroll.discount select null,#{new_race_cmptId},mix,type,isDelete,#{userId},null,NOW(),null from raceenroll.discount where id = #{id} insert into raceenroll.discount
select null,#{new_race_cmptId},mix,type,
isDelete,#{userId},null,NOW(),null
from raceenroll.discount where id = #{id}
</insert> </insert>
<!--复制raceenroll下的表 discount_item--> <!--复制raceenroll下的表 discount_item-->
<insert id="copyRaceDiscountItem" parameterType="java.util.Map"> <insert id="copyRaceDiscountItem" parameterType="java.util.Map">
insert into raceenroll.discount_item select null, #{new_race_discountId}, unit, minNum, maxNum, startTime, endTime, #{userId}, null, NOW(), null, isDelete, multiDiscount, disType, isQualifiedCode, isRepeated from raceenroll.discount_item where discountId = #{id} insert into raceenroll.discount_item
select null, #{new_race_discountId}, unit, minNum, maxNum,
startTime, endTime, #{userId}, null, NOW(), null, isDelete,
multiDiscount, disType, isQualifiedCode, isRepeated
from raceenroll.discount_item where discountId = #{id}
</insert> </insert>
<!--复制raceenroll下的表 discount_road_map--> <!--复制raceenroll下的表 discount_road_map-->
<insert id="copyRaceDiscountRoadMap" parameterType="java.util.Map"> <insert id="copyRaceDiscountRoadMap" parameterType="java.util.Map">
insert into raceenroll.discount_road_map select #{new_race_roadId}, #{new_race_discountId}, isDelete, #{userId}, null, NOW(), null from raceenroll.discount_road_map where discountId = #{discountId} and roadId = #{roadId} insert into raceenroll.discount_road_map
select #{new_race_roadId}, #{new_race_discountId}, isDelete,
#{userId}, null, NOW(), null
from raceenroll.discount_road_map
where discountId = #{discountId} and roadId = #{roadId}
</insert> </insert>
<select id="queryRaceExtrapayByRoadId" resultType="java.util.Map" parameterType="int"> <select id="queryRaceExtrapayByRoadId" resultType="java.util.Map" parameterType="int">
...@@ -87,7 +148,10 @@ ...@@ -87,7 +148,10 @@
<!--复制raceenroll下的表 extrapay--> <!--复制raceenroll下的表 extrapay-->
<insert id="copyRaceExtrapay" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "id" keyColumn = "id"> <insert id="copyRaceExtrapay" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "id" keyColumn = "id">
insert into raceenroll.extrapay select null, name, type, NOW(), #{new_race_roadId},isDelete,isNeed from raceenroll.extrapay where id = #{id} insert into raceenroll.extrapay
select null, name, type, NOW(), #{new_race_roadId},isDelete,isNeed
from raceenroll.extrapay
where id = #{id}
</insert> </insert>
<select id="queryRaceMarkNoRuleByCompId" resultType="java.util.Map" parameterType="int"> <select id="queryRaceMarkNoRuleByCompId" resultType="java.util.Map" parameterType="int">
...@@ -98,27 +162,46 @@ ...@@ -98,27 +162,46 @@
<!--复制raceenroll下的表 mark_no_rule--> <!--复制raceenroll下的表 mark_no_rule-->
<insert id="copyRaceMarkNoRule" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "ruleId" keyColumn = "ruleId"> <insert id="copyRaceMarkNoRule" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "ruleId" keyColumn = "ruleId">
insert into raceenroll.mark_no_rule select null,#{new_race_cmptId},NOW(),null,delFlag,rule_type from raceenroll.mark_no_rule where ruleId = #{ruleId} insert into raceenroll.mark_no_rule
(ruleId,cmptId,createTime,delFlag,rule_type)
select null,#{new_race_cmptId},NOW(),delFlag,rule_type
from raceenroll.mark_no_rule
where ruleId = #{ruleId}
</insert> </insert>
<!--复制raceenroll下的表 mark_no_rule_item--> <!--复制raceenroll下的表 mark_no_rule_item-->
<insert id="copyRaceMarkNoRuleItem" parameterType="java.util.Map"> <insert id="copyRaceMarkNoRuleItem" parameterType="java.util.Map">
insert into raceenroll.mark_no_rule_item select null,#{new_race_ruleId},type,flag,seq,seqLength,NOW(),null from raceenroll.mark_no_rule_item where ruleId = #{ruleId} insert into raceenroll.mark_no_rule_item
(id,ruleId,type,flag,seq,seqLength,createTime)
select null,#{new_race_ruleId},type,flag,seq,seqLength,NOW()
from raceenroll.mark_no_rule_item
where ruleId = #{ruleId}
</insert> </insert>
<!--复制raceenroll下的表 payitem--> <!--复制raceenroll下的表 payitem-->
<insert id="copyRacePayitem" parameterType="java.util.Map"> <insert id="copyRacePayitem" parameterType="java.util.Map">
insert into raceenroll.payitem select null,#{new_race_extraPayId},name,price,minNum,maxNum,isdelete,NOW(),null,#{new_race_roadId},remark from raceenroll.payitem where extraPayId = #{extraPayId} insert into raceenroll.payitem
select null,#{new_race_extraPayId},name,price,minNum,
maxNum,isdelete,NOW(),null,#{new_race_roadId},remark
from raceenroll.payitem
where extraPayId = #{extraPayId}
</insert> </insert>
<!--复制raceenroll下的表 road_extrapay_relation--> <!--复制raceenroll下的表 road_extrapay_relation-->
<insert id="copyRaceRoadExtrapayRelation" parameterType="java.util.Map"> <insert id="copyRaceRoadExtrapayRelation" parameterType="java.util.Map">
insert into raceenroll.road_extrapay_relation select null,#{new_race_roadId},#{new_race_extraPayId},#{new_race_cmptId},isDelete from raceenroll.road_extrapay_relation where extraPayId = #{extraPayId} and roadId = #{roadId} and cmptId = #{cmptId} and isDelete = 0 insert into raceenroll.road_extrapay_relation
select null,#{new_race_roadId},#{new_race_extraPayId},#{new_race_cmptId},isDelete
from raceenroll.road_extrapay_relation
where extraPayId = #{extraPayId} and roadId = #{roadId}
and cmptId = #{cmptId} and isDelete = 0
</insert> </insert>
<!--复制raceenroll下的表 road_mark_no_map--> <!--复制raceenroll下的表 road_mark_no_map-->
<insert id="copyRaceRoadMarkNoMap" parameterType="java.util.Map"> <insert id="copyRaceRoadMarkNoMap" parameterType="java.util.Map">
insert into raceenroll.road_mark_no_map select #{new_race_ruleId},#{new_race_roadId} from raceenroll.road_mark_no_map where ruleId = #{ruleId} and roadId = #{roadId} insert into raceenroll.road_mark_no_map(ruleId,roadId)
select #{new_race_ruleId},#{new_race_roadId}
from raceenroll.road_mark_no_map
where ruleId = #{ruleId} and roadId = #{roadId}
</insert> </insert>
<select id="queryRaceroadchannelByCompIdAndDiscountId" resultType="java.util.Map"> <select id="queryRaceroadchannelByCompIdAndDiscountId" resultType="java.util.Map">
...@@ -131,12 +214,18 @@ ...@@ -131,12 +214,18 @@
<!--复制raceenroll下的表 roadchannel--> <!--复制raceenroll下的表 roadchannel-->
<insert id="copyRaceRoadchannel" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "id" keyColumn = "id"> <insert id="copyRaceRoadchannel" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "id" keyColumn = "id">
insert into raceenroll.roadchannel select null,#{new_race_cmptId},channelName,#{new_race_discountId},isDelete,NOW(),remark from raceenroll.roadchannel where id = #{id} insert into raceenroll.roadchannel
select null,#{new_race_cmptId},channelName,#{new_race_discountId},isDelete,NOW(),remark
from raceenroll.roadchannel
where id = #{id}
</insert> </insert>
<!--复制raceenroll下的表 roadchannelitem--> <!--复制raceenroll下的表 roadchannelitem-->
<insert id="copyRaceRoadchannelitem" parameterType="java.util.Map"> <insert id="copyRaceRoadchannelitem" parameterType="java.util.Map">
insert into raceenroll.roadchannelitem select #{new_race_channelId},#{new_race_roadId},isDelete from raceenroll.roadchannelitem where channelId = #{channelId} and roadId = #{roadId} insert into raceenroll.roadchannelitem
select #{new_race_channelId},#{new_race_roadId},isDelete
from raceenroll.roadchannelitem
where channelId = #{channelId} and roadId = #{roadId}
</insert> </insert>
<select id="queryRaceUserdefinedRoadRelationByCompId" resultType="java.util.Map" parameterType="int"> <select id="queryRaceUserdefinedRoadRelationByCompId" resultType="java.util.Map" parameterType="int">
...@@ -147,17 +236,42 @@ ...@@ -147,17 +236,42 @@
<!--复制raceenroll下的表 userdefined_road_relation--> <!--复制raceenroll下的表 userdefined_road_relation-->
<insert id="copyRaceUserdefinedRoadRelation" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "id" keyColumn = "id"> <insert id="copyRaceUserdefinedRoadRelation" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "id" keyColumn = "id">
insert into raceenroll.userdefined_road_relation select null,#{new_race_cmptId},isOpen,#{new_roadIds},0,type,NOW(),null,registerId from raceenroll.userdefined_road_relation where id = #{id} insert into raceenroll.userdefined_road_relation(
id,cmptId,isOpen,roadId,type,createTime,registerId
)
select null,#{new_race_cmptId},isOpen,#{new_roadIds},type,NOW(),registerId
from raceenroll.userdefined_road_relation
where id = #{id}
</insert> </insert>
<!--复制raceenroll下的表 user_defined_create--> <!--复制raceenroll下的表 user_defined_create-->
<insert id="copyRaceUserDefinedCreate" parameterType="java.util.Map"> <insert id="copyRaceUserDefinedCreate" parameterType="java.util.Map">
insert into raceenroll.user_defined_create select null, userdefinedId, name, isRequired, definedContent, definedType, hint, optionType, isTeam, sort, #{new_race_denpendId}, isCheck, isDelete, NOW(), null, registerId from raceenroll.user_defined_create where denpendId = #{denpendId} and isDelete = 0 insert into raceenroll.user_defined_create(
id, userdefinedId, name, isRequired, definedContent, definedType, hint,
optionType, isTeam, sort, denpendId,
isCheck, isDelete,createTime, registerId
)
select null, userdefinedId, name, isRequired, definedContent, definedType, hint,
optionType, isTeam, sort, #{new_race_denpendId},
isCheck, isDelete, NOW(), registerId
from raceenroll.user_defined_create
where denpendId = #{denpendId} and isDelete = 0
</insert> </insert>
<!--复制raceenroll下的表 userdefined--> <!--复制raceenroll下的表 userdefined-->
<insert id="copyRaceUserdefined" parameterType="java.util.Map"> <insert id="copyRaceUserdefined" parameterType="java.util.Map">
insert into raceenroll.userdefined select null, userdefinedId, name, isRequired, definedContent, definedType, dependOn, hint, optionType, #{new_race_cmptId}, #{new_race_roadId}, roleId, isTeam, sort, isDelete, isCheck, NOW(), null, registerId from raceenroll.userdefined where cmptId = #{cmptId} and roadId = #{roadId} and isDelete = 0 insert into raceenroll.userdefined (id,
userdefinedId, name, isRequired, definedContent,
definedType, dependOn, hint, optionType, cmptId,
roadId, roleId, isTeam, sort, isDelete, isCheck,
createTime, registerId
) select null,
userdefinedId, name, isRequired, definedContent,
definedType, dependOn, hint, optionType, #{new_race_cmptId},
#{new_race_roadId}, roleId, isTeam, sort, isDelete, isCheck,
NOW(), registerId
from raceenroll.userdefined
where cmptId = #{cmptId} and roadId = #{roadId} and isDelete = 0
</insert> </insert>
<select id="getGeerunnerSeqVal" resultType="int" parameterType="java.lang.String"> <select id="getGeerunnerSeqVal" resultType="int" parameterType="java.lang.String">
...@@ -166,12 +280,38 @@ ...@@ -166,12 +280,38 @@
<!--获取 geerunner 下的用户id --> <!--获取 geerunner 下的用户id -->
<select id="getGeerunnerUserId" resultType="java.lang.Integer" parameterType="int"> <select id="getGeerunnerUserId" resultType="java.lang.Integer" parameterType="int">
select gtUserId from common.neuuser where gUserId = #{userId} select gtUserId from common.neuuser
where gUserId = #{userId}
</select> </select>
<!--复制 geerunner 下的表 cmpt_main --> <!--复制 geerunner 下的表 cmpt_main -->
<insert id="copyGeerunnerCmptMain" parameterType="java.util.Map"> <insert id="copyGeerunnerCmptMain" parameterType="java.util.Map">
insert into geerunner.cmpt_main select uuid(), #{new_gk_cmptId}, cmpt_name, cmpt_name_en, #{orgId}, type, cmpt_parent_type, cmpt_type, is_charity, donate_min, cmpt_city, cmpt_field, image_url, enroll_start, enroll_deadline, start_time, end_time, cmpt_status, show_index, cmpt_info, is_close, cmpt_single_seg, templated, is_hide_enroll_list, auto_sms, auto_mail, is_publish, is_need_timer, is_multilingual, rankSearchStyle, gpsLived, videoLived, cmpt_domain, cmpt_priority, isPublish, rankShow, is_open_pre_enroll, pre_enroll_status, score_notice, is_allow_duplicate, limit_count, album_address, timer_address, is_point_race, is_exit_query, is_exam, redirectUrlType, redirectUrlPath, jsCompanyType, isCertProfilePhoto, certification_type, common_cmpt_type, cmpt_option_group_value, remark1, del_flg, is_rinse, NOW(), #{gk_userId}, null, null, code, pay_deadline from geerunner.cmpt_main where cmpt_id = #{cmpt_id} insert into geerunner.cmpt_main
(uuid,cmpt_id,cmpt_name,cmpt_name_en,org_id,type,
cmpt_parent_type,cmpt_type, is_charity,donate_min,cmpt_city,cmpt_field,
image_url,enroll_start,enroll_deadline,start_time,end_time,cmpt_status,
show_index,cmpt_info,is_close,cmpt_single_seg,templated,is_hide_enroll_list,
auto_sms,auto_mail,is_publish,is_need_timer,is_multilingual,rankSearchStyle,
gpsLived,videoLived,cmpt_domain,cmpt_priority,isPublish,rankShow,is_open_pre_enroll,
pre_enroll_status, score_notice, is_allow_duplicate, limit_count, album_address,
timer_address, is_point_race, is_exit_query, is_exam, redirectUrlType, redirectUrlPath,
jsCompanyType, isCertProfilePhoto, certification_type, common_cmpt_type,
cmpt_option_group_value, remark1, del_flg, is_rinse,create_time, create_user,
code)
select uuid(), #{new_gk_cmptId},
cmpt_name, cmpt_name_en, #{orgId},
type, cmpt_parent_type, cmpt_type, is_charity, donate_min,
cmpt_city, cmpt_field, image_url, enroll_start, enroll_deadline,
start_time, end_time, cmpt_status, show_index, cmpt_info, is_close,
cmpt_single_seg, templated, is_hide_enroll_list, auto_sms, auto_mail,
is_publish, is_need_timer, is_multilingual, rankSearchStyle, gpsLived,
videoLived, cmpt_domain, cmpt_priority, isPublish, rankShow, is_open_pre_enroll,
pre_enroll_status, score_notice, is_allow_duplicate, limit_count, album_address,
timer_address, is_point_race, is_exit_query, is_exam, redirectUrlType, redirectUrlPath,
jsCompanyType, isCertProfilePhoto, certification_type, common_cmpt_type,
cmpt_option_group_value, remark1, del_flg, is_rinse, create_time, #{gk_userId},
code from geerunner.cmpt_main where cmpt_id = #{cmpt_id}
</insert> </insert>
<select id="queryGeerunnerCmptItemByCompId" resultType="java.util.Map" parameterType="int"> <select id="queryGeerunnerCmptItemByCompId" resultType="java.util.Map" parameterType="int">
...@@ -182,7 +322,39 @@ ...@@ -182,7 +322,39 @@
<!--复制 geerunner 下的表 cmpt_item --> <!--复制 geerunner 下的表 cmpt_item -->
<insert id="copyGeerunnerCmptItem" parameterType="java.util.Map"> <insert id="copyGeerunnerCmptItem" parameterType="java.util.Map">
insert into geerunner.cmpt_item select uuid(), #{new_gk_cmptId}, #{new_gk_itemId}, item_name, item_name_en, fee, enroll_start, enroll_deadline, start_time, end_time, kilometre, team_type, teammate_count, teammate_count_min, team_female_count_max, team_female_count_min, team_one_take_enroll, team_fee_type, team_count, limit_count, is_close, item_type, item_mold, isTimeOrMileage, isRelayOrTogether, isSingleOrWind, invite_code_enable, invite_code_quota, enroll_member_level, checkin_count, is_auto_distribute, is_need_qualify, is_support_invoice, invoice_deadline, combinedItemId, itemFrom, is_need_timer, is_open_pre_enroll, pre_enroll_status, is_pay_enroll, pre_fee, is_publish, enroll_tip, enroll_tip_en, show_index, is_allow_withdraw, is_allow_transfer, transfer_fee, is_allow_duplicate, is_need_itra_check, itra_idca, address, address_en, saleforce_id, item_group_value, del_flg, NOW(), #{gk_userId}, null, null, road_name from geerunner.cmpt_item where item_id = #{item_id} and del_flg = 0 insert into geerunner.cmpt_item
(uuid, cmpt_id,
item_id, item_name, item_name_en, fee, enroll_start,
enroll_deadline, start_time, end_time, kilometre, team_type,
teammate_count, teammate_count_min, team_female_count_max,
team_female_count_min, team_one_take_enroll, team_fee_type,
team_count, limit_count, is_close, item_type, item_mold,
isTimeOrMileage, isRelayOrTogether, isSingleOrWind,
invite_code_enable, invite_code_quota, enroll_member_level,
checkin_count, is_auto_distribute, is_need_qualify, is_support_invoice,
invoice_deadline, combinedItemId, itemFrom, is_need_timer,
is_open_pre_enroll, pre_enroll_status, is_pay_enroll, pre_fee,
is_publish, enroll_tip, enroll_tip_en, show_index, is_allow_withdraw,
is_allow_transfer, transfer_fee, is_allow_duplicate, is_need_itra_check,
itra_idca, address, address_en, saleforce_id, item_group_value, del_flg, create_time,
create_user, road_name)
select uuid(), #{new_gk_cmptId},
#{new_gk_itemId}, item_name, item_name_en, fee, enroll_start,
enroll_deadline, start_time, end_time, kilometre, team_type,
teammate_count, teammate_count_min, team_female_count_max,
team_female_count_min, team_one_take_enroll, team_fee_type,
team_count, limit_count, is_close, item_type, item_mold,
isTimeOrMileage, isRelayOrTogether, isSingleOrWind,
invite_code_enable, invite_code_quota, enroll_member_level,
checkin_count, is_auto_distribute, is_need_qualify, is_support_invoice,
invoice_deadline, combinedItemId, itemFrom, is_need_timer,
is_open_pre_enroll, pre_enroll_status, is_pay_enroll, pre_fee,
is_publish, enroll_tip, enroll_tip_en, show_index, is_allow_withdraw,
is_allow_transfer, transfer_fee, is_allow_duplicate, is_need_itra_check,
itra_idca, address, address_en, saleforce_id, item_group_value, del_flg, NOW(),
#{gk_userId}, road_name from geerunner.cmpt_item
where item_id = #{item_id} and del_flg = 0
</insert> </insert>
<select id="queryGeerunnerCertificateByRoadId" resultType="java.util.Map" parameterType="int"> <select id="queryGeerunnerCertificateByRoadId" resultType="java.util.Map" parameterType="int">
...@@ -193,12 +365,22 @@ ...@@ -193,12 +365,22 @@
<!--复制 geerunner 下的表 certificate --> <!--复制 geerunner 下的表 certificate -->
<insert id="copyGeerunnerCertificate" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "id" keyColumn = "id"> <insert id="copyGeerunnerCertificate" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "id" keyColumn = "id">
insert into geerunner.certificate select null, name, type, imgurl, #{new_gk_cmptId}, #{new_gk_itemId}, ispublished, certType, isChg from geerunner.certificate where id = #{id} insert into geerunner.certificate
select null, name, type, imgurl, #{new_gk_cmptId},
#{new_gk_itemId}, ispublished, certType, isChg
from geerunner.certificate where id = #{id}
</insert> </insert>
<!--复制 geerunner 下的表 certificatesetinfo --> <!--复制 geerunner 下的表 certificatesetinfo -->
<insert id="copyGeerunnerCertificatesetinfo" parameterType="java.util.Map"> <insert id="copyGeerunnerCertificatesetinfo" parameterType="java.util.Map">
insert into geerunner.certificatesetinfo select null, #{new_gk_itemId}, #{new_gk_cmptId}, selectedField, x_coordinate, y_coordinate, font_size, font_color, selectedFieldName, NOW(), font_family, certtype, #{new_gk_certId}, width, height, selectedFieldType, horizontal from geerunner.certificatesetinfo where certid = #{certid} insert into geerunner.certificatesetinfo
select null, #{new_gk_itemId}, #{new_gk_cmptId},
selectedField, x_coordinate, y_coordinate, font_size,
font_color, selectedFieldName, NOW(), font_family,
certtype, #{new_gk_certId}, width, height,
selectedFieldType, horizontal
from geerunner.certificatesetinfo
where certid = #{certid}
</insert> </insert>
<select id="queryGeerunnerCmptDiscountByCmptId" resultType="java.util.Map" parameterType="int"> <select id="queryGeerunnerCmptDiscountByCmptId" resultType="java.util.Map" parameterType="int">
...@@ -210,12 +392,16 @@ ...@@ -210,12 +392,16 @@
<!--复制 geerunner 下的表 cmpt_discount --> <!--复制 geerunner 下的表 cmpt_discount -->
<insert id="copyGeerunnerCmptDiscount" parameterType="java.util.Map"> <insert id="copyGeerunnerCmptDiscount" parameterType="java.util.Map">
insert into geerunner.cmpt_discount select null, #{new_gk_discountId}, #{new_gk_cmptId}, type, scope, start_time, end_time, limit_count, tip, tip_en, identity_no_start, amount, apply_to_all, del_flg, NOW(), #{gk_userId}, null, null from geerunner.cmpt_discount where id = #{id} insert into geerunner.cmpt_discount
select null, #{new_gk_discountId}, #{new_gk_cmptId}, type, scope, start_time, end_time, limit_count, tip, tip_en, identity_no_start, amount, apply_to_all, del_flg, NOW(), #{gk_userId}, null, null from geerunner.cmpt_discount where id = #{id}
</insert> </insert>
<!--复制 geerunner 下的表 cmpt_discount_mapping --> <!--复制 geerunner 下的表 cmpt_discount_mapping -->
<insert id="copyGeerunnerCmptDiscountMapping" parameterType="java.util.Map"> <insert id="copyGeerunnerCmptDiscountMapping" parameterType="java.util.Map">
insert into geerunner.cmpt_discount_mapping select null, #{new_gk_discountId}, #{new_gk_itemId}, #{new_gk_cmptId} from geerunner.cmpt_discount_mapping where discount_id = #{discount_id} and item_id = #{item_id} and cmpt_id = #{cmpt_id} insert into geerunner.cmpt_discount_mapping
select null, #{new_gk_discountId}, #{new_gk_itemId},
#{new_gk_cmptId} from geerunner.cmpt_discount_mapping
where discount_id = #{discount_id} and item_id = #{item_id} and cmpt_id = #{cmpt_id}
</insert> </insert>
<!--查询 geerunner 下 表 cmpt_extra_charge 的 group_id --> <!--查询 geerunner 下 表 cmpt_extra_charge 的 group_id -->
...@@ -237,27 +423,57 @@ ...@@ -237,27 +423,57 @@
<!--复制 geerunner 下的表 cmpt_extra_charge --> <!--复制 geerunner 下的表 cmpt_extra_charge -->
<insert id="copyGeerunnerCmptExtraCharge" parameterType="java.util.Map"> <insert id="copyGeerunnerCmptExtraCharge" parameterType="java.util.Map">
insert into geerunner.cmpt_extra_charge select uuid(), #{new_gk_chargeId}, #{new_gk_cmptId}, #{new_itemIds}, charge_type, type_id, type_name, type_name_en, #{new_gk_groupId}, group_name, group_name_en, group_detail, group_detail_en, group_image, charge_name, charge_name_en, charge_detail, charge_detail_en, price, charge_count, default_charge_id, remark, is_onsale, del_flg, NOW(), #{gk_userId}, null, null from geerunner.cmpt_extra_charge where charge_id = #{charge_id} insert into geerunner.cmpt_extra_charge
select uuid(), #{new_gk_chargeId}, #{new_gk_cmptId},
#{new_itemIds}, charge_type, type_id, type_name,
type_name_en, #{new_gk_groupId}, group_name, group_name_en,
group_detail, group_detail_en, group_image, charge_name,
charge_name_en, charge_detail, charge_detail_en, price, charge_count,
default_charge_id, remark, is_onsale, del_flg, NOW(), #{gk_userId}, null, null
from geerunner.cmpt_extra_charge
where charge_id = #{charge_id}
</insert> </insert>
<!--复制 geerunner 下的表 cmpt_medal --> <!--复制 geerunner 下的表 cmpt_medal -->
<insert id="copyGeerunnerCmptMedal" parameterType="java.util.Map"> <insert id="copyGeerunnerCmptMedal" parameterType="java.util.Map">
insert into geerunner.cmpt_medal select uuid(), #{new_gk_cmptId}, type, img, link_url, show_index, del_flg, NOW(), #{gk_userId}, null, null from geerunner.cmpt_medal where cmpt_id = #{cmpt_id} insert into geerunner.cmpt_medal
select uuid(), #{new_gk_cmptId}, type, img, link_url, show_index,
del_flg, NOW(), #{gk_userId}, null, null
from geerunner.cmpt_medal
where cmpt_id = #{cmpt_id}
</insert> </insert>
<!--复制 geerunner 下的表 cmpt_paypal --> <!--复制 geerunner 下的表 cmpt_paypal -->
<insert id="copyGeerunnerCmptPaypal" parameterType="java.util.Map"> <insert id="copyGeerunnerCmptPaypal" parameterType="java.util.Map">
insert into geerunner.cmpt_paypal select null, #{new_gk_cmptId}, #{new_gk_itemId}, fee_type, currency, amount, show_index, del_flg, NOW(), #{gk_userId}, null, null from geerunner.cmpt_paypal where cmpt_id = #{cmpt_id} and item_id = #{item_id} and del_flg = 0 insert into geerunner.cmpt_paypal
select null, #{new_gk_cmptId}, #{new_gk_itemId}, fee_type,
currency, amount, show_index, del_flg, NOW(), #{gk_userId},
null, null from geerunner.cmpt_paypal
where cmpt_id = #{cmpt_id} and item_id = #{item_id} and del_flg = 0
</insert> </insert>
<!--复制 geerunner 下的表 cmpt_rich_text --> <!--复制 geerunner 下的表 cmpt_rich_text -->
<insert id="copyGeerunnerCmptRichText" parameterType="java.util.Map"> <insert id="copyGeerunnerCmptRichText" parameterType="java.util.Map">
insert into geerunner.cmpt_rich_text select uuid(), org_id, uuid(), #{new_gk_cmptId}, #{new_gk_itemId}, parent_type, type, title, summary, img_url, content, read_count, show_index, status, lan_flg, remark, del_flg, NOW(), #{gk_userId}, null, null from geerunner.cmpt_rich_text where cmpt_id = #{cmpt_id} and item_id = #{item_id} and del_flg = "0" insert into geerunner.cmpt_rich_text
select uuid(), org_id, uuid(), #{new_gk_cmptId},
#{new_gk_itemId}, parent_type, type, title, summary, img_url,
content, read_count, show_index, status, lan_flg,
remark, del_flg, NOW(), #{gk_userId}, null, null
from geerunner.cmpt_rich_text
where cmpt_id = #{cmpt_id} and item_id = #{item_id} and del_flg = "0"
</insert> </insert>
<!--复制 geerunner 下的表 cmpt_userdefine --> <!--复制 geerunner 下的表 cmpt_userdefine -->
<insert id="copyGeerunnerCmptUserdefine" parameterType="java.util.Map"> <insert id="copyGeerunnerCmptUserdefine" parameterType="java.util.Map">
insert into geerunner.cmpt_userdefine select uuid(), geerunner.nextval('USERDEFINE_ID'), #{new_gk_cmptId}, #{new_gk_itemId}, custom_id, custom_name, custom_name_en, column_name, is_required, is_modify, defined_content, defined_content_en, defined_type, hint, hint_en, option_type, is_team, sort, NOW(), is_second_form from geerunner.cmpt_userdefine where cmpt_id = #{cmpt_id} and cmpt_item = #{item_id} insert into geerunner.cmpt_userdefine
select uuid(), geerunner.nextval('USERDEFINE_ID'),
#{new_gk_cmptId}, #{new_gk_itemId}, custom_id, custom_name,
custom_name_en, column_name, is_required, is_modify,
defined_content, defined_content_en, defined_type,
hint, hint_en, option_type, is_team, sort, NOW(),
is_second_form
from geerunner.cmpt_userdefine
where cmpt_id = #{cmpt_id} and cmpt_item = #{item_id}
</insert> </insert>
<!--查询 geerunner 下 表 gps_path --> <!--查询 geerunner 下 表 gps_path -->
...@@ -269,12 +485,19 @@ ...@@ -269,12 +485,19 @@
<!--复制 geerunner 下的表 gps_path --> <!--复制 geerunner 下的表 gps_path -->
<insert id="copyGeerunnerGpsPath" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "id" keyColumn = "id"> <insert id="copyGeerunnerGpsPath" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "id" keyColumn = "id">
insert into geerunner.gps_path select null, #{new_gk_cmptId}, #{new_gk_itemId}, tracePoint, color, name from geerunner.gps_path where id = #{id} insert into geerunner.gps_path
select null, #{new_gk_cmptId}, #{new_gk_itemId}, tracePoint,
color, name
from geerunner.gps_path
where id = #{id}
</insert> </insert>
<!--复制 geerunner 下的表 gps_placemark --> <!--复制 geerunner 下的表 gps_placemark -->
<insert id="copyGeerunnerGpsPlacemark" parameterType="java.util.Map"> <insert id="copyGeerunnerGpsPlacemark" parameterType="java.util.Map">
insert into geerunner.gps_placemark select null, #{new_gk_pathId}, info, type, lng, lat from geerunner.gps_placemark where pathId = #{id} insert into geerunner.gps_placemark
select null, #{new_gk_pathId}, info, type, lng, lat
from geerunner.gps_placemark
where pathId = #{id}
</insert> </insert>
<!--查询 geerunner 下 表 time_checkpoint --> <!--查询 geerunner 下 表 time_checkpoint -->
...@@ -286,7 +509,11 @@ ...@@ -286,7 +509,11 @@
<!--复制 geerunner 下的表 time_checkpoint --> <!--复制 geerunner 下的表 time_checkpoint -->
<insert id="copyGeerunnerTimeCheckpoint" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "id" keyColumn = "id"> <insert id="copyGeerunnerTimeCheckpoint" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "id" keyColumn = "id">
insert into geerunner.time_checkpoint select null, #{new_gk_cmptId}, name, dayValue, isRestArea, isAutoPenalty, restDuration from geerunner.time_checkpoint where id = #{id} insert into geerunner.time_checkpoint
select null, #{new_gk_cmptId}, name, dayValue,
isRestArea, isAutoPenalty, restDuration
from geerunner.time_checkpoint
where id = #{id}
</insert> </insert>
<!--查询 geerunner 下 表 time_seg --> <!--查询 geerunner 下 表 time_seg -->
...@@ -298,7 +525,11 @@ ...@@ -298,7 +525,11 @@
<!--复制 geerunner 下的表 time_seg --> <!--复制 geerunner 下的表 time_seg -->
<insert id="copyGeerunnerTimeSeg" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "id" keyColumn = "id"> <insert id="copyGeerunnerTimeSeg" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "id" keyColumn = "id">
insert into geerunner.time_seg select null, #{new_gk_itemId}, #{new_gk_cmptId}, name, type, isValidSeg, open, close, distance, minDuration, maxDuration, enable, endTime, time, maxCyclicSize from geerunner.time_seg where id = #{id} insert into geerunner.time_seg
select null, #{new_gk_itemId}, #{new_gk_cmptId}, name, type, isValidSeg,
open, close, distance, minDuration, maxDuration, enable, endTime, time,
maxCyclicSize from geerunner.time_seg
where id = #{id}
</insert> </insert>
<!--查询 geerunner 下 表 time_ranking --> <!--查询 geerunner 下 表 time_ranking -->
...@@ -310,17 +541,30 @@ ...@@ -310,17 +541,30 @@
<!--复制 geerunner 下的表 time_ranking --> <!--复制 geerunner 下的表 time_ranking -->
<insert id="copyGeerunnerTimeRanking" parameterType="java.util.Map"> <insert id="copyGeerunnerTimeRanking" parameterType="java.util.Map">
insert into geerunner.time_ranking select null, #{new_gk_cmptId}, #{new_gk_itemId}, listName, listDetailFixed, listDetailUserdefined, userRole, userGender, teamType, scoreType, scoreFrom, listFrom, rangeType, #{new_fromSegs}, sortType, topN, exportTopN, tableIndex, cp_ids, user_visible, start_age, end_age, showScoreLimit, showStopTime from geerunner.time_ranking where id = #{id} insert into geerunner.time_ranking select null, #{new_gk_cmptId},
#{new_gk_itemId}, listName, listDetailFixed, listDetailUserdefined,
userRole, userGender, teamType, scoreType, scoreFrom, listFrom,
rangeType, #{new_fromSegs}, sortType, topN, exportTopN, tableIndex,
cp_ids, user_visible, start_age, end_age, showScoreLimit, showStopTime
from geerunner.time_ranking where id = #{id}
</insert> </insert>
<!--复制 geerunner 下的表 time_seg_checkpoint --> <!--复制 geerunner 下的表 time_seg_checkpoint -->
<insert id="copyGeerunnertimeSegCheckpoint" parameterType="java.util.Map"> <insert id="copyGeerunnertimeSegCheckpoint" parameterType="java.util.Map">
insert into geerunner.time_seg_checkpoint select null, #{new_gk_segId}, #{new_gk_checkPointId}, preDistance, distance, #{new_gk_cmptId}, checkPointName, closeDoorTime from geerunner.time_seg_checkpoint where segId = #{segId} and checkPointId = #{checkPointId} insert into geerunner.time_seg_checkpoint
select null, #{new_gk_segId}, #{new_gk_checkPointId}, preDistance,
distance, #{new_gk_cmptId}, checkPointName, closeDoorTime
from geerunner.time_seg_checkpoint
where segId = #{segId} and checkPointId = #{checkPointId}
</insert> </insert>
<!--复制 gksite 下的表 gk_cmpt --> <!--复制 gksite 下的表 gk_cmpt -->
<insert id="copyGkSiteGkCmpt" parameterType="java.util.Map"> <insert id="copyGkSiteGkCmpt" parameterType="java.util.Map">
insert into gksite.gk_cmpt select #{new_gk_cmptId}, cmpt_name, cmpt_type, start_time, end_time, logo, bg_color, #{gk_userId}, null, null, null, del_flag, cmpt_status, is_day_rank from gksite.gk_cmpt where cmpt_id = #{cmpt_id} insert into gksite.gk_cmpt
select #{new_gk_cmptId}, cmpt_name, cmpt_type, start_time,
end_time, logo, bg_color, #{gk_userId}, null, null, null,
del_flag, cmpt_status, is_day_rank
from gksite.gk_cmpt where cmpt_id = #{cmpt_id}
</insert> </insert>
<!--查询 gksite 下 表 banner --> <!--查询 gksite 下 表 banner -->
...@@ -338,57 +582,138 @@ ...@@ -338,57 +582,138 @@
<!--复制 gksite 下的表 banner --> <!--复制 gksite 下的表 banner -->
<insert id="copyGkSiteBanner" parameterType="java.util.Map"> <insert id="copyGkSiteBanner" parameterType="java.util.Map">
insert into gksite.banner select #{new_bannerId}, #{new_gk_cmptId}, name, page_view, seq, description, url, NOW(), del_flag from gksite.banner where id = #{id} insert into gksite.banner
select #{new_bannerId}, #{new_gk_cmptId}, name, page_view,
seq, description, url, NOW(), del_flag
from gksite.banner
where id = #{id}
</insert> </insert>
<!--复制 gksite 下的表 banner_statistic --> <!--复制 gksite 下的表 banner_statistic -->
<insert id="copyGkSiteBannerStatistic" parameterType="java.util.Map"> <insert id="copyGkSiteBannerStatistic" parameterType="java.util.Map">
insert into gksite.banner_statistic select null, #{new_gk_cmptId}, date_format(now(), '%Y%m%d'), pv, uv, #{new_bannerId} from gksite.banner_statistic where banner_id = #{id} insert into gksite.banner_statistic
select null, #{new_gk_cmptId}, date_format(now(), '%Y%m%d'),
pv, uv, #{new_bannerId}
from gksite.banner_statistic where banner_id = #{id}
</insert> </insert>
<!--复制 gksite 下的表 gk_cmpt_func --> <!--复制 gksite 下的表 gk_cmpt_func -->
<insert id="copyGkSiteGkCmptFunc" parameterType="java.util.Map"> <insert id="copyGkSiteGkCmptFunc" parameterType="java.util.Map">
insert into gksite.gk_cmpt_func select #{new_gk_cmptId}, switch_mobile, switch_countdown, switch_banner, switch_news, switch_customer, switch_mileage, switch_scoreReview, news_alias, now() from gksite.gk_cmpt_func where cmpt_id = #{cmpt_id} insert into gksite.gk_cmpt_func(
cmpt_id, switch_mobile, switch_countdown,
switch_banner, switch_news, switch_customer, switch_mileage,
switch_scoreReview, news_alias, create_date
)
select #{new_gk_cmptId}, switch_mobile, switch_countdown,
switch_banner, switch_news, switch_customer, switch_mileage,
switch_scoreReview, news_alias, now()
from gksite.gk_cmpt_func where cmpt_id = #{cmpt_id}
</insert> </insert>
<!--复制 gksite 下的表 gk_cmpt_score_checkpoint --> <!--复制 gksite 下的表 gk_cmpt_score_checkpoint -->
<insert id="copyGkSiteGkCmptScoreCheckpoint" parameterType="java.util.Map"> <insert id="copyGkSiteGkCmptScoreCheckpoint" parameterType="java.util.Map">
insert into gksite.gk_cmpt_score_checkpoint select null, #{new_gk_cmptId}, #{new_gk_itemId}, name, distance, latitude, longitude, is_time, is_delete, now(), null from gksite.gk_cmpt_score_checkpoint where cmpt_id = #{cmpt_id} and road_id = #{item_id} and is_delete = 0 insert into gksite.gk_cmpt_score_checkpoint(
checkpoint_id, cmpt_id, road_id,
name, distance, latitude, longitude, is_time,
is_delete, insert_time, update_time
)
select null, #{new_gk_cmptId}, #{new_gk_itemId},
name, distance, latitude, longitude, is_time,
is_delete, now(), null
from gksite.gk_cmpt_score_checkpoint
where cmpt_id = #{cmpt_id} and road_id = #{item_id} and is_delete = 0
</insert> </insert>
<!--复制 gksite 下的表 gk_cmpt_score_field --> <!--复制 gksite 下的表 gk_cmpt_score_field -->
<insert id="copyGkSiteGkCmptScoreField" parameterType="java.util.Map"> <insert id="copyGkSiteGkCmptScoreField" parameterType="java.util.Map">
insert into gksite.gk_cmpt_score_field select null, #{new_gk_cmptId}, is_required, field_name, field_type, field_index, is_delete, null, now() from gksite.gk_cmpt_score_field where cmpt_id = #{cmpt_id} and is_delete = 0 insert into gksite.gk_cmpt_score_field(
id, cmpt_id, is_required,
field_name, field_type, field_index, is_delete,
update_time, insert_time
)
select null, #{new_gk_cmptId}, is_required,
field_name, field_type, field_index, is_delete,
null, now()
from gksite.gk_cmpt_score_field
where cmpt_id = #{cmpt_id} and is_delete = 0
</insert> </insert>
<!--复制 gksite 下的表 gk_cmpt_score_rank --> <!--复制 gksite 下的表 gk_cmpt_score_rank -->
<insert id="copyGkSiteGkCmptScoreRank" parameterType="java.util.Map"> <insert id="copyGkSiteGkCmptScoreRank" parameterType="java.util.Map">
insert into gksite.gk_cmpt_score_rank select null, #{new_gk_cmptId}, #{new_gk_itemId}, score_rank_name, score_rank_type, score_rank_person_rule, score_rank_team_rule, score_rank_from_time, score_rank_end_time, score_rank_sex, score_rank_order, is_delete, now(), null from gksite.gk_cmpt_score_rank where cmpt_id = #{cmpt_id} and road_id = #{item_id} and is_delete = 0 insert into gksite.gk_cmpt_score_rank(
score_rank_id, cmpt_id, road_id,
score_rank_name, score_rank_type, score_rank_person_rule,
score_rank_team_rule, score_rank_from_time, score_rank_end_time,
score_rank_sex, score_rank_order, is_delete, insert_time, end_time
)
select null, #{new_gk_cmptId}, #{new_gk_itemId},
score_rank_name, score_rank_type, score_rank_person_rule,
score_rank_team_rule, score_rank_from_time, score_rank_end_time,
score_rank_sex, score_rank_order, is_delete, now(), null
from gksite.gk_cmpt_score_rank
where cmpt_id = #{cmpt_id} and road_id = #{item_id} and is_delete = 0
</insert> </insert>
<!--复制 gksite 下的表 gk_cmpt_score_rule --> <!--复制 gksite 下的表 gk_cmpt_score_rule -->
<insert id="copyGkSiteGkCmptScoreRule" parameterType="java.util.Map"> <insert id="copyGkSiteGkCmptScoreRule" parameterType="java.util.Map">
insert into gksite.gk_cmpt_score_rule select null, 0, #{new_gk_cmptId}, #{new_gk_itemId}, score_rule, score_upload_times, start_time, end_time, now(), now(), order_rule from gksite.gk_cmpt_score_rule where cmpt_id = #{cmpt_id} and road_id = #{item_id} insert into gksite.gk_cmpt_score_rule(
cmpt_id, road_id, score_rule,
score_upload_times, start_time, end_time, update_time, insert_time, order_rule
)
select #{new_gk_cmptId}, #{new_gk_itemId}, score_rule,
score_upload_times, start_time, end_time, now(), now(), order_rule
from gksite.gk_cmpt_score_rule
where cmpt_id = #{cmpt_id} and road_id = #{item_id}
</insert> </insert>
<!--复制 gksite 下的表 gk_cmptsetting --> <!--复制 gksite 下的表 gk_cmptsetting -->
<insert id="copyGkSiteGkCmptsetting" parameterType="java.util.Map"> <insert id="copyGkSiteGkCmptsetting" parameterType="java.util.Map">
insert into gksite.gk_cmptsetting select uuid(), #{new_gk_cmptId}, name_web, name, type, visibility, status, style, seq, #{gk_userId}, now(), null, null, del_flag, app_id, url from gksite.gk_cmptsetting where cmptid = #{cmpt_id} and del_flag = '0' insert into gksite.gk_cmptsetting(
id, cmptid, name_web, name, type, visibility, status, style, seq,
create_by, create_date, del_flag, app_id, url
)
select uuid(), #{new_gk_cmptId}, name_web, name, type, visibility, status, style, seq,
#{gk_userId}, now(), del_flag, app_id, url
from gksite.gk_cmptsetting where cmptid = #{cmpt_id} and del_flag = '0'
</insert> </insert>
<!--复制 gksite 下的表 gk_road --> <!--复制 gksite 下的表 gk_road -->
<insert id="copyGkSiteGkRoad" parameterType="java.util.Map"> <insert id="copyGkSiteGkRoad" parameterType="java.util.Map">
insert into gksite.gk_road select null, #{new_gk_itemId}, #{new_gk_cmptId}, road_name, file_name, file_url, file_size, is_delete, now(), 0 from gksite.gk_road where cmpt_id = #{cmpt_id} and road_id = #{item_id} and is_delete = 0 insert into gksite.gk_road (
id, road_id,
cmpt_id, road_name, file_name, file_url, file_size,
is_delete, create_time
) select null, #{new_gk_itemId},
#{new_gk_cmptId}, road_name, file_name, file_url, file_size,
is_delete, now()
from gksite.gk_road
where cmpt_id = #{cmpt_id} and road_id = #{item_id} and is_delete = 0
</insert> </insert>
<!--复制 gksite 下的表 gk_roads_gps --> <!--复制 gksite 下的表 gk_roads_gps -->
<insert id="copyGkSiteGkRoadsGps" parameterType="java.util.Map"> <insert id="copyGkSiteGkRoadsGps" parameterType="java.util.Map">
insert into gksite.gk_roads_gps select null, #{new_gk_cmptId}, #{new_gk_itemId}, points, now() from gksite.gk_roads_gps where cmpt_id = #{cmpt_id} and road_id = #{item_id} insert into gksite.gk_roads_gps (
id, cmpt_id,
road_id, points, create_time
)
select null, #{new_gk_cmptId},
#{new_gk_itemId}, points, now()
from gksite.gk_roads_gps
where cmpt_id = #{cmpt_id} and road_id = #{item_id}
</insert> </insert>
<!--复制 gksite 下的表 gk_roads_gps_checkpoint_map --> <!--复制 gksite 下的表 gk_roads_gps_checkpoint_map -->
<insert id="copyGkSiteGkRoadsGpsCheckpointMap" parameterType="java.util.Map"> <insert id="copyGkSiteGkRoadsGpsCheckpointMap" parameterType="java.util.Map">
insert into gksite.gk_roads_gps_checkpoint_map select null, #{new_gk_cmptId}, #{new_gk_itemId}, #{new_gk_checkPointId}, checkpoint_name, checkpoint_distance, checkpoint_gps_name, checkpoint_latitude, checkpoint_longitude, is_delete, now(), null from gksite.gk_roads_gps_checkpoint_map where cmpt_id = #{cmpt_id} and road_id = #{item_id} and checkpoint_id = #{checkPointId} and is_delete = '0' insert into gksite.gk_roads_gps_checkpoint_map(
id, cmpt_id, road_id, checkpoint_id,
checkpoint_name, checkpoint_distance, checkpoint_gps_name, checkpoint_latitude,
checkpoint_longitude, is_delete, inster_time, update_time
)
select null, #{new_gk_cmptId}, #{new_gk_itemId}, #{new_gk_checkPointId},
checkpoint_name, checkpoint_distance, checkpoint_gps_name, checkpoint_latitude,
checkpoint_longitude, is_delete, now(), null
from gksite.gk_roads_gps_checkpoint_map
where cmpt_id = #{cmpt_id} and road_id = #{item_id} and checkpoint_id = #{checkPointId} and is_delete = '0'
</insert> </insert>
<!--获取 common 下的用户id --> <!--获取 common 下的用户id -->
...@@ -398,26 +723,46 @@ ...@@ -398,26 +723,46 @@
<!--复制 common 下的表 neucmpt --> <!--复制 common 下的表 neucmpt -->
<insert id="copyCommonNeucmpt" parameterType="java.util.Map"> <insert id="copyCommonNeucmpt" parameterType="java.util.Map">
insert into common.neucmpt select null, #{new_race_cmptId}, #{new_gk_cmptId}, #{neuUserId}, committeeNeuUserId, deleted from common.neucmpt where gCmptId = #{race_cmptId} and gtCmptId = #{gk_cmptId} insert into common.neucmpt(
neuCmptId, gCmptId, gtCmptId, neuUserId,
committeeNeuUserId, deleted
)
select null, #{new_race_cmptId}, #{new_gk_cmptId}, #{neuUserId},
committeeNeuUserId, deleted
from common.neucmpt
where gCmptId = #{race_cmptId} and gtCmptId = #{gk_cmptId}
</insert> </insert>
<!--按 raceenroll.registerInfo 生成 geerunner.sys_admin 的账户 --> <!--按 raceenroll.registerInfo 生成 geerunner.sys_admin 的账户 -->
<insert id="copyRaceRegisterInfoToGeerunnerSysAdmin" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "id" keyColumn = "id"> <insert id="copyRaceRegisterInfoToGeerunnerSysAdmin" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "id" keyColumn = "id">
insert into geerunner.sys_admin select uuid(), null, r.unionId, r.callPhone, r.locName, #{org_id}, '123456', null, null, r.userId, r.password, null, null, null, null, '0', now(), null, null, null from raceenroll.registerInfo r where r.userId = #{userId} insert into geerunner.sys_admin(
uuid, id, unionId, user_id, user_name, org_id,
admin_psw, registerId, registerPwd, del_flg, create_time
)
select uuid(), null, r.unionId, r.callPhone, r.locName, #{org_id},
'123456', r.userId, r.password, '0', now()
from raceenroll.registerInfo r
where r.userId = #{userId}
</insert> </insert>
<!--同步 raceenroll.registerInfo 与 geerunner.sys_admin 的账户 --> <!--同步 raceenroll.registerInfo 与 geerunner.sys_admin 的账户 -->
<insert id="insertToCommonNeuuser" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "neuUserId" keyColumn = "neuUserId"> <insert id="insertToCommonNeuuser" parameterType="java.util.Map" useGeneratedKeys = "true" keyProperty = "neuUserId" keyColumn = "neuUserId">
insert into common.neuuser values( null, #{userId}, null, #{gk_userId}, null) insert into common.neuuser (
neuUserId,gUserId,wUserId,gtUserId,role
)
values( null, #{userId}, null, #{gk_userId}, null)
</insert> </insert>
<!--同步 raceenroll.registerInfo 与 geerunner.sys_admin 的账户 --> <!--同步 raceenroll.registerInfo 与 geerunner.sys_admin 的账户 -->
<insert id="updateCommonNeuuser" parameterType="java.util.Map"> <insert id="updateCommonNeuuser" parameterType="java.util.Map">
update common.neuuser set gtUserId= #{gk_userId} where gUserId = #{userId} update common.neuuser
set gtUserId= #{gk_userId} where gUserId = #{userId}
</insert> </insert>
<!--按id 获取 sys_admin 下的 org_id --> <!--按id 获取 sys_admin 下的 org_id -->
<select id="getGeerunnerOrgId" resultType="java.lang.String" parameterType="int"> <select id="getGeerunnerOrgId" resultType="java.lang.String" parameterType="int">
select org_id from geerunner.sys_admin where id = #{gk_userId} select org_id
from geerunner.sys_admin
where id = #{gk_userId}
</select> </select>
</mapper> </mapper>
\ No newline at end of file
...@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel; ...@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
/** /**
...@@ -16,6 +17,7 @@ import lombok.experimental.Accessors; ...@@ -16,6 +17,7 @@ import lombok.experimental.Accessors;
@Getter @Getter
@Setter @Setter
@Accessors(chain = true) @Accessors(chain = true)
@ToString
public class Cmpt extends JaapRecord<Cmpt> { public class Cmpt extends JaapRecord<Cmpt> {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -15,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -15,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeUnit;
/** /**
* 赛事 * 赛事
...@@ -37,8 +38,9 @@ public class CmptService { ...@@ -37,8 +38,9 @@ public class CmptService {
public Cmpt queryCmptBycmptId(Integer cmptId) { public Cmpt queryCmptBycmptId(Integer cmptId) {
try { try {
long start = System.currentTimeMillis();
Cmpt cmpt = remoteService.getCmptByCmptId(cmptId); Cmpt cmpt = remoteService.getCmptByCmptId(cmptId);
log.info("耗时cmpt1:"+(System.currentTimeMillis()-start));
if(cmpt == null) { if(cmpt == null) {
log.error("not find related cmpt id : " + cmptId); log.error("not find related cmpt id : " + cmptId);
return new Cmpt().setCmptId(cmptId); return new Cmpt().setCmptId(cmptId);
...@@ -47,9 +49,10 @@ public class CmptService { ...@@ -47,9 +49,10 @@ public class CmptService {
log.info(cmpt); log.info(cmpt);
Cmpt localCmpt = cmptMapper.queryCmptBycmptId(cmptId); Cmpt localCmpt = cmptMapper.queryCmptBycmptId(cmptId);
log.info("耗时cmpt2:"+(System.currentTimeMillis()-start));
if (localCmpt == null) { if (localCmpt == null) {
save(cmpt); save(cmpt);
log.info("耗时cmpt3:"+(System.currentTimeMillis()-start));
return cmptMapper.queryCmptBycmptId(cmptId); return cmptMapper.queryCmptBycmptId(cmptId);
} else { } else {
localCmpt.setCmptName(cmpt.getCmptName()); localCmpt.setCmptName(cmpt.getCmptName());
...@@ -57,6 +60,7 @@ public class CmptService { ...@@ -57,6 +60,7 @@ public class CmptService {
localCmpt.setEndTime(cmpt.getEndTime()); localCmpt.setEndTime(cmpt.getEndTime());
localCmpt.setCmptType(cmpt.getCmptType()); localCmpt.setCmptType(cmpt.getCmptType());
update(localCmpt); update(localCmpt);
log.info("耗时cmpt4:"+(System.currentTimeMillis()-start));
return localCmpt; return localCmpt;
} }
}catch (Exception ex){ }catch (Exception ex){
...@@ -125,15 +129,27 @@ public class CmptService { ...@@ -125,15 +129,27 @@ public class CmptService {
} }
public Page<List<Cmpt>> queryCmpt(Pageable page, Map<String,String> param) { public Page<List<Cmpt>> queryCmpt(Pageable page, Map<String,String> param) {
long start = System.currentTimeMillis();
long count = cmptMapper.countCount(param); long count = cmptMapper.countCount(param);
log.info("耗时1:"+(System.currentTimeMillis()-start));
List<Cmpt> list = cmptMapper.queryCmpt(page, param); List<Cmpt> list = cmptMapper.queryCmpt(page, param);
log.info("耗时2:"+(System.currentTimeMillis()-start));
list.forEach(cmpt -> { list.forEach(cmpt -> {
Object o = valueOperations.get("gk:view:" + cmpt.getCmptId()); Object o = valueOperations.get("gk:view:" + cmpt.getCmptId());
if(o != null){ if(o != null){
cmpt.setView((Integer) o); cmpt.setView((Integer) o);
} }
cmpt.setEnroll(remoteService.getCmptEnrollCount(cmpt.getCmptId()));
log.info("耗时3:"+(System.currentTimeMillis()-start));
Object countStr = valueOperations.get("count:cmptid:" + cmpt.getCmptId());
if(countStr != null){
cmpt.setEnroll(Integer.valueOf(countStr.toString()));
}else{
int cmptEnrollCount = remoteService.getCmptEnrollCount(cmpt.getCmptId());
cmpt.setEnroll(cmptEnrollCount);
valueOperations.set("count:cmptid:"+cmpt.getCmptId(),cmptEnrollCount+"",30, TimeUnit.MINUTES);
log.info("耗时4:"+(System.currentTimeMillis()-start));
}
}); });
return PageFactory.setContent(list, page, count); return PageFactory.setContent(list, page, count);
} }
...@@ -241,4 +257,8 @@ public class CmptService { ...@@ -241,4 +257,8 @@ public class CmptService {
public RoadUser getEnrollUsersByPhone(Integer cmptId, String phone) { public RoadUser getEnrollUsersByPhone(Integer cmptId, String phone) {
return cmptMapper.getEnrollUsersByPhone(cmptId,phone); return cmptMapper.getEnrollUsersByPhone(cmptId,phone);
} }
public List<Cmpt> queryMyCmpt(String userId) {
return cmptMapper.queryMyCmpt(userId);
}
} }
...@@ -2,13 +2,15 @@ package com.dlbridge.jadp.plugins.cmpt.service; ...@@ -2,13 +2,15 @@ package com.dlbridge.jadp.plugins.cmpt.service;
import com.dlbridge.jadp.plugins.cmpt.bean.CmptTemplate; import com.dlbridge.jadp.plugins.cmpt.bean.CmptTemplate;
import com.dlbridge.jadp.plugins.cmpt.dao.mapper.TemplateMapper; import com.dlbridge.jadp.plugins.cmpt.dao.mapper.TemplateMapper;
import javafx.beans.binding.ObjectBinding;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.*; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service @Service
public class TemplateService { public class TemplateService {
...@@ -87,7 +89,7 @@ public class TemplateService { ...@@ -87,7 +89,7 @@ public class TemplateService {
itemMap.put("new_gk_itemId", new_gk_itemId); itemMap.put("new_gk_itemId", new_gk_itemId);
gkItemMapList.add(itemMap); gkItemMapList.add(itemMap);
// 查询 certificate 表 // 查询 certificate 表
List<Map<String, Object>> certificateList = templateMapper.queryGeerunnerCertificateByRoadId(Integer.valueOf(cmptItemList.get(i).get("item_id").toString())); /*List<Map<String, Object>> certificateList = templateMapper.queryGeerunnerCertificateByRoadId(Integer.valueOf(cmptItemList.get(i).get("item_id").toString()));
if(certificateList.size()>0) { if(certificateList.size()>0) {
// 复制 certificate 表 // 复制 certificate 表
for (int j = 0; j < certificateList.size(); j++) { for (int j = 0; j < certificateList.size(); j++) {
...@@ -106,13 +108,13 @@ public class TemplateService { ...@@ -106,13 +108,13 @@ public class TemplateService {
// 复制 cmpt_rich_text 赛事富文本表 // 复制 cmpt_rich_text 赛事富文本表
templateMapper.copyGeerunnerCmptRichText(gmap1); templateMapper.copyGeerunnerCmptRichText(gmap1);
// 复制 cmpt_userdefine 报名配置表 // 复制 cmpt_userdefine 报名配置表
templateMapper.copyGeerunnerCmptUserdefine(gmap1); templateMapper.copyGeerunnerCmptUserdefine(gmap1);*/
} }
} }
// 查询 cmpt_discount 优惠方案 // 查询 cmpt_discount 优惠方案
List<Map<String, Object>> cmptDiscounts = templateMapper.queryGeerunnerCmptDiscountByCmptId(gk_compId); /*List<Map<String, Object>> cmptDiscounts = templateMapper.queryGeerunnerCmptDiscountByCmptId(gk_compId);
if(cmptDiscounts.size()>0) { if(cmptDiscounts.size()>0) {
for (int i = 0; i < cmptDiscounts.size(); i++) { for (int i = 0; i < cmptDiscounts.size(); i++) {
// 复制 cmpt_discount 优惠方案 // 复制 cmpt_discount 优惠方案
...@@ -131,10 +133,10 @@ public class TemplateService { ...@@ -131,10 +133,10 @@ public class TemplateService {
templateMapper.copyGeerunnerCmptDiscountMapping(gmap2); templateMapper.copyGeerunnerCmptDiscountMapping(gmap2);
} }
} }
} }*/
// 查询 cmpt_extra_charge表的groupId // 查询 cmpt_extra_charge表的groupId
List<Map<String, Object>> groupIds = templateMapper.queryGeerunnerCmptExtraChargeGroupIdByCmptId(gk_compId); /*List<Map<String, Object>> groupIds = templateMapper.queryGeerunnerCmptExtraChargeGroupIdByCmptId(gk_compId);
if (groupIds.size()>0) { if (groupIds.size()>0) {
Map<String, Object> gmap3 = new HashMap<>(); Map<String, Object> gmap3 = new HashMap<>();
gmap3.put("new_gk_cmptId", new_gk_cmptId); gmap3.put("new_gk_cmptId", new_gk_cmptId);
...@@ -164,13 +166,13 @@ public class TemplateService { ...@@ -164,13 +166,13 @@ public class TemplateService {
templateMapper.copyGeerunnerCmptExtraCharge(gmap3); templateMapper.copyGeerunnerCmptExtraCharge(gmap3);
} }
} }
} }*/
// 复制 cmpt_medal 赛事奖牌表 // 复制 cmpt_medal 赛事奖牌表
templateMapper.copyGeerunnerCmptMedal(gmap); //templateMapper.copyGeerunnerCmptMedal(gmap);
// 查询 gps_path // 查询 gps_path
List<Map<String, Object>> gpsPathList = templateMapper.queryGeerunnerGpsPathByCmptId(gk_compId); /*List<Map<String, Object>> gpsPathList = templateMapper.queryGeerunnerGpsPathByCmptId(gk_compId);
if(gpsPathList.size()>0) { if(gpsPathList.size()>0) {
Map<String, Object> gmap4 = new HashMap<>(); Map<String, Object> gmap4 = new HashMap<>();
gmap4.put("new_gk_cmptId", new_gk_cmptId); gmap4.put("new_gk_cmptId", new_gk_cmptId);
...@@ -189,7 +191,7 @@ public class TemplateService { ...@@ -189,7 +191,7 @@ public class TemplateService {
gmap4.put("new_gk_pathId",new_gk_pathId); gmap4.put("new_gk_pathId",new_gk_pathId);
templateMapper.copyGeerunnerGpsPlacemark(gmap4); templateMapper.copyGeerunnerGpsPlacemark(gmap4);
} }
} }*/
// 复制 time_seg // 复制 time_seg
List<Map<String, Object>> gkSegList = new ArrayList<>(); // 存储seq 新旧id关系 List<Map<String, Object>> gkSegList = new ArrayList<>(); // 存储seq 新旧id关系
...@@ -212,7 +214,7 @@ public class TemplateService { ...@@ -212,7 +214,7 @@ public class TemplateService {
} }
} }
// time_checkpoint 计时点 /*// time_checkpoint 计时点
List<Map<String, Object>> timeCheckpointList = templateMapper.queryGeerunnerTimeCheckpointByCmptId(gk_compId); List<Map<String, Object>> timeCheckpointList = templateMapper.queryGeerunnerTimeCheckpointByCmptId(gk_compId);
if (timeCheckpointList.size()>0) { if (timeCheckpointList.size()>0) {
Map<String, Object> gmap6 = new HashMap<>(); Map<String, Object> gmap6 = new HashMap<>();
...@@ -261,7 +263,7 @@ public class TemplateService { ...@@ -261,7 +263,7 @@ public class TemplateService {
templateMapper.copyGeerunnerTimeRanking(gmap7); templateMapper.copyGeerunnerTimeRanking(gmap7);
} }
} }
} }*/
/****************************复制 geerunner 库的信息 结束****************************/ /****************************复制 geerunner 库的信息 结束****************************/
/****************************复制 gksite 库的信息 开始****************************/ /****************************复制 gksite 库的信息 开始****************************/
// 复制 gk_cmpt 赛事主表 // 复制 gk_cmpt 赛事主表
...@@ -271,7 +273,7 @@ public class TemplateService { ...@@ -271,7 +273,7 @@ public class TemplateService {
smap.put("gk_userId",gk_userId); smap.put("gk_userId",gk_userId);
templateMapper.copyGkSiteGkCmpt(smap); templateMapper.copyGkSiteGkCmpt(smap);
// 查询 banner 表 // 查询 banner 表
List<Map<String, Object>> bannerList = templateMapper.queryGksiteBannerByCmptId(gk_compId); /*List<Map<String, Object>> bannerList = templateMapper.queryGksiteBannerByCmptId(gk_compId);
if(bannerList.size()>0) { if(bannerList.size()>0) {
Map<String, Object> smap1 = new HashMap<>(); Map<String, Object> smap1 = new HashMap<>();
smap1.put("new_gk_cmptId",new_gk_cmptId); smap1.put("new_gk_cmptId",new_gk_cmptId);
...@@ -284,7 +286,7 @@ public class TemplateService { ...@@ -284,7 +286,7 @@ public class TemplateService {
// 复制 banner_statistic 表 // 复制 banner_statistic 表
templateMapper.copyGkSiteBannerStatistic(smap1); templateMapper.copyGkSiteBannerStatistic(smap1);
} }
} }*/
// 复制 gk_cmpt_func 表 各种配置的开关 // 复制 gk_cmpt_func 表 各种配置的开关
templateMapper.copyGkSiteGkCmptFunc(smap); templateMapper.copyGkSiteGkCmptFunc(smap);
...@@ -332,7 +334,7 @@ public class TemplateService { ...@@ -332,7 +334,7 @@ public class TemplateService {
pmap.clear(); pmap.clear();
pmap.put("compId",race_cmptId); pmap.put("compId",race_cmptId);
pmap.put("new_race_cmptId",new_race_cmptId); pmap.put("new_race_cmptId",new_race_cmptId);
templateMapper.copyRaceCmptPartnerMap(pmap); //templateMapper.copyRaceCmptPartnerMap(pmap);
// 复制raceenroll.competitioncustom // 复制raceenroll.competitioncustom
templateMapper.copyRaceCompetitioncustom(pmap); templateMapper.copyRaceCompetitioncustom(pmap);
// 查询赛事下的项目列表 // 查询赛事下的项目列表
...@@ -357,13 +359,13 @@ public class TemplateService { ...@@ -357,13 +359,13 @@ public class TemplateService {
pmap1.put("userId",userId); pmap1.put("userId",userId);
pmap1.put("roadId",roads.get(i).get("roadId")); pmap1.put("roadId",roads.get(i).get("roadId"));
pmap1.put("new_race_roadId",new_race_roadId); pmap1.put("new_race_roadId",new_race_roadId);
templateMapper.copyRaceCompetitionroadrole(pmap1); //templateMapper.copyRaceCompetitionroadrole(pmap1);
// 查询 extrapay 表赛事项目额外费项表 // 查询 extrapay 表赛事项目额外费项表
List<Map<String, Object>> extrapays = templateMapper.queryRaceExtrapayByRoadId(Integer.valueOf(roads.get(i).get("roadId").toString())); List<Map<String, Object>> extrapays = templateMapper.queryRaceExtrapayByRoadId(Integer.valueOf(roads.get(i).get("roadId").toString()));
pmap_extrapay.put("new_race_roadId",new_race_roadId); pmap_extrapay.put("new_race_roadId",new_race_roadId);
pmap_payitem.put("new_race_roadId",new_race_roadId); pmap_payitem.put("new_race_roadId",new_race_roadId);
pmap_payitem.put("roadId",roads.get(i).get("roadId")); pmap_payitem.put("roadId",roads.get(i).get("roadId"));
for (int j = 0; j < extrapays.size(); j++) { /*for (int j = 0; j < extrapays.size(); j++) {
// 复制 extrapay 表 赛事项目额外费项表 // 复制 extrapay 表 赛事项目额外费项表
pmap_extrapay.put("id", extrapays.get(j).get("id")); pmap_extrapay.put("id", extrapays.get(j).get("id"));
templateMapper.copyRaceExtrapay(pmap_extrapay); templateMapper.copyRaceExtrapay(pmap_extrapay);
...@@ -374,7 +376,7 @@ public class TemplateService { ...@@ -374,7 +376,7 @@ public class TemplateService {
templateMapper.copyRacePayitem(pmap_payitem); templateMapper.copyRacePayitem(pmap_payitem);
// 复制 road_extrapay_relation 表 // 复制 road_extrapay_relation 表
templateMapper.copyRaceRoadExtrapayRelation(pmap_payitem); templateMapper.copyRaceRoadExtrapayRelation(pmap_payitem);
} }*/
// 存储新旧roadId关系 // 存储新旧roadId关系
Map<String, Object> roadIdMap = new HashMap<>(); Map<String, Object> roadIdMap = new HashMap<>();
roadIdMap.put("roadId",Integer.valueOf(roads.get(i).get("roadId").toString())); roadIdMap.put("roadId",Integer.valueOf(roads.get(i).get("roadId").toString()));
...@@ -385,7 +387,7 @@ public class TemplateService { ...@@ -385,7 +387,7 @@ public class TemplateService {
templateMapper.copyRaceUserdefined(pmap_payitem); templateMapper.copyRaceUserdefined(pmap_payitem);
} }
// 查询项目优惠通道信息 discount表 // 查询项目优惠通道信息 discount表
Map<String, Object> pmap2 = new HashMap<>(); /*Map<String, Object> pmap2 = new HashMap<>();
Map<String, Object> pmap_roadchannel = new HashMap<>(); Map<String, Object> pmap_roadchannel = new HashMap<>();
List<Map<String, Object>> discounts = templateMapper.queryRaceDiscountByCompId(race_cmptId); List<Map<String, Object>> discounts = templateMapper.queryRaceDiscountByCompId(race_cmptId);
for (int i = 0; i < discounts.size(); i++) { for (int i = 0; i < discounts.size(); i++) {
...@@ -426,7 +428,7 @@ public class TemplateService { ...@@ -426,7 +428,7 @@ public class TemplateService {
} }
} }
} }
} }*/
// 查询赛事号码牌规则信息 // 查询赛事号码牌规则信息
List<Map<String, Object>> markNoRules = templateMapper.queryRaceMarkNoRuleByCompId(race_cmptId); List<Map<String, Object>> markNoRules = templateMapper.queryRaceMarkNoRuleByCompId(race_cmptId);
......
...@@ -201,7 +201,8 @@ public class CmptController { ...@@ -201,7 +201,8 @@ public class CmptController {
*/ */
@ResponseBody @ResponseBody
@RequestMapping(value = "saveCmpt", method = RequestMethod.POST) @RequestMapping(value = "saveCmpt", method = RequestMethod.POST)
public com.neusoft.www.utils.web.Result saveCmpt(Cmpt cmpt) { public com.neusoft.www.utils.web.Result saveCmpt(@RequestBody Cmpt cmpt) {
log.info("保存的入参:"+cmpt);
if (cmpt.getCmptId() == null) { if (cmpt.getCmptId() == null) {
cmptService.save(cmpt); cmptService.save(cmpt);
} else { } else {
......
...@@ -293,10 +293,12 @@ public class MicroApiController { ...@@ -293,10 +293,12 @@ public class MicroApiController {
public Page<List<Cmpt>> cmpt(@ApiIgnore Pageable page, String keyword,HttpServletRequest request) { public Page<List<Cmpt>> cmpt(@ApiIgnore Pageable page, String keyword,HttpServletRequest request) {
int type = NumberUtils.toInt(request.getParameter("type"), 0); int type = NumberUtils.toInt(request.getParameter("type"), 0);
String partnerId = request.getParameter("partnerId"); String partnerId = request.getParameter("partnerId");
String creator = request.getParameter("userId");
Partner partner = cmptService.getPartnerById(partnerId); Partner partner = cmptService.getPartnerById(partnerId);
log.info("partner:"+partner); log.info("partner:"+partner);
Map<String,String> param = new HashMap<>(); Map<String,String> param = new HashMap<>();
param.put("userId",partner.getUserId()+""); param.put("userId",partner.getUserId()+"");
param.put("creator",creator);
param.put("type",type+""); param.put("type",type+"");
param.put("keyword",keyword); param.put("keyword",keyword);
Page<List<Cmpt>> result = cmptService.queryCmpt(page, param); Page<List<Cmpt>> result = cmptService.queryCmpt(page, param);
...@@ -304,6 +306,17 @@ public class MicroApiController { ...@@ -304,6 +306,17 @@ public class MicroApiController {
return result; return result;
} }
@GetMapping(value = "/queryMyCmpt")
public Result<List<Cmpt>> queryMyCmpt(@ApiIgnore Pageable page, String keyword,HttpServletRequest request) {
String userId = request.getParameter("userId");
if (StringUtils.isBlank(userId)) {
return Result.fail().setMsg("参数不正常!");
}
List<Cmpt> result = cmptService.queryMyCmpt(userId);
return Result.success().setContent(result);
}
@GetMapping(value = "/func/{cmptId}") @GetMapping(value = "/func/{cmptId}")
@ApiResponses({ @ApiResponses({
@ApiResponse(code = 200, message = "成功"), @ApiResponse(code = 200, message = "成功"),
......
spring.profiles.active=dev spring.profiles.active=dev
\ No newline at end of file
...@@ -18,6 +18,7 @@ $(function () { ...@@ -18,6 +18,7 @@ $(function () {
} }
$.ajax({ $.ajax({
url: '/gk/cmpt/saveCmpt', url: '/gk/cmpt/saveCmpt',
contentType:"application/json",
data: {'cmptId': cmptId, 'cmptbgColor': "#"+bg, 'logo': logo}, data: {'cmptId': cmptId, 'cmptbgColor': "#"+bg, 'logo': logo},
type: 'post', type: 'post',
success: function (data) { success: function (data) {
......
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