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

Merge #132 into master from revert-56b85c33-20f063dc

Browse Source 
Revert commit "Merge #128 into master from cc_20250512_uploadRentContract

* revert-56b85c33-20f063dc: (1 commits squashed)

  - Revert commit "Merge #128 into master from cc_20250512_uploadRentContract
    
    This reverts change request#128

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/132
This commit is contained in:
正新
2026-05-12 09:56:16 +00:00
parent fcb6fb0770
commit 8caf3b1a6a
325 changed files with 262 additions and 14063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml
View File

@@ -23,16 +23,11 @@
<result column="deleted" jdbcType="BIT" property="deleted" />
<result column="audit_id" jdbcType="BIGINT" property="auditId" />
<result column="result_type" jdbcType="TINYINT" property="resultType"/>
<result column="open_time" jdbcType="TIMESTAMP" property="openTime" />
<result column="first_day_income" jdbcType="VARCHAR" property="firstDayIncome" />
<result column="second_day_income" jdbcType="VARCHAR" property="secondDayIncome" />
<result column="third_day_income" jdbcType="VARCHAR" property="thirdDayIncome" />
</resultMap>
<sql id="Base_Column_List">
id,shop_id,plan_source,survey_result,survey_result_url,activity_theme,activity_theme_url,
submission_time,submitted_user_id,preparation_user_ids,route_completed,create_time,
update_time,create_user_id,update_user_id,deleted,audit_id,result_type,open_time,
first_day_income,second_day_income,third_day_income
update_time,create_user_id,update_user_id,deleted,audit_id,result_type
</sql>
<update id="updateByShopId">
update xfsg_opening_operation_plan
@@ -49,20 +44,6 @@
and
deleted = 0
</select>
<select id="selectByShopIds" resultType="com.cool.store.entity.OpeningOperationPlanDO">
select
<include refid="Base_Column_List"/>
from
xfsg_opening_operation_plan
where deleted = 0
<if test="shopIds != null and shopIds.size() > 0">
and shop_id in
<foreach collection="shopIds" item="shopId" index="index" open="(" separator="," close=")">
#{shopId}
</foreach>
</if>
</select>
<select id="getOpenPlanShopListByCondition"
resultType="com.cool.store.dto.openPreparation.OpenPlanShopInfoDTO">
select si.id as shopId, si.region_id AS regionId,si.line_id as lineId, si.shop_name as shopName,