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 17:56:17 +08:00
parent 1f0083d851
commit a9e8d3b090
2 changed files with 15 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/gf/GFElectricityController.java
View File

@ -112,6 +112,12 @@ public class GFElectricityController extends BaseController {
String DEPT_IDS[] = DEPTIDS.split(","); String DEPT_IDS[] = DEPTIDS.split(",");
pd.put("DEPT_IDS", DEPT_IDS); pd.put("DEPT_IDS", DEPT_IDS);
} }
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); page.setPd(pd);
List<PageData> varList = GFelectricityService.list(page); //列出Electricity列表 List<PageData> varList = GFelectricityService.list(page); //列出Electricity列表
map.put("varList", varList); map.put("varList", varList);

9
src/main/resources/mybatis/datasource/gf/ElectricityMapper.xml
View File

@ -744,6 +744,15 @@
<if test="pd.ANALYZE_USER_ID != null and pd.ANALYZE_USER_ID != ''"> <if test="pd.ANALYZE_USER_ID != null and pd.ANALYZE_USER_ID != ''">
and f.ANALYZE_USER_ID = #{pd.ANALYZE_USER_ID} and f.ANALYZE_USER_ID = #{pd.ANALYZE_USER_ID}
</if> </if>
<if test="pd.UNIT_LEADER_DEPARTMENT_ID != null and pd.UNIT_LEADER_DEPARTMENT_ID != ''">
and f.APPLY_DEPARTMENT_ID = #{pd.UNIT_LEADER_DEPARTMENT_ID}
</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>
<choose> <choose>
<when test='pd.ISMAIN != null and pd.ISMAIN != "" and pd.ISMAIN == "1"'> <when test='pd.ISMAIN != null and pd.ISMAIN != "" and pd.ISMAIN == "1"'>
<if test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''"> <if test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">