|
@@ -35,10 +35,7 @@ import java.io.IOException; |
|
@@ -35,10 +35,7 @@ import java.io.IOException; |
35
|
import java.net.URL;
|
35
|
import java.net.URL;
|
36
|
import java.text.ParseException;
|
36
|
import java.text.ParseException;
|
37
|
import java.text.SimpleDateFormat;
|
37
|
import java.text.SimpleDateFormat;
|
38
|
-import java.util.ArrayList;
|
|
|
39
|
-import java.util.Date;
|
|
|
40
|
-import java.util.List;
|
|
|
41
|
-import java.util.Map;
|
38
|
+import java.util.*;
|
42
|
|
39
|
|
43
|
/**
|
40
|
/**
|
44
|
* @Auther: shenhl
|
41
|
* @Auther: shenhl
|
|
@@ -76,7 +73,7 @@ public class SecurityDeclarationController { |
|
@@ -76,7 +73,7 @@ public class SecurityDeclarationController { |
76
|
@RequestMapping(value = "/grid.json")
|
73
|
@RequestMapping(value = "/grid.json")
|
77
|
@ResponseBody
|
74
|
@ResponseBody
|
78
|
public DataGrid<SecurityDeclarationVo> grid(HttpServletRequest request, EasyPage<SecurityManifestEntity> pageForm) {
|
75
|
public DataGrid<SecurityDeclarationVo> grid(HttpServletRequest request, EasyPage<SecurityManifestEntity> pageForm) {
|
79
|
-
|
76
|
+ try {
|
80
|
Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_");
|
77
|
Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_");
|
81
|
UserEntity ue = (UserEntity)SecurityUtils.getSubject().getSession().getAttribute("user");
|
78
|
UserEntity ue = (UserEntity)SecurityUtils.getSubject().getSession().getAttribute("user");
|
82
|
pageForm.setSearchParams(searchParams);
|
79
|
pageForm.setSearchParams(searchParams);
|
|
@@ -85,7 +82,7 @@ public class SecurityDeclarationController { |
|
@@ -85,7 +82,7 @@ public class SecurityDeclarationController { |
85
|
|
82
|
|
86
|
if (Tools.getUserId() != null && Tools.getUserId() != 1){
|
83
|
if (Tools.getUserId() != null && Tools.getUserId() != 1){
|
87
|
// 不是管理员,添加用户id的条件
|
84
|
// 不是管理员,添加用户id的条件
|
88
|
- pageForm.getSearchParams().put("EQ_USER_ID", u);
|
85
|
+ pageForm.getSearchParams().put("EQ_USERID", u);
|
89
|
}
|
86
|
}
|
90
|
}
|
87
|
}
|
91
|
|
88
|
|
|
@@ -105,6 +102,7 @@ public class SecurityDeclarationController { |
|
@@ -105,6 +102,7 @@ public class SecurityDeclarationController { |
105
|
sdVo.setSd_transport_certificate(sd.getCertificate());
|
102
|
sdVo.setSd_transport_certificate(sd.getCertificate());
|
106
|
sdVo.setSd_transportation_prove(sd.getProve());
|
103
|
sdVo.setSd_transportation_prove(sd.getProve());
|
107
|
sdVo.setSd_iata_number(sd.getIata());
|
104
|
sdVo.setSd_iata_number(sd.getIata());
|
|
|
105
|
+ sdVo.setUser_id(sd.getUSERID());
|
108
|
if("1".equals(sd.getStatics())){
|
106
|
if("1".equals(sd.getStatics())){
|
109
|
sdVo.setSd_static("已发送安检申报报文");
|
107
|
sdVo.setSd_static("已发送安检申报报文");
|
110
|
}
|
108
|
}
|
|
@@ -117,6 +115,13 @@ public class SecurityDeclarationController { |
|
@@ -117,6 +115,13 @@ public class SecurityDeclarationController { |
117
|
vos.setRows(rows);
|
115
|
vos.setRows(rows);
|
118
|
vos.setTotal(securityDeclarationEntityDataGrid.getTotal());
|
116
|
vos.setTotal(securityDeclarationEntityDataGrid.getTotal());
|
119
|
return vos;
|
117
|
return vos;
|
|
|
118
|
+
|
|
|
119
|
+ }catch (Exception e){
|
|
|
120
|
+ e.printStackTrace();
|
|
|
121
|
+ DataGrid<SecurityDeclarationVo> vos = new DataGrid<>();
|
|
|
122
|
+ return vos;
|
|
|
123
|
+ }
|
|
|
124
|
+
|
120
|
}
|
125
|
}
|
121
|
|
126
|
|
122
|
|
127
|
|