DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

주요사건 처리현황 저장 오류 수정.

master
강석 최 2023-06-28 11:47:47 +09:00
parent 5642680cee
commit 9800a85bf7
4 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java
View File

@ -1,15 +1,10 @@
package com.dbnt.faisp.main.ivsgtMgt.majorStatus;
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.equip.model.Equip;
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.userInfo.model.UserInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
@ -24,7 +19,7 @@ import java.util.List;
@RestController
@RequiredArgsConstructor
@RequestMapping("/ivsgt")
public class MajorStatusController {
public class MajorStatusController { // 외사수사관리 > 주요사건처리현황
private final AuthMgtService authMgtService;
private final MajorStatusService majorStatusService;
@ -34,12 +29,9 @@ public class MajorStatusController {
public ModelAndView majorStatus(@AuthenticationPrincipal UserInfo loginUser, MajorStatus majorStatus){
ModelAndView mav = new ModelAndView("ivsgt/majorStatus/majorStatusPage");
mav.addObject("mstList", codeMgtService.selectCodeMgtList("MST"));
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
mav.addObject("searchParams", majorStatus);
majorStatus.setQueryInfo();
mav.addObject("majorList", majorStatusService.selectMajorList(majorStatus));
majorStatus.setContentCnt(majorStatusService.selectMajorListCnt(majorStatus));
@ -52,7 +44,6 @@ public class MajorStatusController {
@GetMapping("/majorEditModal")
public ModelAndView majorEditModal(@AuthenticationPrincipal UserInfo loginUser, MajorStatus majorStatus) {
ModelAndView mav = new ModelAndView("ivsgt/majorStatus/majorStatusEditModal");
if(majorStatus.getMajorKey()!=null){
majorStatus = majorStatusService.selectMajor(majorStatus.getMajorKey());
}else{
@ -62,10 +53,7 @@ public class MajorStatusController {
majorStatus.setWrtUserGrd(loginUser.getTitleCd());
majorStatus.setWrtUserNm(loginUser.getUserNm());
majorStatus.setWrtDt(LocalDateTime.now());
}
//mav.addObject("mstList", codeMgtService.selectCodeMgtList("MST"));
mav.addObject("majorStatus", majorStatus);
mav.addObject("userSeq", loginUser.getUserSeq());
return mav;
@ -74,34 +62,25 @@ public class MajorStatusController {
@GetMapping("/majorViewModal")
public ModelAndView majorViewModal(@AuthenticationPrincipal UserInfo loginUser,MajorStatus majorStatus){
ModelAndView mav = new ModelAndView("ivsgt/majorStatus/majorStatusViewModal");
majorStatus = majorStatusService.selectMajor(majorStatus.getMajorKey());
mav.addObject("userSeq", loginUser.getUserSeq());
mav.addObject("majorStatus", majorStatus);
//메뉴권한 확인
// mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/ivsgt/"+majorStatus.getMajorType()).get(0).getAccessAuth());
return mav;
}
@PostMapping("/saveContent")
public Integer saveContent (MajorStatus majorStatus,
@PostMapping("/saveMajorStatus")
public Integer saveMajorStatus (MajorStatus majorStatus,
MultipartHttpServletRequest request,
@RequestParam(value = "fileSeq", required = false) List< Integer > deleteFileSeq){
majorStatus.setMultipartFileList(request.getMultiFileMap().get("uploadFiles"));
return majorStatusService.saveContent(majorStatus, deleteFileSeq);
return majorStatusService.saveMajorStatus(majorStatus, deleteFileSeq);
}
@PostMapping("/deleteContent")
@ResponseBody
public void deleteContent(@RequestBody MajorStatus majorStatus){
majorStatusService.deleteContent(majorStatus);
}
}

2
src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/service/MajorStatusService.java
View File

@ -40,7 +40,7 @@ public class MajorStatusService extends BaseService {
}
@Transactional
public Integer saveContent(MajorStatus majorStatus, List<Integer> deleteFileSeq) {
public Integer saveMajorStatus(MajorStatus majorStatus, List<Integer> deleteFileSeq) {
Integer majorKey = majorStatusRepository.save(majorStatus).getMajorKey();
if(deleteFileSeq!=null && deleteFileSeq.size()>0){
deleteMajorFile(majorKey, deleteFileSeq);

2
src/main/resources/static/js/ivsgt/majorStatus.js
View File

@ -157,7 +157,7 @@ function saveContent(contentStatus){
$.ajax({
type : 'POST',
data : formData,
url : "/ivsgt/saveContent",
url : "/ivsgt/saveMajorStatus",
processData: false,
contentType: false,
success : function(result) {

3
src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html
View File

@ -14,6 +14,7 @@
<input type="hidden" name="wrtUserSeq" th:value="${majorStatus.wrtUserSeq}">
<input type="hidden" name="wrtUserGrd" th:value="${majorStatus.wrtUserGrd}">
<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">
<label for="wrtUserNm" class="col-sm-2 col-form-label col-form-label-sm text-center">작성자</label>
<div class="col-sm-2">
@ -25,7 +26,7 @@
</div>
<label for="wrtDt" class="col-sm-2 col-form-label col-form-label-sm text-center">작성일</label>
<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>
<label for="majorType" class="col-sm-2 col-form-label col-form-label-sm text-center">분류</label>
<div class="col-sm-2">