From 5d43370b99a03391c9271d04d3f351f0fd734dae Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 18 Mar 2021 20:23:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/common/actions/ProjExceptionAction.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/ProjExceptionAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/ProjExceptionAction.java
index 7229a15..19ed8a3 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/ProjExceptionAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/ProjExceptionAction.java
@@ -1,22 +1,16 @@
package com.matrix.system.common.actions;
-import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
-import com.matrix.core.pojo.PaginationVO;
-import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.ProjException;
-import com.matrix.system.common.bean.SysUsers;
-import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.ProjExceptionDao;
-import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
import java.util.Arrays;
-import java.util.List;
/**
* @author 姜友瑶
@@ -31,12 +25,19 @@
ProjExceptionDao projExceptionDao;
@RequestMapping(value = "/showException")
- public @ResponseBody
- AjaxResult showException(Long id) {
+ public
+ ModelAndView showException(Long id) {
ProjException projException = projExceptionDao.selectById(id);
- return AjaxResult.buildSuccessInstance(Arrays.asList(projException));
+ ModelAndView mv = new ModelAndView("common/showprojException");
+ mv.addObject("obj", projException);
+ return mv;
+
}
+
+
+
+
@RequestMapping(value = "/projException/del")
public @ResponseBody
AjaxResult del(@RequestBody ProjException projException) {
--
Gitblit v1.9.1