diff --git a/src/main/java/kcc/com/cmm/service/EgovCmmUseService.java b/src/main/java/kcc/com/cmm/service/EgovCmmUseService.java index cccbaed8..59b87d0c 100644 --- a/src/main/java/kcc/com/cmm/service/EgovCmmUseService.java +++ b/src/main/java/kcc/com/cmm/service/EgovCmmUseService.java @@ -70,4 +70,8 @@ public interface EgovCmmUseService { * @throws Exception */ public List selectGroupIdDetail(ComDefaultCodeVO vo) throws Exception; + + public void updateSatis(SatisVO satisVO) throws Exception; + + public SatisVO selectSatis() throws Exception; } diff --git a/src/main/java/kcc/com/cmm/service/SatisVO.java b/src/main/java/kcc/com/cmm/service/SatisVO.java new file mode 100644 index 00000000..4e3a3fbb --- /dev/null +++ b/src/main/java/kcc/com/cmm/service/SatisVO.java @@ -0,0 +1,27 @@ +package kcc.com.cmm.service; + +import java.io.Serializable; +import java.util.Map; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +public class SatisVO implements Serializable { + + private static final long serialVersionUID = 1L; + + private String openYn; + private String lastUpdtPnttm; + private String lastUpdtId; + + +} \ No newline at end of file diff --git a/src/main/java/kcc/com/cmm/service/impl/CmmUseDAO.java b/src/main/java/kcc/com/cmm/service/impl/CmmUseDAO.java index 809fed2b..b88ebc61 100644 --- a/src/main/java/kcc/com/cmm/service/impl/CmmUseDAO.java +++ b/src/main/java/kcc/com/cmm/service/impl/CmmUseDAO.java @@ -6,6 +6,7 @@ import org.springframework.stereotype.Repository; import kcc.com.cmm.ComDefaultCodeVO; import kcc.com.cmm.service.CmmnDetailCode; +import kcc.com.cmm.service.SatisVO; /** * @Class Name : CmmUseDAO.java @@ -71,4 +72,12 @@ public class CmmUseDAO extends EgovComAbstractDAO { public CmmnDetailCode selectCmmCodeDetailValue(ComDefaultCodeVO vo) throws Exception { return (CmmnDetailCode) select("CmmUseDAO.selectCmmCodeDetailValue", vo); } + + public SatisVO selectSatis() throws Exception { + return (SatisVO) select ("cmmUseDAO.selectSatis"); + } + + public void updateSatis(SatisVO satisVO) throws Exception { + update("cmmUseDAO.updateSatis", satisVO); + } } diff --git a/src/main/java/kcc/com/cmm/service/impl/EgovCmmUseServiceImpl.java b/src/main/java/kcc/com/cmm/service/impl/EgovCmmUseServiceImpl.java index 4372da53..2f3b4146 100644 --- a/src/main/java/kcc/com/cmm/service/impl/EgovCmmUseServiceImpl.java +++ b/src/main/java/kcc/com/cmm/service/impl/EgovCmmUseServiceImpl.java @@ -9,6 +9,7 @@ import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; import kcc.com.cmm.ComDefaultCodeVO; import kcc.com.cmm.service.CmmnDetailCode; import kcc.com.cmm.service.EgovCmmUseService; +import kcc.com.cmm.service.SatisVO; import javax.annotation.Resource; @@ -106,4 +107,15 @@ public class EgovCmmUseServiceImpl extends EgovAbstractServiceImpl implements Eg public List selectGroupIdDetail(ComDefaultCodeVO vo) throws Exception { return cmmUseDAO.selectGroupIdDetail(vo); } + + @Override + public void updateSatis(SatisVO satisVO) throws Exception { + cmmUseDAO.updateSatis(satisVO); + } + + @Override + public SatisVO selectSatis() throws Exception { + return cmmUseDAO.selectSatis(); + } + } diff --git a/src/main/java/kcc/com/cmm/util/DateUtil.java b/src/main/java/kcc/com/cmm/util/DateUtil.java index 6a44202f..b99dc389 100644 --- a/src/main/java/kcc/com/cmm/util/DateUtil.java +++ b/src/main/java/kcc/com/cmm/util/DateUtil.java @@ -148,7 +148,7 @@ public final class DateUtil { return DateUtil.parseLocalDateTime(source, null); } - static String format(Date date, String pattern) { + public static String format(Date date, String pattern) { if (date == null) return null; diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index 5f81c80e..23855264 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/src/main/java/kcc/web/MainController.java @@ -206,6 +206,9 @@ public class MainController { @Autowired private ExamBoardService examBoardService; + + @Resource(name = "EgovCmmUseService") + private EgovCmmUseService egovCmmUseService; @RequestMapping(value = "/web/main/mainPage.do") public String siteMainPage(HttpServletRequest request, ModelMap model, HttpSession session) throws Exception { @@ -279,7 +282,8 @@ public class MainController { */ @RequestMapping(value = "/web/com/webCommonFooter.do") public String siteWebCommonFooter(@RequestParam Map commandMap, HttpServletRequest request, - ModelMap model) throws Exception { + ModelMap model + , MenuManageJTreeVO menuManageVO) throws Exception { LoginLog loginLog = new LoginLog(); if (request.getRequestURI().contains("/web/main/mainPage.do")) { // 사용자 메인 @@ -364,6 +368,16 @@ public class MainController { } // model.addAttribute("loginLog", loginLog); + MenuManageVO resultVO = new MenuManageVO(); + MenuManageVO tempMenuManageVO = new MenuManageVO(); + tempMenuManageVO.setSearchCondition("Y"); + setViewMenu(request, commandMap, tempMenuManageVO, resultVO, menuManageVO); + + model.addAttribute("menuManageVO", menuManageVO); + + model.addAttribute("satisVO", egovCmmUseService.selectSatis()); + + return "web/com/webCommonFooter"; } diff --git a/src/main/java/seed/com/gtm/base/OzReportController.java b/src/main/java/seed/com/gtm/base/OzReportController.java index 746e1d40..0971952b 100644 --- a/src/main/java/seed/com/gtm/base/OzReportController.java +++ b/src/main/java/seed/com/gtm/base/OzReportController.java @@ -1,6 +1,9 @@ package seed.com.gtm.base; +import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -10,18 +13,24 @@ import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; import org.json.JSONArray; import org.json.simple.JSONObject; +import org.json.simple.parser.JSONParser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; +import com.fasterxml.jackson.databind.ObjectMapper; + import egovframework.rte.psl.dataaccess.util.EgovMap; +import kcc.com.cmm.util.DateUtil; import kcc.utill.OzUtill; +import seed.com.gtm.base.service.DecisionVO; import seed.com.gtm.code.CodeService; import seed.com.gtm.seedfile.SeedFileService; import seed.com.gtm.service.BaseService; import seed.com.gtm.util.JSPUtil; +import seed.utils.SeedConstants; @Controller @@ -1695,6 +1704,153 @@ public class OzReportController { return s_ret; } + @SuppressWarnings({ "unused", "unchecked" }) + @RequestMapping("/clip/ozReport/OzDecisionPaper.do") + public String OzDecisionPaper( + ModelMap model + , HttpServletRequest request + ) throws Exception { + + String cfrncNo = request.getParameter("cfrncNo"); + String memberNo = request.getParameter("memberNo"); + + EgovMap params = new EgovMap(); + params.put("cfrncNo", cfrncNo); + + //기본정보 + params.put("sql", "trublcfrncmngCfrncmanageSel"); + Map basicMap = bserviceReturnMap(params); + + //심의안건 + params.put("sql", "trublcfrncmngDlbrtmtrSel"); + List> simList = (List>) JSPUtil.fixNull(bservice.list(params)); + + //보고안건 + params.put("sql", "trublcfrncmngEndmtrSel2"); + List> bogoList = (List>) JSPUtil.fixNull(bservice.list(params)); + + //조정조서안건 + params.put("sql", "trublcfrncmngEndjosuSel"); + List> jojungList = (List>) JSPUtil.fixNull(bservice.list(params)); + + //참여위원 + params.put("sql", "trublcfrncmngCfrncatndncSelOne"); + params.put("memberNo", memberNo); + Map uiwonMap = bserviceReturnMap(params); + + DecisionVO decisionVO = new DecisionVO(); + + decisionVO.getP1TOP().setP1T1( + basicMap.get("conferenceNames") + + " 서면의결서" + ); + decisionVO.getP1TOP().setP1T2( + basicMap.get("conferenceNames") + + "에 상정된 안건에 대하여 본인은 다음의 내용과 같이 의사표시를 합니다." + ); + decisionVO.getP1TOP().setP1T3( + "(안건 수: " + + simList.size() + + "건)" + ); + decisionVO.getP1TOP().setP1T4( + "(안건 수: " + + bogoList.size() + + "건, 성립 " + + mediationBigCnt(bogoList, "성립") + + "건, 불성립 " + + mediationBigCnt(bogoList, "불성립") + + "건, 종결 " + + mediationBigCnt(bogoList, "종결") + + "건)" + ); + //!!!! + decisionVO.getP1TOP().setP1T5("기타의견"); + + decisionVO.getP1TOP().setP1T6(DateUtil.format(new Date(), "yyyy년 M월 d일")); + decisionVO.getP1TOP().setP1T7(uiwonMap.get("memberPosit") + " " + uiwonMap.get("memberName")); + + //!!!! + decisionVO.getP1TOP().setP1T8("http://192.168.0.34:8081/uss/ion/pwm/getImage.do?atchFileId=FILE_000000000000240"); + if(basicMap.get("caseGubun").contains( + "0201000000" //공정 + + " || 0202000000" // 가맹 + + " || 0204000000" // 유통 + ) + ) { + decisionVO.getP1TOP().setP1T9("한국공정거래조정원 분쟁조정1실장 귀하"); + }else { + decisionVO.getP1TOP().setP1T9("한국공정거래조정원 분쟁조정2실장 귀하"); + } + + //순번 사용 + AtomicInteger countSim = new AtomicInteger(1); + + simList.stream() + .forEach( t -> { + DecisionVO.P1M1 p1m1 = new DecisionVO.P1M1(); + + p1m1.setP1M1T0(String.valueOf(countSim.getAndIncrement())); + p1m1.setP1M1T1(t.get("caseNo")); + if("1301000000".equals(t.get("companyGubun"))) { + p1m1.setP1M1T2(t.get("companyCeo")); + }else { + p1m1.setP1M1T2(t.get("applcntCompany")); + } + if("1301000000".equals(t.get("respondentGubun"))) { + p1m1.setP1M1T3(t.get("respondentCeo")); + }else { + p1m1.setP1M1T3(t.get("respondentCompany")); + } + p1m1.setP1M1T4("조정안 제시"); + simResult(p1m1, t); + + decisionVO.getP1M1().add(p1m1); + } + ); + + //순번 초기화 + countSim.set(1); + + bogoList.stream() + .forEach( t -> { + DecisionVO.P1M2 p1m2 = new DecisionVO.P1M2(); + p1m2.setP1M2T0(String.valueOf(countSim.getAndIncrement())); + p1m2.setP1M2T1(t.get("caseNo")); + if("1301000000".equals(t.get("companyGubun"))) { + p1m2.setP1M2T2(t.get("companyCeo")); + }else { + p1m2.setP1M2T2(t.get("applcntCompany")); + } + if("1301000000".equals(t.get("respondentGubun"))) { + p1m2.setP1M2T3(t.get("respondentCeo")); + }else { + p1m2.setP1M2T3(t.get("respondentCompany")); + } + + p1m2.setP1M2T4(t.get("mediationBig")); + p1m2.setP1M2T5(t.get("mediationSmall")); + p1m2.setP1M2T6("동의여부"); + + decisionVO.getP1M2().add(p1m2); + } + ); + + ObjectMapper objectMapper = new ObjectMapper(); + String jsonStr = objectMapper.writeValueAsString(decisionVO); + + JSONParser parser = new JSONParser(); + Object obj = parser.parse(jsonStr); + JSONObject pramJsonObj = (JSONObject) obj; + + + ozUtill.ozReportJson(pramJsonObj, model); + + model.addAttribute("ozFile", "decisionPaper01_all.ozr"); + + return "/xxx/ozReportDecision"; + } + //신청인 정보 private String makeApplcntNCnt(List p_caseApplcntData) { String v_ret = ""; @@ -1758,4 +1914,79 @@ public class OzReportController { return v_ret; } -} \ No newline at end of file + + @SuppressWarnings("unchecked") + private Map bserviceReturnMap( + EgovMap params + ){ + + List list = JSPUtil.fixNull(bservice.list(params)); + if(list.size() > 0) { + return (Map) list.get(0); + }else { + return null; + } + } + + private Integer mediationBigCnt(List> bogoList, String div) { + return Long.valueOf( + bogoList.stream() + .filter(t -> + div.equals( + t.get("mediationBig") + ) + ) + .count() + ).intValue(); + } + + + private Map simResult(DecisionVO.P1M1 p1m1, Map simMap) { + + EgovMap params = new EgovMap(); + params.put("caseNo", simMap.get("caseNo")); + + //기본정보 + params.put("sql", "trublcfrncmngDlbrtmtrTypeCnt"); + Map simResultMap = bserviceReturnMap(params); + + if( + "0618000000".equals(simResultMap.get("mediationSmall")) //재심의 + ) { + if("Y".equals(simResultMap.get("modResolution"))) { + //수정의결 + p1m1.setP1M1T6("O"); + }else { + //원안의결 + p1m1.setP1M1T5("O"); + } + //재심의 + p1m1.setP1M1T7("O"); + } + else if( + "0601010000".equals(simResultMap.get("mediationBig")) //성립 + || "0602010000".equals(simResultMap.get("mediationBig")) //성립 + || "0621010000".equals(simResultMap.get("mediationBig")) //불성립 + || "0622010000".equals(simResultMap.get("mediationBig")) //불성립 + || "0606010000".equals(simResultMap.get("mediationBig")) //중지 + ){ + if("Y".equals(simResultMap.get("modResolution"))) { + //수정의결 + p1m1.setP1M1T6("O"); + }else { + //원안의결 + p1m1.setP1M1T5("O"); + } + }else { + //원안의결 + p1m1.setP1M1T5("-"); + //수정의결 + p1m1.setP1M1T6("-"); + //재심의 + p1m1.setP1M1T7("-"); + } + + return simMap; + } +} + diff --git a/src/main/java/seed/com/gtm/base/service/DecisionVO.java b/src/main/java/seed/com/gtm/base/service/DecisionVO.java new file mode 100644 index 00000000..a92f85e7 --- /dev/null +++ b/src/main/java/seed/com/gtm/base/service/DecisionVO.java @@ -0,0 +1,173 @@ +package seed.com.gtm.base.service; + +import java.util.ArrayList; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public class DecisionVO { + + @JsonProperty("P1TOP") + private P1TOP P1TOP = new P1TOP(); + @JsonProperty("P1M1") + private List P1M1 = new ArrayList<>(); + @JsonProperty("P1M2") + private List P1M2 = new ArrayList<>(); + + @Getter + @Setter + @NoArgsConstructor + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public static class P1TOP { + /** + * 최상단 제목 + */ + @JsonProperty("P1T1") + private String P1T1; + /** + * 내용 + */ + @JsonProperty("P1T2") + private String P1T2; + /** + * 심의사항 - 안건 수 + */ + @JsonProperty("P1T3") + private String P1T3; + /** + * 보고사항 - 안건 수, 성립 건 수 , 불성립 건 수, 종결 건 수 + */ + @JsonProperty("P1T4") + private String P1T4; + /** + * 기타의견 + */ + @JsonProperty("P1T5") + private String P1T5; + /** + * 일자 + */ + @JsonProperty("P1T6") + private String P1T6; + /** + * 위원/위원장, 위원이름 + */ + @JsonProperty("P1T7") + private String P1T7; + /** + * 위원 서명 링크 URL + */ + @JsonProperty("P1T8") + private String P1T8; + /** + * 하단 푸터 내용 + */ + @JsonProperty("P1T9") + private String P1T9; + } + + /** + * 심의사항 + */ + @Getter + @Setter + @NoArgsConstructor + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public static class P1M1 { + /** + * 심의사항 - 순번 + */ + @JsonProperty("P1M1T0") + private String P1M1T0; + /** + * 심의사항 - 사건번호 + */ + @JsonProperty("P1M1T1") + private String P1M1T1; + /** + * 심의사항 - 신청인 + */ + @JsonProperty("P1M1T2") + private String P1M1T2; + /** + * 심의사항 - 피신청인 + */ + @JsonProperty("P1M1T3") + private String P1M1T3; + /** + * 심의사항 - 검토의견 + */ + @JsonProperty("P1M1T4") + private String P1M1T4; + /** + * 심의사항 - 심의결과 - 원안의결 + */ + @JsonProperty("P1M1T5") + private String P1M1T5; + /** + * 심의사항 - 심의결과 - 수정의결 + */ + @JsonProperty("P1M1T6") + private String P1M1T6; + /** + * 심의사항 - 심의결과 - 재심의 + */ + @JsonProperty("P1M1T7") + private String P1M1T7; + } + + /** + * 보고사항 + */ + @Getter + @Setter + @NoArgsConstructor + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public static class P1M2 { + /** + * 보고사항 - 순번 + */ + @JsonProperty("P1M2T0") + private String P1M2T0; + /** + * 보고사항 - 사건번호 + */ + @JsonProperty("P1M2T1") + private String P1M2T1; + /** + * 보고사항 - 신청인 + */ + @JsonProperty("P1M2T2") + private String P1M2T2; + /** + * 보고사항 - 피신청인 + */ + @JsonProperty("P1M2T3") + private String P1M2T3; + /** + * 보고사항 - 결과1 + */ + @JsonProperty("P1M2T4") + private String P1M2T4; + /** + * 보고사항 - 결과2 + */ + @JsonProperty("P1M2T5") + private String P1M2T5; + /** + * 동의여부 + */ + @JsonProperty("P1M2T6") + private String P1M2T6; + } + +} \ No newline at end of file diff --git a/src/main/java/seed/common/web/CommonController.java b/src/main/java/seed/common/web/CommonController.java index 2123a53e..671596cc 100644 --- a/src/main/java/seed/common/web/CommonController.java +++ b/src/main/java/seed/common/web/CommonController.java @@ -31,11 +31,14 @@ import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.util.FileCopyUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; @@ -105,6 +108,7 @@ import seed.map.T_POPUP_SET; import seed.map.T_QUICK_DATA; import seed.map.T_QUICK_MANAGER; import seed.map.T_QUICK_SET; +import seed.map.T_SITE; import seed.map.T_SITE_MENU; import seed.map.T_SITE_SATISFACTION; import seed.map.T_SMART_MENU_MANAGER; @@ -10333,4 +10337,36 @@ public class CommonController { return new ModelAndView("/_common/jsp/message"); } + + @RequestMapping(value = "/web/common/proc/case/1/commonSatisfactionRegProc.do") + public ResponseEntity setWebCommonSatisfactionRegProc(HttpSession session, HttpServletRequest httpServletRequest, +// @RequestParam(value="pageUrl", required=true) String pageUrl, +// @RequestParam(value="pageUrl", defaultValue = "url") String pageUrl, + @RequestBody T_SITE_SATISFACTION tSiteSatisfaction){ + + + httpServletRequest.getHeader("WL-Proxy-Client-IP"); + + String memberIp = httpServletRequest.getRemoteAddr(); +// tSiteSatisfaction.settSite("case"); + tSiteSatisfaction.settSite(new T_SITE()); + tSiteSatisfaction.gettSite().setSiteIdx("case"); + + tSiteSatisfaction.settSiteMenu(new T_SITE_MENU()); + tSiteSatisfaction.gettSiteMenu().setSiteMenuIdx(167); + + Map returnMap = new HashMap(); + + if(commonSatisfactionService.setCommonSatisfactionRegProc(tSiteSatisfaction, memberIp)){ + returnMap.put("msg", "등록되었습니다."); + }else{ + returnMap.put("msg", "등록에 실패했습니다."); + } + +// session.setAttribute("url", pageUrl); + +// return new ModelAndView("/_common/jsp/umessage"); +// return returnModel; + return new ResponseEntity<>(returnMap, HttpStatus.OK); + } } \ No newline at end of file diff --git a/src/main/java/seed/manager/site/web/ManagerSiteController.java b/src/main/java/seed/manager/site/web/ManagerSiteController.java index e67043d1..388fa7d1 100644 --- a/src/main/java/seed/manager/site/web/ManagerSiteController.java +++ b/src/main/java/seed/manager/site/web/ManagerSiteController.java @@ -42,6 +42,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; +import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; +import kcc.com.cmm.LoginVO; +import kcc.com.cmm.service.EgovCmmUseService; +import kcc.com.cmm.service.SatisVO; import kcc.com.snd.service.SendService; import kcc.com.snd.service.SendSmsVO; import seed.common.service.CommonMenuAuthService; @@ -131,6 +135,9 @@ public class ManagerSiteController { @Resource(name = "SendService") private SendService sendService; + @Resource(name = "EgovCmmUseService") + private EgovCmmUseService egovCmmUseService; + @Value("#{config['root.path']}") private String rootPath; @@ -210,6 +217,8 @@ public class ManagerSiteController { map.put("sendSet", sendService.selectSendSet()); + map.put("satisSet", egovCmmUseService.selectSatis()); + return new ModelAndView("/manager/site/siteEdit"); } @@ -1447,6 +1456,22 @@ public class ManagerSiteController { return new ResponseEntity<>("변경 완료되었습니다.", headers, HttpStatus.OK); } + @RequestMapping(value = "/gtm/siteEdit/caseSatisAjax.do") + public ResponseEntity caseSatisAjax(HttpServletRequest request, SatisVO satisVO) throws Exception { + + LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + if(null != loginVO){ + satisVO.setLastUpdtId(loginVO.getId()); + } + + egovCmmUseService.updateSatis(satisVO); + + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(new MediaType("text", "plain", Charset.forName("UTF-8"))); + + return new ResponseEntity<>("변경 완료되었습니다.", headers, HttpStatus.OK); + } + private String getBrowser(HttpServletRequest request){ String header = request.getHeader("User-Agent").toLowerCase(); diff --git a/src/main/java/seed/map/T_SITE_SATISFACTION.java b/src/main/java/seed/map/T_SITE_SATISFACTION.java index 96e2a5d6..cd5819e5 100644 --- a/src/main/java/seed/map/T_SITE_SATISFACTION.java +++ b/src/main/java/seed/map/T_SITE_SATISFACTION.java @@ -25,11 +25,13 @@ public class T_SITE_SATISFACTION { private Integer siteSatisfactionIdx; @ManyToOne - @JoinColumn(name="SITE_IDX", nullable=false, insertable=true, updatable= false) +// @JoinColumn(name="SITE_IDX", nullable=false, insertable=true, updatable= false) + @JoinColumn(name="SITE_IDX", nullable=true, insertable=true, updatable= false) private T_SITE tSite; @ManyToOne - @JoinColumn(name="SITE_MENU_IDX", nullable=false, insertable=true, updatable= false) +// @JoinColumn(name="SITE_MENU_IDX", nullable=false, insertable=true, updatable= false) + @JoinColumn(name="SITE_MENU_IDX", nullable=true, insertable=true, updatable= false) private T_SITE_MENU tSiteMenu; @Column(name = "SITE_SATISFACTION_STATUS", length=1, nullable=false, insertable=true, updatable=false) diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml index b97325a1..000be70a 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml @@ -1775,4 +1775,37 @@ ORDER BY FIX_DAY ASC + + + + + + \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/let/cmm/use/EgovCmmUse_SQL_Oracle.xml b/src/main/resources/egovframework/sqlmap/let/cmm/use/EgovCmmUse_SQL_Oracle.xml index 22abf942..6552c397 100644 --- a/src/main/resources/egovframework/sqlmap/let/cmm/use/EgovCmmUse_SQL_Oracle.xml +++ b/src/main/resources/egovframework/sqlmap/let/cmm/use/EgovCmmUse_SQL_Oracle.xml @@ -5,6 +5,8 @@ + + @@ -127,4 +129,16 @@ ORDER BY code + + + + UPDATE UNP_SATISFACTION_SET + SET OPEN_YN=#openYn# + , LAST_UPDT_PNTTM=sysdate + , LAST_UPDT_ID=#lastUpdtId# + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/manager/site/siteEdit.jsp b/src/main/webapp/WEB-INF/jsp/manager/site/siteEdit.jsp index 94b0939a..dc512af4 100644 --- a/src/main/webapp/WEB-INF/jsp/manager/site/siteEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/manager/site/siteEdit.jsp @@ -27,6 +27,26 @@ return false; } } + + function satisYn(obj){ + if(confirm("사이트만족도 공개여부를 변경하시겠습니까?")){ + $.ajax({ + url: '/gtm/siteEdit/caseSatisAjax.do', + type: 'POST', + processData: false, + contentType: false, + data: new FormData(document.satisForm), + success: function(response) { + alert(response); + }, + error: function(error) { + alert("error"); + } + }); + }else{ + return false; + } + } @@ -78,6 +98,22 @@ + +
+
+
+
+

사이트 만족도 설정

+
+ checked> + + checked> + +
+
+
+
+