angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 直推升级数据,导出

This commit is contained in:
zhangheng 2025-09-24 13:25:16 +08:00 committed by cabbage
parent dce78bb2f0
commit 6314e51dcf
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/controller/AcRecommendConfigController.java
View File

@ -70,7 +70,7 @@ public class AcRecommendConfigController extends BaseController {
* @param acDirectPushUpgradeParam * @param acDirectPushUpgradeParam
* @return * @return
*/ */
@Log(module = EOperationModule.AC_DIRECT_PUSH_UPGRADE, business = EOperationBusiness.AC_DIRECT_PUSH_UPGRADE, method = EOperationMethod.INSERT, remark = "在线签呈") @Log(module = EOperationModule.AC_DIRECT_PUSH_UPGRADE, business = EOperationBusiness.AC_DIRECT_PUSH_UPGRADE, method = EOperationMethod.INSERT)
@PostMapping("/directPushUpgrade") @PostMapping("/directPushUpgrade")
public AjaxResult directPushUpgradeSubmit(@RequestBody AcDirectPushUpgradeParam acDirectPushUpgradeParam) { public AjaxResult directPushUpgradeSubmit(@RequestBody AcDirectPushUpgradeParam acDirectPushUpgradeParam) {
acDirectPushUpgradeParam.setPkCountry(SecurityUtils.getPkCountry()); acDirectPushUpgradeParam.setPkCountry(SecurityUtils.getPkCountry());
@ -87,13 +87,14 @@ public class AcRecommendConfigController extends BaseController {
* @param param * @param param
* @return * @return
*/ */
@Log(module = EOperationModule.AC_DIRECT_PUSH_UPGRADE, business = EOperationBusiness.AC_DIRECT_PUSH_UPGRADE, method = EOperationMethod.SELECT, remark = "在线签呈") @Log(module = EOperationModule.AC_DIRECT_PUSH_UPGRADE_LIST, business = EOperationBusiness.AC_DIRECT_PUSH_UPGRADE_LIST, method = EOperationMethod.SELECT)
@GetMapping("/directPushUpgradeList") @GetMapping("/directPushUpgradeList")
public TableDataInfo directPushUpgradeList(AcDirectPushUpgradeListParam param) { public TableDataInfo directPushUpgradeList(AcDirectPushUpgradeListParam param) {
startPage(); startPage();
return getDataTable(iAcRecomUpgradeRecordService.queryList(param)); return getDataTable(iAcRecomUpgradeRecordService.queryList(param));
} }
@Log(module = EOperationModule.AC_DIRECT_PUSH_UPGRADE_LIST, business = EOperationBusiness.AC_DIRECT_PUSH_UPGRADE_LIST, method = EOperationMethod.SELECT)
@PostMapping("/directPushUpgradeExport") @PostMapping("/directPushUpgradeExport")
public void export(AcDirectPushUpgradeListParam param, HttpServletResponse response) { public void export(AcDirectPushUpgradeListParam param, HttpServletResponse response) {
startPage(); startPage();

21
bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml
View File

@ -64,8 +64,8 @@
<select id="queryList" resultType="com.hzs.activity.recommend.dto.AcDirectPushUpgradeListDTO"> <select id="queryList" resultType="com.hzs.activity.recommend.dto.AcDirectPushUpgradeListDTO">
SELECT SELECT
abc.ACT_NAME, abc.ACT_NAME,
cmm.member_code, cm.member_code,
cmm.member_name, cm.member_name,
arur.PK_SETTLE_GRADE, arur.PK_SETTLE_GRADE,
arur.PK_RECOMMEND_GRADE, arur.PK_RECOMMEND_GRADE,
abc.ACT_START_DATE, abc.ACT_START_DATE,
@ -75,26 +75,25 @@
FROM FROM
AC_RECOM_UPGRADE_RECORD arur AC_RECOM_UPGRADE_RECORD arur
LEFT JOIN AC_BASE_CONFIG abc ON arur.PK_BASE_ID = abc.PK_ID LEFT JOIN AC_BASE_CONFIG abc ON arur.PK_BASE_ID = abc.PK_ID
LEFT JOIN CU_MEMBER cm ON arur.pk_member = cm.PK_PARENT LEFT JOIN CU_MEMBER cm ON arur.pk_member = cm.PK_ID
LEFT JOIN CU_MEMBER cmm ON cm.PK_PARENT = cmm.PK_ID
WHERE arur.DEL_FLAG = 0 WHERE arur.DEL_FLAG = 0
<if test="actName != null"> <if test="actName != null">
AND abc.ACT_NAME = #{actName} AND abc.ACT_NAME = #{actName}
</if> </if>
<if test="memberCode != null"> <if test="memberCode != null">
AND cmm.member_code = #{memberCode} AND cm.member_code = #{memberCode}
</if> </if>
<if test="startActStartDate != null"> <if test="startActStartDate != null">
AND abc.ACT_START_DATE >= #{startActStartDate} AND abc.ACT_START_DATE >= #{startActStartDate,javaType=DATE}
</if> </if>
<if test="startActEndDate != null"> <if test="startActEndDate != null">
AND abc.ACT_START_DATE &lt;= #{startActEndDate} AND abc.ACT_START_DATE &lt;= #{startActEndDate,javaType=DATE}
</if>
<if test="startActEndDate != null">
AND abc.ACT_END_DATE >= #{endActStartDate}
</if> </if>
<if test="endActStartDate != null"> <if test="endActStartDate != null">
AND abc.ACT_END_DATE &lt;= #{endActEndDate} AND abc.ACT_END_DATE >= #{endActStartDate,javaType=DATE}
</if>
<if test="endActEndDate != null">
AND abc.ACT_END_DATE &lt;= #{endActEndDate,javaType=DATE}
</if> </if>
</select> </select>

2
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java
View File

@ -256,6 +256,8 @@ public enum EOperationBusiness {
AC_DIRECT_PUSH_UPGRADE("直推升级"), AC_DIRECT_PUSH_UPGRADE("直推升级"),
AC_DIRECT_PUSH_UPGRADE_LIST("直推升级数据"),
AC_WARES_RULE_CONFIG("商品赠送"), AC_WARES_RULE_CONFIG("商品赠送"),

2
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java
View File

@ -355,6 +355,8 @@ public enum EOperationModule {
AC_DIRECT_PUSH_UPGRADE("直推升级"), AC_DIRECT_PUSH_UPGRADE("直推升级"),
AC_DIRECT_PUSH_UPGRADE_LIST("直推升级数据"),
AC_TOURISM_CONFIG("旅游活动"), AC_TOURISM_CONFIG("旅游活动"),
AC_WARES_RULE_CONFIG("商品赠送"), AC_WARES_RULE_CONFIG("商品赠送"),