Merge branch 'master' of https://dev.azure.com/DBNTech/ForeignAffairs/_git/ForeignAffairs
commit
f4380878d2
|
|
@ -52,6 +52,8 @@ public class BaseService {
|
|||
protected String majorStatusPath;
|
||||
@Value("${file.dir.monitoring}")
|
||||
protected String monitoringPath;
|
||||
@Value("${file.dir.intelligenceNetwork}")
|
||||
protected String intelligenceNetworkPath;
|
||||
|
||||
protected String calculationSize(double fileSize){
|
||||
String[] units = {"bytes", "KB", "MB", "GB", "TB", "PB"};
|
||||
|
|
|
|||
|
|
@ -139,6 +139,7 @@ public class SecurityConfig{
|
|||
"/sri/**",
|
||||
"/counterIntelligence/**",
|
||||
"/monitoring/**",
|
||||
"/intelligenceNetwork/**",
|
||||
"/resetSession"
|
||||
).hasRole(Role.USER.name()) // USER 접근 허용
|
||||
.antMatchers(
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ public class AsfCovController {
|
|||
mav.addObject("searchParams", asfCov);
|
||||
|
||||
asfCov.setQueryInfo();
|
||||
// mav.addObject("asfCov", asfCov);
|
||||
mav.addObject("asfCovList", asfCovService.selectAsfCovList(asfCov));
|
||||
asfCov.setPaginationInfo();
|
||||
return mav;
|
||||
|
|
@ -66,28 +67,27 @@ public class AsfCovController {
|
|||
public ModelAndView asfCovViewModal(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov){
|
||||
ModelAndView mav= new ModelAndView("faStatistics/asfCov/asfCovViewModal");
|
||||
|
||||
asfCov = asfCovService.selectAsfCov(asfCov.getAsfCovKey());
|
||||
mav.addObject("userSeq",loginUser.getUserSeq());
|
||||
mav.addObject("asfCov", asfCov);
|
||||
|
||||
mav.addObject("asfCov", asfCovService.selectAsfCov(asfCov.getAsfCovKey()));
|
||||
mav.addObject("asfCovHistory", asfCovService.selectAsfCovHistory(asfCov.getAsfCovKey()));
|
||||
return mav;
|
||||
}
|
||||
|
||||
@GetMapping("/asfCovHistoryViewModal")
|
||||
public ModelAndView asfCovHistoryViewModal(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov){
|
||||
ModelAndView mav = new ModelAndView("faStatistics/asfCov/asfCovHistoryViewModal");
|
||||
asfCov = asfCovService.selectAsfCov(asfCov.getAsfCovKey());
|
||||
mav.addObject("userSeq",loginUser.getUserSeq());
|
||||
mav.addObject("asfCovList", asfCovService.selectAsfCovList(asfCov));
|
||||
mav.addObject("asfCov", asfCov);
|
||||
return mav;
|
||||
}
|
||||
// @GetMapping("/asfCovHistoryViewModal")
|
||||
// public ModelAndView asfCovHistoryViewModal(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov){
|
||||
// ModelAndView mav = new ModelAndView("faStatistics/asfCov/asfCovHistoryViewModal");
|
||||
// asfCov = asfCovService.selectAsfCov(asfCov.getAsfCovKey());
|
||||
// mav.addObject("userSeq",loginUser.getUserSeq());
|
||||
// mav.addObject("asfCovList", asfCovService.selectAsfCovList(asfCov));
|
||||
// return mav;
|
||||
// }
|
||||
|
||||
@GetMapping("/asfCovHistoryDetail")
|
||||
public ModelAndView asfCovHistoryDetail(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov){
|
||||
ModelAndView mav = new ModelAndView("faStatistics/asfCov/asfCovHistoryDetail");
|
||||
asfCov = asfCovService.selectAsfCov(asfCov.getAsfCovKey());
|
||||
mav.addObject("userSeq",loginUser.getUserSeq());
|
||||
mav.addObject("asfCovHistory", asfCovService.selectAsfCovHistory(asfCov.getAsfCovKey()));
|
||||
mav.addObject("asfCov", asfCov);
|
||||
return mav;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,4 +14,5 @@ public interface AsfCovMapper {
|
|||
// ArrestType selectArrestType(AsfCov asfCov);
|
||||
List<AsfCov> selectAsfCovListWhere(AsfCov asfCov);
|
||||
|
||||
List<AsfCov> selectAsfCovHistory(Integer asfCovKey);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ public class AsfCov extends BaseModel {
|
|||
private Integer cdsKey;
|
||||
|
||||
@Column(name ="person_cnt")
|
||||
private Integer personCnt;
|
||||
private Integer personCnt=0;
|
||||
|
||||
@Column(name ="pressurized_yn")
|
||||
private String pressurizedYn;
|
||||
|
|
@ -45,10 +45,10 @@ public class AsfCov extends BaseModel {
|
|||
private String pressurizedN;
|
||||
|
||||
@Column(name ="person_negative_cnt")
|
||||
private Integer personNegativeCnt;
|
||||
private Integer personNegativeCnt=0;
|
||||
|
||||
@Column(name ="person_positive_cnt")
|
||||
private Integer personPositiveCnt;
|
||||
private Integer personPositiveCnt=0;
|
||||
|
||||
@Column(name ="asfcov_action_detail")
|
||||
private String asfcovActionDetail;
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ import lombok.RequiredArgsConstructor;
|
|||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.List;
|
||||
|
||||
|
|
@ -54,14 +55,6 @@ public class AsfCovService extends BaseService {
|
|||
return asfCov;
|
||||
}
|
||||
|
||||
// public List<CrackdownStatusVersion> selectCrackdownStatusVersionList(Integer asfCovKey) {
|
||||
// return asfCovRepository.findByAsfCovKey(asfCovKey);
|
||||
// }
|
||||
//
|
||||
// public CrackdownStatusVersion selectCrackdownStatusVersion(Integer versionNo, Integer asfCovKey) {
|
||||
// return asfCovRepository.findByVersionNoAndAsfCovKey(versionNo, asfCovKey);
|
||||
// }
|
||||
|
||||
@Transactional
|
||||
public Integer saveContent(AsfCov asfCov) {
|
||||
if(asfCov.getAsfCovKey()==null){
|
||||
|
|
@ -70,6 +63,7 @@ public class AsfCovService extends BaseService {
|
|||
asfCov.setVersionNo(1);
|
||||
}else{
|
||||
asfCov.setVersionNo(asfCov.getVersionNo()+1);
|
||||
asfCov.setWrtDt(LocalDateTime.now());
|
||||
}
|
||||
asfCovRepository.save(asfCov);
|
||||
return asfCov.getAsfCovKey();
|
||||
|
|
@ -82,4 +76,7 @@ public class AsfCovService extends BaseService {
|
|||
}
|
||||
|
||||
|
||||
public List<AsfCov> selectAsfCovHistory(Integer asfCovKey) {
|
||||
return asfCovMapper.selectAsfCovHistory(asfCovKey);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,155 @@
|
|||
package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork;
|
||||
|
||||
import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
|
||||
import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlan;
|
||||
import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlanApprv;
|
||||
import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.service.IntelligenceNetworkService;
|
||||
import com.dbnt.faisp.main.userInfo.model.UserInfo;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.security.core.annotation.AuthenticationPrincipal;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@RequestMapping("/intelligenceNetwork")
|
||||
public class IntelligenceNetworkController { // 첩보수집활동 > 해양외사모니터링
|
||||
private final IntelligenceNetworkService intelligenceNetworkService;
|
||||
private final AuthMgtService authMgtService;
|
||||
|
||||
@GetMapping("/operationPlanList/{type}")
|
||||
public ModelAndView operationPlanList(@AuthenticationPrincipal UserInfo loginUser,@PathVariable("type") String type, OperationPlan op){
|
||||
ModelAndView mav = new ModelAndView("igActivities/fpiMgt/intelligenceNetwork/operationPlanList");
|
||||
|
||||
//메뉴권한 확인
|
||||
String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/operationPlanList/all").get(0).getAccessAuth();
|
||||
if(type.equals("all")) {
|
||||
switch (accessAuth){
|
||||
case "ACC001": // 조회
|
||||
case "ACC002": // 작성 // 자신이 작성한 문서만 열람가능
|
||||
op.setWrtUserSeq(loginUser.getUserSeq());
|
||||
break;
|
||||
case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능
|
||||
op.setDownOrganCdList(loginUser.getDownOrganCdList());
|
||||
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
|
||||
break;
|
||||
}
|
||||
}else if(type.equals("stay") || type.equals("commit")) {
|
||||
switch (accessAuth){
|
||||
case "ACC001": // 조회
|
||||
case "ACC002": // 작성 // 자신의 관서 내에서 작성한 문서만 열람가능
|
||||
op.setWrtOrgan(loginUser.getOgCd());
|
||||
break;
|
||||
case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능
|
||||
op.setDownOrganCdList(loginUser.getDownOrganCdList());
|
||||
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
|
||||
break;
|
||||
}
|
||||
}
|
||||
//결재권한 확인
|
||||
String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/operationPlanList/all").get(0).getApprovalAuth();
|
||||
if(type.equals("stay")) {
|
||||
if(apprvAuth==null) {
|
||||
if(!accessAuth.equals("ACC003")){
|
||||
op.setWrtUserSeq(loginUser.getUserSeq());
|
||||
op.setUserType("normalStayList");
|
||||
}else{
|
||||
op.setUserType("managerStayList");
|
||||
}
|
||||
}else{
|
||||
mav.addObject("userNm", loginUser.getUserNm());
|
||||
switch (apprvAuth){
|
||||
case "APC004": // 계장대행
|
||||
case "APC003": // 계장 // 결재대기 문서 조회
|
||||
case "APC002": // 부장대행
|
||||
case "APC001": // 부장 // 결재대기 문서 조회
|
||||
op.setOpState("DST002");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}else if(type.equals("commit")){
|
||||
if(apprvAuth==null) {
|
||||
if(!accessAuth.equals("ACC003")){
|
||||
op.setWrtUserSeq(loginUser.getUserSeq());
|
||||
op.setUserType("normalCommitList");
|
||||
}else{
|
||||
op.setUserType("managerCommitList");
|
||||
}
|
||||
}else{
|
||||
switch (apprvAuth) {
|
||||
case "APC004": // 계장대행
|
||||
case "APC003": // 계장 //
|
||||
case "APC002": // 부장대행
|
||||
case "APC001": // 부장 //
|
||||
op.setUserType("sectionCommitList");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
mav.addObject("accessAuth", accessAuth);
|
||||
mav.addObject("apprvAuth", apprvAuth);
|
||||
|
||||
op.setQueryInfo();
|
||||
mav.addObject("opList", intelligenceNetworkService.selectOperationPlanList(op));
|
||||
op.setContentCnt(intelligenceNetworkService.selectOperationPlanListCnt(op));
|
||||
op.setPaginationInfo();
|
||||
mav.addObject("type", type);
|
||||
|
||||
mav.addObject("searchUrl", "/intelligenceNetwork/operationPlanList/"+type);
|
||||
mav.addObject("searchParams", op);
|
||||
return mav;
|
||||
}
|
||||
|
||||
@GetMapping("/operationPlanEditModal")
|
||||
public ModelAndView operationPlanEditModal(@AuthenticationPrincipal UserInfo loginUser, OperationPlan op){
|
||||
ModelAndView mav = new ModelAndView("igActivities/fpiMgt/intelligenceNetwork/operationPlanEditModal");
|
||||
if(op.getOpKey()!=null){
|
||||
op = intelligenceNetworkService.selectOperationPlan(op.getOpKey());
|
||||
}
|
||||
|
||||
mav.addObject("op", op);
|
||||
return mav;
|
||||
}
|
||||
|
||||
@PostMapping("/saveOperationPlan")
|
||||
public Integer saveOperationPlan(@AuthenticationPrincipal UserInfo loginUser,OperationPlan op,
|
||||
MultipartHttpServletRequest request, @RequestParam(value = "fileSeq", required = false) List<Integer> deleteFileSeq){
|
||||
op.setMultipartFileList(request.getMultiFileMap().get("uploadFiles"));
|
||||
if(op.getOpKey() == null) {
|
||||
op.setWrtOrgan(loginUser.getOgCd());
|
||||
op.setWrtPart(loginUser.getOfcCd());
|
||||
op.setWrtUserGrd(loginUser.getTitleCd());
|
||||
op.setWrtUserSeq(loginUser.getUserSeq());
|
||||
op.setWrtUserNm(loginUser.getUserNm());
|
||||
op.setWrtDt(LocalDateTime.now());
|
||||
}
|
||||
return intelligenceNetworkService.saveOperationPlan(op,deleteFileSeq);
|
||||
}
|
||||
|
||||
@GetMapping("/operationPlanViewModal")
|
||||
public ModelAndView operationPlanViewModal(@AuthenticationPrincipal UserInfo loginUser, OperationPlan op){
|
||||
ModelAndView mav = new ModelAndView("igActivities/fpiMgt/intelligenceNetwork/operationPlanViewModal");
|
||||
op = intelligenceNetworkService.selectOperationPlan(op.getOpKey());
|
||||
mav.addObject("op", op);
|
||||
mav.addObject("userSeq",loginUser.getUserSeq());
|
||||
//메뉴권한 확인
|
||||
mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/operationPlanList/all").get(0).getAccessAuth());
|
||||
mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/operationPlanList/all").get(0).getApprovalAuth());
|
||||
return mav;
|
||||
}
|
||||
|
||||
@PostMapping("/operationPlanStateChange")
|
||||
public Integer operationPlanStateChange(@AuthenticationPrincipal UserInfo loginUser, OperationPlanApprv apprv){
|
||||
apprv.setUserSeq(loginUser.getUserSeq());
|
||||
apprv.setUserGrd(loginUser.getTitleCd());
|
||||
apprv.setUserNm(loginUser.getUserNm());
|
||||
apprv.setSaveDt(LocalDateTime.now());
|
||||
return intelligenceNetworkService.operationPlanStateChange(apprv);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.mapper;
|
||||
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlan;
|
||||
import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringDesignation;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface IntelligenceNetworkMapper {
|
||||
|
||||
List<OperationPlan> selectOperationPlanList(OperationPlan op);
|
||||
|
||||
Integer selectOperationPlanListCnt(OperationPlan op);
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,85 @@
|
|||
package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model;
|
||||
|
||||
import com.dbnt.faisp.config.BaseModel;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import javax.persistence.*;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@Entity
|
||||
@NoArgsConstructor
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@Table(name = "operation_plan")
|
||||
public class OperationPlan extends BaseModel {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "op_key")
|
||||
private Integer opKey;
|
||||
@Column(name = "op_name")
|
||||
private String opName;
|
||||
@Column(name = "op_birth")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDate opBirth;
|
||||
@Column(name = "op_position")
|
||||
private String opPosition;
|
||||
@Column(name = "op_job")
|
||||
private String opJob;
|
||||
@Column(name = "op_career")
|
||||
private String opCareer;
|
||||
@Column(name = "op_phone")
|
||||
private String opPhone;
|
||||
@Column(name = "op_address")
|
||||
private String opAddress;
|
||||
@Column(name = "op_rank")
|
||||
private String opRank;
|
||||
@Column(name = "op_etc")
|
||||
private String opEtc;
|
||||
@Column(name = "target_location")
|
||||
private String targetLocation;
|
||||
@Column(name = "vulnerability_analyze")
|
||||
private String vulnerabilityAnalyze;
|
||||
@Column(name = "eligibility_analyze")
|
||||
private String eligibilityAnalyze;
|
||||
@Column(name = "focus_collection")
|
||||
private String focusCollection;
|
||||
@Column(name = "op_state")
|
||||
private String opState;
|
||||
@Column(name = "wrt_organ")
|
||||
private String wrtOrgan;
|
||||
@Column(name = "wrt_part")
|
||||
private String wrtPart;
|
||||
@Column(name = "wrt_user_seq")
|
||||
private Integer wrtUserSeq;
|
||||
@Column(name = "wrt_user_grd")
|
||||
private String wrtUserGrd;
|
||||
@Column(name = "wrt_user_nm")
|
||||
private String wrtUserNm;
|
||||
@Column(name = "wrt_dt")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
|
||||
private LocalDateTime wrtDt;
|
||||
|
||||
|
||||
@Transient
|
||||
private Integer fileCnt;
|
||||
@Transient
|
||||
private String userType;
|
||||
@Transient
|
||||
private List<OperationPlanApprv> apprvList;
|
||||
@Transient
|
||||
private List<OperationPlanFile> fileList;
|
||||
@Transient
|
||||
private List<MultipartFile> multipartFileList;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model;
|
||||
|
||||
import lombok.*;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.*;
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@Entity
|
||||
@NoArgsConstructor
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@Table(name = "operation_plan_apprv")
|
||||
@IdClass(OperationPlanApprv.OperationPlanApprvId.class)
|
||||
public class OperationPlanApprv {
|
||||
@Id
|
||||
@Column(name = "op_key")
|
||||
private Integer opKey;
|
||||
@Id
|
||||
@Column(name = "apprv_seq")
|
||||
private Integer apprvSeq;
|
||||
@Column(name = "state")
|
||||
private String state;
|
||||
@Column(name = "user_seq")
|
||||
private Integer userSeq;
|
||||
@Column(name = "user_grd")
|
||||
private String userGrd;
|
||||
@Column(name = "user_nm")
|
||||
private String userNm;
|
||||
@Column(name = "save_dt")
|
||||
private LocalDateTime saveDt;
|
||||
|
||||
@Embeddable
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public static class OperationPlanApprvId implements Serializable {
|
||||
private Integer opKey;
|
||||
private Integer apprvSeq;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model;
|
||||
|
||||
import com.dbnt.faisp.config.FileInfo;
|
||||
import lombok.*;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.*;
|
||||
import java.io.Serializable;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@Entity
|
||||
@NoArgsConstructor
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@Table(name = "operation_plan_file")
|
||||
@IdClass(OperationPlanFile.OperationPlanFileId.class)
|
||||
public class OperationPlanFile extends FileInfo {
|
||||
@Id
|
||||
@Column(name = "op_key")
|
||||
private Integer opKey;
|
||||
@Id
|
||||
@Column(name = "file_seq")
|
||||
private Integer fileSeq;
|
||||
@Column(name = "orig_nm")
|
||||
private String origNm;
|
||||
@Column(name = "conv_nm")
|
||||
private String convNm;
|
||||
@Column(name = "file_extn")
|
||||
private String fileExtn;
|
||||
@Column(name = "file_size")
|
||||
private String fileSize;
|
||||
@Column(name = "save_path")
|
||||
private String savePath;
|
||||
|
||||
|
||||
@Embeddable
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public static class OperationPlanFileId implements Serializable {
|
||||
private Integer opKey;
|
||||
private Integer fileSeq;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository;
|
||||
|
||||
import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlanApprv;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
|
||||
public interface OperationPlanApprvRepository extends JpaRepository<OperationPlanApprv, OperationPlanApprv.OperationPlanApprvId> {
|
||||
|
||||
List<OperationPlanApprv> findByOpKey(Integer opKey);
|
||||
|
||||
Optional<OperationPlanApprv> findTopByOpKeyOrderByApprvSeqDesc(Integer opKey);
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository;
|
||||
|
||||
import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlanFile;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
|
||||
public interface OperationPlanFileRepository extends JpaRepository<OperationPlanFile, OperationPlanFile.OperationPlanFileId> {
|
||||
|
||||
List<OperationPlanFile> findByOpKey(Integer opKey);
|
||||
|
||||
Optional<OperationPlanFile> findTopByOpKeyOrderByFileSeqDesc(Integer opKey);
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository;
|
||||
|
||||
import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlan;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
|
||||
|
||||
public interface OperationPlanRepository extends JpaRepository<OperationPlan, Integer> {
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,126 @@
|
|||
package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.service;
|
||||
|
||||
|
||||
import com.dbnt.faisp.config.BaseService;
|
||||
|
||||
import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.mapper.IntelligenceNetworkMapper;
|
||||
import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlan;
|
||||
import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlanApprv;
|
||||
import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlanFile;
|
||||
import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository.OperationPlanApprvRepository;
|
||||
import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository.OperationPlanFileRepository;
|
||||
import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository.OperationPlanRepository;
|
||||
import com.dbnt.faisp.main.userInfo.service.UserAlarmService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class IntelligenceNetworkService extends BaseService {
|
||||
private final UserAlarmService userAlarmService;
|
||||
private final OperationPlanApprvRepository operationPlanApprvRepository;
|
||||
private final OperationPlanFileRepository operationPlanFileRepository;
|
||||
private final OperationPlanRepository operationPlanRepository;
|
||||
private final IntelligenceNetworkMapper intelligenceNetworkMapper;
|
||||
|
||||
@Transactional
|
||||
public Integer saveOperationPlan(OperationPlan op, List<Integer> deleteFileSeq) {
|
||||
Integer opKey = operationPlanRepository.save(op).getOpKey();
|
||||
if(deleteFileSeq != null && deleteFileSeq.size()>0){
|
||||
deleteOperationPlanFile(opKey, deleteFileSeq);
|
||||
}
|
||||
if(op.getMultipartFileList()!=null){
|
||||
saveOperationPlanUploadFiles(opKey, op.getMultipartFileList());
|
||||
}
|
||||
if(op.getOpState().equals("DST002")){
|
||||
//작성완료일 때 계장 결재 사용자에게 알림 발송.
|
||||
userAlarmService.sendAlarmToApprvUser(opKey, op.getWrtOrgan(), "APC001", 32, "외사첩보망 견문관리 운영계획에 결재대기 문서가 있습니다.");
|
||||
userAlarmService.sendAlarmToApprvUser(opKey, op.getWrtOrgan(), "APC002", 32, "외사첩보망 견문관리 운영계획에 결재대기 문서가 있습니다.");
|
||||
userAlarmService.sendAlarmToApprvUser(opKey, op.getWrtOrgan(), "APC003", 32, "외사첩보망 견문관리 운영계획에 결재대기 문서가 있습니다.");
|
||||
userAlarmService.sendAlarmToApprvUser(opKey, op.getWrtOrgan(), "APC004", 32, "외사첩보망 견문관리 운영계획에 결재대기 문서가 있습니다.");
|
||||
}
|
||||
return opKey;
|
||||
}
|
||||
|
||||
private void deleteOperationPlanFile(Integer opKey, List<Integer> deleteFileSeq) {
|
||||
List<OperationPlanFile> operationPlanFileList = operationPlanFileRepository.findByOpKey(opKey);
|
||||
for(OperationPlanFile file: operationPlanFileList){
|
||||
if(deleteFileSeq.contains(file.getFileSeq())){
|
||||
deleteStoredFile(new File(file.getSavePath(), file.getConvNm()));
|
||||
operationPlanFileRepository.delete(file);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void saveOperationPlanUploadFiles(Integer opKey, List<MultipartFile> multipartFileList){
|
||||
OperationPlanFile lastFileInfo = operationPlanFileRepository.findTopByOpKeyOrderByFileSeqDesc(opKey).orElse(null);
|
||||
int fileSeq = lastFileInfo==null?1:(lastFileInfo.getFileSeq()+1);
|
||||
for(MultipartFile file : multipartFileList){
|
||||
String saveName = UUID.randomUUID().toString();
|
||||
String path = locationPath+intelligenceNetworkPath;
|
||||
saveFile(file, new File(path+File.separator+saveName));
|
||||
|
||||
String originalFilename = file.getOriginalFilename();
|
||||
int extnIdx = originalFilename.lastIndexOf(".");
|
||||
OperationPlanFile fileInfo = new OperationPlanFile();
|
||||
fileInfo.setOpKey(opKey);
|
||||
fileInfo.setFileSeq(fileSeq++);
|
||||
fileInfo.setOrigNm(originalFilename.substring(0, extnIdx));
|
||||
fileInfo.setFileExtn(originalFilename.substring(extnIdx+1));
|
||||
fileInfo.setConvNm(saveName);
|
||||
fileInfo.setFileSize(calculationSize(file.getSize()));
|
||||
fileInfo.setSavePath(path);
|
||||
operationPlanFileRepository.save(fileInfo);
|
||||
}
|
||||
}
|
||||
|
||||
public List<OperationPlan> selectOperationPlanList(OperationPlan op) {
|
||||
return intelligenceNetworkMapper.selectOperationPlanList(op);
|
||||
}
|
||||
|
||||
public Integer selectOperationPlanListCnt(OperationPlan op) {
|
||||
return intelligenceNetworkMapper.selectOperationPlanListCnt(op);
|
||||
}
|
||||
|
||||
public OperationPlan selectOperationPlan(Integer opKey) {
|
||||
OperationPlan savedOperationPlan = operationPlanRepository.findById(opKey).orElse(null);
|
||||
if (savedOperationPlan != null) {
|
||||
savedOperationPlan.setFileList(operationPlanFileRepository.findByOpKey(opKey));
|
||||
savedOperationPlan.setApprvList(operationPlanApprvRepository.findByOpKey(opKey));
|
||||
}
|
||||
return savedOperationPlan;
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Integer operationPlanStateChange(OperationPlanApprv apprv) {
|
||||
OperationPlan saveOperationPlan = operationPlanRepository.findById(apprv.getOpKey()).orElse(null);
|
||||
saveOperationPlan.setOpState(apprv.getState());
|
||||
OperationPlanApprv lastApprv = operationPlanApprvRepository.findTopByOpKeyOrderByApprvSeqDesc(apprv.getOpKey()).orElse(null);
|
||||
apprv.setApprvSeq(lastApprv==null?1:lastApprv.getApprvSeq()+1);
|
||||
operationPlanApprvRepository.save(apprv);
|
||||
|
||||
switch (apprv.getState()){
|
||||
case "DST003":
|
||||
case "DST005":
|
||||
// 반려시 작성자에게 반려 알림 발송
|
||||
userAlarmService.sendAlarmToWrtUser(saveOperationPlan.getOpKey(), saveOperationPlan.getWrtUserSeq(), 32,"외사첩보망 견문관리 운영계획에 문서가 반려되었습니다.");
|
||||
break;
|
||||
case "DST004":
|
||||
case "DST006":
|
||||
// 부장승인시 작성자에게 승인 알림 발송
|
||||
userAlarmService.sendAlarmToWrtUser(saveOperationPlan.getOpKey(), saveOperationPlan.getWrtUserSeq(), 32,"외사첩보망 견문관리 운영계획에 문서가 승인되었습니다.");
|
||||
break;
|
||||
}
|
||||
return apprv.getOpKey();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -28,6 +28,7 @@ file.dir.cia.edu=/cia/edu
|
|||
file.dir.activityCase=/activityCase
|
||||
file.dir.majorStatus=/majorStatus
|
||||
file.dir.monitoring=/monitoring
|
||||
file.dir.intelligenceNetwork=/intelligenceNetwork
|
||||
|
||||
editor.img.view=/file/editorFileDisplay?fileNm=
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ file.dir.cia.edu=/cia/edu
|
|||
file.dir.activityCase=/activityCase
|
||||
file.dir.majorStatus=/majorStatus
|
||||
file.dir.monitoring=/monitoring
|
||||
file.dir.intelligenceNetwork=/intelligenceNetwork
|
||||
|
||||
editor.img.view=/file/editorFileDisplay?fileNm=
|
||||
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ file.dir.cia.edu=/cia/edu
|
|||
file.dir.activityCase=/activityCase
|
||||
file.dir.majorStatus=/majorStatus
|
||||
file.dir.monitoring=/monitoring
|
||||
file.dir.intelligenceNetwork=/intelligenceNetwork
|
||||
|
||||
editor.img.view=/file/editorFileDisplay?fileNm=
|
||||
|
||||
|
|
|
|||
|
|
@ -57,62 +57,23 @@
|
|||
cs.cds_key
|
||||
, cs.case_num
|
||||
, cs.napo_dt
|
||||
, cs.napo_sea_point_lon
|
||||
, cs.napo_sea_point_lat
|
||||
, cs.napo_sea_point_detail
|
||||
, cs.invasion_type
|
||||
, cs.nll
|
||||
, cs.case_agency
|
||||
, cs.case_police_officer
|
||||
, cs.crackdown_boat
|
||||
, cs.crackdown_police
|
||||
, cs.mmsi
|
||||
, cs.field_ivsgt
|
||||
, cs.obstr_exspd_cnt
|
||||
, cs.person_damage_cnt
|
||||
, cs.person_damage_amount
|
||||
, cs.person_damage_detail
|
||||
, cs.material_damage_cnt
|
||||
, cs.material_damage_amount
|
||||
, cs.material_damage_detail
|
||||
, cs.field_ivsgt_napo_dt
|
||||
, cs.field_ivsgt_release_dt
|
||||
, cs.field_ivsgt_time_taken
|
||||
, cs.pressurized_start_dt
|
||||
, cs.pressurized_end_dt
|
||||
, cs.distance
|
||||
, fb.fb_key
|
||||
, fb.boat_name_kr
|
||||
, fb.boat_name_cn
|
||||
, fb.ton_cnt
|
||||
, fb.fishery_type
|
||||
, fb.boat_material
|
||||
, fb.boat_nny_sung
|
||||
, fb.boat_nny_si
|
||||
, fb.offense_quantity
|
||||
, fb.offense_amount
|
||||
, fb.offense_illegal_waste_quantity
|
||||
, fb.dambo_unpaid_amount
|
||||
, fb.dambo_payment
|
||||
, fb.payment_payment_dt
|
||||
, fb.confiscation_frame
|
||||
, fb.confiscation_width
|
||||
, fb.confiscation_jo
|
||||
, fb.confiscation_gae
|
||||
, fb.confiscation_etc
|
||||
, fb.catch_fish_species
|
||||
, fb.catch_cnt
|
||||
, fb.offense_fish_species
|
||||
, fb.offense_catch_cnt
|
||||
, fb.status
|
||||
|
||||
FROM asfcov_status a
|
||||
inner join (select asfcov_key, max(version_no) as lastVersion
|
||||
from asfcov_status
|
||||
group by asfcov_key) b on a.asfcov_key = b.asfcov_key and a.version_no = b.lastVersion
|
||||
INNER JOIN crackdown_status cs
|
||||
ON a.cds_key = cs.cds_key
|
||||
|
||||
INNER JOIN fishing_boat fb
|
||||
ON a.cds_key = fb.cds_key
|
||||
|
||||
<include refid="selectAsfCovListWhere"></include>
|
||||
order by a.asfcov_key desc
|
||||
limit #{rowCnt} offset #{firstIndex}
|
||||
|
|
@ -126,6 +87,17 @@
|
|||
<include refid="selectAsfCovListWhere"></include>
|
||||
</select>
|
||||
|
||||
|
||||
<select id="selectAsfCovHistory" resultType="AsfCov" parameterType="int">
|
||||
select asfcov_key,
|
||||
version_no,
|
||||
wrt_organ,
|
||||
wrt_part,
|
||||
wrt_user_grd,
|
||||
wrt_user_nm,
|
||||
wrt_dt
|
||||
from asfcov_status
|
||||
where asfcov_key = #{asfcovKey}
|
||||
order by version_no desc
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,82 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.mapper.IntelligenceNetworkMapper">
|
||||
<sql id="selectOperationPlanListWhere">
|
||||
<where>
|
||||
<if test='wrtUserSeq != null and wrtUserSeq != ""'>
|
||||
and op.wrt_user_seq = #{wrtUserSeq}
|
||||
</if>
|
||||
<if test='wrtUserNm != null and wrtUserNm != ""'>
|
||||
and op.wrt_user_nm like '%'||#{wrtUserNm}||'%'
|
||||
</if>
|
||||
<if test='wrtOrgan != null and wrtOrgan != ""'>
|
||||
and op.wrt_organ = #{wrtOrgan}
|
||||
</if>
|
||||
<if test='opState != null and opState != ""'>
|
||||
and op.op_state = #{opState}
|
||||
</if>
|
||||
<if test='startDate != null and startDate != ""'>
|
||||
and op.wrt_dt >= #{startDate}::date
|
||||
</if>
|
||||
<if test='endDate != null and endDate != ""'>
|
||||
and op.wrt_dt <= #{endDate}::date+1
|
||||
</if>
|
||||
<if test="downOrganCdList != null">
|
||||
and op.wrt_organ in
|
||||
<foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
|
||||
#{organCd}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test='userType != null and userType != ""'>
|
||||
<if test='userType == "normalStayList"'>
|
||||
and op_state in ('DST002')
|
||||
</if>
|
||||
<if test='userType == "normalCommitList"'>
|
||||
and op_state in ('DST003', 'DST004', 'DST005', 'DST006')
|
||||
</if>
|
||||
<if test='userType == "sectionCommitList"'>
|
||||
and op_state in ('DST003', 'DST004', 'DST005', 'DST006')
|
||||
</if>
|
||||
<if test='userType == "managerStayList"'>
|
||||
and op_state in ('DST002')
|
||||
</if>
|
||||
<if test='userType == "managerCommitList"'>
|
||||
and op_state in ('DST003', 'DST004', 'DST005', 'DST006')
|
||||
</if>
|
||||
</if>
|
||||
</where>
|
||||
</sql>
|
||||
<select id="selectOperationPlanList" resultType="OperationPlan" parameterType="OperationPlan">
|
||||
select op.op_key,
|
||||
op_name,
|
||||
op_birth ,
|
||||
op_position ,
|
||||
op_phone ,
|
||||
op_rank ,
|
||||
(select item_value from code_mgt where item_cd = op_state) as op_state,
|
||||
wrt_user_seq,
|
||||
(select item_value from code_mgt where item_cd = wrt_organ) as wrt_organ,
|
||||
(select item_value from code_mgt where item_cd = wrt_part) as wrt_part,
|
||||
(select item_value from code_mgt where item_cd = wrt_user_grd) as wrt_user_grd,
|
||||
wrt_user_nm,
|
||||
wrt_dt,
|
||||
b.fileCnt
|
||||
from operation_plan op
|
||||
left outer join (select op_key,
|
||||
count(file_seq) as fileCnt
|
||||
from operation_plan_file
|
||||
group by op_key) b
|
||||
on op.op_key = b.op_key
|
||||
<include refid="selectOperationPlanListWhere"></include>
|
||||
order by op.op_key desc
|
||||
limit #{rowCnt} offset #{firstIndex}
|
||||
</select>
|
||||
<select id="selectOperationPlanListCnt" resultType="Integer" parameterType="OperationPlan">
|
||||
select count(*)
|
||||
from operation_plan op
|
||||
<include refid="selectOperationPlanListWhere"></include>
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
@ -75,7 +75,7 @@ $(function(){
|
|||
|
||||
|
||||
$(document).on('click', '#deleteMajorBtn', function (){
|
||||
const asfCovKey = $('#processResultEditBody').find(".asfCovKey").val();
|
||||
const asfCovKey = $('#asfCovEditModalContent').find(".asfCovKey").val();
|
||||
console.log(asfCovKey);
|
||||
if(confirm("삭제하시겠습니까?")){
|
||||
//contentFade("in");
|
||||
|
|
@ -109,10 +109,6 @@ function getEditModal(asfCovKey){
|
|||
type: 'GET',
|
||||
dataType:"html",
|
||||
success: function(html){
|
||||
const crackdownPolice = $("#crackdownPolice").val()
|
||||
if(crackdownPolice){
|
||||
getCrackdownBoatOption(crackdownPolice)
|
||||
}
|
||||
$("#asfCovEditModalContent").empty().append(html);
|
||||
$("#asfCovEditModal").modal('show');
|
||||
$("#editContent").empty().append(html);
|
||||
|
|
@ -124,10 +120,13 @@ function getEditModal(asfCovKey){
|
|||
});
|
||||
}
|
||||
|
||||
function getViewModal(asfCovKey){
|
||||
function getViewModal(asfCovKey,versionNo){
|
||||
$.ajax({
|
||||
url: '/faStatistics/asfCovViewModal',
|
||||
data: {asfCovKey: asfCovKey},
|
||||
data: {
|
||||
versionNo : versionNo,
|
||||
asfCovKey : asfCovKey
|
||||
},
|
||||
type: 'GET',
|
||||
dataType:"html",
|
||||
success: function(html){
|
||||
|
|
@ -223,10 +222,30 @@ $(document).on('change', '#searchFormPolice', function (){
|
|||
}
|
||||
})
|
||||
|
||||
$(document).on('click', '.version-tr', function (){
|
||||
$(this).find('input[name="versionNo"]').prop('checked', true);
|
||||
const versionNo = $(this).find('input[name="versionNo"]').val();
|
||||
const asfCovKey = $('#asfCovEditForm').find('input[name="cdsKey"]').val();
|
||||
// $(function(){
|
||||
// const searchFormBoat = $("#pressurizedN")
|
||||
// if(searchFormBoat.val()!==""){
|
||||
// searchFormBoat.find("."+$("#pressurizedYn").val()).show();
|
||||
// searchFormBoat.removeAttr("disabled");
|
||||
// }
|
||||
//
|
||||
// });
|
||||
//
|
||||
// $(document).on('change', '#pressurizedYn', function (){
|
||||
// const searchFormBoat = $("#pressurizedN")
|
||||
// searchFormBoat.find("option").hide()
|
||||
// if(this.value !== ""){
|
||||
// searchFormBoat.removeAttr("disabled")
|
||||
// searchFormBoat.find("."+this.value).show();
|
||||
// }else{
|
||||
// searchFormBoat.attr("disabled", "disabled")
|
||||
// }
|
||||
// })
|
||||
|
||||
$(document).on('click', '.versionInfoTr', function (){
|
||||
$(this).find(".versionNo").prop('checked', true);
|
||||
const versionNo = $(this).find(".versionNo").val();
|
||||
const asfCovKey = $(this).find(".asfCovKey").val();
|
||||
getHistoryDetail(versionNo, asfCovKey);
|
||||
});
|
||||
|
||||
|
|
@ -235,32 +254,12 @@ function getHistoryDetail(versionNo, asfCovKey){
|
|||
url: '/faStatistics/asfCovHistoryDetail',
|
||||
data: {
|
||||
versionNo : versionNo,
|
||||
asfCovKe : asfCovKey
|
||||
asfCovKey : asfCovKey
|
||||
},
|
||||
type: 'GET',
|
||||
dataType:"html",
|
||||
success: function(html){
|
||||
$("#historyDetailDiv").empty().append(html);
|
||||
},
|
||||
error:function(e){
|
||||
ajaxErrorAction(e);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
$(document).on('click', '#history-tab', function (){
|
||||
getHistoryViewModal($('#asfCovEditForm').find('input[name="asfCovKey"]').val());
|
||||
});
|
||||
|
||||
function getHistoryViewModal(asfCovKey){
|
||||
$.ajax({
|
||||
url: '/faStatistics/asfCovHistoryViewModal',
|
||||
data: {asfCovKey: asfCovKey},
|
||||
type: 'GET',
|
||||
dataType:"html",
|
||||
success: function(html){
|
||||
$("#asfCovViewModalContent").empty().append(html)
|
||||
$("#asfCovViewModal").modal('show');
|
||||
$("#asfcovVersionInfoDiv").empty().append(html);
|
||||
},
|
||||
error:function(e){
|
||||
ajaxErrorAction(e);
|
||||
|
|
@ -271,3 +270,4 @@ function getHistoryViewModal(asfCovKey){
|
|||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,138 @@
|
|||
$(function(){
|
||||
$("#dateSelectorDiv").datepicker({
|
||||
format: "yyyy-mm-dd",
|
||||
language: "ko",
|
||||
autoclose: true
|
||||
});
|
||||
})
|
||||
|
||||
$(document).on('click', '#allTab', function (){
|
||||
location.href = "/intelligenceNetwork/operationPlanList/all";
|
||||
})
|
||||
$(document).on('click', '#stayTab', function (){
|
||||
location.href = "/intelligenceNetwork/operationPlanList/stay";
|
||||
})
|
||||
$(document).on('click', '#commitTab', function (){
|
||||
location.href = "/intelligenceNetwork/operationPlanList/commit";
|
||||
})
|
||||
|
||||
$(document).on('click', '#addBtn', function (){
|
||||
getoOerationPlanEditModal(null);
|
||||
})
|
||||
|
||||
function getoOerationPlanEditModal(opKey){
|
||||
$.ajax({
|
||||
url: '/intelligenceNetwork/operationPlanEditModal',
|
||||
data: {opKey: opKey},
|
||||
type: 'GET',
|
||||
dataType:"html",
|
||||
success: function(html){
|
||||
$("#operationPlanEditModalContent").empty().append(html)
|
||||
$("#opBirth").datepicker({
|
||||
format: "yyyy-mm-dd",
|
||||
language: "ko",
|
||||
autoclose: true
|
||||
});
|
||||
setUploadDiv();
|
||||
$("#operationPlanEditModal").modal('show');
|
||||
},
|
||||
error:function(){
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
$(document).on('click', '#editBtn', function (){
|
||||
$("#operationPlanViewModal").modal('hide');
|
||||
getoOerationPlanEditModal($(this).attr("data-opkey"));
|
||||
})
|
||||
|
||||
$(document).on('click', '#saveBtn', function (){
|
||||
if(confirm("저장하시겠습니까?")){
|
||||
saveOperationPlan('DST002');
|
||||
}
|
||||
})
|
||||
|
||||
$(document).on('click', '#saveTempBtn', function (){
|
||||
if(confirm("임시저장 하시겠습니까?")){
|
||||
saveOperationPlan('DST001');
|
||||
}
|
||||
})
|
||||
|
||||
function saveOperationPlan(opState){
|
||||
contentFade("in");
|
||||
const formData = new FormData($("#operationPlanEditForm")[0]);
|
||||
for(const file of files) {
|
||||
if(!file.isDelete)
|
||||
formData.append('uploadFiles', file, file.name);
|
||||
}
|
||||
$(".text-decoration-line-through").each(function (idx, el){
|
||||
formData.append('fileSeq', $(el).attr("data-fileseq"));
|
||||
})
|
||||
formData.append('opState', opState);
|
||||
$.ajax({
|
||||
type : 'POST',
|
||||
data : formData,
|
||||
url : "/intelligenceNetwork/saveOperationPlan",
|
||||
processData: false,
|
||||
contentType: false,
|
||||
success : function(result) {
|
||||
alert("저장되었습니다.");
|
||||
contentFade("out");
|
||||
location.reload();
|
||||
},
|
||||
error : function(xhr, status) {
|
||||
alert("저장에 실패하였습니다.")
|
||||
contentFade("out");
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
$(document).on('click', '.operationPlanTr', function (){
|
||||
getOperationPlanViewModal(Number($(this).find(".opKey").val()));
|
||||
})
|
||||
|
||||
function getOperationPlanViewModal(opKey){
|
||||
$.ajax({
|
||||
url: '/intelligenceNetwork/operationPlanViewModal',
|
||||
data: {opKey: opKey},
|
||||
type: 'GET',
|
||||
dataType:"html",
|
||||
success: function(html){
|
||||
$("#operationPlanViewModalBody").empty().append(html)
|
||||
$("#operationPlanViewModal").modal('show');
|
||||
},
|
||||
error:function(){
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
$(document).on('click', '.apprvBtn', function (){
|
||||
$("#viewModalApprvValue").val($(this).attr("data-planstate"));
|
||||
const approval = $(this).val();
|
||||
if(confirm(approval+"하시겠습니까?")){
|
||||
const formData = new FormData($("#apprvForm")[0]);
|
||||
contentFade("in")
|
||||
$.ajax({
|
||||
type : 'POST',
|
||||
data : formData,
|
||||
url : "/intelligenceNetwork/operationPlanStateChange",
|
||||
processData: false,
|
||||
contentType: false,
|
||||
beforeSend: function (xhr){
|
||||
xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val());
|
||||
},
|
||||
success : function(result) {
|
||||
alert(approval+"되었습니다");
|
||||
getOperationPlanViewModal(result);
|
||||
contentFade("out");
|
||||
},
|
||||
error : function(xhr, status) {
|
||||
alert(approval+"처리를 실패하였습니다.");
|
||||
contentFade("out");
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
|
|
@ -112,9 +112,9 @@
|
|||
<th></th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
<th th:text="${#aggregates.sum(asfCovList.![personCnt])}"></th>
|
||||
<th th:text="${#aggregates.sum(asfCovList.![personPositiveCnt])}"></th>
|
||||
<th th:text="${#aggregates.sum(asfCovList.![personNegativeCnt])}"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="table-group-divider align-middle">
|
||||
|
|
@ -130,14 +130,19 @@
|
|||
<th:block th:each="commonCode:${session.commonCode.get('CPO')}">
|
||||
<td th:if="${asfcov.crackdownPolice eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
|
||||
</th:block>
|
||||
<td th:text="${asfcov.pressurizedYn}"></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<th:block th:unless="${#strings.isEmpty(asfcov.crackdownBoat)}">
|
||||
<th:block th:each="code:${session.commonCode.get(asfcov.crackdownPolice)}">
|
||||
<td th:if="${asfcov.crackdownBoat eq code.itemCd}" th:text="${code.itemValue}"></td>
|
||||
</th:block>
|
||||
</th:block>
|
||||
<td th:text="${asfcov.pressurizedYn eq 'Y'?'O':''}"></td>
|
||||
<td th:text="${asfcov.pressurizedN eq 'A'?'O':''}"></td>
|
||||
<td th:text="${asfcov.pressurizedN eq 'M'?'O':''}"></td>
|
||||
<td th:text="${asfcov.personCnt}"></td>
|
||||
<td th:text="${asfcov.personPositiveCnt}"></td>
|
||||
<td th:text="${asfcov.personNegativeCnt}"></td>
|
||||
<td th:text="${asfcov.asfcovActionDetail}"></td>
|
||||
<td th:text="${asfcov.wrtDt}"></td>
|
||||
<td th:text="${#temporals.format(asfcov.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
|
||||
|
||||
</tr>
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@
|
|||
<option value=""></option>
|
||||
<th:block th:each="cpoCode:${session.commonCode.get('CPO')}">
|
||||
<th:block th:each="boatCode:${session.commonCode.get(cpoCode.itemCd)}">
|
||||
<option th:value="${boatCode.itemCd}" th:text="${boatCode.itemValue}"></option>
|
||||
<option th:value="${boatCode.itemCd}" th:text="${boatCode.itemValue}" th:selected="${boatCode.itemCd eq asfCov.crackdownBoat}"></option>
|
||||
</th:block>
|
||||
</th:block>
|
||||
</select>
|
||||
|
|
@ -97,29 +97,29 @@
|
|||
<div class="col-sm-2">
|
||||
<select class="form-select form-select-sm crackdownStatusInfo" name="pressurizedN" id="pressurizedN">
|
||||
<option value="">선택</option>
|
||||
<option value="Y" th:selected="${asfCov.pressurizedN eq 'A'}">현장조사</option>
|
||||
<option value="N" th:selected="${asfCov.pressurizedN eq 'O'}">기타</option>
|
||||
<option value="A" th:selected="${asfCov.pressurizedN eq 'A'}">현장조사</option>
|
||||
<option value="M" th:selected="${asfCov.pressurizedN eq 'M'}">기타</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label for="personCnt" class="col-sm-1 col-form-label col-form-label-sm text-center">검사인원</label>
|
||||
<div class="col-sm-2">
|
||||
<input type="text" class="form-control form-control-sm crackdownStatusInfo" id="personCnt" name="personCnt" th:value="${asfCov.personCnt}">
|
||||
<input type="number" class="form-control form-control-sm crackdownStatusInfo" id="personCnt" name="personCnt" min="0" value="0" th:value="${asfCov.personCnt}">
|
||||
</div>
|
||||
<label for="pressurizedN" class="col-sm-1 col-form-label col-form-label-sm text-center">코로나19 검사결과</label>
|
||||
<label for="personPositiveCnt" class="col-sm-1 col-form-label col-form-label-sm text-center">양성</label>
|
||||
<div class="col-sm-1">
|
||||
<input type="text" class="form-control form-control-sm crackdownStatusInfo" id="personPositiveCnt" name="personPositiveCnt" th:value="${asfCov.personPositiveCnt}">
|
||||
<input type="number" class="form-control form-control-sm crackdownStatusInfo" id="personPositiveCnt" name="personPositiveCnt" min="0" value="0" th:value="${asfCov.personPositiveCnt}">
|
||||
</div>
|
||||
<label for="personNegativeCnt" class="col-sm-1 col-form-label col-form-label-sm text-center">음성</label>
|
||||
<div class="col-sm-1">
|
||||
<input type="text" class="form-control form-control-sm crackdownStatusInfo" id="personNegativeCnt" name="personNegativeCnt" th:value="${asfCov.personNegativeCnt}">
|
||||
<input type="number" class="form-control form-control-sm crackdownStatusInfo" id="personNegativeCnt" name="personNegativeCnt" min="0" value="0" th:value="${asfCov.personNegativeCnt}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label for="asfcovActionDetail" class="col-sm-1 col-form-label col-form-label-sm text-center">검/방역조치내용</label>
|
||||
<div class="col-sm-11">
|
||||
<div class="col-sm-10">
|
||||
<textarea class="form-control form-control-sm" rows="5" cols="30" id="asfcovActionDetail" name="asfcovActionDetail" th:value="${asfCov.asfcovActionDetail}"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,25 +1,16 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<div class="row mb-1">
|
||||
나포정보
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">나포일시</label>
|
||||
<div class="col-4">
|
||||
<input class="form-control form-control-sm" name="napoDt" id="napoDt" th:value="${#temporals.format(asfCov.napoDt, 'yyyy-MM-dd HH:mm')}" readonly>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">침범유형</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">선명</label>
|
||||
<div class="col-4">
|
||||
<select class="form-select form-select-sm" name="invasionType" disabled>
|
||||
<option value="">선택</option>
|
||||
<th:block th:each="commonCode:${session.commonCode.get('IST')}">
|
||||
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
|
||||
th:selected="${commonCode.itemCd eq asfCov.invasionType}"></option>
|
||||
</th:block>
|
||||
</select>
|
||||
<input class="form-control form-control-sm" name="boatNameKr" id="boatNameKr" th:value="${asfCov.boatNameKr}" readonly>
|
||||
</div>
|
||||
<label for="caseNum" class="col-sm-2 col-form-label col-form-label-sm text-center">사건번호</label>
|
||||
<div class="col-sm-4">
|
||||
<div class="input-group">
|
||||
<input type="text" class="form-control form-control-sm cdsInfo" id="caseNum" name="caseNum" th:value="${asfCov.caseNum}" disabled>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -34,7 +25,7 @@
|
|||
</th:block>
|
||||
</select>
|
||||
</div>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">단속<br>경찰서</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">단속경찰서</label>
|
||||
<div class="col-4">
|
||||
<select class="form-select form-select-sm" name="crackdownPolice" id="crackdownPolice" disabled>
|
||||
<option value="">선택</option>
|
||||
|
|
@ -59,11 +50,42 @@
|
|||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<!--<div class="row mb-1">-->
|
||||
<!-- <label class="col-sm-2 col-form-label col-form-label-sm text-center">나포일시</label>-->
|
||||
<!-- <div class="col-4">-->
|
||||
<!-- <input class="form-control form-control-sm" name="fieldIvsgtNapoDt" id="fieldIvsgtNapoDt" th:value="${#temporals.format(asfCovList.fieldIvsgtNapoDt, 'yyyy-MM-dd HH:mm')}" readonly>-->
|
||||
<!-- </div>-->
|
||||
<!--</div>-->
|
||||
|
||||
<div class="row mb-1">
|
||||
<label for="pressurizedYn" class="col-sm-2 col-form-label col-form-label-sm text-center">전용부두 압송여부</label>
|
||||
<div class="col-sm-4">
|
||||
<select class="form-select form-select-sm crackdownStatusInfo" name="pressurizedYn" id="pressurizedYn" DISABLED>
|
||||
<option value="">선택</option>
|
||||
<option value="O" th:selected="${asfCov.pressurizedYn eq 'Y'}">압송</option>
|
||||
<option value="" th:selected="${asfCov.pressurizedYn eq 'N'}">미압송</option>
|
||||
</select>
|
||||
</div>
|
||||
<label for="pressurizedN" class="col-sm-2 col-form-label col-form-label-sm text-center">미압송시</label>
|
||||
<div class="col-sm-4">
|
||||
<select class="form-select form-select-sm crackdownStatusInfo" name="pressurizedN" id="pressurizedN" DISABLED>
|
||||
<option value="">선택</option>
|
||||
<option value="Y" th:selected="${asfCov.pressurizedN eq 'A'}">현장조사</option>
|
||||
<option value="N" th:selected="${asfCov.pressurizedN eq 'O'}">기타</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label 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 crackdownStatusInfo" id="personCnt" name="personCnt" th:value="${asfCov.personCnt}" readonly>
|
||||
</div>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">양성</label>
|
||||
<div class="col-sm-1">
|
||||
<input type="text" class="form-control form-control-sm crackdownStatusInfo" id="personPositiveCnt" name="personPositiveCnt" th:value="${asfCov.personPositiveCnt}" readonly>
|
||||
</div>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">음성</label>
|
||||
<div class="col-sm-1">
|
||||
<input type="text" class="form-control form-control-sm crackdownStatusInfo" id="personNegativeCnt" name="personNegativeCnt" th:value="${asfCov.personNegativeCnt}" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label for="asfcovActionDetail" class="col-sm-2 col-form-label col-form-label-sm text-center">검/방역조치내용</label>
|
||||
<div class="col-sm-8">
|
||||
<textarea class="form-control form-control-sm" rows="5" cols="30" id="asfcovActionDetail" name="asfcovActionDetail" th:value="${asfCov.asfcovActionDetail}" readonly></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</html>
|
||||
|
|
@ -1,201 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
|
||||
<div class="modal-header bg-dark">
|
||||
<h5 class="modal-title text-white" id="processResultEditModalLabel">ASF 및 코로나19 관련 조치현황</h5>
|
||||
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
</div>
|
||||
<!-- 탭 메뉴 -->
|
||||
<ul class="nav nav-tabs" role="tablist">
|
||||
<li class="nav-item" role="presentation">
|
||||
<button class="nav-link crackdownStatusTab" id="crackdownStatus-tab" data-bs-toggle="tab"
|
||||
data-bs-target="#crackdownStatus" type="button" role="tab" aria-controls="crackdownStatus" data-crackdownStatus-type="crackdownStatus"
|
||||
aria-selected="true">상세</button>
|
||||
</li>
|
||||
<li class="nav-item" role="presentation">
|
||||
<button class="nav-link crackdownStatusTab active" id="history-tab" data-bs-toggle="tab"
|
||||
data-bs-target="#history" type="button" role="tab" data-history-type="history"
|
||||
aria-controls="history">수정이력</button>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<!-- 내용 -->
|
||||
<div class="tab-content" style="overflow-y: scroll">
|
||||
<div class="tab-pane fade show active" id="history" role="tabpanel" aria-labelledby="history-tab">
|
||||
<div class="modal-body" id="cdsEditBody">
|
||||
<form action="#" method="post" id="cdsEditForm">
|
||||
<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" name="cdsKey" th:value="${asfCov.cdsKey}">
|
||||
<th:block th:if="${!#lists.isEmpty(asfCov)}">
|
||||
<div class="row justify-content-start">
|
||||
<div class="col-3">
|
||||
<table class="table table-sm table-hover table-bordered" id="crackdownStatusVersionTable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th></th>
|
||||
<th>작성인</th>
|
||||
<th>작성/수정일</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="table-group-divider">
|
||||
<th:block th:each="asfCov:${asfCovList}">
|
||||
<tr class="version-tr">
|
||||
<td>
|
||||
<input type="radio" name="versionNo" th:value="${asfCov.versionNo}">
|
||||
</td>
|
||||
<td th:text="${asfCov.wrtUserNm}"></td>
|
||||
<td th:text="${#temporals.format(asfCov.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
|
||||
</tr>
|
||||
</th:block>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="col-9">
|
||||
<div id="historyDetailDiv">
|
||||
<div class="row mb-1">
|
||||
나포정보
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">나포일시</label>
|
||||
<div class="col-4">
|
||||
<input class="form-control form-control-sm" name="napoDt" id="napoDt" readonly>
|
||||
</div>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">NLL</label>
|
||||
<div class="col-4">
|
||||
<input class="form-control form-control-sm" name="nll" id="nll" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">침범유형</label>
|
||||
<div class="col-4">
|
||||
<input class="form-control form-control-sm" name="invasionType" id="invasionType" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">위반장소</label>
|
||||
<div class="col-6">
|
||||
<input class="form-control form-control-sm" placeholder="위도" name="napoSeaPointLat" readonly>
|
||||
<input class="form-control form-control-sm" placeholder="경도" name="napoSeaPointLon" readonly>
|
||||
<input class="form-control form-control-sm" placeholder="상세내용" name="napoSeaPointDetail" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
특수공무집행방해
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">발생건수</label>
|
||||
<div class="col-4">
|
||||
<input type="number" min="0" class="form-control form-control-sm" name="obstrExspdCnt" readonly>
|
||||
</div>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">피해인원</label>
|
||||
<div class="col-4">
|
||||
<input type="number" min="0" class="form-control form-control-sm" name="personDamageCnt" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">피해액</label>
|
||||
<div class="col-4">
|
||||
<input type="number" min="0" class="form-control form-control-sm" name="personDamageAmount" readonly>
|
||||
</div>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">상세내용</label>
|
||||
<div class="col-4">
|
||||
<input class="form-control form-control-sm" name="personDamageDetail" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">발생건수</label>
|
||||
<div class="col-4">
|
||||
<input type="number" min="0" class="form-control form-control-sm" name="materialDamageCnt" readonly>
|
||||
</div>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">피해액</label>
|
||||
<div class="col-4">
|
||||
<input type="number" min="0" class="form-control form-control-sm" name="materialDamageAmount" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">상세내용</label>
|
||||
<div class="col-4">
|
||||
<input class="form-control form-control-sm" name="materialDamageDetail" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
검거기관
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">사건담당 기관</label>
|
||||
<div class="col-4">
|
||||
<input class="form-control form-control-sm" name="caseAgency" readonly>
|
||||
</div>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">단속<br>경찰서</label>
|
||||
<div class="col-4">
|
||||
<input class="form-control form-control-sm" name="crackdownPolice" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">단속함정</label>
|
||||
<div class="col-4">
|
||||
<input class="form-control form-control-sm" name="crackdownBoat" readonly>
|
||||
</div>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">MMSI.NO</label>
|
||||
<div class="col-4">
|
||||
<input class="form-control form-control-sm" name="mmsi" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
현장조사
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">나포일시</label>
|
||||
<div class="col-4">
|
||||
<input class="form-control form-control-sm" name="fieldIvsgtNapoDt" id="fieldIvsgtNapoDt" readonly>
|
||||
</div>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">석방일시</label>
|
||||
<div class="col-4">
|
||||
<input class="form-control form-control-sm" name="fieldIvsgtReleaseDt" id="fieldIvsgtReleaseDt" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">소요시간</label>
|
||||
<div class="col-4">
|
||||
<input class="form-control form-control-sm" name="fieldIvsgtTimeTaken" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
압송
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">압송시작</label>
|
||||
<div class="col-4">
|
||||
<input class="form-control form-control-sm" name="pressurizedStartDt" id="pressurizedStartDt" readonly>
|
||||
</div>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">압송종료</label>
|
||||
<div class="col-4">
|
||||
<input class="form-control form-control-sm" name="pressurizedEndDt" id="pressurizedEndDt" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">영장청구<br>소요시간</label>
|
||||
<div class="col-4">
|
||||
<input class="form-control form-control-sm" name="warrantReqTakeTime" readonly>
|
||||
</div>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">거리</label>
|
||||
<div class="col-4">
|
||||
<input class="form-control form-control-sm" name="distance" readonly>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</th:block>
|
||||
<th:block th:if="${#lists.isEmpty(asfCovList)}">
|
||||
<div>수정이력이 없습니다.</div>
|
||||
</th:block>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer bg-light">
|
||||
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
|
||||
</div>
|
||||
</html>
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
|
||||
<div class="modal-header bg-dark">
|
||||
<h5 class="modal-title text-white" id="processResultEditModalLabel">ASF 및 코로나19 관련 조치현황</h5>
|
||||
<h5 class="modal-title text-white" id="asfCovEditModalLabel">ASF 및 코로나19 관련 조치현황</h5>
|
||||
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
</div>
|
||||
<!-- 탭 메뉴 -->
|
||||
<div class="modal-body">
|
||||
<!-- 탭 메뉴 -->
|
||||
<ul class="nav nav-tabs" role="tablist">
|
||||
<li class="nav-item" role="presentation">
|
||||
<button class="nav-link processResultTab active" id="processResult-tab" data-bs-toggle="tab"
|
||||
|
|
@ -21,118 +21,66 @@
|
|||
<!-- 내용 -->
|
||||
<div class="tab-content bg-white border border-top-0 p-2">
|
||||
<div class="tab-pane fade show active" id="processResult" role="tabpanel" aria-labelledby="processResult-tab">
|
||||
<div class="modal-body" id="processResultEditBody">
|
||||
<div class="modal-body" id="asfCovEditModalContent">
|
||||
<input type="hidden" class="asfCovKey" th:value="${asfCov.asfCovKey}">
|
||||
<div class="row mb-1">
|
||||
<label for="wrtUserNm" class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
|
||||
<div class="col-sm-2">
|
||||
<th:block th:if="${asfCov.wrtUserGrd eq null}">
|
||||
<input type="text" class="form-control form-control-sm" id="wrtUserNm" th:value="${asfCov.wrtUserNm}" readonly>
|
||||
</th:block>
|
||||
<th:block th:unless="${asfCov.wrtUserGrd eq null}">
|
||||
<th:block th:each="code:${session.commonCode.get('JT')}">
|
||||
<th:block th:if="${code.itemCd eq asfCov.wrtUserGrd}">
|
||||
<input type="text" class="form-control form-control-sm" id="wrtUserNm" th:value="|${code.itemValue} ${asfCov.wrtUserNm}|" readonly>
|
||||
</th:block>
|
||||
</th:block>
|
||||
</th:block>
|
||||
</div>
|
||||
<label for="wrtDt" class="col-sm-1 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(asfCov.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly>
|
||||
</div>
|
||||
<div class="col-sm-9"></div>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">작성일시</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(asfCov.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">사건번호</label>
|
||||
<label class="col-sm-8 col-form-label col-form-label-sm text-start" th:text="${asfCov.caseNum}"></label>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">작성자</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.wrtUserNm}"></label>
|
||||
</div>
|
||||
<hr class="my-1">
|
||||
<div class="row mb-1">
|
||||
<label for="boatNameKr" class="col-sm-1 col-form-label col-form-label-sm text-center">선명</label>
|
||||
<div class="col-sm-2">
|
||||
<input type="text" class="form-control form-control-sm cdsInfo" id="boatNameKr" name="boatNameKr" th:value="${asfCov.boatNameKr}" disabled>
|
||||
</div>
|
||||
<label for="caseNum" class="col-sm-1 col-form-label col-form-label-sm text-center">사건번호</label>
|
||||
<div class="col-sm-2">
|
||||
<div class="input-group">
|
||||
<input type="text" class="form-control form-control-sm cdsInfo" id="caseNum" name="caseNum" th:value="${asfCov.caseNum}" disabled>
|
||||
<input type="button" class="btn btn-sm btn-outline-primary crackdownStatusInfo w-auto" id="caseNumBtn" value="불러오기">
|
||||
</div>
|
||||
</div>
|
||||
<label for="caseNum" class="col-sm-2 col-form-label col-form-label-sm text-center">*사건번호로 불러와주세요</label>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">선명</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.boatNameKr}"></label>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">단속함정</label>
|
||||
<th:block th:unless="${#strings.isEmpty(asfCov.crackdownBoat)}">
|
||||
<th:block th:each="code:${session.commonCode.get(asfCov.crackdownPolice)}">
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:if="${asfCov.crackdownBoat eq code.itemCd}" th:text="${code.itemValue}"></td>
|
||||
</th:block>
|
||||
</th:block>
|
||||
</div>
|
||||
<hr class="my-1">
|
||||
<div class="row mb-1">
|
||||
<label for="caseAgency" class="col-sm-1 col-form-label col-form-label-sm text-center">사건담당기관</label>
|
||||
<div class="col-sm-2">
|
||||
<select class="form-select form-select-sm cdsInfo" id="caseAgency" name="caseAgency" disabled>
|
||||
<option value=""></option>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">사건담당기관</label>
|
||||
<th:block th:each="commonCode:${session.commonCode.get('ATA')}">
|
||||
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq asfCov.caseAgency}"></option>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:if="${asfCov.caseAgency eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></label>
|
||||
</th:block>
|
||||
</select>
|
||||
</div>
|
||||
<label for="casePoliceOfficer" class="col-sm-1 col-form-label col-form-label-sm text-center fs-13">사건담당경찰관</label>
|
||||
<div class="col-sm-2">
|
||||
<input type="text" class="form-control form-control-sm cdsInfo" id="casePoliceOfficer" name="casePoliceOfficer" th:value="${asfCov.casePoliceOfficer}" disabled>
|
||||
</div>
|
||||
<label for="crackdownPolice" class="col-sm-1 col-form-label col-form-label-sm text-center">단속경찰서</label>
|
||||
<div class="col-sm-2">
|
||||
<select class="form-select form-select-sm cdsInfo" name="crackdownPolice" id="crackdownPolice" disabled>
|
||||
<option value=""></option>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">사건담당경찰관</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.casePoliceOfficer}"></label>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">단속경찰서</label>
|
||||
<th:block th:each="commonCode:${session.commonCode.get('CPO')}">
|
||||
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq asfCov.crackdownPolice}"></option>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:if="${asfCov.crackdownPolice eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></label>
|
||||
</th:block>
|
||||
</select>
|
||||
</div>
|
||||
<label for="crackdownBoat" class="col-sm-1 col-form-label col-form-label-sm text-center">단속함정</label>
|
||||
<div class="col-sm-2">
|
||||
<select class="form-select form-select-sm cdsInfo" name="crackdownBoat" id="crackdownBoat" disabled>
|
||||
<option value=""></option>
|
||||
<th:block th:each="cpoCode:${session.commonCode.get('CPO')}">
|
||||
<th:block th:each="boatCode:${session.commonCode.get(cpoCode.itemCd)}">
|
||||
<option th:value="${boatCode.itemCd}" th:text="${boatCode.itemValue}"></option>
|
||||
</th:block>
|
||||
</th:block>
|
||||
</select>
|
||||
</div>
|
||||
<hr class="my-1">
|
||||
<div class="row mb-1">
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">전용부두 압송여부</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.pressurizedYn}"></label>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">미압송시</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.pressurizedN}"></label>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label for="pressurizedYn" class="col-sm-1 col-form-label col-form-label-sm text-center">전용부두 압송여부</label>
|
||||
<div class="col-sm-2">
|
||||
<select class="form-select form-select-sm crackdownStatusInfo" name="pressurizedYn" id="pressurizedYn">
|
||||
<option value="">선택</option>
|
||||
<option value="Y" th:selected="${asfCov.pressurizedYn eq 'Y'}">압송</option>
|
||||
<option value="N" th:selected="${asfCov.pressurizedYn eq 'N'}">미압송</option>
|
||||
</select>
|
||||
</div>
|
||||
<label for="pressurizedN" class="col-sm-1 col-form-label col-form-label-sm text-center">미압송시</label>
|
||||
<div class="col-sm-2">
|
||||
<select class="form-select form-select-sm crackdownStatusInfo" name="pressurizedN" id="pressurizedN">
|
||||
<option value="">선택</option>
|
||||
<option value="Y" th:selected="${asfCov.pressurizedN eq 'A'}">현장조사</option>
|
||||
<option value="N" th:selected="${asfCov.pressurizedN eq 'O'}">기타</option>
|
||||
</select>
|
||||
</div>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">검사인원</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.personCnt}"></label>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">양성</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.personPositiveCnt}"></label>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">음성</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.personNegativeCnt}"></label>
|
||||
</div>
|
||||
|
||||
<hr class="my-1">
|
||||
<div class="row mb-1">
|
||||
<label for="personCnt" class="col-sm-1 col-form-label col-form-label-sm text-center">검사인원</label>
|
||||
<div class="col-sm-2">
|
||||
<input type="text" class="form-control form-control-sm crackdownStatusInfo" id="personCnt" name="personCnt" th:value="${asfCov.personCnt}">
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">검/방역조치 내용</label>
|
||||
<div class="col-sm-11 form-control-sm" th:utext="${asfCov.asfcovActionDetail}"></div>
|
||||
</div>
|
||||
<label for="pressurizedN" class="col-sm-1 col-form-label col-form-label-sm text-center">코로나19 검사결과</label>
|
||||
<label for="personPositiveCnt" class="col-sm-1 col-form-label col-form-label-sm text-center">양성</label>
|
||||
<div class="col-sm-1">
|
||||
<input type="text" class="form-control form-control-sm crackdownStatusInfo" id="personPositiveCnt" name="personPositiveCnt" th:value="${asfCov.personPositiveCnt}">
|
||||
</div>
|
||||
<label for="personNegativeCnt" class="col-sm-1 col-form-label col-form-label-sm text-center">음성</label>
|
||||
<div class="col-sm-1">
|
||||
<input type="text" class="form-control form-control-sm crackdownStatusInfo" id="personNegativeCnt" name="personNegativeCnt" th:value="${asfCov.personNegativeCnt}">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label for="asfcovActionDetail" class="col-sm-1 col-form-label col-form-label-sm text-center">검/방역조치내용</label>
|
||||
<div class="col-sm-11">
|
||||
<textarea class="form-control form-control-sm" rows="5" cols="30" id="asfcovActionDetail" name="asfcovActionDetail" th:value="${asfCov.asfcovActionDetail}"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tab-pane fade p-2 mx-2" id="history" role="tabpanel" aria-labelledby="history-tab" tabindex="0">
|
||||
<div class="tab-pane fade" id="history" role="tabpanel" aria-labelledby="history-tab">
|
||||
<div class="row">
|
||||
<div class="col-4">
|
||||
<table class="table table-hover">
|
||||
|
|
@ -144,7 +92,7 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr class="versionInfoTr" th:each="asfcov:${asfCovList}">
|
||||
<tr class="versionInfoTr" th:each="asfcov:${asfCovHistory}">
|
||||
<input type="hidden" class="asfCovKey" th:value="${asfcov.asfCovKey}">
|
||||
<input type="hidden" class="versionNo" th:value="${asfcov.versionNo}">
|
||||
<td><input type="checkbox" class="versionInfoChkbox"></td>
|
||||
|
|
@ -152,6 +100,9 @@
|
|||
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
|
||||
<th:block th:if="${asfcov.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
|
||||
</th:block>
|
||||
<th:block th:each="commonCode:${session.commonCode.get('OFC')}">
|
||||
<th:block th:if="${asfcov.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
|
||||
</th:block>
|
||||
<br>
|
||||
<th:block th:each="commonCode:${session.commonCode.get('JT')}">
|
||||
<th:block th:if="${asfcov.wrtUserGrd eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
|
||||
|
|
@ -163,7 +114,7 @@
|
|||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="col-8" id="fishingBoardVersionInfoDiv">
|
||||
<div class="col-8" id="asfcovVersionInfoDiv">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -174,9 +125,6 @@
|
|||
<th:block th:if="${userSeq eq asfCov.wrtUserSeq}"><!--작성자일 경우 수정 허용-->
|
||||
<button type="button" class="btn btn-warning" id="editBtn" th:data-asfCovkey="${asfCov.asfCovKey}">수정</button>
|
||||
</th:block>
|
||||
<!-- <th:block th:if="${userSeq eq asfCov.wrtUserSeq or accessAuth eq 'ACC003'}"><!–작성자일 경우 수정 허용–><!–관리자일 경우 수정 허용–>-->
|
||||
<!-- <button type="button" class="btn btn-warning" id="processResultEditBtn">수정</button>-->
|
||||
<!-- </th:block>-->
|
||||
<button type="button" class="btn btn-danger" id="deleteMajorBtn">삭제</button>
|
||||
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,131 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
|
||||
<div class="modal-header bg-dark">
|
||||
<h5 class="modal-title text-white" id="affairEditModalLabel" th:text="${op.opKey eq null?'운영 계획서 작성':'운영 계획서 수정'}"></h5>
|
||||
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
</div>
|
||||
<div class="modal-body" id="affairEditBody">
|
||||
<form action="#" method="post" id="operationPlanEditForm">
|
||||
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
|
||||
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
|
||||
<!-- <input type="hidden" name="mdKey" th:value="${md.mdKey}">
|
||||
<input type="hidden" name="wrtOrgan" th:value="${md.wrtOrgan}">
|
||||
<input type="hidden" name="wrtPart" th:value="${md.wrtPart}">
|
||||
<input type="hidden" name="wrtUserSeq" th:value="${md.wrtUserSeq}">
|
||||
<input type="hidden" name="wrtUserGrd" th:value="${md.wrtUserGrd}">
|
||||
<input type="hidden" name="wrtUserNm" th:value="${md.wrtUserNm}">
|
||||
<input type="hidden" name="wrtDt" id="wrtDt" th:value="${#temporals.format(md.wrtDt, 'yyyy-MM-dd HH:mm')}"> -->
|
||||
<div class="row mb-1">
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
|
||||
<div class="col-sm-2">
|
||||
<input type="text" class="form-control form-control-sm" placeholder="작성자 자동입력" readonly>
|
||||
</div>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">작성일</label>
|
||||
<div class="col-sm-2">
|
||||
<input type="text" class="form-control form-control-sm" placeholder="작성일 자동입력" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="row mb-1"><h6 class="text-center">정보협력자<br>구성</h6></div>
|
||||
<div class="row mb-1">
|
||||
<div class="col-sm-1"></div>
|
||||
<label for="affairType1" class="col-sm-1 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="opName" name="opName" th:value="${op.opName}">
|
||||
</div>
|
||||
<label for="affairType2" class="col-sm-1 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="opBirth" name="opBirth" th:value="${op.opBirth}" readonly>
|
||||
</div>
|
||||
<label for="affairType3" class="col-sm-1 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="opPosition" name="opPosition" th:value="${op.opPosition}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<div class="col-sm-1"></div>
|
||||
<label for="affairType4" class="col-sm-1 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="opJob" name="opJob" th:value="${op.opJob}">
|
||||
</div>
|
||||
<label for="affairType1" class="col-sm-1 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="opCareer" name="opCareer" th:value="${op.opCareer}">
|
||||
</div>
|
||||
<label for="affairType2" class="col-sm-1 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="opPhone" name="opPhone" th:value="${op.opPhone}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<div class="col-sm-1"></div>
|
||||
<label for="affairType4" class="col-sm-1 col-form-label col-form-label-sm text-center">주소</label>
|
||||
<div class="col-sm-5">
|
||||
<input type="text" class="form-control form-control-sm" id="opAddress" name="opAddress" th:value="${op.opAddress}">
|
||||
</div>
|
||||
<label for="affairType2" class="col-sm-1 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="opRank" name="opRank" th:value="${op.opRank}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<div class="col-sm-1"></div>
|
||||
<label for="affairType3" class="col-sm-1 col-form-label col-form-label-sm text-center">기타 참고</label>
|
||||
<div class="col-sm-8">
|
||||
<input type="text" class="form-control form-control-sm" id="opEtc" name="opEtc" th:value="${op.opEtc}">
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="row mb-1">
|
||||
<label for="hashTags" class="col-sm-1 col-form-label col-form-label-sm text-center">*대상목표<br>및<br>위치</label>
|
||||
<div class="col-sm-11">
|
||||
<textarea id="targetLocation" name="targetLocation" rows="5" cols="139" th:utext="${op.targetLocation}"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label for="hashTags" class="col-sm-1 col-form-label col-form-label-sm text-center">*취약성 분석</label>
|
||||
<div class="col-sm-11">
|
||||
<textarea id="vulnerabilityAnalyze" name="vulnerabilityAnalyze" rows="5" cols="139" th:utext="${op.vulnerabilityAnalyze}"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label for="hashTags" class="col-sm-1 col-form-label col-form-label-sm text-center">*적격성 분석</label>
|
||||
<div class="col-sm-11">
|
||||
<textarea id="eligibilityAnalyze" name="eligibilityAnalyze" rows="5" cols="139" th:utext="${op.eligibilityAnalyze}"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<label for="hashTags" class="col-sm-1 col-form-label col-form-label-sm text-center">*중점<br>수집사항</label>
|
||||
<div class="col-sm-11">
|
||||
<textarea id="focusCollection" name="focusCollection" rows="5" cols="139" th:utext="${op.focusCollection}"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row mb-3">
|
||||
<label for="fileInputer" class="col-sm-1 col-form-label col-form-label-sm text-center">첨부파일</label>
|
||||
<div class="col-sm-11" style="min-height: 70px;">
|
||||
<div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
|
||||
<th:block th:if="${#arrays.isEmpty(op.fileList)}">
|
||||
<br>파일을 업로드 해주세요.
|
||||
</th:block>
|
||||
<th:block th:unless="${#arrays.isEmpty(op.fileList)}">
|
||||
<div class='row-col-6' th:each="file:${op.fileList}">
|
||||
<span th:data-fileseq="${file.fileSeq}" th:text="|${file.origNm}.${file.fileExtn} ${file.fileSize}|"></span>
|
||||
<a href='#' class='uploadedFileDelete text-danger text-decoration-none'>삭제</a>
|
||||
</div>
|
||||
</th:block>
|
||||
</div>
|
||||
</div>
|
||||
<input type="file" class="d-none" id="fileInputer" multiple>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class="modal-footer justify-content-between bg-light">
|
||||
<div class="col-auto">
|
||||
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<button type="button" class="btn btn-warning" id="saveTempBtn">임시저장</button>
|
||||
<button type="button" class="btn btn-primary" id="saveBtn">저장</button>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -0,0 +1,179 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="ko" xmlns:th="http://www.thymeleaf.org"
|
||||
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
|
||||
layout:decorate="~{layout/layout}">
|
||||
<th:block layout:fragment="script">
|
||||
<script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/intelligenceNetwork/operationPlan.js}"></script>
|
||||
</th:block>
|
||||
<div layout:fragment="content">
|
||||
<main>
|
||||
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
|
||||
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
|
||||
<div class="row justify-content-between">
|
||||
<div class="col-auto"><h4>운영계획서</h4></div>
|
||||
<div class="col-auto"><p class="mb-0 mt-2">첩보수집활동 > 외사첩보망 견문관리 > 계획수립</p></div>
|
||||
</div>
|
||||
<div class="row mx-0">
|
||||
<div class="col-12 card bg-light text-center">
|
||||
<div class="card-body">
|
||||
<ul class="nav nav-tabs" id="userTab" role="tablist">
|
||||
<li class="nav-item" role="presentation">
|
||||
<button class="nav-link" th:classappend="${type eq 'all'?' active':''}" id="allTab" data-bs-toggle="tab" type="button" role="tab">전체 목록</button>
|
||||
</li>
|
||||
<li class="nav-item" role="presentation">
|
||||
<button class="nav-link" th:classappend="${type eq 'stay'?' active':''}" id="stayTab" data-bs-toggle="tab" type="button" role="tab">결재대기목록</button>
|
||||
</li>
|
||||
<li class="nav-item" role="presentation">
|
||||
<button class="nav-link" th:classappend="${type eq 'commit'?' active':''}" id="commitTab" data-bs-toggle="tab" type="button" role="tab">결재처리목록</button>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="tab-content bg-white border border-top-0 p-2" id="planContent">
|
||||
<!-- <form method="get" th:action="${searchUrl}">
|
||||
<input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
|
||||
<div class="row justify-content-between py-1">
|
||||
<div class="col-auto">
|
||||
<select class="form-select form-select-sm" name="rowCnt" id="rowCnt">
|
||||
<th:block th:each="num : ${#numbers.sequence(1,5)}">
|
||||
<option th:value="${num*10}" th:text="${num*10}" th:selected="${searchParams.rowCnt eq num*10}"></option>
|
||||
</th:block>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-8">
|
||||
<div class="row">
|
||||
<div class="col-11">
|
||||
<div class="row justify-content-end pb-1" th:if="${accessAuth eq 'ACC003'}">
|
||||
<div class="col-2">
|
||||
<select class="form-select form-select-sm" name="wrtOrgan">
|
||||
<option value="">관서 선택</option>
|
||||
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
|
||||
<th:block th:if="${#lists.contains(mgtOrganList, commonCode.itemCd)}">
|
||||
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq searchParams.wrtOrgan}"></option>
|
||||
</th:block>
|
||||
</th:block>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<input type="text" class="form-control form-control-sm" placeholder="작성자" name="wrtUserNm" th:value="${searchParams.wrtUserNm}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row justify-content-end">
|
||||
<div class="col-2">
|
||||
<input type="text" class="form-control form-control-sm" placeholder="제목" name="mdTitle" th:value="${searchParams.mdTitle}">
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<select class="form-select form-select-sm" name="mdState">
|
||||
<option value="">상태 선택</option>
|
||||
<th:block th:each="commonCode:${session.commonCode.get('DST')}">
|
||||
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq searchParams.mdState}"></option>
|
||||
</th:block>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<div class="input-group input-daterange" id="dateSelectorDiv">
|
||||
<select class="form-select form-select-sm w-30" name="dateSelector">
|
||||
<option value="">조건선택</option>
|
||||
<option value="mdDt" th:selected="${searchParams.dateSelector eq 'mdDt'}">시행일</option>
|
||||
<option value="wrtDt" th:selected="${searchParams.dateSelector eq 'wrtDt'}">작성일</option>
|
||||
</select>
|
||||
<input type="text" class="form-control form-control-sm w-35" id="startDate" name="startDate" placeholder="시작일" autocomplete="off" readonly th:value="${searchParams.startDate}">
|
||||
<input type="text" class="form-control form-control-sm w-35" id="endDate" name="endDate" placeholder="종료일" autocomplete="off" readonly th:value="${searchParams.endDate}">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-1 d-grid gap-2">
|
||||
<input type="submit" class="btn btn-sm btn-primary" id="searchBtn" value="검색">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form> -->
|
||||
<div class="row justify-content-start">
|
||||
<div class="col-12">
|
||||
<table class="table table-sm table-bordered table-hover">
|
||||
<thead>
|
||||
<tr class="table-secondary">
|
||||
<th colspan="5">정보협력자 구성</th>
|
||||
<th rowspan="2">등록일</th>
|
||||
<th rowspan="2">상태</th>
|
||||
<th rowspan="2">관리관<br>결제여부</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>성명</th>
|
||||
<th>생년월일</th>
|
||||
<th>근무처</th>
|
||||
<th>연락처</th>
|
||||
<th>등급</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="table-group-divider">
|
||||
<tr class="operationPlanTr" th:each="list:${opList}">
|
||||
<td th:text="${list.opName}"></td>
|
||||
<td th:text="${list.opBirth}"></td>
|
||||
<td th:text="${list.opPosition}"></td>
|
||||
<td th:text="${list.opPhone}"></td>
|
||||
<td th:text="${list.opRank}"></td>
|
||||
<td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
|
||||
<td th:text="${list.opState}"></td>
|
||||
<td th:text="${list.opState}"></td>
|
||||
<th:block>
|
||||
<input type="hidden" class="opKey" th:value="${list.opKey}">
|
||||
</th:block>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row justify-content-between">
|
||||
<div class="col-auto"></div>
|
||||
<div class="col-auto">
|
||||
<nav aria-label="Page navigation">
|
||||
<ul class="pagination mb-0">
|
||||
<th:block th:if="${searchParams.pageIndex>3}">
|
||||
<li class="page-item" th:data-pageindex="${(searchParams.pageIndex)-3}">
|
||||
<a class="page-link" href="#" aria-label="Previous">
|
||||
<span aria-hidden="true">«</span>
|
||||
</a>
|
||||
</li>
|
||||
</th:block>
|
||||
<th:block th:each="num : ${#numbers.sequence(searchParams.startNum, searchParams.endNum)}">
|
||||
<li class="page-item" th:data-pageindex="${num}" th:classappend="${searchParams.pageIndex eq num?'active':''}">
|
||||
<a class="page-link" href="#" th:text="${num}"></a>
|
||||
</li>
|
||||
</th:block>
|
||||
<th:block th:if="${searchParams.maxNum>searchParams.endNum+2}">
|
||||
<li class="page-item" th:data-pageindex="${(searchParams.pageIndex)+3}">
|
||||
<a class="page-link" href="#" aria-label="Next">
|
||||
<span aria-hidden="true">»</span>
|
||||
</a>
|
||||
</li>
|
||||
</th:block>
|
||||
</ul>
|
||||
</nav>
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<input type="button" class="btn btn-success" value="등록" id="addBtn" th:unless="${accessAuth eq 'ACC001'}">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
|
||||
<div class="modal fade" id="operationPlanEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="planEditModalLabel" aria-hidden="true">
|
||||
<div class="modal-dialog modal-xl modal-dialog-scrollable">
|
||||
<div class="modal-content" id="operationPlanEditModalContent">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal fade" id="operationPlanViewModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="planViewModalLabel" aria-hidden="true">
|
||||
<div class="modal-dialog modal-xl modal-dialog-scrollable">
|
||||
<div class="modal-content" id="operationPlanViewModalBody">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,166 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
|
||||
<div class="modal-header bg-dark">
|
||||
<h5 class="modal-title text-white" id="affairViewModalLabel">운영 계획서 열람</h5>
|
||||
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<input type="hidden" name="affairKey" id="viewModalAffairKey">
|
||||
<ul class="nav nav-tabs" id="userTab" role="tablist">
|
||||
<li class="nav-item" role="presentation">
|
||||
<button class="nav-link active" id="boardTab" data-bs-toggle="tab" data-bs-target="#boardTabPanel" type="button" role="tab" aria-controls="boardTabPanel" aria-selected="true">본문</button>
|
||||
</li>
|
||||
<li class="nav-item" role="presentation" th:if="${#lists.size(op.fileList)>0}">
|
||||
<button class="nav-link" id="fileTab" data-bs-toggle="tab" data-bs-target="#fileTabPanel" type="button" role="tab" aria-controls="fileTabPanel" aria-selected="false" th:text="${#strings.concat('첨부파일(', #lists.size(op.fileList), ')')}"></button>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="tab-content bg-white border border-top-0 p-2">
|
||||
<div class="tab-pane fade p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0">
|
||||
<div class="row mb-1">
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
|
||||
<th:block th:each="commonCode:${session.commonCode.get('JT')}">
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:if="${commonCode.itemCd eq op.wrtUserGrd}" th:text="|${commonCode.itemValue} ${op.wrtUserNm}|"></label>
|
||||
</th:block>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">작성일</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(op.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">상태</label>
|
||||
<th:block th:each="commonCode:${session.commonCode.get('DST')}">
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:if="${commonCode.itemCd eq op.opState}" th:text="${commonCode.itemValue}"></label>
|
||||
</th:block>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="row mb-1"><h6 class="text-center">정보협력자<br>구성</h6></div>
|
||||
<br>
|
||||
<div class="row">
|
||||
<div class="col-sm-1"></div>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">성명:</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${op.opName}"></label>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">생년월일:</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${op.opBirth}"></label>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">근무처(소속):</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${op.opPosition}"></label>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-sm-1"></div>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">직업(직위):</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${op.opJob}"></label>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">경력:</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${op.opCareer}"></label>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">연락처:</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${op.opPhone}"></label>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-sm-1"></div>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">주소:</label>
|
||||
<label class="col-sm-5 col-form-label col-form-label-sm text-start" th:text="${op.opAddress}"></label>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">등급:</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${op.opRank}"></label>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-sm-1"></div>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">기타 참고:</label>
|
||||
<label class="col-sm-8 col-form-label col-form-label-sm text-start" th:text="${op.opEtc}"></label>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="row">
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">대상목표<br>및<br>위지</label>
|
||||
<div class="col-sm-11 form-control-sm" id="contentDiv">
|
||||
<div th:utext="${op.targetLocation}"></div>
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="row mb-1">
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">취약성 분석</label>
|
||||
<div class="col-sm-11 form-control-sm" id="contentDiv">
|
||||
<div th:utext="${op.vulnerabilityAnalyze}"></div>
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="row mb-1">
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">적격성 분석</label>
|
||||
<div class="col-sm-11 form-control-sm" id="contentDiv">
|
||||
<div th:utext="${op.eligibilityAnalyze}"></div>
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="row mb-1">
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">중점 수집사항</label>
|
||||
<div class="col-sm-11 form-control-sm" id="contentDiv">
|
||||
<div th:utext="${op.focusCollection}"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tab-pane fade p-2" id="fileTabPanel" role="tabpanel" tabindex="0">
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>파일명</th>
|
||||
<th>사이즈</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<th:block th:if="${#lists.isEmpty(op.fileList)}">
|
||||
<tr>
|
||||
<td colspan="2">파일이 없습니다.</td>
|
||||
</tr>
|
||||
</th:block>
|
||||
<th:block th:unless="${#lists.isEmpty(op.fileList)}">
|
||||
<th:block th:each="file:${op.fileList}">
|
||||
<tr class="fileInfoTr">
|
||||
<td><a href="#" class="fileDownLink" data-board="affair"
|
||||
th:data-parentkey="${file.opKey}" th:data-fileseq="${file.fileSeq}" th:text="|${file.origNm}.${file.fileExtn}|"></a></td>
|
||||
<td th:text="${file.fileSize}"></td>
|
||||
</tr>
|
||||
</th:block>
|
||||
</th:block>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-12" th:unless="${#lists.isEmpty(op.apprvList)}">
|
||||
<hr>
|
||||
<th:block th:each="apprv:${op.apprvList}">
|
||||
<div class="row">
|
||||
<th:block th:each="commonCode:${session.commonCode.get('DST')}">
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center" th:if="${commonCode.itemCd eq apprv.state}" th:text="|결재결과: ${commonCode.itemValue}|"></label>
|
||||
</th:block>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">
|
||||
<th:block th:each="commonCode:${session.commonCode.get('JT')}">
|
||||
<th:block th:if="${commonCode.itemCd eq apprv.userGrd}" th:text="|결제자: ${commonCode.itemValue} ${apprv.userNm}|"></th:block>
|
||||
</th:block>
|
||||
</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-center">
|
||||
<th:block th:text="|결제일시: ${#temporals.format(apprv.saveDt, 'yyyy-MM-dd HH:mm:ss')}|"></th:block>
|
||||
</label>
|
||||
|
||||
</div>
|
||||
</th:block>
|
||||
</div>
|
||||
</div>
|
||||
<form action="#" method="post" id="apprvForm">
|
||||
<div class="row">
|
||||
<div class="col-10">
|
||||
<input type="hidden" name="opKey" th:value="${op.opKey}">
|
||||
<input type="hidden" name="state" id="viewModalApprvValue">
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer justify-content-between bg-light">
|
||||
<div class="col-auto">
|
||||
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<th:block th:if="${(apprvAuth eq 'APC001' or apprvAuth eq 'APC002' or apprvAuth eq 'APC003' or apprvAuth eq 'APC004') and op.opState eq 'DST002'}">
|
||||
<button type="button" class="btn btn-danger apprvBtn" th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST003':'DST005'}" th:value="반려">반려</button>
|
||||
<button type="button" class="btn btn-success apprvBtn" th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST004':'DST006'}" th:value="승인">승인</button>
|
||||
</th:block>
|
||||
<th:block th:unless="${op.opState eq 'DST004' or op.opState eq 'DST006'}"><!--승인 상태일때는 수정 불가 -->
|
||||
<th:block th:if="${userSeq eq op.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
|
||||
<button type="button" class="btn btn-warning" th:data-opkey="${op.opKey}" id="editBtn">수정</button>
|
||||
</th:block>
|
||||
</th:block>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
Loading…
Reference in New Issue