Commit 25cfe3da by huluobin

# 费用系统 搜索页面

parent 0e3bc819
...@@ -414,7 +414,9 @@ public abstract class AbstractCostService implements CostService { ...@@ -414,7 +414,9 @@ public abstract class AbstractCostService implements CostService {
if (userDomain.getIsadmin() > 0 || userDomain.getIsfinansys() > 0) { if (userDomain.getIsadmin() > 0 || userDomain.getIsfinansys() > 0) {
req.setCreateUserid(null); req.setCreateUserid(null);
} }
return costDao.queryPage(new Page<>(req.getPageNum(), req.getPageSize()), req); Page<CostDomain> page = costDao.queryPage(new Page<>(req.getPageNum(), req.getPageSize()), req);
this.setPrimaryDepartment(page.getRecords());
return page;
} }
@Resource @Resource
......
...@@ -297,7 +297,7 @@ ...@@ -297,7 +297,7 @@
from cost t1 from cost t1
left join cost_current_reviewer t2 on t1.cost_no = t2.cost_no left join cost_current_reviewer t2 on t1.cost_no = t2.cost_no
WHERE WHERE
t1.cost_status >= 1 true
<if test=" req.costForm!=null and req.costForm != ''">and t1.cost_form= #{req.costForm}</if> <if test=" req.costForm!=null and req.costForm != ''">and t1.cost_form= #{req.costForm}</if>
<if test=" req.isLend!=null and req.isLend != ''">and t1.is_lend=#{req.isLend}</if> <if test=" req.isLend!=null and req.isLend != ''">and t1.is_lend=#{req.isLend}</if>
<if test=" req.companyNo!=null and req.companyNo != ''">and t1.company_no=#{req.companyNo}</if> <if test=" req.companyNo!=null and req.companyNo != ''">and t1.company_no=#{req.companyNo}</if>
...@@ -316,8 +316,9 @@ ...@@ -316,8 +316,9 @@
<if test=" req.projectTypes!=null and req.projectTypes != ''">and <if test=" req.projectTypes!=null and req.projectTypes != ''">and
find_in_set(t1.project_type,#{req.projectTypes}) find_in_set(t1.project_type,#{req.projectTypes})
</if> </if>
and (false or
<if test=" req.keys!=null and req.keys.size()>0 "> <if test=" req.keys!=null and req.keys.size()>0 ">
and (false
<foreach collection="req.keys" item="key" index="index"> <foreach collection="req.keys" item="key" index="index">
<if test="key != null and key != '' "> <if test="key != null and key != '' ">
or t1.cost_plan_no = #{key} or t1.cost_plan_no = #{key}
...@@ -344,9 +345,8 @@ ...@@ -344,9 +345,8 @@
or t1.bank_card_user LIKE CONCAT('%',#{key},'%') or t1.bank_card_user LIKE CONCAT('%',#{key},'%')
</if> </if>
</foreach> </foreach>
)
</if> </if>
)
group by t1.id
group by t1.id group by t1.id
ORDER BY ORDER BY
t1.id DESC t1.id DESC
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment