gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
wangxin
2018-03-12 16:35:08 +08:00
parent 2df9aa9665 0dfba79e68
commit 4e0c54421f
10 changed files with 319 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java
View File

@@ -23,6 +23,7 @@ public interface RequestInfoDao extends CrudDao {
List<TaskInfo> showTask(TaskInfo taskInfo);
void delete(@Param("id") Long id);
}

12
src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
View File

@@ -61,11 +61,11 @@
<if test="isAudit != null">
AND r.is_audit=${isAudit}
</if>
<if test=" timeType == 'requestTime' and beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
<if test="beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
AND r.request_time between #{beginDate} and #{endDate}
</if>
<if test="timeType == 'createTime' and beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
AND (r.create_time between #{beginDate} and #{endDate}) or (r.audit_time between #{beginDate} and #{endDate})
<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
AND (r.create_time between #{dobeginDate} and #{doendDate}) or (r.audit_time between #{dobeginDate} and #{doendDate})
</if>
order by r.request_time desc
</select>
@@ -153,11 +153,11 @@
where id = #{id,jdbcType=BIGINT}
</update>
<!--删除 -->
<update id="delete" parameterType="com.nis.domain.configuration.RequestInfo">
<update id="delete" parameterType="long">
update request_info
<set>
<if test="isValid != null and id != null">
is_valid=#{isValid}
<if test="id != null and id != ''">
is_valid=-1
</if>
</set>
where id = #{id,jdbcType=BIGINT} and is_audit !=1