ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 结算单报错 (#515)

Browse Source 
<!-- Note -->
<!-- This is a template for submitting a new feature.
Use the bug fix template if you're submitting a bug fix pull request by adding `template=bug_fix.md` to your pull request URL. -->

# Description
<!-- Describe the new feature or modification to an existing feature clearly and consciously. -->

# Motivation
<!-- Explain the reason for adding or modifying this feature. -->

# Key changes
<!-- Provide a technically detailed description of the key changes made. -->
- Frontend
- Backend

# Test plan
## Suggestions
<!-- Provide any suggestions or recommendations for improvements in the testing plan. -->

## Underlying risk
<!-- Identify any potential risks or issues that may arise from the new feature or modification. -->

# Showcase
<!-- Including any screenshots of the new feature or modification. -->

Reviewed-on: daoyoucloud/tachycode#515
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
This commit is contained in:
wjh 2024-03-28 14:49:36 +08:00 committed by baijingfeng
parent 08adf2fe40
commit 75b3148521
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/plugins/@hera/plugin-rental/src/server/services/settlement-service.ts
View File

@ -758,7 +758,6 @@ export class SettlementService {
}
}
});
calc.list.forEach((value) => {
const productDate = converDate(value.date, 'YYYY-MM-DD');
if ((value.name as string).includes('-')) {
@ -766,8 +765,10 @@ export class SettlementService {
const valueItem = calc.list.filter(
(item) => converDate(item.date, 'YYYY-MM-DD') === productDate && item.name === name,
)[0];
if (valueItem) {
value.date = dayjs(valueItem.date).add(1, 'seconds');
}
}
});
calc.list?.sort((a, b) => {
return new Date(a.date).getTime() - new Date(b.date).getTime();