Index: pom.xml
===================================================================
diff -u -rf817e6009684bdaa78675bb0e1a8635f81284bf1 -rd50b745f1db61c9681c19cf0980b822ac60b1636
--- pom.xml (.../pom.xml) (revision f817e6009684bdaa78675bb0e1a8635f81284bf1)
+++ pom.xml (.../pom.xml) (revision d50b745f1db61c9681c19cf0980b822ac60b1636)
@@ -10,7 +10,7 @@
4.0.0
313devgrp
java-service-tree-framework-backend-server
- 22.12.09
+ 22.12.12
pom
java-service-tree-framework
Index: web-module/pom.xml
===================================================================
diff -u -rf817e6009684bdaa78675bb0e1a8635f81284bf1 -rd50b745f1db61c9681c19cf0980b822ac60b1636
--- web-module/pom.xml (.../pom.xml) (revision f817e6009684bdaa78675bb0e1a8635f81284bf1)
+++ web-module/pom.xml (.../pom.xml) (revision d50b745f1db61c9681c19cf0980b822ac60b1636)
@@ -7,7 +7,7 @@
313devgrp
java-service-tree-framework-backend-server
- 22.12.09
+ 22.12.12
../pom.xml
Index: web-module/src/main/java/egovframework/api/arms/module_reqstatus/controller/AnonReqStatusController.java
===================================================================
diff -u -r406a474eb7f2a2623e34c1444cfcf6ed27da53e7 -rd50b745f1db61c9681c19cf0980b822ac60b1636
--- web-module/src/main/java/egovframework/api/arms/module_reqstatus/controller/AnonReqStatusController.java (.../AnonReqStatusController.java) (revision 406a474eb7f2a2623e34c1444cfcf6ed27da53e7)
+++ web-module/src/main/java/egovframework/api/arms/module_reqstatus/controller/AnonReqStatusController.java (.../AnonReqStatusController.java) (revision d50b745f1db61c9681c19cf0980b822ac60b1636)
@@ -11,37 +11,28 @@
*/
package egovframework.api.arms.module_reqstatus.controller;
-import egovframework.api.arms.module_reqadd.model.ReqAddDTO;
+import egovframework.api.arms.module_reqstatus.model.ReqStatusDTO;
+import egovframework.api.arms.module_reqstatus.service.ReqStatus;
import egovframework.api.arms.util.PropertiesReader;
+import egovframework.com.ext.jstree.springHibernate.core.controller.SHVAbstractController;
import egovframework.com.ext.jstree.springHibernate.core.interceptor.SessionUtil;
import lombok.extern.slf4j.Slf4j;
-import org.hibernate.criterion.Order;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
import org.springframework.ui.ModelMap;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.servlet.ModelAndView;
+
import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletRequest;
-import java.util.Comparator;
import java.util.List;
-import java.util.NoSuchElementException;
-import egovframework.com.ext.jstree.springHibernate.core.controller.SHVAbstractController;
-
-import egovframework.api.arms.module_reqstatus.model.ReqStatusDTO;
-import egovframework.api.arms.module_reqstatus.service.ReqStatus;
-
@Slf4j
@Controller
@RequestMapping(value = {"/auth-anon/api/arms/reqStatus"})
Index: web-module/src/main/java/egovframework/api/arms/module_reqstatus/controller/UserReqStatusController.java
===================================================================
diff -u -rd0571474eccda63a6bf7121be3731062dd6611c5 -rd50b745f1db61c9681c19cf0980b822ac60b1636
--- web-module/src/main/java/egovframework/api/arms/module_reqstatus/controller/UserReqStatusController.java (.../UserReqStatusController.java) (revision d0571474eccda63a6bf7121be3731062dd6611c5)
+++ web-module/src/main/java/egovframework/api/arms/module_reqstatus/controller/UserReqStatusController.java (.../UserReqStatusController.java) (revision d50b745f1db61c9681c19cf0980b822ac60b1636)
@@ -12,7 +12,10 @@
package egovframework.api.arms.module_reqstatus.controller;
import egovframework.api.arms.module_reqadd.model.ReqAddDTO;
+import egovframework.api.arms.util.StringUtility;
import egovframework.com.ext.jstree.springHibernate.core.interceptor.SessionUtil;
+import egovframework.com.ext.jstree.support.util.ParameterParser;
+import egovframework.com.ext.jstree.support.util.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.hibernate.criterion.Criterion;
import org.hibernate.criterion.Order;
@@ -32,6 +35,7 @@
import org.springframework.web.servlet.ModelAndView;
import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.NoSuchElementException;
@@ -66,6 +70,23 @@
@PathVariable(value ="changeReqTableName") String changeReqTableName,
ReqStatusDTO reqStatusDTO, ModelMap model, HttpServletRequest request) throws Exception {
+ ParameterParser parser = new ParameterParser(request);
+ boolean disableChecker = parser.getBoolean("disable");
+ if(disableChecker){
+ reqStatusDTO.setWhere("c_title", "enable");
+ }
+
+ String[] versionTagArr = StringUtility.split(parser.get("versionTag"), ",");
+ if( versionTagArr != null){
+ List longList = new ArrayList<>();
+ for (String versionTag : versionTagArr ) {
+ longList.add(StringUtility.toLong(versionTag));
+ }
+ Criterion criterion = Restrictions.in("c_version_link", longList);
+ reqStatusDTO.getCriterions().add(criterion);
+ }
+
+
SessionUtil.setAttribute("getStatusMonitor",changeReqTableName);
Criterion criterion = Restrictions.not(