tolag3/fairnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

Browse Source
This commit is contained in:
myname 2024-09-05 18:16:25 +09:00
commit a433f8a73a
10 changed files with 626 additions and 624 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/seed/com/gtm/base/BaseController.java
View File

@ -36,7 +36,7 @@ import seed.com.gtm.util.JSPUtil;
import seed.com.gtm.util.Nanum;
import seed.com.gtm.util.Nice;
import seed.com.gtm.util.PageMaker;
import seed.com.gtm.util.SeedCriteria;
import seed.com.gtm.util.Criteria;
import seed.utils.ApplicationProperty;
import seed.utils.SeedUtils;
@ -67,7 +67,7 @@ public class BaseController {
@RequestMapping(value = "/gtm/case/{pageFolder}/{pageName}/{pageAction}.do")
public ModelAndView getManagerPage(HttpServletRequest request,
HttpSession session, Map<String, Object> map,
SeedCriteria cri,
Criteria cri,
@PathVariable(value="pageFolder") String pageFolder,
@PathVariable(value="pageName") String pageName,
@PathVariable(value="pageAction") String pageAction

4
src/main/java/seed/com/gtm/board/CaseBoardController.java
View File

@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import seed.com.gtm.util.SeedCriteria;
import seed.com.gtm.util.Criteria;
import seed.com.gtm.seedfile.SeedFileService;
import seed.com.gtm.util.PageMaker;
@ -62,7 +62,7 @@ public class CaseBoardController {
// /gtm/case/board/form/list.do
@RequestMapping("/board/{boardIdx}/list.do")
public String boardList(ModelMap model, HttpSession session, SeedCriteria cri,@RequestParam Map<String,Object> paramMap, @PathVariable(value="boardIdx") String boardIdx){
public String boardList(ModelMap model, HttpSession session, Criteria cri,@RequestParam Map<String,Object> paramMap, @PathVariable(value="boardIdx") String boardIdx){
//로그인페이지로 튕겨나가지 않게 우선은 임시방편
session.setAttribute("siteIdx", "case");

28
src/main/java/seed/com/gtm/counsel/OnlineCounselController.java
View File

@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import seed.com.gtm.seedfile.SeedFileService;
import seed.com.gtm.util.SeedCriteria;
import seed.com.gtm.util.Criteria;
import seed.com.gtm.util.PageMaker;
import seed.com.user.counsel.CounselService;
import seed.utils.SeedUtils;
@ -40,7 +40,7 @@ public class OnlineCounselController {
// /gtm/case/onlineCounsel/list.do
@RequestMapping("/onlineCounsel/list.do")
public String counselList(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, SeedCriteria cri){
public String counselList(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, Criteria cri){
session.setAttribute("siteIdx", "case");
//페이징 관련
paramMap.put("pageStart", cri.getPageStart());
@ -60,7 +60,7 @@ public class OnlineCounselController {
}
@RequestMapping("/onlineCounsel/view.do")
public String counselView(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, SeedCriteria cri){
public String counselView(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, Criteria cri){
paramMap.put("dataIdx", paramMap.get("counselSeq"));
paramMap.put("memberDept", session.getAttribute("memberDept"));
@ -76,7 +76,7 @@ public class OnlineCounselController {
}
@RequestMapping("/onlineCounsel/writePage.do")
public String counselWritePage(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, SeedCriteria cri){
public String counselWritePage(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, Criteria cri){
paramMap.put("memberDept", session.getAttribute("memberDept"));
List<Map<String,Object>> memberList = service.memberSelect(paramMap);
@ -113,7 +113,7 @@ public class OnlineCounselController {
}
@RequestMapping("/onlineCounsel/edit.do")
public String counselEdit(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, SeedCriteria cri){
public String counselEdit(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, Criteria cri){
if( SeedUtils.setReplaceNull(paramMap.get("managerNm")).equals("") ){
paramMap.put("managerNm", session.getAttribute("memberName"));
@ -154,7 +154,7 @@ public class OnlineCounselController {
}
@RequestMapping("/onlineCounsel/state.do")
public String counselState(HttpServletRequest request ,ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, SeedCriteria cri){
public String counselState(HttpServletRequest request ,ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, Criteria cri){
String[] checkList = request.getParameterValues("okCheck");
//센터장(memberPosition : 0902000000)만 승인가능 하도록
@ -205,7 +205,7 @@ public class OnlineCounselController {
@RequestMapping("/onlineCounsel/del.do")
public String counselDel(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, SeedCriteria cri){
public String counselDel(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, Criteria cri){
service.counselDelete(paramMap);
map.put("message", "common.message.del");
@ -218,7 +218,7 @@ public class OnlineCounselController {
// /gtm/case/onlineCounsel/lawList.do
@RequestMapping("/onlineCounsel/lawList.do")
public String lawCounselList(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, SeedCriteria cri){
public String lawCounselList(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, Criteria cri){
session.setAttribute("siteIdx", "case");
//페이징 관련
paramMap.put("pageStart", cri.getPageStart());
@ -238,7 +238,7 @@ public class OnlineCounselController {
}
@RequestMapping("/onlineCounsel/lawView.do")
public String lawCounselView(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, SeedCriteria cri){
public String lawCounselView(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, Criteria cri){
paramMap.put("dataIdx", paramMap.get("counselSeq"));
paramMap.put("memberDept", session.getAttribute("memberDept"));
@ -255,7 +255,7 @@ public class OnlineCounselController {
}
@RequestMapping("/onlineCounsel/lawWritePage.do")
public String lawWritePage(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, SeedCriteria cri){
public String lawWritePage(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, Criteria cri){
paramMap.put("memberDept", session.getAttribute("memberDept"));
List<Map<String,Object>> memberList = service.memberSelect(paramMap);
@ -287,7 +287,7 @@ public class OnlineCounselController {
}
@RequestMapping("/onlineCounsel/rawEdit.do")
public String lawCounselEdit(ModelMap model, HttpServletRequest request,HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, SeedCriteria cri){
public String lawCounselEdit(ModelMap model, HttpServletRequest request,HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, Criteria cri){
if( SeedUtils.setReplaceNull(paramMap.get("managerNm")).equals("") ){
paramMap.put("managerNm", session.getAttribute("memberName"));
@ -332,7 +332,7 @@ public class OnlineCounselController {
}
@RequestMapping("/onlineCounsel/lawState.do")
public String lawCounselState(HttpServletRequest request ,ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, SeedCriteria cri){
public String lawCounselState(HttpServletRequest request ,ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, Criteria cri){
String[] checkList = request.getParameterValues("okCheck");
//센터장(memberPosition : 0902000000)만 승인가능 하도록
@ -385,7 +385,7 @@ public class OnlineCounselController {
@RequestMapping("/onlineCounsel/lawDel.do")
public String counselLawDel(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, SeedCriteria cri){
public String counselLawDel(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, Criteria cri){
service.counselDelete(paramMap);
map.put("message", "common.message.del");
@ -396,7 +396,7 @@ public class OnlineCounselController {
}
@RequestMapping("/onlineCounsel/civilChange.do")
public String counselCivilChange(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, SeedCriteria cri){
public String counselCivilChange(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Map<String, Object> map, Criteria cri){
if( SeedUtils.setReplaceNull(paramMap.get("managerNm")).equals("") ){
paramMap.put("managerNm", session.getAttribute("memberName"));

4
src/main/java/seed/com/gtm/exam/ExamBoardController.java
View File

@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import seed.com.gtm.seedfile.SeedFileService;
import seed.com.gtm.util.PageMaker;
import seed.com.gtm.util.SeedCriteria;
import seed.com.gtm.util.Criteria;
import seed.utils.SeedDbUtilsSupport;
@Controller
@ -65,7 +65,7 @@ public class ExamBoardController {
}
@RequestMapping("exam/{boardIdx}/list.do")
public String examList(ModelMap model, HttpSession session, SeedCriteria cri,@RequestParam Map<String,Object> paramMap, @PathVariable(value="boardIdx") String boardIdx){
public String examList(ModelMap model, HttpSession session, Criteria cri,@RequestParam Map<String,Object> paramMap, @PathVariable(value="boardIdx") String boardIdx){
//로그인페이지로 튕겨나가지 않게 우선은 임시방편
session.setAttribute("siteIdx", "case");

4
src/main/java/seed/com/gtm/faqbbs/faqBoardController.java
View File

@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import seed.com.gtm.util.PageMaker;
import seed.com.gtm.util.SeedCriteria;
import seed.com.gtm.util.Criteria;
@Controller
@RequestMapping("/gtm/case")
@ -59,7 +59,7 @@ public class faqBoardController {
}
@RequestMapping("/faqBbs/list.do")
public String faqBbsList(HttpSession session, ModelMap model, @RequestParam Map<String,Object> paramMap, SeedCriteria cri){
public String faqBbsList(HttpSession session, ModelMap model, @RequestParam Map<String,Object> paramMap, Criteria cri){
//로그인페이지로 튕겨나가지 않게 우선은 임시방편
session.setAttribute("siteIdx", "case");

4
src/main/java/seed/com/gtm/sample/SampleController.java
View File

@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import seed.com.gtm.seedfile.SeedFileService;
import seed.com.gtm.util.PageMaker;
import seed.com.gtm.util.SeedCriteria;
import seed.com.gtm.util.Criteria;
@Controller
@RequestMapping("/gtm/sample")
@ -124,7 +124,7 @@ public class SampleController {
//목록화면
@RequestMapping("/board/{boardIdx}/list.do")
public String boardList(ModelMap model, HttpSession session, SeedCriteria cri,@RequestParam Map<String,Object> paramMap, @PathVariable(value="boardIdx") String boardIdx){
public String boardList(ModelMap model, HttpSession session, Criteria cri,@RequestParam Map<String,Object> paramMap, @PathVariable(value="boardIdx") String boardIdx){
//로그인페이지로 튕겨나가지 않게 우선은 임시방편
session.setAttribute("siteIdx", "case");

4
src/main/java/seed/com/gtm/trublchargermng/TrublchargermngController.java
View File

@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import seed.com.gtm.seedfile.SeedFileService;
import seed.com.gtm.util.PageMaker;
import seed.com.gtm.util.SeedCriteria;
import seed.com.gtm.util.Criteria;
import seed.utils.SeedUtils;
@Controller
@ -109,7 +109,7 @@ public class TrublchargermngController {
// /gtm/case/trublchargermng/list.do
@RequestMapping("/trublchargermng/list.do")
public String joinList(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, SeedCriteria cri){
public String joinList(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, Criteria cri){
session.setAttribute("siteIdx", "case");

2
src/main/java/seed/com/gtm/util/JSPUtil.java
View File

@ -83,6 +83,8 @@ public class JSPUtil {
continue;
if (key.startsWith("javax."))
continue;
if (key.startsWith("LoginVO"))
continue;
params.put(key, session.getAttribute(key));
}
return params;

6
src/main/java/seed/com/gtm/util/PageMaker.java
View File

@ -8,9 +8,9 @@ public class PageMaker {
private boolean next;
private int displayPageNum = 10;
private SeedCriteria cri;
private Criteria cri;
public void setCri(SeedCriteria cri){
public void setCri(Criteria cri){
this.cri = cri;
}
@ -60,7 +60,7 @@ public class PageMaker {
return displayPageNum;
}
public SeedCriteria getCri(){
public Criteria getCri(){
return cri;
}
}

4
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administWrite.jsp
View File

@ -420,10 +420,10 @@ $(document).ready(function(){
//ajaxCombo2({url:'/gtm/case/common/ajax/MdatTy.do'}, $("#a"));
//ajaxCombo2({url:'/gtm/case/common/ajax/Resn2depth.do'}, $("#b"));
caseGubunCombo();
resnCombo();
/* resnCombo();
docCheckCombo();
hadoCombo();
hadoMnCombo();
hadoMnCombo(); */
}, 0);
$("#caseGubun").change(function(){