|
|
@@ -130,16 +130,16 @@
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
and ((
|
|
|
- #{hashMap.startDate} <= r.plan_start_time
|
|
|
+ #{hashMap.startDate} <= r.plan_start_time
|
|
|
and #{hashMap.endDate} >= r.plan_start_time
|
|
|
)
|
|
|
or (
|
|
|
- #{hashMap.startDate} <= r.plan_end_time
|
|
|
+ #{hashMap.startDate} <= r.plan_end_time
|
|
|
and #{hashMap.endDate} >= r.plan_end_time
|
|
|
)
|
|
|
or (
|
|
|
#{hashMap.startDate} >= r.plan_start_time
|
|
|
- and #{hashMap.endDate} <= r.plan_end_time
|
|
|
+ and #{hashMap.endDate} <= r.plan_end_time
|
|
|
))
|
|
|
</if>
|
|
|
<if test="pageDto.status !=null ">
|
|
|
@@ -154,16 +154,18 @@
|
|
|
#{orgId}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
+ <if test="pageDto.taskName!=null and pageDto.taskName.length()>0">
|
|
|
+ and r.name like concat('%',#{pageDto.taskName},'%')
|
|
|
+ </if>
|
|
|
<if test="pageDto.executeRole !=null ">
|
|
|
and r.plan_id in (select plan_id from core_resumption_plan_to_role where role_id=#{pageDto.executeRole})
|
|
|
</if>
|
|
|
- <if test="pageDto.planId !=null ">
|
|
|
- and r.parent_plan_id = #{pageDto.planId}
|
|
|
- </if>
|
|
|
+ <!-- <if test="pageDto.planId !=null ">-->
|
|
|
+ <!-- and r.parent_plan_id = #{pageDto.planId}-->
|
|
|
+ <!-- </if>-->
|
|
|
<!-- <if test="pageDto.checkSub == true">-->
|
|
|
<!-- and o.path like concat(#{pageDto.orgPath},'%')-->
|
|
|
<!-- </if>-->
|
|
|
-
|
|
|
</where>
|
|
|
order by r.plan_start_time desc, r.name desc ,r.id desc
|
|
|
</select>
|
|
|
@@ -207,16 +209,16 @@
|
|
|
where pti.plan_id in (select plan_id from core_resumption where id = #{resumptionId}))
|
|
|
</select>
|
|
|
|
|
|
-<!-- <select id="selectResumptionRole" resultType="com.xunmei.core.resumption.vo.resumptionRecord.ResumptionRoleVo">-->
|
|
|
-<!-- select distinct tr.id as id, tr.name as name-->
|
|
|
-<!-- from core_resumption r-->
|
|
|
-<!-- inner join sys_role tr on r.role_id = tr.id-->
|
|
|
-<!-- inner join sys_org o on r.org_id = o.id and o.deleted=0-->
|
|
|
-<!-- where o.path like concat(#{roleDto.orgPath},'%')-->
|
|
|
-<!-- <if test="roleDto.type != null">-->
|
|
|
-<!-- and r.type = #{roleDto.type}-->
|
|
|
-<!-- </if>-->
|
|
|
-<!-- </select>-->
|
|
|
+ <!-- <select id="selectResumptionRole" resultType="com.xunmei.core.resumption.vo.resumptionRecord.ResumptionRoleVo">-->
|
|
|
+ <!-- select distinct tr.id as id, tr.name as name-->
|
|
|
+ <!-- from core_resumption r-->
|
|
|
+ <!-- inner join sys_role tr on r.role_id = tr.id-->
|
|
|
+ <!-- inner join sys_org o on r.org_id = o.id and o.deleted=0-->
|
|
|
+ <!-- where o.path like concat(#{roleDto.orgPath},'%')-->
|
|
|
+ <!-- <if test="roleDto.type != null">-->
|
|
|
+ <!-- and r.type = #{roleDto.type}-->
|
|
|
+ <!-- </if>-->
|
|
|
+ <!-- </select>-->
|
|
|
|
|
|
<select id="selectNFCRecord" resultType="com.xunmei.core.resumption.vo.resumptionRecord.NFCRecordVo">
|
|
|
select distinct a.name as areaName,
|
|
|
@@ -265,24 +267,24 @@
|
|
|
<!-- </select>-->
|
|
|
|
|
|
<select id="selectDataInfo" resultType="com.xunmei.core.resumption.vo.resumptionRecord.AppResumptionDataInfoVo">
|
|
|
- SELECT p.name AS pointName,
|
|
|
- case a.`name` when null then '其它' else a.`name` end AS areaName,
|
|
|
- ch.check_name as check_name,
|
|
|
- d.res_value AS executeResult,
|
|
|
- d.submit_time AS executeTime,
|
|
|
- d.res_remark AS resRemark,
|
|
|
- d.res_status AS executeStatus,
|
|
|
- d.id AS dataId,
|
|
|
+ SELECT p.name AS pointName,
|
|
|
+ case a.`name` when null then '其它' else a.`name` end AS areaName,
|
|
|
+ ch.check_name as check_name,
|
|
|
+ d.res_value AS executeResult,
|
|
|
+ d.submit_time AS executeTime,
|
|
|
+ d.res_remark AS resRemark,
|
|
|
+ d.res_status AS executeStatus,
|
|
|
+ d.id AS dataId,
|
|
|
d.item_id,
|
|
|
d.res_value,
|
|
|
d.submit_name
|
|
|
FROM core_resumption_data d
|
|
|
INNER JOIN core_resumption_rule_point p ON d.item_id = p.id
|
|
|
LEFT JOIN sys_area a ON a.id = d.area_id
|
|
|
- LEFT JOIN sys_area_check ch on ch.id=d.check_id
|
|
|
+ LEFT JOIN sys_area_check ch on ch.id = d.check_id
|
|
|
WHERE d.resumption_id = #{resumptionId}
|
|
|
and p.item_id = #{ruleItemId}
|
|
|
- order by d.item_id
|
|
|
+ order by d.item_id
|
|
|
</select>
|
|
|
|
|
|
<select id="selectRuleItemIdList" resultType="java.lang.Long">
|
|
|
@@ -306,24 +308,24 @@
|
|
|
where id = #{ruleItemId}
|
|
|
</select>
|
|
|
|
|
|
-<!-- <select id="selectResumptionPlan" resultType="com.xunmei.core.resumption.vo.resumptionRecord.ResumptionRoleVo">-->
|
|
|
-<!-- select distinct p.id as id, p.plan_name as name, p.plan_status as status-->
|
|
|
-<!-- from core_resumption_plan p INNER JOIN core_resumption r on r.plan_id = p.id and p.plan_type = 0-->
|
|
|
-<!-- inner join core_resumption_plan_to_role pr on p.id = pr.plan_id-->
|
|
|
-<!-- INNER JOIN sys_org o on o.id=r.org_id-->
|
|
|
-<!-- where o.path like concat(#{planDto.orgPath},'%')-->
|
|
|
-<!-- <choose>-->
|
|
|
-<!-- <when test="planDto.type != null and planDto.type ==0">-->
|
|
|
-<!-- and r.type in (0,6)-->
|
|
|
-<!-- </when>-->
|
|
|
-<!-- <otherwise>-->
|
|
|
-<!-- and r.type = #{planDto.type}-->
|
|
|
-<!-- </otherwise>-->
|
|
|
-<!-- </choose>-->
|
|
|
-<!-- <if test="planDto.roleId != null">-->
|
|
|
-<!-- and pr.role_id = #{planDto.roleId}-->
|
|
|
-<!-- </if>-->
|
|
|
-<!-- </select>-->
|
|
|
+ <!-- <select id="selectResumptionPlan" resultType="com.xunmei.core.resumption.vo.resumptionRecord.ResumptionRoleVo">-->
|
|
|
+ <!-- select distinct p.id as id, p.plan_name as name, p.plan_status as status-->
|
|
|
+ <!-- from core_resumption_plan p INNER JOIN core_resumption r on r.plan_id = p.id and p.plan_type = 0-->
|
|
|
+ <!-- inner join core_resumption_plan_to_role pr on p.id = pr.plan_id-->
|
|
|
+ <!-- INNER JOIN sys_org o on o.id=r.org_id-->
|
|
|
+ <!-- where o.path like concat(#{planDto.orgPath},'%')-->
|
|
|
+ <!-- <choose>-->
|
|
|
+ <!-- <when test="planDto.type != null and planDto.type ==0">-->
|
|
|
+ <!-- and r.type in (0,6)-->
|
|
|
+ <!-- </when>-->
|
|
|
+ <!-- <otherwise>-->
|
|
|
+ <!-- and r.type = #{planDto.type}-->
|
|
|
+ <!-- </otherwise>-->
|
|
|
+ <!-- </choose>-->
|
|
|
+ <!-- <if test="planDto.roleId != null">-->
|
|
|
+ <!-- and pr.role_id = #{planDto.roleId}-->
|
|
|
+ <!-- </if>-->
|
|
|
+ <!-- </select>-->
|
|
|
|
|
|
<!-- <select id="selectData" resultType="com.xunmei.core.resumption.vo.registerBook.RegisterBookItemInfoVo">-->
|
|
|
<!-- select distinct o.name as orgName, r.start_time as date, #{id} as resumptionId-->
|
|
|
@@ -385,7 +387,8 @@
|
|
|
#{id}
|
|
|
</foreach>
|
|
|
or p.plan_create_org_id in (select id from sys_org
|
|
|
- where type in ('1','2','3','4','11') and deleted=0 and path like concat((select path from sys_org where id=#{query.orgId}),'%'))
|
|
|
+ where type in ('1','2','3','4','11') and deleted=0 and path like concat((select path from sys_org where
|
|
|
+ id=#{query.orgId}),'%'))
|
|
|
)
|
|
|
</if>
|
|
|
</select>
|
|
|
@@ -405,7 +408,8 @@
|
|
|
#{id}
|
|
|
</foreach>
|
|
|
or plan_create_org_id in (select id from sys_org
|
|
|
- where type in ('1','2','3') and deleted=0 and path like concat((select path from sys_org where id=#{query.orgId}),'%'))
|
|
|
+ where type in ('1','2','3') and deleted=0 and path like concat((select path from sys_org where
|
|
|
+ id=#{query.orgId}),'%'))
|
|
|
)
|
|
|
</if>
|
|
|
</select>
|
jingyuanchao