|
@@ -42,7 +42,7 @@
|
|
|
ap.secondary_examine_and_approve_remark,
|
|
ap.secondary_examine_and_approve_remark,
|
|
|
a.name as approverName,
|
|
a.name as approverName,
|
|
|
a2.name as secondaryApproverName,
|
|
a2.name as secondaryApproverName,
|
|
|
- u.user_name as userName,
|
|
|
|
|
|
|
+ u.user_name as usersName,
|
|
|
o.id as orgId,
|
|
o.id as orgId,
|
|
|
o.name as orgName,
|
|
o.name as orgName,
|
|
|
ap.house_count as houseCount
|
|
ap.house_count as houseCount
|
|
@@ -60,7 +60,7 @@
|
|
|
</if>
|
|
</if>
|
|
|
|
|
|
|
|
<if test="key != null and key != ''">
|
|
<if test="key != null and key != ''">
|
|
|
- AND ( apu.approverName LIKE '%' #{key} '%' OR apu.secondaryApproverName LIKE '%' #{key} '%' OR apu.userName LIKE '%' #{key} '%' )
|
|
|
|
|
|
|
+ AND ( apu.approverName LIKE '%' #{key} '%' OR apu.secondaryApproverName LIKE '%' #{key} '%' OR apu.usersName LIKE '%' #{key} '%' )
|
|
|
</if>
|
|
</if>
|
|
|
|
|
|
|
|
<if test="examineAndApproveStartTime != null and examineAndApproveStartTime != '' and examineAndApproveEndTime != null and examineAndApproveEndTime != '' ">
|
|
<if test="examineAndApproveStartTime != null and examineAndApproveStartTime != '' and examineAndApproveEndTime != null and examineAndApproveEndTime != '' ">
|
|
@@ -186,8 +186,8 @@
|
|
|
ap.secondary_examine_and_approve_time as secondaryExamineAndApproveTime,
|
|
ap.secondary_examine_and_approve_time as secondaryExamineAndApproveTime,
|
|
|
ap.secondary_examine_and_approve_remark as secondaryExamineAndApproveRemark,
|
|
ap.secondary_examine_and_approve_remark as secondaryExamineAndApproveRemark,
|
|
|
a.name as approverName,
|
|
a.name as approverName,
|
|
|
- a2.name as secondaryApproverName
|
|
|
|
|
- u.user_name as userName,
|
|
|
|
|
|
|
+ a2.name as secondaryApproverName,
|
|
|
|
|
+ u.user_name as usersName,
|
|
|
o.name as orgName,
|
|
o.name as orgName,
|
|
|
ap.house_count as houseCount
|
|
ap.house_count as houseCount
|
|
|
FROM
|
|
FROM
|