mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

月度结算页面

master
OathK1per 2022-08-19 18:13:27 +08:00
parent 879b078aa7
commit d033ccfa6a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/cn/palmte/work/service/MonthlySettleService.java
View File

@ -351,11 +351,11 @@ public class MonthlySettleService {
} }
if(StrUtil.isNotEmpty(searchInfo.get("contractStartTime"))){ if(StrUtil.isNotEmpty(searchInfo.get("contractStartTime"))){
String time = searchInfo.get("contractStartTime") + " 00:00:00"; String time = searchInfo.get("contractStartTime") + " 00:00:00";
queryHelper.addCondition("s.contract_time>=?", time); queryHelper.addCondition("s.contract_sign_time>=?", time);
} }
if(StrUtil.isNotEmpty(searchInfo.get("contractEndTime"))){ if(StrUtil.isNotEmpty(searchInfo.get("contractEndTime"))){
String time = searchInfo.get("contractEndTime") + " 23:59:59"; String time = searchInfo.get("contractEndTime") + " 23:59:59";
queryHelper.addCondition("s.contract_time<=?", time); queryHelper.addCondition("s.contract_sign_time<=?", time);
} }
queryHelper.addDescOrderProperty("s.id"); queryHelper.addDescOrderProperty("s.id");

2
src/main/resources/templates/admin/monthly_settle_list.ftl
View File

@ -125,7 +125,7 @@
<div align='right'> <div align='right'>
<button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary" <button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary"
id="submit-btn" onclick="sub_function('query')">搜索 id="submit-btn" onclick="sub_function('query')">搜索
</button>F </button>
<@shiro.hasPermission name="MONTHLY_SETTLE_EXPORT"> <@shiro.hasPermission name="MONTHLY_SETTLE_EXPORT">
<button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary" <button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary"
id="submit-btn-export" onclick="sub_function('export')">导出 id="submit-btn-export" onclick="sub_function('export')">导出