|
@@ -69,7 +69,7 @@ public class ProblemInfoController extends BaseController {
|
|
|
* @return
|
|
|
*/
|
|
|
@GetMapping("preWarn")
|
|
|
- public ModelAndView preWarn(ModelMap model,String subjectId,String sourceId,String mainId,String hyfl,String lastUrl) {
|
|
|
+ public ModelAndView preWarn(ModelMap model,String subjectId,String sourceId,String mainId,String hyfl,String lastUrl,String code) {
|
|
|
model.put("HYFL", tSysTableService.getByKind(SysTableKind.HYFL));
|
|
|
model.put("XMLX", tSysTableService.getByKind(SysTableKind.XMLX));
|
|
|
model.put("JSXZ", tSysTableService.getByKind(SysTableKind.JSXZ));
|
|
@@ -78,6 +78,7 @@ public class ProblemInfoController extends BaseController {
|
|
|
model.put("mainId", mainId);
|
|
|
model.put("hyfl",hyfl);
|
|
|
model.put("lastUrl",lastUrl);
|
|
|
+ model.put("code",code);
|
|
|
|
|
|
return new ModelAndView("/vmodules/problem/info/preWarn.jsp", model);
|
|
|
}
|
|
@@ -100,6 +101,20 @@ public class ProblemInfoController extends BaseController {
|
|
|
return new ModelAndView("/vmodules/problem/info/preWarn.jsp", model);
|
|
|
}
|
|
|
|
|
|
+ @GetMapping("cbToXjWarn")
|
|
|
+ public ModelAndView cbToXjWarn(ModelMap model,String subjectId,String sourceId,String mainId,String hyfl,String lastUrl,String code) {
|
|
|
+ model.put("HYFL", tSysTableService.getByKind(SysTableKind.HYFL));
|
|
|
+ model.put("XMLX", tSysTableService.getByKind(SysTableKind.XMLX));
|
|
|
+ model.put("JSXZ", tSysTableService.getByKind(SysTableKind.JSXZ));
|
|
|
+ model.put("subjectId", subjectId);
|
|
|
+ model.put("sourceId", sourceId);
|
|
|
+ model.put("mainId", mainId);
|
|
|
+ model.put("hyfl",hyfl);
|
|
|
+ model.put("lastUrl",lastUrl);
|
|
|
+ model.put("code",code);
|
|
|
+ return new ModelAndView("/vmodules/problem/info/cbToXjWarn.jsp", model);
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 月报预期
|
|
@@ -107,7 +122,7 @@ public class ProblemInfoController extends BaseController {
|
|
|
* @return
|
|
|
*/
|
|
|
@GetMapping("monthWarn")
|
|
|
- public ModelAndView monthWarn(ModelMap model,String subjectId,String sourceId,String mainId,String hyfl,String lastUrl) {
|
|
|
+ public ModelAndView monthWarn(ModelMap model,String subjectId,String sourceId,String mainId,String hyfl,String lastUrl,String code) {
|
|
|
model.put("HYFL", tSysTableService.getByKind(SysTableKind.HYFL));
|
|
|
model.put("XMLX", tSysTableService.getByKind(SysTableKind.XMLX));
|
|
|
model.put("JSXZ", tSysTableService.getByKind(SysTableKind.JSXZ));
|
|
@@ -116,6 +131,7 @@ public class ProblemInfoController extends BaseController {
|
|
|
model.put("mainId", mainId);
|
|
|
model.put("hyfl",hyfl);
|
|
|
model.put("lastUrl",lastUrl);
|
|
|
+ model.put("code",code);
|
|
|
|
|
|
return new ModelAndView("/vmodules/problem/info/monthWarn.jsp", model);
|
|
|
}
|
|
@@ -127,7 +143,7 @@ public class ProblemInfoController extends BaseController {
|
|
|
* @return
|
|
|
*/
|
|
|
@GetMapping("openWarn")
|
|
|
- public ModelAndView openWarn(ModelMap model,String subjectId,String sourceId,String mainId,String hyfl,String lastUrl) {
|
|
|
+ public ModelAndView openWarn(ModelMap model,String subjectId,String sourceId,String mainId,String hyfl,String lastUrl,String code) {
|
|
|
model.put("HYFL", tSysTableService.getByKind(SysTableKind.HYFL));
|
|
|
model.put("XMLX", tSysTableService.getByKind(SysTableKind.XMLX));
|
|
|
model.put("JSXZ", tSysTableService.getByKind(SysTableKind.JSXZ));
|
|
@@ -137,6 +153,7 @@ public class ProblemInfoController extends BaseController {
|
|
|
model.put("mainId", mainId);
|
|
|
model.put("hyfl",hyfl);
|
|
|
model.put("lastUrl",lastUrl);
|
|
|
+ model.put("code",code);
|
|
|
|
|
|
return new ModelAndView("/vmodules/problem/info/openWarn.jsp", model);
|
|
|
}
|
|
@@ -147,7 +164,7 @@ public class ProblemInfoController extends BaseController {
|
|
|
* @return
|
|
|
*/
|
|
|
@GetMapping("endWarn")
|
|
|
- public ModelAndView endWarn(ModelMap model,String subjectId,String sourceId,String mainId,String hyfl,String lastUrl) {
|
|
|
+ public ModelAndView endWarn(ModelMap model,String subjectId,String sourceId,String mainId,String hyfl,String lastUrl,String code) {
|
|
|
model.put("HYFL", tSysTableService.getByKind(SysTableKind.HYFL));
|
|
|
model.put("XMLX", tSysTableService.getByKind(SysTableKind.XMLX));
|
|
|
model.put("JSXZ", tSysTableService.getByKind(SysTableKind.JSXZ));
|
|
@@ -157,6 +174,7 @@ public class ProblemInfoController extends BaseController {
|
|
|
model.put("mainId", mainId);
|
|
|
model.put("hyfl",hyfl);
|
|
|
model.put("lastUrl",lastUrl);
|
|
|
+ model.put("code",code);
|
|
|
|
|
|
return new ModelAndView("/vmodules/problem/info/endWarn.jsp", model);
|
|
|
}
|
|
@@ -168,7 +186,7 @@ public class ProblemInfoController extends BaseController {
|
|
|
* @return
|
|
|
*/
|
|
|
@GetMapping("pldWarn")
|
|
|
- public ModelAndView pldWarn(ModelMap model,String subjectId,String sourceId,String mainId,String hyfl,String lastUrl) {
|
|
|
+ public ModelAndView pldWarn(ModelMap model,String subjectId,String sourceId,String mainId,String hyfl,String lastUrl,String code) {
|
|
|
model.put("HYFL", tSysTableService.getByKind(SysTableKind.HYFL));
|
|
|
model.put("XMLX", tSysTableService.getByKind(SysTableKind.XMLX));
|
|
|
model.put("JSXZ", tSysTableService.getByKind(SysTableKind.JSXZ));
|
|
@@ -178,6 +196,7 @@ public class ProblemInfoController extends BaseController {
|
|
|
model.put("mainId", mainId);
|
|
|
model.put("hyfl",hyfl);
|
|
|
model.put("lastUrl",lastUrl);
|
|
|
+ model.put("code",code);
|
|
|
|
|
|
return new ModelAndView("/vmodules/problem/info/pldWarn.jsp", model);
|
|
|
}
|