|
|
@@ -523,15 +523,9 @@
|
|
|
<if test="releaseStarts != null and publicEnd != null">
|
|
|
and a.release_start BETWEEN #{releaseStarts} and #{publicEnd}
|
|
|
</if>
|
|
|
- <if test="userName !=null">
|
|
|
- and b.nickname like CONCAT('%',#{userName},'%')
|
|
|
- </if>
|
|
|
<if test="status !=null">
|
|
|
and a.status = #{status}
|
|
|
</if>
|
|
|
- <if test="clockIn !=null">
|
|
|
- and a.clock_in = #{clockIn}
|
|
|
- </if>
|
|
|
<if test="type==2">
|
|
|
ORDER BY a.create_time desc
|
|
|
</if>
|
|
|
@@ -546,7 +540,7 @@
|
|
|
</select>
|
|
|
<select id="countPublicRelease" resultType="java.lang.Integer">
|
|
|
select count(*)
|
|
|
- from public_release a left join `user` b on a.uid =b.id left join admin c on a.aid =c.id
|
|
|
+ from public_release a left join admin c on a.aid =c.id
|
|
|
<if test="type==2">
|
|
|
left join department d on c.department_id =d.id
|
|
|
</if>
|
|
|
@@ -595,25 +589,20 @@
|
|
|
<if test="releaseStarts != null and publicEnd != null">
|
|
|
and a.release_start BETWEEN #{releaseStarts} and #{publicEnd}
|
|
|
</if>
|
|
|
- <if test="userName !=null">
|
|
|
- and b.nickname like CONCAT('%',#{userName},'%')
|
|
|
- </if>
|
|
|
+
|
|
|
<if test="status !=null">
|
|
|
and a.status = #{status}
|
|
|
</if>
|
|
|
- <if test="clockIn !=null">
|
|
|
- and a.clock_in = #{clockIn}
|
|
|
- </if>
|
|
|
</select>
|
|
|
|
|
|
<select id="selectDtails" resultType="com.goafanti.weChat.bo.OutPublicRelease">
|
|
|
- select a.id,b.nickname ,c.name aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.district_name districtName,a.update_time updateTime,a.user_names userNames,
|
|
|
+ select a.id,c.name aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.update_time updateTime,a.user_names userNames,
|
|
|
date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.status,
|
|
|
- a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,a.longitude ,a.aid ,c.superior_id suprId,a.uid,
|
|
|
- a.clock_in clockIn ,a.plan ,a.expected_effect expectedEffect,a.next_plan nextPlan,c.reviewer,a.type,a.order_no orderNo,d.contract_no contractNo,
|
|
|
+ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.aid ,c.superior_id suprId,
|
|
|
+ a.plan ,a.expected_effect expectedEffect,a.next_plan nextPlan,c.reviewer,a.type,a.order_no orderNo,d.contract_no contractNo,
|
|
|
date_format(a.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_Status updateStatus,a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,
|
|
|
a.main_name mainName,a.assistant_aid assistantAid,a.assistant_name assistantName,a.public_again publicAhain,x.uids
|
|
|
- from public_release a left join `user` b on a.uid =b.id left join admin c on a.aid =c.id
|
|
|
+ from public_release a left join admin c on a.aid =c.id
|
|
|
left join (select prid ,GROUP_CONCAT(uid)uids from public_release_details where prid= #{id} group by prid)x on a.id=x.prid
|
|
|
left join t_order_new d on a.order_no=d.order_no
|
|
|
where 1=1
|