주요사건 처리현황 저장 오류 수정.
parent
5642680cee
commit
9800a85bf7
|
|
@ -1,15 +1,10 @@
|
||||||
package com.dbnt.faisp.main.ivsgtMgt.majorStatus;
|
package com.dbnt.faisp.main.ivsgtMgt.majorStatus;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
|
import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
|
||||||
import com.dbnt.faisp.main.codeMgt.model.CodeMgt;
|
|
||||||
import com.dbnt.faisp.main.codeMgt.service.CodeMgtService;
|
import com.dbnt.faisp.main.codeMgt.service.CodeMgtService;
|
||||||
import com.dbnt.faisp.main.equip.model.Equip;
|
|
||||||
import com.dbnt.faisp.main.ivsgtMgt.majorStatus.model.MajorStatus;
|
import com.dbnt.faisp.main.ivsgtMgt.majorStatus.model.MajorStatus;
|
||||||
import com.dbnt.faisp.main.ivsgtMgt.majorStatus.repository.MajorStatusRepository;
|
|
||||||
import com.dbnt.faisp.main.ivsgtMgt.majorStatus.service.MajorStatusService;
|
import com.dbnt.faisp.main.ivsgtMgt.majorStatus.service.MajorStatusService;
|
||||||
|
|
||||||
import com.dbnt.faisp.main.userInfo.model.UserInfo;
|
import com.dbnt.faisp.main.userInfo.model.UserInfo;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.security.core.annotation.AuthenticationPrincipal;
|
import org.springframework.security.core.annotation.AuthenticationPrincipal;
|
||||||
|
|
@ -24,7 +19,7 @@ import java.util.List;
|
||||||
@RestController
|
@RestController
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@RequestMapping("/ivsgt")
|
@RequestMapping("/ivsgt")
|
||||||
public class MajorStatusController {
|
public class MajorStatusController { // 외사수사관리 > 주요사건처리현황
|
||||||
|
|
||||||
private final AuthMgtService authMgtService;
|
private final AuthMgtService authMgtService;
|
||||||
private final MajorStatusService majorStatusService;
|
private final MajorStatusService majorStatusService;
|
||||||
|
|
@ -34,12 +29,9 @@ public class MajorStatusController {
|
||||||
public ModelAndView majorStatus(@AuthenticationPrincipal UserInfo loginUser, MajorStatus majorStatus){
|
public ModelAndView majorStatus(@AuthenticationPrincipal UserInfo loginUser, MajorStatus majorStatus){
|
||||||
|
|
||||||
ModelAndView mav = new ModelAndView("ivsgt/majorStatus/majorStatusPage");
|
ModelAndView mav = new ModelAndView("ivsgt/majorStatus/majorStatusPage");
|
||||||
|
|
||||||
mav.addObject("mstList", codeMgtService.selectCodeMgtList("MST"));
|
mav.addObject("mstList", codeMgtService.selectCodeMgtList("MST"));
|
||||||
|
|
||||||
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
|
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
|
||||||
mav.addObject("searchParams", majorStatus);
|
mav.addObject("searchParams", majorStatus);
|
||||||
|
|
||||||
majorStatus.setQueryInfo();
|
majorStatus.setQueryInfo();
|
||||||
mav.addObject("majorList", majorStatusService.selectMajorList(majorStatus));
|
mav.addObject("majorList", majorStatusService.selectMajorList(majorStatus));
|
||||||
majorStatus.setContentCnt(majorStatusService.selectMajorListCnt(majorStatus));
|
majorStatus.setContentCnt(majorStatusService.selectMajorListCnt(majorStatus));
|
||||||
|
|
@ -52,7 +44,6 @@ public class MajorStatusController {
|
||||||
@GetMapping("/majorEditModal")
|
@GetMapping("/majorEditModal")
|
||||||
public ModelAndView majorEditModal(@AuthenticationPrincipal UserInfo loginUser, MajorStatus majorStatus) {
|
public ModelAndView majorEditModal(@AuthenticationPrincipal UserInfo loginUser, MajorStatus majorStatus) {
|
||||||
ModelAndView mav = new ModelAndView("ivsgt/majorStatus/majorStatusEditModal");
|
ModelAndView mav = new ModelAndView("ivsgt/majorStatus/majorStatusEditModal");
|
||||||
|
|
||||||
if(majorStatus.getMajorKey()!=null){
|
if(majorStatus.getMajorKey()!=null){
|
||||||
majorStatus = majorStatusService.selectMajor(majorStatus.getMajorKey());
|
majorStatus = majorStatusService.selectMajor(majorStatus.getMajorKey());
|
||||||
}else{
|
}else{
|
||||||
|
|
@ -62,10 +53,7 @@ public class MajorStatusController {
|
||||||
majorStatus.setWrtUserGrd(loginUser.getTitleCd());
|
majorStatus.setWrtUserGrd(loginUser.getTitleCd());
|
||||||
majorStatus.setWrtUserNm(loginUser.getUserNm());
|
majorStatus.setWrtUserNm(loginUser.getUserNm());
|
||||||
majorStatus.setWrtDt(LocalDateTime.now());
|
majorStatus.setWrtDt(LocalDateTime.now());
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
//mav.addObject("mstList", codeMgtService.selectCodeMgtList("MST"));
|
|
||||||
mav.addObject("majorStatus", majorStatus);
|
mav.addObject("majorStatus", majorStatus);
|
||||||
mav.addObject("userSeq", loginUser.getUserSeq());
|
mav.addObject("userSeq", loginUser.getUserSeq());
|
||||||
return mav;
|
return mav;
|
||||||
|
|
@ -74,34 +62,25 @@ public class MajorStatusController {
|
||||||
|
|
||||||
@GetMapping("/majorViewModal")
|
@GetMapping("/majorViewModal")
|
||||||
public ModelAndView majorViewModal(@AuthenticationPrincipal UserInfo loginUser,MajorStatus majorStatus){
|
public ModelAndView majorViewModal(@AuthenticationPrincipal UserInfo loginUser,MajorStatus majorStatus){
|
||||||
|
|
||||||
ModelAndView mav = new ModelAndView("ivsgt/majorStatus/majorStatusViewModal");
|
ModelAndView mav = new ModelAndView("ivsgt/majorStatus/majorStatusViewModal");
|
||||||
|
|
||||||
majorStatus = majorStatusService.selectMajor(majorStatus.getMajorKey());
|
majorStatus = majorStatusService.selectMajor(majorStatus.getMajorKey());
|
||||||
mav.addObject("userSeq", loginUser.getUserSeq());
|
mav.addObject("userSeq", loginUser.getUserSeq());
|
||||||
mav.addObject("majorStatus", majorStatus);
|
mav.addObject("majorStatus", majorStatus);
|
||||||
|
|
||||||
//메뉴권한 확인
|
|
||||||
// mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/ivsgt/"+majorStatus.getMajorType()).get(0).getAccessAuth());
|
|
||||||
|
|
||||||
return mav;
|
return mav;
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/saveContent")
|
@PostMapping("/saveMajorStatus")
|
||||||
public Integer saveContent (MajorStatus majorStatus,
|
public Integer saveMajorStatus (MajorStatus majorStatus,
|
||||||
MultipartHttpServletRequest request,
|
MultipartHttpServletRequest request,
|
||||||
@RequestParam(value = "fileSeq", required = false) List< Integer > deleteFileSeq){
|
@RequestParam(value = "fileSeq", required = false) List< Integer > deleteFileSeq){
|
||||||
majorStatus.setMultipartFileList(request.getMultiFileMap().get("uploadFiles"));
|
majorStatus.setMultipartFileList(request.getMultiFileMap().get("uploadFiles"));
|
||||||
return majorStatusService.saveContent(majorStatus, deleteFileSeq);
|
return majorStatusService.saveMajorStatus(majorStatus, deleteFileSeq);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@PostMapping("/deleteContent")
|
@PostMapping("/deleteContent")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public void deleteContent(@RequestBody MajorStatus majorStatus){
|
public void deleteContent(@RequestBody MajorStatus majorStatus){
|
||||||
|
|
||||||
majorStatusService.deleteContent(majorStatus);
|
majorStatusService.deleteContent(majorStatus);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ public class MajorStatusService extends BaseService {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
public Integer saveContent(MajorStatus majorStatus, List<Integer> deleteFileSeq) {
|
public Integer saveMajorStatus(MajorStatus majorStatus, List<Integer> deleteFileSeq) {
|
||||||
Integer majorKey = majorStatusRepository.save(majorStatus).getMajorKey();
|
Integer majorKey = majorStatusRepository.save(majorStatus).getMajorKey();
|
||||||
if(deleteFileSeq!=null && deleteFileSeq.size()>0){
|
if(deleteFileSeq!=null && deleteFileSeq.size()>0){
|
||||||
deleteMajorFile(majorKey, deleteFileSeq);
|
deleteMajorFile(majorKey, deleteFileSeq);
|
||||||
|
|
|
||||||
|
|
@ -157,7 +157,7 @@ function saveContent(contentStatus){
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type : 'POST',
|
type : 'POST',
|
||||||
data : formData,
|
data : formData,
|
||||||
url : "/ivsgt/saveContent",
|
url : "/ivsgt/saveMajorStatus",
|
||||||
processData: false,
|
processData: false,
|
||||||
contentType: false,
|
contentType: false,
|
||||||
success : function(result) {
|
success : function(result) {
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
<input type="hidden" name="wrtUserSeq" th:value="${majorStatus.wrtUserSeq}">
|
<input type="hidden" name="wrtUserSeq" th:value="${majorStatus.wrtUserSeq}">
|
||||||
<input type="hidden" name="wrtUserGrd" th:value="${majorStatus.wrtUserGrd}">
|
<input type="hidden" name="wrtUserGrd" th:value="${majorStatus.wrtUserGrd}">
|
||||||
<input type="hidden" name="wrtUserNm" th:value="${majorStatus.wrtUserNm}">
|
<input type="hidden" name="wrtUserNm" th:value="${majorStatus.wrtUserNm}">
|
||||||
|
<input type="hidden" name="wrtDt" th:value="${#temporals.format(majorStatus.wrtDt, 'yyyy-MM-dd HH:mm')}">
|
||||||
<div class="row mb-1">
|
<div class="row mb-1">
|
||||||
<label for="wrtUserNm" class="col-sm-2 col-form-label col-form-label-sm text-center">작성자</label>
|
<label for="wrtUserNm" class="col-sm-2 col-form-label col-form-label-sm text-center">작성자</label>
|
||||||
<div class="col-sm-2">
|
<div class="col-sm-2">
|
||||||
|
|
@ -25,7 +26,7 @@
|
||||||
</div>
|
</div>
|
||||||
<label for="wrtDt" class="col-sm-2 col-form-label col-form-label-sm text-center">작성일</label>
|
<label for="wrtDt" class="col-sm-2 col-form-label col-form-label-sm text-center">작성일</label>
|
||||||
<div class="col-sm-2">
|
<div class="col-sm-2">
|
||||||
<input type="text" class="form-control form-control-sm" id="wrtDt" name="wrtDt" th:value="${#temporals.format(majorStatus.wrtDt, 'yyyy-MM-dd')}" readonly>
|
<input type="text" class="form-control form-control-sm" id="wrtDt" th:value="${#temporals.format(majorStatus.wrtDt, 'yyyy-MM-dd')}" readonly>
|
||||||
</div>
|
</div>
|
||||||
<label for="majorType" class="col-sm-2 col-form-label col-form-label-sm text-center">분류</label>
|
<label for="majorType" class="col-sm-2 col-form-label col-form-label-sm text-center">분류</label>
|
||||||
<div class="col-sm-2">
|
<div class="col-sm-2">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue