guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

2024/12/13 动火增加时间筛选

0205cmt
zhaohongyu 2024-12-13 16:29:48 +08:00
parent 82e9cd2d33
commit ef22ca6c04
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java
View File

@ -2243,6 +2243,12 @@ public class HotWorkApplicationController extends BaseController {
pd.put("CREATOR", Jurisdiction.getUSER_ID());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
pd = Jurisdiction.getUserDataJurisdiction(pd);
String STARTTIME = pd.getString("STARTTIME"); // 关键词检索条件
if (Tools.notEmpty(STARTTIME))
pd.put("STARTTIME", STARTTIME.trim());
String ENDTIME = pd.getString("ENDTIME"); // 关键词检索条件
if (Tools.notEmpty(ENDTIME))
pd.put("ENDTIME", ENDTIME + " 23:59:59");
page.setPd(pd);
List<PageData> varList = hotworkapplicationService.hotworkdatalistPage(page); //列出HotWorkApplication列表
Map<String,Integer> hotIdKeyMap = new HashMap<>();

6
src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml
View File

@ -393,6 +393,12 @@
<if test="pd.keyState != null and pd.keyState != ''">
and f.STATE = #{pd.keyState}
</if>
<if test="pd.STARTTIME != null and pd.STARTTIME != ''"><!-- 关键词检索 -->
and f.CREATTIME >= #{pd.STARTTIME}
</if>
<if test="pd.ENDTIME != null and pd.ENDTIME != ''">
and f.CREATTIME &lt;= #{pd.ENDTIME}
</if>
GROUP BY HOTWORKAPPLICATION_ID
ORDER BY
fu.OPERATTIME DESC <!-- 前台的排序时间查的是hotuser表里的OPERATTIME，起别名叫排序时间 -->