Merge #30 into master from cc_20260106_process_change

fix:加盟合同签约及建店资料修改

* cc_20260106_process_change: (6 commits squashed)

  - fix:加盟合同签约新增财务审批

  - fix:建店资料阶段逻辑修改

  - fix:加盟合同签约待办,财务查看待财务审批的待办

  - feat:城市规划

  - feat:行政区划接口;
    fix:城市规划修改

  - fix:加盟合同签约审批日志逻辑修改

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-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/30
This commit is contained in:
王非凡
2026-01-19 09:11:34 +00:00
committed by 正新
parent eb9b8bdf00
commit c28515123a
41 changed files with 1259 additions and 92 deletions

View File

@@ -328,4 +328,31 @@
</otherwise>
</choose>
</select>
<select id="storeNumStatisticsByAd" resultType="java.util.Map">
SELECT YEAR(open_date) year, province, city, COUNT(1) store_num, QUARTER(open_date) quarter
FROM store_${enterpriseId}
WHERE is_delete = 'effective'
AND city IN
<foreach item="item" collection="cityNames" separator="," open="(" close=")">
#{item}
</foreach>
AND YEAR(open_date) IN
<foreach item="item" collection="years" separator="," open="(" close=")">
#{item}
</foreach>
GROUP BY YEAR(open_date), QUARTER(open_date), province, city
</select>
<select id="totalStoreNumByAd" resultType="java.lang.Integer">
SELECT COUNT(1)
FROM store_${enterpriseId}
WHERE is_delete = 'effective' AND province = #{province} AND city = #{city}
<if test="openStartTime != null">
AND open_time >= #{openStartTime}
</if>
<if test="openEndTime != null">
AND open_time &lt;= #{openEndTime}
</if>
</select>
</mapper>