status 없는 테이블에 컬럼 추가.
parent
04540448dd
commit
90b80708c6
|
|
@ -176,9 +176,11 @@ public class SecurityConfig{
|
||||||
// https://computer-science-student.tistory.com/497
|
// https://computer-science-student.tistory.com/497
|
||||||
http.headers().frameOptions().sameOrigin();
|
http.headers().frameOptions().sameOrigin();
|
||||||
// 나모에디터 이미지 업로드시 csrf 토큰을 추가할 수 없어서 예외처리.
|
// 나모에디터 이미지 업로드시 csrf 토큰을 추가할 수 없어서 예외처리.
|
||||||
http.csrf().ignoringAntMatchers("/Crosseditor/uploadImg");
|
|
||||||
// 비밀번호찾기 토큰없이 사용
|
// 비밀번호찾기 토큰없이 사용
|
||||||
http.csrf().ignoringAntMatchers("/user/findUser");
|
http.csrf().ignoringAntMatchers(
|
||||||
|
"/Crosseditor/uploadImg",
|
||||||
|
"/user/findUser"
|
||||||
|
);
|
||||||
|
|
||||||
return http.build();
|
return http.build();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -285,6 +285,7 @@ public class EquipController {
|
||||||
@PostMapping("/saveCellPhone")
|
@PostMapping("/saveCellPhone")
|
||||||
public Integer saveCellPhone (@AuthenticationPrincipal UserInfo loginUser,CellPhone cellPhone){
|
public Integer saveCellPhone (@AuthenticationPrincipal UserInfo loginUser,CellPhone cellPhone){
|
||||||
cellPhone.setWrtDt(LocalDateTime.now());
|
cellPhone.setWrtDt(LocalDateTime.now());
|
||||||
|
cellPhone.setStatus("DST007");
|
||||||
return equipService.saveCellPhone(cellPhone);
|
return equipService.saveCellPhone(cellPhone);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -55,6 +55,8 @@ public class CellPhone extends BaseModel{
|
||||||
private String wrtNm;
|
private String wrtNm;
|
||||||
@Column(name = "wrt_dt")
|
@Column(name = "wrt_dt")
|
||||||
private LocalDateTime wrtDt;
|
private LocalDateTime wrtDt;
|
||||||
|
@Column(name = "status")
|
||||||
|
private String status;
|
||||||
|
|
||||||
@Transient
|
@Transient
|
||||||
private String userNm;
|
private String userNm;
|
||||||
|
|
|
||||||
|
|
@ -401,6 +401,7 @@ public class FipTargetController {
|
||||||
@RequestParam(value = "fileSeq", required = false) List < Integer > deleteFileSeq){
|
@RequestParam(value = "fileSeq", required = false) List < Integer > deleteFileSeq){
|
||||||
vulnerable.setMultipartFileList(request.getMultiFileMap().get("uploadFiles"));
|
vulnerable.setMultipartFileList(request.getMultiFileMap().get("uploadFiles"));
|
||||||
vulnerable.setWrtDt(LocalDateTime.now());
|
vulnerable.setWrtDt(LocalDateTime.now());
|
||||||
|
vulnerable.setStatus("DST007");
|
||||||
Integer result = fipTargetService.saveVulnerable(vulnerable,deleteFileSeq);
|
Integer result = fipTargetService.saveVulnerable(vulnerable,deleteFileSeq);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
@ -529,6 +530,7 @@ public class FipTargetController {
|
||||||
shipInfo.setWrtUserSeq(loginUser.getUserSeq());
|
shipInfo.setWrtUserSeq(loginUser.getUserSeq());
|
||||||
shipInfo.setWrtOrgan(loginUser.getOgCd());
|
shipInfo.setWrtOrgan(loginUser.getOgCd());
|
||||||
shipInfo.setWrtDt(LocalDateTime.now());
|
shipInfo.setWrtDt(LocalDateTime.now());
|
||||||
|
shipInfo.setStatus("DST007");
|
||||||
fipTargetService.saveShipInfo(shipInfo);
|
fipTargetService.saveShipInfo(shipInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -44,8 +44,8 @@ public class PartWork extends BaseModel implements Serializable{
|
||||||
private String workInfo;
|
private String workInfo;
|
||||||
@Column(name = "description")
|
@Column(name = "description")
|
||||||
private String description;
|
private String description;
|
||||||
@Column(name = "save_yn")
|
@Column(name = "status")
|
||||||
private String saveYn;
|
private String status;
|
||||||
@Column(name = "wrt_organ")
|
@Column(name = "wrt_organ")
|
||||||
private String wrtOrgan;
|
private String wrtOrgan;
|
||||||
@Column(name = "wrt_part")
|
@Column(name = "wrt_part")
|
||||||
|
|
@ -59,10 +59,10 @@ public class PartWork extends BaseModel implements Serializable{
|
||||||
@Column(name = "wrt_dt")
|
@Column(name = "wrt_dt")
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
|
||||||
private LocalDateTime wrtDt;
|
private LocalDateTime wrtDt;
|
||||||
|
|
||||||
@Transient
|
@Transient
|
||||||
private List<MultipartFile> multipartFileList;
|
private List<MultipartFile> multipartFileList;
|
||||||
|
|
||||||
@Transient
|
@Transient
|
||||||
private String excel;
|
private String excel;
|
||||||
@Transient
|
@Transient
|
||||||
|
|
@ -71,54 +71,19 @@ public class PartWork extends BaseModel implements Serializable{
|
||||||
private String terminalStatus;
|
private String terminalStatus;
|
||||||
@Transient
|
@Transient
|
||||||
private Integer fileCnt;
|
private Integer fileCnt;
|
||||||
|
|
||||||
@Transient
|
@Transient
|
||||||
private List<PartWorkFile> fileList;
|
private List<PartWorkFile> fileList;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "PartWork [pwSeq=" + pwSeq + ", piSeq=" + piSeq + ", workDt=" + workDt + ", workType=" + workType
|
|
||||||
+ ", workInfo=" + workInfo + ", description=" + description + ", saveYn=" + saveYn + ", wrtOrgan="
|
|
||||||
+ wrtOrgan + ", wrtPart=" + wrtPart + ", wrtUserSeq=" + wrtUserSeq + ", wrtNm=" + wrtNm + ", wrtDt=" + wrtDt
|
|
||||||
+ ", multipartFileList=" + multipartFileList + ", excel=" + excel + ", fileList=" + fileList + "]";
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Embeddable
|
|
||||||
@Data
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
public static class PartWorkId implements Serializable {
|
|
||||||
private Integer pwSeq;
|
|
||||||
private Integer piSeq;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@Embeddable
|
||||||
|
@Data
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public static class PartWorkId implements Serializable {
|
||||||
|
private Integer pwSeq;
|
||||||
|
private Integer piSeq;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -72,6 +72,8 @@ public class ShipInfo extends BaseModel implements Serializable{
|
||||||
@Column(name = "wrt_dt")
|
@Column(name = "wrt_dt")
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
|
||||||
private LocalDateTime wrtDt;
|
private LocalDateTime wrtDt;
|
||||||
|
@Column(name = "status")
|
||||||
|
private String status;
|
||||||
|
|
||||||
@Transient
|
@Transient
|
||||||
private String excel;
|
private String excel;
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,9 @@ public class Vulnerable extends BaseModel{
|
||||||
private String wrtNm;
|
private String wrtNm;
|
||||||
@Column(name = "wrt_dt")
|
@Column(name = "wrt_dt")
|
||||||
private LocalDateTime wrtDt;
|
private LocalDateTime wrtDt;
|
||||||
|
@Column(name = "status")
|
||||||
|
private String status;
|
||||||
|
|
||||||
@Transient
|
@Transient
|
||||||
private List<MultipartFile> multipartFileList;
|
private List<MultipartFile> multipartFileList;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -250,6 +250,7 @@
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<sql id="selectPartWorkListWhere">
|
<sql id="selectPartWorkListWhere">
|
||||||
|
and status <> 'DST008'
|
||||||
<if test="downOrganCdList != null">
|
<if test="downOrganCdList != null">
|
||||||
and pi.mgt_organ in
|
and pi.mgt_organ in
|
||||||
<foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
|
<foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
|
||||||
|
|
@ -270,7 +271,7 @@
|
||||||
pw.wrt_nm,
|
pw.wrt_nm,
|
||||||
pw.wrt_user_seq,
|
pw.wrt_user_seq,
|
||||||
pw.work_dt,
|
pw.work_dt,
|
||||||
pw.save_yn,
|
pw.status,
|
||||||
work_type,
|
work_type,
|
||||||
pw.description,
|
pw.description,
|
||||||
(select count(*) from part_work_file pwf where pw.pw_seq = pwf.pw_seq and pw.pi_seq = pwf.pi_seq) as file_cnt,
|
(select count(*) from part_work_file pwf where pw.pw_seq = pwf.pw_seq and pw.pi_seq = pwf.pi_seq) as file_cnt,
|
||||||
|
|
@ -297,7 +298,7 @@
|
||||||
pi.terminal_nm,
|
pi.terminal_nm,
|
||||||
pw.wrt_nm,
|
pw.wrt_nm,
|
||||||
pw.work_dt,
|
pw.work_dt,
|
||||||
pw.save_yn,
|
pw.status,
|
||||||
work_type,
|
work_type,
|
||||||
case
|
case
|
||||||
when pw.work_type = 'CH' then 'O'
|
when pw.work_type = 'CH' then 'O'
|
||||||
|
|
|
||||||
|
|
@ -32,24 +32,15 @@ $(document).on('click', '#saveBtn', function (){
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if(confirm("저장하시겠습니까?")){
|
if(confirm("저장하시겠습니까?")){
|
||||||
$('#saveYn').val('Y');
|
$('#status').val('DST007');
|
||||||
contentFade("in");
|
contentFade("in");
|
||||||
savePartWork();
|
savePartWork();
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
$(document).on('click', '#temporarySaveBtn', function (){
|
$(document).on('click', '#temporarySaveBtn', function (){
|
||||||
if($('#piSeq').val() == ''){
|
|
||||||
alert('터미널명을 선택해주세요');
|
|
||||||
$('#piSeq').focus();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if($('input:radio[name="workType"]:checked').length < 1){
|
|
||||||
alert('종류를 선택해주세요');
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if(confirm("임시 저장하시겠습니까?")){
|
if(confirm("임시 저장하시겠습니까?")){
|
||||||
$('#saveYn').val('N');
|
$('#status').val('DST001');
|
||||||
contentFade("in");
|
contentFade("in");
|
||||||
savePartWork();
|
savePartWork();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
<form action="#" method="post" id="partWorkSaveFm">
|
<form action="#" method="post" id="partWorkSaveFm">
|
||||||
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
|
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
|
||||||
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
|
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
|
||||||
<input type="hidden" id="saveYn" name="saveYn">
|
<input type="hidden" id="status" name="status">
|
||||||
<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-4">
|
<div class="col-sm-4">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue