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

来函增加函号的校验；

Browse Source 
来函统计修复取消来函的展示bug，修复分页问题。
This commit is contained in:
duandongmei
2019-01-06 12:46:42 +06:00
parent cecc8c90e9
commit 8cd631af13
9 changed files with 106 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@ public interface RequestInfoDao extends CrudDao {
List<RequestInfo> findRequestInfo(RequestInfo requestInfo);
RequestInfo getRequestInfoByRequestNumber(@Param("requestNumber") String requestNumber);
RequestInfo getRequestInfoByRequest(RequestInfo requestInfo);
RequestInfo getRequestInfoById(@Param("id") Long id);
List<RequestInfo> getRequestInfoByIds(@Param("ids") String ids);

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

@@ -95,11 +95,22 @@
</select>
<!-- 根据来函号查询 -->
<select id="getRequestInfoByRequestNumber" parameterType="java.lang.String" resultMap="BaseResultMap">
<select id="getRequestInfoByRequest" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from request_info
where request_number = #{requestNumber,jdbcType=VARCHAR} and is_valid !=-1
<where>
<if test="requestNumber != null and requestNumber != ''">
and request_number = #{requestNumber,jdbcType=VARCHAR}
</if>
<if test="requestTitle != null and requestTitle != ''">
and request_title = #{requestTitle,jdbcType=VARCHAR}
</if>
<if test="id != null">
and id != #{id}
</if>
and is_valid !=-1
</where>
</select>
<!-- 根据来id查询 -->
<select id="getRequestInfoById" parameterType="java.lang.Long" resultMap="BaseResultMap">

3
src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.java
View File

@@ -3,6 +3,7 @@ package com.nis.web.dao.configuration.statistics;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.ibatis.annotations.Param;
@@ -19,7 +20,7 @@ public interface ConfigureStatisticsDao {
public List<Object[]> getConfigStateStatistics(@Param("statisticTime")String statisticTime);
public Date getConfigStatisticTime();
public Date getRequestStatisticTime();
public List<Object[]> getRequestStateStatistics(@Param("requestList")List<RequestInfo> requestList,@Param("menuList")List<SysMenu> menuList,@Param("statisticTime")String statisticTime) ;
public List<Map> getRequestStateStatistics(@Param("requestList")List<RequestInfo> requestList,@Param("menuList")List<SysMenu> menuList,@Param("statisticTime")String statisticTime) ;
/*public List<Object[]> getRequestStateStatistics(@Param("requestList")List<RequestInfo> requestList,@Param("serviceList")List<FunctionServiceDict> serviceList,@Param("statisticTime")String statisticTime) ;*/
public Integer getEffectiveCfgNum(@Param("serviceId")Integer serviceId);
}

10
src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.xml
View File

@@ -33,7 +33,15 @@
sum(case when c.function_id =${menu.functionId} then 1 else 0 end) as '${menu.functionId}_${menu.functionId}'
</foreach>
from request_num_statistics c
where statistic_time =#{statisticTime}
<where>
and statistic_time =#{statisticTime}
<if test="requestList != null">
and request_id in
<foreach collection="requestList" index="index" item="requestInfo" open="(" separator="," close=")">
#{requestInfo.id}
</foreach>
</if>
</where>
group by request_id
</select>
<!-- 来函业务配置数统计 20181126废弃