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

Merge #109 into master from cc_20260420_export

Browse Source 
feat：数量不一致

* cc_20260420_export: (7 commits squashed)

  - feat:提示修改

  - feat:提示修改

  - feat:导出调整

  - feat:管理员查询所有 非管理员权限查询

  - feat:管理员查询所有 非管理员权限查询

  - feat:fix

  - feat：数量不一致

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/109
This commit is contained in:
正新
2026-04-24 09:44:31 +00:00
parent d885635728
commit 7c5a2c858d
28 changed files with 756 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
coolstore-partner-dao/src/main/java/com/cool/store/dao/AdjustmentOrderDAO.java
View File

@@ -116,6 +116,13 @@ public class AdjustmentOrderDAO {
return AdjustmentOrderMapper.pageQuery(request);
}
/**
* 分页查询总数
*/
public Long pageCount(AdjustmentOrderPageRequest request) {
return AdjustmentOrderMapper.pageCount(request);
}
/**
* 删除
*/

7
coolstore-partner-dao/src/main/java/com/cool/store/dao/SplitOrderDAO.java
View File

@@ -112,6 +112,13 @@ public class SplitOrderDAO {
return zxjpSplitOrderMapper.pageQueryWithStore(request);
}
/**
* 分页查询总数
*/
public Long pageCount(SplitOrderPageRequest request) {
return zxjpSplitOrderMapper.pageCount(request);
}
/**
* 删除
*/

5
coolstore-partner-dao/src/main/java/com/cool/store/mapper/AdjustmentOrderMapper.java
View File

@@ -48,4 +48,9 @@ public interface AdjustmentOrderMapper extends Mapper<AdjustmentOrderDO> {
* 分页查询
*/
List<AdjustmentOrderResponse> pageQuery(@Param("request") AdjustmentOrderPageRequest request);
/**
* 分页查询总数
*/
Long pageCount(@Param("request") AdjustmentOrderPageRequest request);
}

5
coolstore-partner-dao/src/main/java/com/cool/store/mapper/SplitOrderMapper.java
View File

@@ -48,4 +48,9 @@ public interface SplitOrderMapper extends Mapper<SplitOrderDO> {
* 分页查询（关联门店信息）
*/
List<SplitOrderResponse> pageQueryWithStore(@Param("request") SplitOrderPageRequest request);
/**
* 分页查询总数
*/
Long pageCount(@Param("request") SplitOrderPageRequest request);
}

57
coolstore-partner-dao/src/main/resources/mapper/AdjustmentOrderMapper.xml
View File

@@ -97,8 +97,63 @@
<if test="request.expenseSheetType != null and request.expenseSheetType != ''">
and a.expense_sheet_type = #{request.expenseSheetType}
</if>
<if test="request.regionIds != null and !request.regionIds.isEmpty()">
AND <foreach collection="request.regionIds" item="regionId" separator=" OR " open="(" close=")">
b.region_path LIKE CONCAT('%/', #{regionId}, '/%')
</foreach>
</if>
order by create_time desc
</select>
<!-- 分页查询总数 -->
<select id="pageCount" resultType="java.lang.Long">
select count(1)
from zxjp_adjustment_order a
left join store_${enterpriseId} b
on a.store_id = b.store_id
where a.deleted = 0
<if test="request.keyword != null and request.keyword != ''">
and (b.store_name like concat('%', #{request.keyword}, '%')
or b.store_num like concat('%', #{request.keyword}, '%'))
</if>
<if test="request.adjustmentNo != null and request.adjustmentNo != ''">
and a.adjustment_no like concat('%', #{request.adjustmentNo}, '%')
</if>
<if test="request.storeId != null and request.storeId != ''">
and a.store_id = #{request.storeId}
</if>
<if test="request.expenseTypeCode != null and request.expenseTypeCode != ''">
and a.expense_type_code = #{request.expenseTypeCode}
</if>
<if test="request.adjustType != null">
and a.adjust_type = #{request.adjustType}
</if>
<if test="request.statusList != null and request.statusList.size() > 0">
and a.status in
<foreach collection="request.statusList" item="status" open="(" separator="," close=")">
#{status}
</foreach>
</if>
<if test="request.adjustReason != null and request.adjustReason != ''">
and a.adjust_reason like concat('%', #{request.adjustReason}, '%')
</if>
<if test="request.businessTypeCode != null and request.businessTypeCode != ''">
and a.business_type_code = #{request.businessTypeCode}
</if>
<if test="request.claimStartTime != null">
and a.claim_time &gt;= #{request.claimStartTime}
</if>
<if test="request.claimEndTime != null">
and a.claim_time &lt;= #{request.claimEndTime}
</if>
<if test="request.expenseSheetType != null and request.expenseSheetType != ''">
and a.expense_sheet_type = #{request.expenseSheetType}
</if>
<if test="request.regionIds != null and !request.regionIds.isEmpty()">
AND <foreach collection="request.regionIds" item="regionId" separator=" OR " open="(" close=")">
b.region_path LIKE CONCAT('%/', #{regionId}, '/%')
</foreach>
</if>
</select>
</mapper>

41
coolstore-partner-dao/src/main/resources/mapper/SplitOrderMapper.xml
View File

@@ -141,6 +141,43 @@
ORDER BY a.create_time DESC
</select>
<!-- 分页查询总数 -->
<select id="pageCount" resultType="java.lang.Long">
select count(1)
from zxjp_split_order a
left join store_${enterpriseId} b
on a.related_store_id = b.store_id
where a.deleted = 0
<if test="request.splitNo != null and request.splitNo != ''">
AND a.split_no LIKE CONCAT('%', #{request.splitNo}, '%')
</if>
<if test="request.splitType != null">
AND a.split_type = #{request.splitType}
</if>
<if test="request.payerAccountName != null and request.payerAccountName != ''">
AND a.payer_account_name LIKE CONCAT('%', #{request.payerAccountName}, '%')
</if>
<if test="request.payeeAccountName != null and request.payeeAccountName != ''">
AND a.payee_account_name LIKE CONCAT('%', #{request.payeeAccountName}, '%')
</if>
<if test="request.expenseTypeCode != null and request.expenseTypeCode != ''">
AND a.expense_type_code = #{request.expenseTypeCode}
</if>
<if test="request.relatedStoreId != null and request.relatedStoreId != ''">
AND a.related_store_id = #{request.relatedStoreId}
</if>
<if test="request.relatedDocNo != null and request.relatedDocNo != ''">
AND a.related_doc_no LIKE CONCAT('%', #{request.relatedDocNo}, '%')
</if>
<if test="request.status != null and request.status != ''">
AND a.status = #{request.status}
</if>
<if test="request.source != null">
AND a.source = #{request.source}
</if>
<if test="request.keyword != null and request.keyword != ''">
AND (b.store_name LIKE CONCAT('%', #{request.keyword}, '%') OR b.store_num LIKE CONCAT('%', #{request.keyword}, '%'))
</if>
</select>
</mapper>
</mapper>