|
@@ -202,6 +202,7 @@ public class IncidentController {
|
|
try {
|
|
try {
|
|
//督办事件
|
|
//督办事件
|
|
Incident incident = incidentService.get(id);
|
|
Incident incident = incidentService.get(id);
|
|
|
|
+ incident.setSpecialClassName(dataDictionaryService.getName(incident.getSpecialClassId()));
|
|
incident.setNewStep(new IncidentStep());
|
|
incident.setNewStep(new IncidentStep());
|
|
//附件列表
|
|
//附件列表
|
|
List<IncidentAttachment> incidentAttachmentList1 = incidentAttachmentService.findListByIncidentId(id,"1");
|
|
List<IncidentAttachment> incidentAttachmentList1 = incidentAttachmentService.findListByIncidentId(id,"1");
|
|
@@ -521,7 +522,8 @@ public class IncidentController {
|
|
searchParams.put("createBy", subject);
|
|
searchParams.put("createBy", subject);
|
|
|
|
|
|
List<Sort> sortList = new ArrayList<>();
|
|
List<Sort> sortList = new ArrayList<>();
|
|
- sortList.add(new Sort("create_time","desc"));
|
|
|
|
|
|
+ sortList.add(new Sort("batch_","asc"));
|
|
|
|
+ sortList.add(new Sort("serial_no","asc"));
|
|
|
|
|
|
//当角色为高级用户时,查看所有案件
|
|
//当角色为高级用户时,查看所有案件
|
|
List<Role> roleList = userRoleService.findRoleByUserId(subject);
|
|
List<Role> roleList = userRoleService.findRoleByUserId(subject);
|
|
@@ -585,11 +587,12 @@ public class IncidentController {
|
|
|
|
|
|
Map<String,Object> searchParams = new HashMap<>();
|
|
Map<String,Object> searchParams = new HashMap<>();
|
|
searchParams.put("isFinished", "1");
|
|
searchParams.put("isFinished", "1");
|
|
- searchParams.put("createBy", subject);
|
|
|
|
|
|
+// searchParams.put("createBy", subject);
|
|
|
|
|
|
List<Sort> sortList = new ArrayList<>();
|
|
List<Sort> sortList = new ArrayList<>();
|
|
// sortList.add(new Sort("a.warn_time","asc"));
|
|
// sortList.add(new Sort("a.warn_time","asc"));
|
|
- sortList.add(new Sort("create_time","desc"));
|
|
|
|
|
|
+ sortList.add(new Sort("batch_","asc"));
|
|
|
|
+ sortList.add(new Sort("serial_no","asc"));
|
|
|
|
|
|
List<Role> roleList = userRoleService.findRoleByUserId(subject);
|
|
List<Role> roleList = userRoleService.findRoleByUserId(subject);
|
|
for(Role role : roleList) {
|
|
for(Role role : roleList) {
|