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

50
src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
View File

@@ -76,17 +76,45 @@ public class RequestInfoController extends BaseController{
public String saveOrUpdate(RequestInfo requestInfo, HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) {
try {
if(requestInfo.getId()!=null){
// 保存用户信息
logger.info(requestInfo.getId()+"修改成功");
requestInfoService.saveOrUpdate(requestInfo);
addMessage(redirectAttributes,"success","save_success");
}else{
if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){
logger.info(requestInfo.getRequestNumber()+"重复数据");
RequestInfo requestNumber=new RequestInfo();
requestNumber.setRequestNumber(requestInfo.getRequestNumber());
requestNumber.setId(requestInfo.getId());
RequestInfo requestTitle=new RequestInfo();
requestTitle.setRequestTitle(requestInfo.getRequestTitle());
requestTitle.setId(requestInfo.getId());
if (!checkRequestInfo(requestNumber)){
logger.info(requestNumber.getRequestNumber()+"重复数据");
Properties props=this.getMsgProp();
addMessage("error",model,props.getProperty("duplicate", "Duplicate")+" "+props.getProperty("title", "Title"));
return form(requestInfo, model);
}
if (!checkRequestInfo(requestTitle)){
logger.info(requestTitle.getRequestTitle()+"重复数据");
Properties props=this.getMsgProp();
addMessage("error",model,props.getProperty("duplicate", "Duplicate")+" "+props.getProperty("request_number", "Letter Number"));
return form(requestInfo, model);
}
// 保存用户信息
requestInfoService.saveOrUpdate(requestInfo);
logger.info(requestInfo.getId()+"修改成功");
addMessage(redirectAttributes,"success","save_success");
}else{
RequestInfo requestNumber=new RequestInfo();
requestNumber.setRequestNumber(requestInfo.getRequestNumber());
RequestInfo requestTitle=new RequestInfo();
requestTitle.setRequestTitle(requestInfo.getRequestTitle());
if (!checkRequestInfo(requestNumber)){
logger.info(requestNumber.getRequestNumber()+"重复数据");
Properties props=this.getMsgProp();
addMessage("error",model,props.getProperty("duplicate", "Duplicate")+" "+props.getProperty("title", "Title"));
return form(requestInfo, model);
}
if (!checkRequestInfo(requestTitle)){
logger.info(requestTitle.getRequestTitle()+"重复数据");
Properties props=this.getMsgProp();
addMessage("error",model,props.getProperty("duplicate", "Duplicate")+" "+props.getProperty("request_number", "Letter Number"));
return form(requestInfo, model);
}
// 保存用户信息
requestInfoService.saveOrUpdate(requestInfo);
addMessage(redirectAttributes,"success","save_success");
@@ -105,11 +133,11 @@ public class RequestInfoController extends BaseController{
*/
@ResponseBody
@RequestMapping(value = "checkRequestNumber")
public String checkRequestNumber(String requestNumber) {
if (requestNumber !=null && requestInfoService.getRequestInfoByRequestNumber(requestNumber) == null) {
return "true";
public boolean checkRequestInfo(RequestInfo requestInfo) {
if (requestInfo !=null && requestInfoService.getRequestInfoByRequest(requestInfo) == null) {
return true;
}
return "false";
return false;
}
/**

39
src/main/java/com/nis/web/controller/configuration/statistics/ConfigureStatisticsController.java
View File

@@ -69,7 +69,7 @@ public class ConfigureStatisticsController extends BaseController{
Page requestPage = requestInfoService.findRequestInfo(new Page(request, response,"r"),requestInfo);
List<RequestInfo> requestInfos=requestPage.getList();
//4、根据当前页的requestInfo信息查询request统计信息
List<Object[]> requestStatisticList=new ArrayList<Object[]>();
List<Map> requestStatisticList=new ArrayList<Map>();
if(!StringUtil.isEmpty(requestInfos)){
Date requestStatisticTime=configureStatisticsService.getRequestStatisticTime();
String requestStatisticTimeStr="";
@@ -77,16 +77,28 @@ public class ConfigureStatisticsController extends BaseController{
requestStatisticTimeStr=sdf.format(requestStatisticTime);
}
requestStatisticList=configureStatisticsService.getRequestStateStatistics(requestInfos,menuList,requestStatisticTimeStr);
if(!StringUtil.isEmpty(requestStatisticList)){
for (Iterator iterator = requestStatisticList.iterator(); iterator.hasNext();) {
Map map = (Map) iterator.next();
RequestInfo removeRequest=null;
for (RequestInfo requestInfoO : requestInfos) {
if(requestInfoO.getId().toString().equals(map.get("request").toString())){
map.put("request", requestInfoO.getRequestTitle());
removeRequest=requestInfoO;
}
}
if(removeRequest != null){
requestInfos.remove(removeRequest);
}
}
}
for (RequestInfo requestInfoA: requestInfos) {
Map map=new HashMap<>();
map.put("request", requestInfoA.getRequestTitle());
requestStatisticList.add(map);
}
model.addAttribute("requestStatisticTime", requestStatisticTimeStr);
}
requestPage.setList(requestStatisticList);
@@ -157,7 +169,7 @@ public class ConfigureStatisticsController extends BaseController{
Page requestPage = requestInfoService.findRequestInfo(page,requestInfo);
List<RequestInfo> requestInfos=requestPage.getList();
//4、根据当前页的requestInfo信息查询request统计信息
List<Object[]> requestStatisticList=new ArrayList<Object[]>();
List<Map> requestStatisticList=new ArrayList<Map>();
if(!StringUtil.isEmpty(requestInfos)){
Date requestStatisticTime=configureStatisticsService.getRequestStatisticTime();
String requestStatisticTimeStr="";
@@ -166,14 +178,25 @@ public class ConfigureStatisticsController extends BaseController{
}
requestStatisticList=configureStatisticsService.getRequestStateStatistics(requestInfos,menuList,requestStatisticTimeStr);
if(!StringUtil.isEmpty(requestStatisticList)){
for (Iterator iterator = requestStatisticList.iterator(); iterator.hasNext();) {
Map map = (Map) iterator.next();
for (RequestInfo requestInfoO : requestInfos) {
if(requestInfoO.getId().toString().equals(map.get("request").toString())){
map.put("request", requestInfoO.getRequestTitle());
}
for (Iterator iterator = requestStatisticList.iterator(); iterator.hasNext();) {
Map map = (Map) iterator.next();
RequestInfo removeRequest=null;
for (RequestInfo requestInfoO : requestInfos) {
if(requestInfoO.getId().toString().equals(map.get("request").toString())){
map.put("request", requestInfoO.getRequestTitle());
removeRequest=requestInfoO;
}
}
if(removeRequest != null){
requestInfos.remove(removeRequest);
}
}
}
for (RequestInfo requestInfoA: requestInfos) {
Map map=new HashMap<>();
map.put("request", requestInfoA.getRequestTitle());
requestStatisticList.add(map);
}
model.addAttribute("requestStatisticTime", requestStatisticTimeStr);
}