Merge branch 'master' of https://dev.azure.com/DBNTech/ForeignAffairs/_git/ForeignAffairs
commit
d586df90e3
|
|
@ -50,6 +50,8 @@ public class BaseService {
|
||||||
protected String activityCasePath;
|
protected String activityCasePath;
|
||||||
@Value("${file.dir.majorStatus}")
|
@Value("${file.dir.majorStatus}")
|
||||||
protected String majorStatusPath;
|
protected String majorStatusPath;
|
||||||
|
@Value("${file.dir.monitoring}")
|
||||||
|
protected String monitoringPath;
|
||||||
|
|
||||||
protected String calculationSize(double fileSize){
|
protected String calculationSize(double fileSize){
|
||||||
String[] units = {"bytes", "KB", "MB", "GB", "TB", "PB"};
|
String[] units = {"bytes", "KB", "MB", "GB", "TB", "PB"};
|
||||||
|
|
|
||||||
|
|
@ -43,8 +43,8 @@ public class AsfCovController {
|
||||||
@GetMapping("/asfCovEditModal")
|
@GetMapping("/asfCovEditModal")
|
||||||
public ModelAndView asfCovEditModal(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov) {
|
public ModelAndView asfCovEditModal(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov) {
|
||||||
ModelAndView mav = new ModelAndView("faStatistics/asfCov/asfCovEditModal");
|
ModelAndView mav = new ModelAndView("faStatistics/asfCov/asfCovEditModal");
|
||||||
if (asfCov.getAsfcovKey() != null) {
|
if (asfCov.getAsfCovKey() != null) {
|
||||||
asfCov = asfCovService.selectAsfCov(asfCov.getAsfcovKey());
|
asfCov = asfCovService.selectAsfCov(asfCov.getAsfCovKey());
|
||||||
} else {
|
} else {
|
||||||
asfCov.setWrtOrgan(loginUser.getOgCd());
|
asfCov.setWrtOrgan(loginUser.getOgCd());
|
||||||
asfCov.setWrtPart(loginUser.getOfcCd());
|
asfCov.setWrtPart(loginUser.getOfcCd());
|
||||||
|
|
@ -52,13 +52,23 @@ public class AsfCovController {
|
||||||
asfCov.setWrtUserGrd(loginUser.getTitleCd());
|
asfCov.setWrtUserGrd(loginUser.getTitleCd());
|
||||||
asfCov.setWrtUserNm(loginUser.getUserNm());
|
asfCov.setWrtUserNm(loginUser.getUserNm());
|
||||||
asfCov.setWrtDt(loginUser.getWrtDt());
|
asfCov.setWrtDt(loginUser.getWrtDt());
|
||||||
asfCov.setWrtDt(loginUser.getWrtDt());
|
|
||||||
}
|
}
|
||||||
mav.addObject("asfCov", asfCov);
|
mav.addObject("asfCov", asfCov);
|
||||||
mav.addObject("userSeq", loginUser.getUserSeq());
|
mav.addObject("userSeq", loginUser.getUserSeq());
|
||||||
|
|
||||||
return mav;
|
return mav;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/asfCovViewModal")
|
||||||
|
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);
|
||||||
|
|
||||||
|
return mav;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.asfCov;
|
||||||
import com.dbnt.faisp.config.BaseModel;
|
import com.dbnt.faisp.config.BaseModel;
|
||||||
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus;
|
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus;
|
||||||
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatusBaseEntity;
|
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatusBaseEntity;
|
||||||
|
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoat;
|
||||||
import io.micrometer.core.annotation.Counted;
|
import io.micrometer.core.annotation.Counted;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
@ -25,7 +26,7 @@ public class AsfCov extends BaseModel {
|
||||||
@Id
|
@Id
|
||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
@Column(name = "asfcov_key")
|
@Column(name = "asfcov_key")
|
||||||
private Integer asfcovKey;
|
private Integer asfCovKey;
|
||||||
|
|
||||||
@Column(name="version_no")
|
@Column(name="version_no")
|
||||||
private Integer versionNo;
|
private Integer versionNo;
|
||||||
|
|
@ -70,9 +71,106 @@ public class AsfCov extends BaseModel {
|
||||||
@Column(name = "wrt_part")
|
@Column(name = "wrt_part")
|
||||||
private String wrtPart;
|
private String wrtPart;
|
||||||
|
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
||||||
@Transient
|
@Transient
|
||||||
private CrackdownStatus crackdownStatus;
|
private CrackdownStatus crackdownStatus;
|
||||||
|
|
||||||
|
@Column(name = "case_num")
|
||||||
|
private String caseNum;
|
||||||
|
|
||||||
|
@Column(name = "case_police_officer")
|
||||||
|
private String casePoliceOfficer;
|
||||||
|
|
||||||
|
@Column(name = "crackdown_boat")
|
||||||
|
private String crackdownBoat;
|
||||||
|
|
||||||
|
@Column(name = "napo_dt")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
|
||||||
|
private LocalDateTime napoDt;
|
||||||
|
|
||||||
|
@Column(name = "napo_sea_point_lon")
|
||||||
|
private String napoSeaPointLon;
|
||||||
|
|
||||||
|
@Column(name = "napo_sea_point_lat")
|
||||||
|
private String napoSeaPointLat;
|
||||||
|
|
||||||
|
@Column(name = "napo_sea_point_detail")
|
||||||
|
private String napoSeaPointDetail;
|
||||||
|
|
||||||
|
@Column(name = "invasion_type")
|
||||||
|
private String invasionType;
|
||||||
|
|
||||||
|
@Column(name = "nll")
|
||||||
|
private String nll;
|
||||||
|
|
||||||
|
@Column(name = "case_agency")
|
||||||
|
private String caseAgency;
|
||||||
|
|
||||||
|
@Column(name = "crackdown_police")
|
||||||
|
private String crackdownPolice;
|
||||||
|
|
||||||
|
@Column(name = "mmsi")
|
||||||
|
private String mmsi;
|
||||||
|
|
||||||
|
@Column(name = "field_ivsgt")
|
||||||
|
private String fieldIvsgt;
|
||||||
|
|
||||||
|
@Column(name = "obstr_exspd_cnt")
|
||||||
|
private Integer obstrExspdCnt;
|
||||||
|
|
||||||
|
@Column(name = "person_damage_cnt")
|
||||||
|
private Integer personDamageCnt;
|
||||||
|
|
||||||
|
@Column(name = "person_damage_amount")
|
||||||
|
private Integer personDamageAmount;
|
||||||
|
|
||||||
|
@Column(name = "person_damage_detail")
|
||||||
|
private String personDamageDetail;
|
||||||
|
|
||||||
|
@Column(name = "material_damage_cnt")
|
||||||
|
private Integer materialDamageCnt;
|
||||||
|
|
||||||
|
@Column(name = "material_damage_amount")
|
||||||
|
private Integer materialDamageAmount;
|
||||||
|
|
||||||
|
@Column(name = "material_damage_detail")
|
||||||
|
private String materialDamageDetail;
|
||||||
|
|
||||||
|
@Column(name = "field_ivsgt_napo_dt")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
|
||||||
|
private LocalDateTime fieldIvsgtNapoDt;
|
||||||
|
|
||||||
|
@Column(name = "field_ivsgt_release_dt")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
|
||||||
|
private LocalDateTime fieldIvsgtReleaseDt;
|
||||||
|
|
||||||
|
@Column(name = "field_ivsgt_time_taken")
|
||||||
|
private String fieldIvsgtTimeTaken;
|
||||||
|
|
||||||
|
@Column(name = "pressurized_start_dt")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
|
||||||
|
private LocalDateTime pressurizedStartDt;
|
||||||
|
|
||||||
|
@Column(name = "pressurized_end_dt")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
|
||||||
|
private LocalDateTime pressurizedEndDt;
|
||||||
|
|
||||||
|
@Column(name = "distance")
|
||||||
|
private String distance;
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
@Transient
|
@Transient
|
||||||
private Integer caseNum;
|
private FishingBoat fishingBoat;
|
||||||
|
|
||||||
|
@Column(name = "boat_name_kr")
|
||||||
|
private String boatNameKr;
|
||||||
|
@Column(name = "boat_name_cn")
|
||||||
|
private String boatNameCn;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,158 @@
|
||||||
|
package com.dbnt.faisp.main.fpiMgt.monitoring;
|
||||||
|
|
||||||
|
import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanApprv;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanBoard;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringDesignation;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringDesignationApprv;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.monitoring.service.MonitoringService;
|
||||||
|
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("/monitoring")
|
||||||
|
public class MonitoringController { // 첩보수집활동 > 해양외사모니터링
|
||||||
|
private final MonitoringService monitoringService;
|
||||||
|
private final AuthMgtService authMgtService;
|
||||||
|
|
||||||
|
@GetMapping("/designationList/{type}")
|
||||||
|
public ModelAndView designationList(@AuthenticationPrincipal UserInfo loginUser,@PathVariable("type") String type, MonitoringDesignation md){
|
||||||
|
ModelAndView mav = new ModelAndView("igActivities/fpiMgt/monitoring/designationList");
|
||||||
|
|
||||||
|
//메뉴권한 확인
|
||||||
|
String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/monitoring/designationList/all").get(0).getAccessAuth();
|
||||||
|
if(type.equals("all")) {
|
||||||
|
switch (accessAuth){
|
||||||
|
case "ACC001": // 조회
|
||||||
|
case "ACC002": // 작성 // 자신이 작성한 문서만 열람가능
|
||||||
|
md.setWrtUserSeq(loginUser.getUserSeq());
|
||||||
|
break;
|
||||||
|
case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능
|
||||||
|
md.setDownOrganCdList(loginUser.getDownOrganCdList());
|
||||||
|
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}else if(type.equals("stay") || type.equals("commit")) {
|
||||||
|
switch (accessAuth){
|
||||||
|
case "ACC001": // 조회
|
||||||
|
case "ACC002": // 작성 // 자신의 관서 내에서 작성한 문서만 열람가능
|
||||||
|
md.setWrtOrgan(loginUser.getOgCd());
|
||||||
|
break;
|
||||||
|
case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능
|
||||||
|
md.setDownOrganCdList(loginUser.getDownOrganCdList());
|
||||||
|
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//결재권한 확인
|
||||||
|
String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/monitoring/designationList/all").get(0).getApprovalAuth();
|
||||||
|
if(type.equals("stay")) {
|
||||||
|
if(apprvAuth==null) {
|
||||||
|
if(!accessAuth.equals("ACC003")){
|
||||||
|
md.setWrtUserSeq(loginUser.getUserSeq());
|
||||||
|
md.setUserType("normalStayList");
|
||||||
|
}else{
|
||||||
|
md.setUserType("managerStayList");
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
mav.addObject("userNm", loginUser.getUserNm());
|
||||||
|
switch (apprvAuth){
|
||||||
|
case "APC004": // 계장대행
|
||||||
|
case "APC003": // 계장 // 결재대기 문서 조회
|
||||||
|
md.setMdState("DST002");
|
||||||
|
break;
|
||||||
|
case "APC002": // 부장대행
|
||||||
|
case "APC001": // 부장 // 계장승인 문서 조회
|
||||||
|
md.setMdState("DST004");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}else if(type.equals("commit")){
|
||||||
|
if(apprvAuth==null) {
|
||||||
|
if(!accessAuth.equals("ACC003")){
|
||||||
|
md.setWrtUserSeq(loginUser.getUserSeq());
|
||||||
|
md.setUserType("normalCommitList");
|
||||||
|
}else{
|
||||||
|
md.setUserType("managerCommitList");
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
switch (apprvAuth) {
|
||||||
|
case "APC004": // 계장대행
|
||||||
|
case "APC003": // 계장 // 계장반려, 계장승인 문서 조회
|
||||||
|
md.setUserType("sectionCommitList");
|
||||||
|
break;
|
||||||
|
case "APC002": // 부장대행
|
||||||
|
case "APC001": // 부장 // 부장반려, 부장승인 문서 조회
|
||||||
|
md.setUserType("headCommitList");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
mav.addObject("accessAuth", accessAuth);
|
||||||
|
mav.addObject("apprvAuth", apprvAuth);
|
||||||
|
md.setQueryInfo();
|
||||||
|
mav.addObject("mdList", monitoringService.selectDesignationList(md));
|
||||||
|
md.setContentCnt(monitoringService.selectDesignationListCnt(md));
|
||||||
|
md.setPaginationInfo();
|
||||||
|
mav.addObject("type", type);
|
||||||
|
mav.addObject("searchParams", md);
|
||||||
|
return mav;
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/designationEditModal")
|
||||||
|
public ModelAndView planEditModal(@AuthenticationPrincipal UserInfo loginUser, MonitoringDesignation md){
|
||||||
|
ModelAndView mav = new ModelAndView("igActivities/fpiMgt/monitoring/designationEditModal");
|
||||||
|
if(md.getMdKey()!=null){
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
mav.addObject("md", md);
|
||||||
|
return mav;
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/saveDesignation")
|
||||||
|
public Integer saveDesignation(@AuthenticationPrincipal UserInfo loginUser,MonitoringDesignation md,
|
||||||
|
MultipartHttpServletRequest request, @RequestParam(value = "fileSeq", required = false) List<Integer> deleteFileSeq){
|
||||||
|
md.setMultipartFileList(request.getMultiFileMap().get("uploadFiles"));
|
||||||
|
if(md.getMdKey() == null) {
|
||||||
|
md.setWrtOrgan(loginUser.getOgCd());
|
||||||
|
md.setWrtPart(loginUser.getOfcCd());
|
||||||
|
md.setWrtUserGrd(loginUser.getTitleCd());
|
||||||
|
md.setWrtUserSeq(loginUser.getUserSeq());
|
||||||
|
md.setWrtUserNm(loginUser.getUserNm());
|
||||||
|
md.setWrtDt(LocalDateTime.now());
|
||||||
|
}
|
||||||
|
return monitoringService.saveDesignation(md,deleteFileSeq);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/designationViewModal")
|
||||||
|
public ModelAndView designationViewModal(@AuthenticationPrincipal UserInfo loginUser, MonitoringDesignation md){
|
||||||
|
ModelAndView mav = new ModelAndView("igActivities/fpiMgt/monitoring/designationViewModal");
|
||||||
|
md = monitoringService.selectDesignation(md.getMdKey());
|
||||||
|
mav.addObject("md", md);
|
||||||
|
mav.addObject("userSeq",loginUser.getUserSeq());
|
||||||
|
//메뉴권한 확인
|
||||||
|
mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/monitoring/designationList/all").get(0).getAccessAuth());
|
||||||
|
mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/monitoring/designationList/all").get(0).getApprovalAuth());
|
||||||
|
return mav;
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/designationStateChange")
|
||||||
|
public Integer designationStateChange(@AuthenticationPrincipal UserInfo loginUser, MonitoringDesignationApprv apprv){
|
||||||
|
apprv.setUserSeq(loginUser.getUserSeq());
|
||||||
|
apprv.setUserGrd(loginUser.getTitleCd());
|
||||||
|
apprv.setUserNm(loginUser.getUserNm());
|
||||||
|
apprv.setSaveDt(LocalDateTime.now());
|
||||||
|
return monitoringService.designationStateChange(apprv);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,17 @@
|
||||||
|
package com.dbnt.faisp.main.fpiMgt.monitoring.mapper;
|
||||||
|
|
||||||
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringDesignation;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Mapper
|
||||||
|
public interface MonitoringMapper {
|
||||||
|
|
||||||
|
List<MonitoringDesignation> selectDesignationList(MonitoringDesignation md);
|
||||||
|
|
||||||
|
Integer selectDesignationListCnt(MonitoringDesignation md);
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,84 @@
|
||||||
|
package com.dbnt.faisp.main.fpiMgt.monitoring.model;
|
||||||
|
|
||||||
|
import com.dbnt.faisp.config.BaseModel;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.affair.model.AffairFile;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanApprv;
|
||||||
|
|
||||||
|
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 = "monitoring_designation")
|
||||||
|
public class MonitoringDesignation extends BaseModel {
|
||||||
|
@Id
|
||||||
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
|
@Column(name = "md_key")
|
||||||
|
private Integer mdKey;
|
||||||
|
@Column(name = "md_dt")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||||
|
private LocalDate mdDt;
|
||||||
|
@Column(name = "md_title")
|
||||||
|
private String mdTitle;
|
||||||
|
@Column(name = "md_name")
|
||||||
|
private String mdName;
|
||||||
|
@Column(name = "md_nationality")
|
||||||
|
private String mdNationality;
|
||||||
|
@Column(name = "md_rank")
|
||||||
|
private String mdRank;
|
||||||
|
@Column(name = "md_birth")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||||
|
private LocalDate mdBirth;
|
||||||
|
@Column(name = "md_address")
|
||||||
|
private String mdAddress;
|
||||||
|
@Column(name = "md_career")
|
||||||
|
private String mdCareer;
|
||||||
|
@Column(name = "md_etc")
|
||||||
|
private String mdEtc;
|
||||||
|
@Column(name = "md_reason")
|
||||||
|
private String mdReason;
|
||||||
|
@Column(name = "md_plan")
|
||||||
|
private String mdPlan;
|
||||||
|
@Column(name = "md_state")
|
||||||
|
private String mdState;
|
||||||
|
@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<MonitoringDesignationApprv> apprvList;
|
||||||
|
@Transient
|
||||||
|
private List<MonitoringDesignationFile> fileList;
|
||||||
|
@Transient
|
||||||
|
private List<MultipartFile> multipartFileList;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,47 @@
|
||||||
|
package com.dbnt.faisp.main.fpiMgt.monitoring.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 = "monitoring_designation_apprv")
|
||||||
|
@IdClass(MonitoringDesignationApprv.monitoringDesignationApprvId.class)
|
||||||
|
public class MonitoringDesignationApprv {
|
||||||
|
@Id
|
||||||
|
@Column(name = "md_key")
|
||||||
|
private Integer mdKey;
|
||||||
|
@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 = "etc")
|
||||||
|
private String etc;
|
||||||
|
@Column(name = "save_dt")
|
||||||
|
private LocalDateTime saveDt;
|
||||||
|
|
||||||
|
@Embeddable
|
||||||
|
@Data
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public static class monitoringDesignationApprvId implements Serializable {
|
||||||
|
private Integer mdKey;
|
||||||
|
private Integer apprvSeq;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,47 @@
|
||||||
|
package com.dbnt.faisp.main.fpiMgt.monitoring.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 = "monitoring_designation_file")
|
||||||
|
@IdClass(MonitoringDesignationFile.monitoringDesignationFileId.class)
|
||||||
|
public class MonitoringDesignationFile extends FileInfo {
|
||||||
|
@Id
|
||||||
|
@Column(name = "md_key")
|
||||||
|
private Integer mdKey;
|
||||||
|
@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 monitoringDesignationFileId implements Serializable {
|
||||||
|
private Integer mdKey;
|
||||||
|
private Integer fileSeq;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,17 @@
|
||||||
|
package com.dbnt.faisp.main.fpiMgt.monitoring.repository;
|
||||||
|
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringDesignationApprv;
|
||||||
|
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
|
||||||
|
public interface MonitoringDesignationApprvRepository extends JpaRepository<MonitoringDesignationApprv, MonitoringDesignationApprv.monitoringDesignationApprvId> {
|
||||||
|
|
||||||
|
List<MonitoringDesignationApprv> findByMdKey(Integer mdKey);
|
||||||
|
|
||||||
|
Optional<MonitoringDesignationApprv> findTopByMdKeyOrderByApprvSeqDesc(Integer mdKey);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,17 @@
|
||||||
|
package com.dbnt.faisp.main.fpiMgt.monitoring.repository;
|
||||||
|
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringDesignationFile;
|
||||||
|
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
|
||||||
|
public interface MonitoringDesignationFileRepository extends JpaRepository<MonitoringDesignationFile, MonitoringDesignationFile.monitoringDesignationFileId> {
|
||||||
|
|
||||||
|
List<MonitoringDesignationFile> findByMdKey(Integer mdKey);
|
||||||
|
|
||||||
|
Optional<MonitoringDesignationFile> findTopByMdKeyOrderByFileSeqDesc(Integer mdKey);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
package com.dbnt.faisp.main.fpiMgt.monitoring.repository;
|
||||||
|
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringDesignation;
|
||||||
|
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
|
||||||
|
public interface MonitoringDesignationRepository extends JpaRepository<MonitoringDesignation, Integer> {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,139 @@
|
||||||
|
package com.dbnt.faisp.main.fpiMgt.monitoring.service;
|
||||||
|
|
||||||
|
|
||||||
|
import com.dbnt.faisp.config.BaseService;
|
||||||
|
import com.dbnt.faisp.config.FileInfo;
|
||||||
|
import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.affairPlan.mapper.PlanMapper;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanApprv;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanBoard;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanFile;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanMainInfo;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.affairPlan.repository.PlanApprvRepository;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.affairPlan.repository.PlanBoardRepository;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.affairPlan.repository.PlanFileRepository;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.affairPlan.repository.PlanMainInfoRepository;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.monitoring.mapper.MonitoringMapper;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringDesignation;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringDesignationApprv;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringDesignationFile;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.monitoring.repository.MonitoringDesignationApprvRepository;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.monitoring.repository.MonitoringDesignationFileRepository;
|
||||||
|
import com.dbnt.faisp.main.fpiMgt.monitoring.repository.MonitoringDesignationRepository;
|
||||||
|
import com.dbnt.faisp.main.userInfo.model.UserAlarm;
|
||||||
|
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.time.LocalDateTime;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class MonitoringService extends BaseService {
|
||||||
|
private final UserAlarmService userAlarmService;
|
||||||
|
private final MonitoringDesignationApprvRepository monitoringDesignationApprvRepository;
|
||||||
|
private final MonitoringDesignationFileRepository monitoringDesignationFileRepository;
|
||||||
|
private final MonitoringDesignationRepository monitoringDesignationRepository;
|
||||||
|
private final MonitoringMapper monitoringMapper;
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public Integer saveDesignation(MonitoringDesignation md, List<Integer> deleteFileSeq) {
|
||||||
|
Integer mdKey = monitoringDesignationRepository.save(md).getMdKey();
|
||||||
|
if(deleteFileSeq != null && deleteFileSeq.size()>0){
|
||||||
|
deleteDesignationFile(mdKey, deleteFileSeq);
|
||||||
|
}
|
||||||
|
if(md.getMultipartFileList()!=null){
|
||||||
|
saveDesignationUploadFiles(mdKey, md.getMultipartFileList());
|
||||||
|
}
|
||||||
|
if(md.getMdState().equals("DST002")){
|
||||||
|
//작성완료일 때 계장 결재 사용자에게 알림 발송.
|
||||||
|
userAlarmService.sendAlarmToApprvUser(mdKey, md.getWrtOrgan(), "APC003", 36, "해양외사 모니터링 지정보고에 결재대기 문서가 있습니다.");
|
||||||
|
userAlarmService.sendAlarmToApprvUser(mdKey, md.getWrtOrgan(), "APC004", 36, "해양외사 모니터링 지정보고에 결재대기 문서가 있습니다.");
|
||||||
|
}
|
||||||
|
return mdKey;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void deleteDesignationFile(Integer mdKey, List<Integer> deleteFileSeq) {
|
||||||
|
List<MonitoringDesignationFile> designationFileList = monitoringDesignationFileRepository.findByMdKey(mdKey);
|
||||||
|
for(MonitoringDesignationFile file: designationFileList){
|
||||||
|
if(deleteFileSeq.contains(file.getFileSeq())){
|
||||||
|
deleteStoredFile(new File(file.getSavePath(), file.getConvNm()));
|
||||||
|
monitoringDesignationFileRepository.delete(file);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void saveDesignationUploadFiles(Integer mdKey, List<MultipartFile> multipartFileList){
|
||||||
|
MonitoringDesignationFile lastFileInfo = monitoringDesignationFileRepository.findTopByMdKeyOrderByFileSeqDesc(mdKey).orElse(null);
|
||||||
|
int fileSeq = lastFileInfo==null?1:(lastFileInfo.getFileSeq()+1);
|
||||||
|
for(MultipartFile file : multipartFileList){
|
||||||
|
String saveName = UUID.randomUUID().toString();
|
||||||
|
String path = locationPath+monitoringPath;
|
||||||
|
saveFile(file, new File(path+File.separator+saveName));
|
||||||
|
|
||||||
|
String originalFilename = file.getOriginalFilename();
|
||||||
|
int extnIdx = originalFilename.lastIndexOf(".");
|
||||||
|
MonitoringDesignationFile fileInfo = new MonitoringDesignationFile();
|
||||||
|
fileInfo.setMdKey(mdKey);
|
||||||
|
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);
|
||||||
|
monitoringDesignationFileRepository.save(fileInfo);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<MonitoringDesignation> selectDesignationList(MonitoringDesignation md) {
|
||||||
|
return monitoringMapper.selectDesignationList(md);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer selectDesignationListCnt(MonitoringDesignation md) {
|
||||||
|
return monitoringMapper.selectDesignationListCnt(md);
|
||||||
|
}
|
||||||
|
|
||||||
|
public MonitoringDesignation selectDesignation(Integer mdKey) {
|
||||||
|
MonitoringDesignation savedDesignation = monitoringDesignationRepository.findById(mdKey).orElse(null);
|
||||||
|
if (savedDesignation != null) {
|
||||||
|
savedDesignation.setFileList(monitoringDesignationFileRepository.findByMdKey(mdKey));
|
||||||
|
savedDesignation.setApprvList(monitoringDesignationApprvRepository.findByMdKey(mdKey));
|
||||||
|
}
|
||||||
|
return savedDesignation;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer designationStateChange(MonitoringDesignationApprv apprv) {
|
||||||
|
MonitoringDesignation saveddesignation = monitoringDesignationRepository.findById(apprv.getMdKey()).orElse(null);
|
||||||
|
saveddesignation.setMdState(apprv.getState());
|
||||||
|
MonitoringDesignationApprv lastApprv = monitoringDesignationApprvRepository.findTopByMdKeyOrderByApprvSeqDesc(apprv.getMdKey()).orElse(null);
|
||||||
|
apprv.setApprvSeq(lastApprv==null?1:lastApprv.getApprvSeq()+1);
|
||||||
|
monitoringDesignationApprvRepository.save(apprv);
|
||||||
|
|
||||||
|
switch (apprv.getState()){
|
||||||
|
case "DST004":
|
||||||
|
// 계장승인시 부장 결재권자에게 알림 발송.
|
||||||
|
userAlarmService.sendAlarmToApprvUser(saveddesignation.getMdKey(), saveddesignation.getWrtOrgan(), "APC001", 36, "해양외사 모니터링 지정보고에 결재대기 문서가 있습니다.");
|
||||||
|
userAlarmService.sendAlarmToApprvUser(saveddesignation.getMdKey(), saveddesignation.getWrtOrgan(), "APC002", 36, "해양외사 모니터링 지정보고에 결재대기 문서가 있습니다.");
|
||||||
|
break;
|
||||||
|
case "DST003":
|
||||||
|
case "DST005":
|
||||||
|
// 반려시 작성자에게 반려 알림 발송
|
||||||
|
userAlarmService.sendAlarmToWrtUser(saveddesignation.getMdKey(), saveddesignation.getWrtUserSeq(), 36, saveddesignation.getMdTitle()+" 문서가 반려되었습니다.");
|
||||||
|
break;
|
||||||
|
case "DST006":
|
||||||
|
// 부장승인시 작성자에게 승인 알림 발송
|
||||||
|
userAlarmService.sendAlarmToWrtUser(saveddesignation.getMdKey(), saveddesignation.getWrtUserSeq(), 36, saveddesignation.getMdTitle()+" 문서가 승인되었습니다.");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return apprv.getMdKey();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -27,6 +27,7 @@ file.dir.cia.foreigner=/cia/foreigner
|
||||||
file.dir.cia.edu=/cia/edu
|
file.dir.cia.edu=/cia/edu
|
||||||
file.dir.activityCase=/activityCase
|
file.dir.activityCase=/activityCase
|
||||||
file.dir.majorStatus=/majorStatus
|
file.dir.majorStatus=/majorStatus
|
||||||
|
file.dir.monitoring=/monitoring
|
||||||
|
|
||||||
editor.img.view=/file/editorFileDisplay?fileNm=
|
editor.img.view=/file/editorFileDisplay?fileNm=
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,7 @@ file.dir.cia.foreigner=/cia/foreigner
|
||||||
file.dir.cia.edu=/cia/edu
|
file.dir.cia.edu=/cia/edu
|
||||||
file.dir.activityCase=/activityCase
|
file.dir.activityCase=/activityCase
|
||||||
file.dir.majorStatus=/majorStatus
|
file.dir.majorStatus=/majorStatus
|
||||||
|
file.dir.monitoring=/monitoring
|
||||||
|
|
||||||
editor.img.view=/file/editorFileDisplay?fileNm=
|
editor.img.view=/file/editorFileDisplay?fileNm=
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@ file.dir.cia.foreigner=/cia/foreigner
|
||||||
file.dir.cia.edu=/cia/edu
|
file.dir.cia.edu=/cia/edu
|
||||||
file.dir.activityCase=/activityCase
|
file.dir.activityCase=/activityCase
|
||||||
file.dir.majorStatus=/majorStatus
|
file.dir.majorStatus=/majorStatus
|
||||||
|
file.dir.monitoring=/monitoring
|
||||||
|
|
||||||
editor.img.view=/file/editorFileDisplay?fileNm=
|
editor.img.view=/file/editorFileDisplay?fileNm=
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -79,14 +79,37 @@
|
||||||
, cs.pressurized_start_dt
|
, cs.pressurized_start_dt
|
||||||
, cs.pressurized_end_dt
|
, cs.pressurized_end_dt
|
||||||
, cs.distance
|
, cs.distance
|
||||||
, cs.wrt_organ
|
, fb.fb_key
|
||||||
, cs.wrt_user_seq
|
, fb.boat_name_kr
|
||||||
, cs.wrt_user_nm
|
, fb.boat_name_cn
|
||||||
, cs.wrt_dt
|
, 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.save_yn
|
||||||
|
|
||||||
FROM crackdown_status cs
|
FROM asfcov_status a
|
||||||
INNER JOIN asfcov_status a
|
INNER JOIN crackdown_status cs
|
||||||
ON cs.cds_key = a.cds_key
|
ON a.cds_key = cs.cds_key
|
||||||
|
|
||||||
|
INNER JOIN fishing_boat fb
|
||||||
|
ON a.cds_key = fb.cds_key
|
||||||
|
|
||||||
<!-- <include refid="selectAsfCovListWhere"></include>-->
|
<!-- <include refid="selectAsfCovListWhere"></include>-->
|
||||||
order by a.asfcov_key desc
|
order by a.asfcov_key desc
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,100 @@
|
||||||
|
<?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.monitoring.mapper.MonitoringMapper">
|
||||||
|
<sql id="selectDesignationListWhere">
|
||||||
|
<where>
|
||||||
|
<if test='wrtUserSeq != null and wrtUserSeq != ""'>
|
||||||
|
and md.wrt_user_seq = #{wrtUserSeq}
|
||||||
|
</if>
|
||||||
|
<if test='wrtUserNm != null and wrtUserNm != ""'>
|
||||||
|
and md.wrt_user_nm like '%'||#{wrtUserNm}||'%'
|
||||||
|
</if>
|
||||||
|
<if test='wrtOrgan != null and wrtOrgan != ""'>
|
||||||
|
and md.wrt_organ = #{wrtOrgan}
|
||||||
|
</if>
|
||||||
|
<if test='mdTitle != null and mdTitle != ""'>
|
||||||
|
and md.md_title like '%'||#{mdTitle}||'%'
|
||||||
|
</if>
|
||||||
|
<if test='mdState != null and mdState != ""'>
|
||||||
|
and md.md_state = #{mdState}
|
||||||
|
</if>
|
||||||
|
<if test='dateSelector == "planDt"'>
|
||||||
|
<if test='startDate != null and startDate != ""'>
|
||||||
|
and md.md_dt >= #{startDate}::date
|
||||||
|
</if>
|
||||||
|
<if test='endDate != null and endDate != ""'>
|
||||||
|
and md.md_dt <= #{endDate}::date+1
|
||||||
|
</if>
|
||||||
|
</if>
|
||||||
|
<if test='dateSelector == "wrtDt"'>
|
||||||
|
<if test='startDate != null and startDate != ""'>
|
||||||
|
and md.wrt_dt >= #{startDate}::date
|
||||||
|
</if>
|
||||||
|
<if test='endDate != null and endDate != ""'>
|
||||||
|
and md.wrt_dt <= #{endDate}::date+1
|
||||||
|
</if>
|
||||||
|
</if>
|
||||||
|
<if test="downOrganCdList != null">
|
||||||
|
and md.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 md_state in ('DST002', 'DST004')
|
||||||
|
</if>
|
||||||
|
<if test='userType == "normalCommitList"'>
|
||||||
|
and md_state in ('DST003', 'DST005', 'DST006')
|
||||||
|
</if>
|
||||||
|
<if test='userType == "sectionCommitList"'>
|
||||||
|
and md_state in ('DST003', 'DST004', 'DST005', 'DST006')
|
||||||
|
</if>
|
||||||
|
<if test='userType == "headCommitList"'>
|
||||||
|
and md_state in ('DST003', 'DST005', 'DST006')
|
||||||
|
</if>
|
||||||
|
<if test='userType == "managerStayList"'>
|
||||||
|
and md_state in ('DST002', 'DST004')
|
||||||
|
</if>
|
||||||
|
<if test='userType == "managerCommitList"'>
|
||||||
|
and md_state in ('DST003', 'DST005', 'DST006')
|
||||||
|
</if>
|
||||||
|
</if>
|
||||||
|
</where>
|
||||||
|
</sql>
|
||||||
|
<select id="selectDesignationList" resultType="MonitoringDesignation" parameterType="MonitoringDesignation">
|
||||||
|
select md.md_key,
|
||||||
|
md_dt,
|
||||||
|
md_title,
|
||||||
|
md_name,
|
||||||
|
md_nationality,
|
||||||
|
md_rank,
|
||||||
|
md_birth,
|
||||||
|
md_address,
|
||||||
|
(select item_value from code_mgt where item_cd = md_state) as md_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 monitoring_designation md
|
||||||
|
left outer join (select md_key,
|
||||||
|
count(file_seq) as fileCnt
|
||||||
|
from monitoring_designation_file mdf
|
||||||
|
group by md_key) b
|
||||||
|
on md.md_key = b.md_key
|
||||||
|
<include refid="selectDesignationListWhere"></include>
|
||||||
|
order by md.md_key desc
|
||||||
|
limit #{rowCnt} offset #{firstIndex}
|
||||||
|
</select>
|
||||||
|
<select id="selectDesignationListCnt" resultType="Integer" parameterType="MonitoringDesignation">
|
||||||
|
select count(*)
|
||||||
|
from monitoring_designation md
|
||||||
|
<include refid="selectDesignationListWhere"></include>
|
||||||
|
</select>
|
||||||
|
</mapper>
|
||||||
|
|
@ -0,0 +1,218 @@
|
||||||
|
|
||||||
|
|
||||||
|
$("#jqueryBtn").click(function(){
|
||||||
|
$(".quiz-text").text("Javascript");
|
||||||
|
$(".quiz-text").css('color', 'blue');
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
$(document).on('click', '#saveBtn', function (){
|
||||||
|
if(confirm("저장하시겠습니까?")){
|
||||||
|
if($('#contentTitle').val() == ''){
|
||||||
|
alert("제목을 입력해주세요.");
|
||||||
|
$('#contentTitle').focus();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if($('#majorType').val() == ''){
|
||||||
|
alert("종류를 선택해주세요.");
|
||||||
|
$('#majorType').focus();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
saveContent('DST007');
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
$(document).on('click', '#saveTempBtn', function (){
|
||||||
|
if(confirm("임시저장 하시겠습니까?")){
|
||||||
|
if($('#contentTitle').val() == ''){
|
||||||
|
alert("제목을 입력해주세요.");
|
||||||
|
$('#contentTitle').focus();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if($('#majorType').val() == ''){
|
||||||
|
alert("종류를 선택해주세요.");
|
||||||
|
$('#majorType').focus();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
saveContent('DST001');
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
$(document).on('click', '#addAsfCovBtn', function (){
|
||||||
|
getEditModal(null)
|
||||||
|
})
|
||||||
|
|
||||||
|
$(document).on('click', '.tr', function (){
|
||||||
|
$(".trChkBox").prop("checked", false);
|
||||||
|
$(this).find(".trChkBox").prop("checked", true);
|
||||||
|
getViewModal(Number($(this).find(".asfCovKey").val()));
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
// $(document).on('click', '#saveBtn', function (){
|
||||||
|
// saveContent("MajorEditForm")
|
||||||
|
// })
|
||||||
|
|
||||||
|
$(document).on('click', '#editBtn', function (){
|
||||||
|
$("#asfCovViewModal").modal('hide')
|
||||||
|
getEditModal($(this).attr("data-asfCovKey"));
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
$(function(){
|
||||||
|
$("#dateSelectorDiv").datepicker({
|
||||||
|
format: "yyyy-mm-dd",
|
||||||
|
language: "ko",
|
||||||
|
autoclose: true
|
||||||
|
});
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
$(document).on('click', '#deleteMajorBtn', function (){
|
||||||
|
const asfCovKey = $('input[name=asfCovKey]').val();
|
||||||
|
console.log(asfCovKey);
|
||||||
|
if(confirm("삭제하시겠습니까?")){
|
||||||
|
//contentFade("in");
|
||||||
|
$.ajax({
|
||||||
|
type : 'POST',
|
||||||
|
url : "/ivsgt/deleteContent",
|
||||||
|
data : JSON.stringify({asfCovKey:asfCovKey}),
|
||||||
|
contentType: 'application/json',
|
||||||
|
beforeSend: function (xhr){
|
||||||
|
xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val());
|
||||||
|
},
|
||||||
|
success : function(data) {
|
||||||
|
alert("삭제 처리되었습니다.");
|
||||||
|
//contentFade("out");
|
||||||
|
location.reload();
|
||||||
|
},
|
||||||
|
error : function(xhr, status) {
|
||||||
|
alert("삭제 처리에 실패하였습니다");
|
||||||
|
//contentFade("out");
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
function getEditModal(asfCovKey){
|
||||||
|
$.ajax({
|
||||||
|
url: '/faStatistics/asfCovEditModal',
|
||||||
|
data: {asfCovKey: asfCovKey},
|
||||||
|
type: 'GET',
|
||||||
|
dataType:"html",
|
||||||
|
success: function(html){
|
||||||
|
const crackdownPolice = $("#crackdownPolice").val()
|
||||||
|
if(crackdownPolice){
|
||||||
|
getCrackdownBoatOption(crackdownPolice)
|
||||||
|
}
|
||||||
|
$("#asfCovEditModalContent").empty().append(html);
|
||||||
|
$("#asfCovEditModal").modal('show');
|
||||||
|
|
||||||
|
},
|
||||||
|
error:function(){
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function getViewModal(asfCovKey){
|
||||||
|
$.ajax({
|
||||||
|
url: '/faStatistics/asfCovViewModal',
|
||||||
|
data: {asfCovKey: asfCovKey},
|
||||||
|
type: 'GET',
|
||||||
|
dataType:"html",
|
||||||
|
success: function(html){
|
||||||
|
$("#asfCovViewModalContent").empty().append(html)
|
||||||
|
$("#asfCovViewModal").modal('show');
|
||||||
|
},
|
||||||
|
error:function(){
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function saveContent(contentStatus){
|
||||||
|
const formData = new FormData($("#asfCovEditForm")[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('contentStatus', contentStatus);
|
||||||
|
formData.append('contentInfo', CrossEditor.GetBodyValue());
|
||||||
|
$.ajax({
|
||||||
|
type : 'POST',
|
||||||
|
data : formData,
|
||||||
|
url : "/ivsgt/saveContent",
|
||||||
|
processData: false,
|
||||||
|
contentType: false,
|
||||||
|
success : function(result) {
|
||||||
|
alert("저장되었습니다.");
|
||||||
|
contentFade("out");
|
||||||
|
location.reload();
|
||||||
|
},
|
||||||
|
error : function(xhr, status) {
|
||||||
|
alert("저장에 실패하였습니다.")
|
||||||
|
contentFade("out");
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function contentCheck(formId){
|
||||||
|
let flag = true;
|
||||||
|
if(!$("#contentTitle").val()){
|
||||||
|
alert("제목을 입력해주세요.")
|
||||||
|
flag = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
flag = fileCheck(flag, files);
|
||||||
|
return flag;
|
||||||
|
}
|
||||||
|
|
||||||
|
function commentFormReset(){
|
||||||
|
const commentForm = $("#commentForm");
|
||||||
|
commentForm[0].reset();
|
||||||
|
$("#childFormRemoveBtn").hide();
|
||||||
|
$("#parentComment").val('');
|
||||||
|
$("#commentFormHome").append(commentForm)
|
||||||
|
}
|
||||||
|
|
||||||
|
$(document).on('click', '#asfCovDownExcel', function (){
|
||||||
|
exportExcel('ASF 및 코로나19 관련 조치현황', 'asfCovTable');
|
||||||
|
});
|
||||||
|
|
||||||
|
$(document).on('click', '#caseNumBtn', function (){
|
||||||
|
searchModalSubmit(1);
|
||||||
|
$("#asfCovSubModal").modal('show');
|
||||||
|
})
|
||||||
|
|
||||||
|
$(document).on('click', '#getCrackdownBtn', function (){
|
||||||
|
getEditModal($(".crackdownChkbox:checked").parents(".crackdownTr").attr("data-key"));
|
||||||
|
$("#asfCovSubModal").modal('hide');
|
||||||
|
})
|
||||||
|
|
||||||
|
$(function(){
|
||||||
|
const searchFormBoat = $("#searchFormBoat")
|
||||||
|
if(searchFormBoat.val()!==""){
|
||||||
|
searchFormBoat.find("."+$("#searchFormPolice").val()).show();
|
||||||
|
searchFormBoat.removeAttr("disabled");
|
||||||
|
}
|
||||||
|
$("#dateSelectorDiv").datepicker({
|
||||||
|
format: "yyyy-mm-dd",
|
||||||
|
language: "ko",
|
||||||
|
autoclose: true
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -0,0 +1,126 @@
|
||||||
|
|
||||||
|
$(document).on('click', '#planTab', function (){
|
||||||
|
location.href = "/monitoring/designationList/all";
|
||||||
|
})
|
||||||
|
$(document).on('click', '#stayTab', function (){
|
||||||
|
location.href = "/monitoring/designationList/stay";
|
||||||
|
})
|
||||||
|
$(document).on('click', '#commitTab', function (){
|
||||||
|
location.href = "/monitoring/designationList/commit";
|
||||||
|
})
|
||||||
|
|
||||||
|
$(document).on('click', '#addBtn', function (){
|
||||||
|
getDesignationEditModal(null)
|
||||||
|
})
|
||||||
|
|
||||||
|
function getDesignationEditModal(mdKey){
|
||||||
|
$.ajax({
|
||||||
|
url: '/monitoring/designationEditModal',
|
||||||
|
data: {mdKey: mdKey},
|
||||||
|
type: 'GET',
|
||||||
|
dataType:"html",
|
||||||
|
success: function(html){
|
||||||
|
$("#designationEditModalContent").empty().append(html)
|
||||||
|
$("#mdDt").datepicker({
|
||||||
|
format: "yyyy-mm-dd",
|
||||||
|
language: "ko",
|
||||||
|
autoclose: true
|
||||||
|
});
|
||||||
|
$("#mdBirth").datepicker({
|
||||||
|
format: "yyyy-mm-dd",
|
||||||
|
language: "ko",
|
||||||
|
autoclose: true
|
||||||
|
});
|
||||||
|
setEditor('editor', '470');
|
||||||
|
setUploadDiv();
|
||||||
|
$("#designationEditModal").modal('show');
|
||||||
|
},
|
||||||
|
error:function(){
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
$(document).on('click', '#saveBtn', function (){
|
||||||
|
if(confirm("저장하시겠습니까?")){
|
||||||
|
saveDesignation('DST002');
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
function saveDesignation(mdState){
|
||||||
|
contentFade("in");
|
||||||
|
const formData = new FormData($("#designationEditForm")[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('mdPlan', CrossEditor.GetBodyValue());
|
||||||
|
formData.append('mdState', mdState);
|
||||||
|
$.ajax({
|
||||||
|
type : 'POST',
|
||||||
|
data : formData,
|
||||||
|
url : "/monitoring/saveDesignation",
|
||||||
|
processData: false,
|
||||||
|
contentType: false,
|
||||||
|
success : function(result) {
|
||||||
|
alert("저장되었습니다.");
|
||||||
|
contentFade("out");
|
||||||
|
location.reload();
|
||||||
|
},
|
||||||
|
error : function(xhr, status) {
|
||||||
|
alert("저장에 실패하였습니다.")
|
||||||
|
contentFade("out");
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
$(document).on('click', '.designationTr', function (){
|
||||||
|
getDesignationViewModal(Number($(this).find(".mdKey").val()));
|
||||||
|
})
|
||||||
|
|
||||||
|
function getDesignationViewModal(mdKey){
|
||||||
|
$.ajax({
|
||||||
|
url: '/monitoring/designationViewModal',
|
||||||
|
data: {mdKey: mdKey},
|
||||||
|
type: 'GET',
|
||||||
|
dataType:"html",
|
||||||
|
success: function(html){
|
||||||
|
$("#designationViewModalBody").empty().append(html)
|
||||||
|
$("#designationViewModal").modal('show');
|
||||||
|
},
|
||||||
|
error:function(){
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
$(document).on('click', '.apprvBtn', function (){
|
||||||
|
$("#viewModalApprvValue").val($(this).attr("data-planstate"));
|
||||||
|
if(confirm($(this).val()+"하시겠습니까?")){
|
||||||
|
const formData = new FormData($("#apprvForm")[0]);
|
||||||
|
contentFade("in")
|
||||||
|
$.ajax({
|
||||||
|
type : 'POST',
|
||||||
|
data : formData,
|
||||||
|
url : "/monitoring/designationStateChange",
|
||||||
|
processData: false,
|
||||||
|
contentType: false,
|
||||||
|
beforeSend: function (xhr){
|
||||||
|
xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val());
|
||||||
|
},
|
||||||
|
success : function(result) {
|
||||||
|
alert($(this).val()+"되었습니다");
|
||||||
|
getDesignationViewModal(result);
|
||||||
|
contentFade("out");
|
||||||
|
},
|
||||||
|
error : function(xhr, status) {
|
||||||
|
alert($(this).val()+"처리를 실패하였습니다.");
|
||||||
|
contentFade("out");
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
|
@ -193,6 +193,8 @@
|
||||||
<tbody class="table-group-divider">
|
<tbody class="table-group-divider">
|
||||||
<th:block th:each="crackdownStatus:${crackdownList}">
|
<th:block th:each="crackdownStatus:${crackdownList}">
|
||||||
<tr class="crackdownTr" th:data-key="${crackdownStatus.cdsKey}">
|
<tr class="crackdownTr" th:data-key="${crackdownStatus.cdsKey}">
|
||||||
|
//여기에추가 6개
|
||||||
|
//<input type="hidden" class
|
||||||
<td><input type="checkbox" class="crackdownChkbox"></td>
|
<td><input type="checkbox" class="crackdownChkbox"></td>
|
||||||
<!--<td th:text="${crackdownStatus.cdsKey}"></td>-->
|
<!--<td th:text="${crackdownStatus.cdsKey}"></td>-->
|
||||||
<td th:text="${crackdownStatus.caseNum}"></td>
|
<td th:text="${crackdownStatus.caseNum}"></td>
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,10 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="ko" xmlns:th="http://www.thymeleaf.org"
|
<html lang="ko" xmlns:th="http://www.thymeleaf.org"
|
||||||
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
|
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
|
||||||
|
xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity5"
|
||||||
layout:decorate="~{layout/layout}">
|
layout:decorate="~{layout/layout}">
|
||||||
<th:block layout:fragment="script">
|
<th:block layout:fragment="script">
|
||||||
<script type="text/javascript" th:src="@{/js/faStatistics/crackdownStatus.js}"></script>
|
<script type="text/javascript" th:src="@{/js/faStatistics/asfCov.js}"></script>
|
||||||
</th:block>
|
</th:block>
|
||||||
<div layout:fragment="content">
|
<div layout:fragment="content">
|
||||||
<main>
|
<main>
|
||||||
|
|
@ -327,7 +328,7 @@
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12 overflow-auto">
|
<div class="col-12 overflow-auto">
|
||||||
<table class="table table-sm table-hover table-bordered text-nowrap" id="cdsTable">
|
<table class="table table-sm table-hover table-bordered text-nowrap" id="asfCovTable">
|
||||||
<thead class="align-middle">
|
<thead class="align-middle">
|
||||||
<tr class="table-secondary">
|
<tr class="table-secondary">
|
||||||
<th rowspan="4">사건번호</th>
|
<th rowspan="4">사건번호</th>
|
||||||
|
|
@ -366,19 +367,23 @@
|
||||||
|
|
||||||
<tr class="tr" th:each="asfcov:${asfCovList}">
|
<tr class="tr" th:each="asfcov:${asfCovList}">
|
||||||
<td th:text="${asfcov.caseNum}"></td>
|
<td th:text="${asfcov.caseNum}"></td>
|
||||||
<td th:text="${asfcov.crackdownStatus.personNegativeCnt}"></td>
|
<td th:text="${asfcov.napoDt}"></td>
|
||||||
<td th:text="${asfcov.crackdownStatus.casePoliceOfficer}"></td>
|
<td th:text="${asfcov.boatNameKr}"></td>
|
||||||
<td></td>
|
<td th:text="${asfcov.casePoliceOfficer}"></td>
|
||||||
<td></td>
|
<th:block th:each="commonCode:${session.commonCode.get('ATA')}">
|
||||||
<td></td>
|
<td th:if="${asfcov.caseAgency eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
|
||||||
<td></td>
|
</th:block>
|
||||||
<td></td>
|
<th:block th:each="commonCode:${session.commonCode.get('CPO')}">
|
||||||
<td></td>
|
<td th:if="${asfcov.crackdownPolice eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
|
||||||
<td></td>
|
</th:block>
|
||||||
<td></td>
|
<td th:text="${asfcov.pressurizedYn}"></td>
|
||||||
<td></td>
|
|
||||||
<td></td>
|
<td></td>
|
||||||
<td></td>
|
<td></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>
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
|
|
@ -388,10 +393,10 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="row justify-content-between pt-1">
|
<div class="row justify-content-between pt-1">
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<button class="btn btn-success" id="cdsDownExcel">엑셀 다운로드</button>
|
<button class="btn btn-success" id="asfCovDownExcel">엑셀 다운로드</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<button class="btn btn-primary" id="crackdownStatusAddBtn">등록</button>
|
<button class="btn btn-primary" id="addAsfCovBtn" >등록</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -399,17 +404,17 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</main>
|
||||||
|
<div class="modal fade" id="asfCovEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="asfCovEditModalLabel" aria-hidden="true">
|
||||||
|
<div class="modal-dialog modal-xl modal-dialog-scrollable">
|
||||||
|
<div class="modal-content" id="asfCovEditModalContent">
|
||||||
|
|
||||||
<div class="modal fade" id="asfCovEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="asfCovEditModalLabel" aria-hidden="true">
|
|
||||||
<div class="modal-dialog modal-xl modal-dialog-scrollable">
|
|
||||||
<div class="modal-content" id="asfCovEditModalContent">
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
<div class="modal fade" id="asfCovViewModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="asfCovViewModalLabel" aria-hidden="true">
|
<div class="modal fade" id="asfCovViewModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="asfCovViewModalLabel" aria-hidden="true">
|
||||||
<div class="modal-dialog modal-xl modal-dialog-scrollable">
|
<div class="modal-dialog modal-xl modal-dialog-scrollable">
|
||||||
<div class="modal-content" id="asfCovViewBody">
|
<div class="modal-content" id="asfCovViewModalContent">
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -419,7 +424,7 @@
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header bg-dark">
|
<div class="modal-header bg-dark">
|
||||||
<h5 class="modal-title text-white" id="asfCovSubModalLabel">단속현황 불러오기</h5>
|
<h5 class="modal-title text-white" id="asfCovSubModalLabel">단속현황 불러오기</h5>
|
||||||
<input type="hidden" id="modalUrl" value="/modal/asfCovModal">
|
<input type="hidden" id="modalUrl" value="/modal/crackdownStatusModal">
|
||||||
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
|
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body text-nowrap" id="subModalBody">
|
<div class="modal-body text-nowrap" id="subModalBody">
|
||||||
|
|
@ -439,6 +444,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</main>
|
|
||||||
</div>
|
</div>
|
||||||
</html>
|
</html>
|
||||||
|
|
@ -1,331 +1,106 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
|
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
|
||||||
<div class="modal-header bg-dark">
|
<div class="modal-header bg-dark">
|
||||||
<h5 class="modal-title text-white" id="fishingBoatEditModalLabel" th:text="${asfCov.asfcovKey eq null?' 조치현황 작성':'조치현황 수정'}"></h5>
|
<h5 class="modal-title text-white" id="asfCovEditModalLabel" th:text="${asfCov.asfCovKey eq null?'ASF 및 코로나19 관련 조치현황 작성':'ASF 및 코로나19 관련 조치현황 수정'}"></h5>
|
||||||
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
|
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body" id="asfCovEditModalContent">
|
||||||
<form action="#" method="post" id="asfCovEditForm">
|
<form action="#" method="post" id="asfCovEditForm">
|
||||||
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
|
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
|
||||||
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
|
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
|
||||||
<input type="hidden" name="asfcovKey" id="asfcovKey" th:value="${asfCov.asfcovKey}">
|
<input type="hidden" name="asfCovKey" th:value="${asfCov.asfCovKey }">
|
||||||
<input type="hidden" name="wrtOrgan" th:value="${asfCov.wrtOrgan}">
|
<input type="hidden" name="wrtOrgan" th:value="${asfCov.wrtOrgan}">
|
||||||
<input type="hidden" name="wrtPart" th:value="${asfCov.wrtPart}">
|
<input type="hidden" name="wrtPart" th:value="${asfCov.wrtPart}">
|
||||||
<input type="hidden" name="wrtUserSeq" th:value="${asfCov.wrtUserSeq}">
|
<input type="hidden" name="wrtUserSeq" th:value="${asfCov.wrtUserSeq}">
|
||||||
<input type="hidden" name="wrtUserNm" th:value="${asfCov.wrtUserNm}">
|
|
||||||
<input type="hidden" name="wrtUserGrd" th:value="${asfCov.wrtUserGrd}">
|
<input type="hidden" name="wrtUserGrd" th:value="${asfCov.wrtUserGrd}">
|
||||||
<ul class="nav nav-tabs" id="userTab" role="tablist">
|
<input type="hidden" name="wrtUserNm" th:value="${asfCov.wrtUserNm}">
|
||||||
<li class="nav-item" role="presentation">
|
<input type="hidden" name="cdsKey" th:value="${asfCov.cdsKey}">
|
||||||
<button class="nav-link active" id="baseInfoTab" data-bs-toggle="tab" data-bs-target="#baseInfoTabPanel" type="button" role="tab" aria-controls="baseInfoTabPanel" aria-selected="true">기본정보</button>
|
<div class="row mb-1">
|
||||||
</li>
|
<label for="boatNameKr" class="col-sm-1 col-form-label col-form-label-sm text-center">선명</label>
|
||||||
<li class="nav-item" role="presentation">
|
<div class="col-sm-2">
|
||||||
<button class="nav-link" id="sailorTab" data-bs-toggle="tab" data-bs-target="#sailorTabPanel" type="button" role="tab" aria-controls="sailorTabPanel" aria-selected="false">선장/선주정보</button>
|
<input type="text" class="form-control form-control-sm fishingBoatInfo boatNameKr" id="boatNameKr" name="fishingBoat.boatNameKr" placeholder="한글" th:value="${asfCov.boatNameKr}">
|
||||||
</li>
|
</div>
|
||||||
<li class="nav-item" role="presentation">
|
<label for="caseNum" class="col-sm-1 col-form-label col-form-label-sm text-center">사건번호</label>
|
||||||
<button class="nav-link" id="fishingBoatTab" data-bs-toggle="tab" data-bs-target="#fishingBoatTabPanel" type="button" role="tab" aria-controls="fishingBoatTabPanel" aria-selected="false">어선정보</button>
|
<div class="col-sm-2">
|
||||||
</li>
|
<div class="input-group">
|
||||||
<li class="nav-item" role="presentation">
|
<input type="text" class="form-control form-control-sm crackdownStatusInfo" id="caseNum" name="caseNum" th:value="${asfCov.caseNum}">
|
||||||
<button class="nav-link" id="processResultTab" data-bs-toggle="tab" data-bs-target="#processResultTabPanel" type="button" role="tab" aria-controls="processResultTabPanel" aria-selected="false">처리결과</button>
|
<input type="button" class="btn btn-sm btn-outline-primary crackdownStatusInfo w-auto" id="caseNumBtn" value="불러오기">
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
<div class="tab-content bg-white border border-top-0">
|
|
||||||
<div class="tab-pane fade p-2 show active" id="baseInfoTabPanel" role="tabpanel" aria-labelledby="baseInfoTab" tabindex="0">
|
|
||||||
<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 fishingBoatInfo boatNameKr" id="boatNameKr" name="fishingBoat.boatNameKr" placeholder="한글" th:value="${asfCov.crackdownStatus.boatNameKr}">
|
|
||||||
</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 crackdownStatusInfo" id="caseNum" name="caseNum" th:value="${asfCov.crackdownStatus.caseNum}">
|
|
||||||
<input type="button" class="btn btn-sm btn-outline-primary crackdownStatusInfo w-auto" id="caseNumBtn" value="불러오기">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<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 crackdownStatusInfo" id="caseAgency" name="caseAgency">
|
|
||||||
<option value="">선택</option>
|
|
||||||
<th:block th:each="commonCode:${session.commonCode.get('ATA')}">
|
|
||||||
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq asfCov.crackdownStatus.caseAgency}"></option>
|
|
||||||
</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 crackdownStatusInfo" id="casePoliceOfficer" name="casePoliceOfficer" th:value="${asfCov.crackdownStatus.casePoliceOfficer}">
|
|
||||||
</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 crackdownStatusInfo crackdownPolice" name="crackdownPolice" id="crackdownPolice">
|
|
||||||
<option value="">선택</option>
|
|
||||||
<th:block th:each="commonCode:${session.commonCode.get('CPO')}">
|
|
||||||
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq asfCov.crackdownStatus.crackdownPolice}"></option>
|
|
||||||
</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 crackdownStatusInfo crackdownBoat" name="crackdownBoat" id="crackdownBoat" th:data-boatcode="${asfCov.crackdownStatus.crackdownBoat}" disabled>
|
|
||||||
<option value="">단속경찰서를 선택해주세요.</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row mb-1">
|
|
||||||
<label for="napoDt" 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 dateTimeSelector" id="napoDt" name="napoDt" placeholder="0000-00-00 00:00" th:value="${#temporals.format(asfCov.crackdownStatus.napoDt, 'yyyy-MM-dd')}" autocomplete="off">
|
|
||||||
</div>
|
|
||||||
<label for="napoSeaPointLon" class="col-sm-1 col-form-label col-form-label-sm text-center">나포장소</label>
|
|
||||||
<div class="col-sm-5">
|
|
||||||
<div class="input-group w-auto">
|
|
||||||
<input type="text" class="form-control form-control-sm w-25 crackdownStatusInfo" id="napoSeaPointLon" name="napoSeaPointLon" placeholder="00 . 00 . 00N" th:value="${asfCov.crackdownStatus.napoSeaPointLon}">
|
|
||||||
<input type="text" class="form-control form-control-sm w-25 crackdownStatusInfo" id="napoSeaPointLat" name="napoSeaPointLat" placeholder="000-00.00E" th:value="${asfCov.crackdownStatus.napoSeaPointLat}">
|
|
||||||
<input type="text" class="form-control form-control-sm w-50 crackdownStatusInfo" id="napoSeaPointDetail" name="napoSeaPointDetail" placeholder="00도 00방 00해리, 어업협정선 내측 00해리" th:value="${asfCov.crackdownStatus.napoSeaPointDetail}">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<label for="fieldIvsgt" 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="fieldIvsgt" id="fieldIvsgt">
|
|
||||||
<option value="">선택</option>
|
|
||||||
<option value="C" th:selected="${asfCov.crackdownStatus.fieldIvsgt eq 'C'}">압송</option>
|
|
||||||
<option value="F" th:selected="${asfCov.crackdownStatus.fieldIvsgt eq 'F'}">현장조사</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
<div class="tab-pane fade p-2" id="fishingBoatTabPanel" role="tabpanel" aria-labelledby="fishingBoatTab" tabindex="0">
|
<div class="row mb-1">
|
||||||
<div class="row mb-1">
|
<label for="caseAgency" class="col-sm-1 col-form-label col-form-label-sm text-center">사건담당기관</label>
|
||||||
<label for="boatNameCn" class="col-sm-1 col-form-label col-form-label-sm text-center">선명</label>
|
<div class="col-sm-2">
|
||||||
<div class="col-sm-4">
|
<select class="form-select form-select-sm crackdownStatusInfo" id="caseAgency" name="caseAgency">
|
||||||
<div class="input-group w-auto">
|
<option value="">선택</option>
|
||||||
|
<th:block th:each="commonCode:${session.commonCode.get('ATA')}">
|
||||||
</div>
|
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq asfCov.caseAgency}"></option>
|
||||||
</div>
|
|
||||||
<div class="col-sm-4">
|
|
||||||
<div class="row" id="violationDiv">
|
|
||||||
<th:block th:each="violation:${asfCov.crackdownStatus.violationList}">
|
|
||||||
<div class="col-6 violation">
|
|
||||||
<input type="hidden" class="form-control form-control-sm fishingBoatInfo violationCd" th:value="${violation.violation}">
|
|
||||||
<div class="input-group w-auto">
|
|
||||||
<th:block th:each="commonCode:${session.commonCode.get('VT')}">
|
|
||||||
<input type="text" class="form-control form-control-sm" th:if="${commonCode.itemCd eq violation.violation}" th:value="${commonCode.itemValue}">
|
|
||||||
</th:block>
|
|
||||||
<button type="button" class="btn btn-sm btn-outline-secondary opacity-75 violationRemoveBtn">
|
|
||||||
<i class="bi bi-dash-square text-danger"></i>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</th:block>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
<div class="tab-pane fade p-2" id="processResultTabPanel" role="tabpanel" aria-labelledby="processResultTab" tabindex="0">
|
|
||||||
<div class="row mb-1">
|
|
||||||
<label for="processStatus" 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 processResultInfo" id="processStatus" name="processResult.processStatus">
|
|
||||||
<option value="">선택</option>
|
|
||||||
<th:block th:each="code:${prList}">
|
|
||||||
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq crackdownStatus.processResult.processStatus}"></option>
|
|
||||||
</th:block>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<label for="pressurizedTimeTakenDate" class="col-sm-1 col-form-label col-form-label-sm text-center">압송소요시간</label>
|
|
||||||
<div class="col-sm-2">
|
|
||||||
<th:block th:with="ptt=${crackdownStatus.processResult.pressurizedTimeTaken}">
|
|
||||||
<div class="input-group w-auto">
|
|
||||||
<input type="number" class="form-control form-control-sm pressurizedTimeTaken processResultInfo" id="pressurizedTimeTakenDate" placeholder="일" th:value="${#strings.substringBefore(ptt, '일')}">
|
|
||||||
<input type="text" class="form-control form-control-sm pressurizedTimeTaken processResultInfo timeSelector" id="pressurizedTimeTakenTime" placeholder="00:00" autocomplete="off" th:value="${#strings.substringAfter(ptt, '일')}">
|
|
||||||
</div>
|
|
||||||
<input type="hidden" class="processResultInfo" name="processResult.pressurizedTimeTaken" id="pressurizedTimeTaken" th:value="${ptt}">
|
|
||||||
</th:block>
|
|
||||||
</div>
|
|
||||||
<label for="warrantReqTakeDate" class="col-sm-1 col-form-label col-form-label-sm text-center fs-11">영장청구 소요시간</label>
|
|
||||||
<div class="col-sm-2">
|
|
||||||
<th:block th:with="wrtt=${crackdownStatus.processResult.warrantReqTakeTime}">
|
|
||||||
<div class="input-group w-auto">
|
|
||||||
<input type="number" class="form-control form-control-sm warrantReqTake processResultInfo" id="warrantReqTakeDate" placeholder="일" th:value="${#strings.substringBefore(wrtt, '일')}">
|
|
||||||
<input type="text" class="form-control form-control-sm warrantReqTake processResultInfo timeSelector" id="warrantReqTakeTime" placeholder="00:00" autocomplete="off" th:value="${#strings.substringAfter(wrtt, '일')}">
|
|
||||||
</div>
|
|
||||||
<input type="hidden" class="processResultInfo" name="processResult.warrantReqTakeTime" id="warrantReqTake" th:value="${wrtt}">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<hr>
|
|
||||||
|
|
||||||
<div class="row mb-1">
|
|
||||||
<label for="consignmentStartDt" 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 processResultInfo dateSelector" id="consignmentStartDt" name="processResult.consignmentStartDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.consignmentStartDt}" autocomplete="off">
|
|
||||||
</div>
|
|
||||||
<label for="consignmentEndDt" 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 processResultInfo dateSelector" id="consignmentEndDt" name="processResult.consignmentEndDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.consignmentEndDt}" autocomplete="off">
|
|
||||||
</div>
|
|
||||||
<label for="confiscationDt" 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 processResultInfo dateSelector" id="confiscationDt" name="processResult.confiscationDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.confiscationDt}" autocomplete="off">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row mb-1">
|
|
||||||
<label for="boatDisposalDt" 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 processResultInfo dateSelector" id="boatDisposalDt" name="processResult.boatDisposalDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.boatDisposalDt}" autocomplete="off">
|
|
||||||
</div>
|
|
||||||
<label for="boatDisposalType" 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 processResultInfo" id="boatDisposalType" name="processResult.boatDisposalType">
|
|
||||||
<option value="">선택</option>
|
|
||||||
<th:block th:each="code:${bdtList}">
|
|
||||||
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq crackdownStatus.processResult.boatDisposalType}"></option>
|
|
||||||
</th:block>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<label for="returnDt" 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 processResultInfo dateSelector" id="returnDt" name="processResult.returnDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.returnDt}" autocomplete="off">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row mb-1">
|
|
||||||
<th:block th:if="${#lists.isEmpty(crackdownStatus.sailorList)}">
|
|
||||||
<label for="captainRestriction" 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 sailorInfo" id="captainRestriction">
|
|
||||||
<option value="">선택</option>
|
|
||||||
<option value="Y">O</option>
|
|
||||||
<option value="N">X</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<label for="navigatingOfficerRestriction" 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 sailorInfo" id="navigatingOfficerRestriction">
|
|
||||||
<option value="">선택</option>
|
|
||||||
<option value="Y">O</option>
|
|
||||||
<option value="N">X</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<label for="chiefEngineerRestriction" 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 sailorInfo" id="chiefEngineerRestriction">
|
|
||||||
<option value="">선택</option>
|
|
||||||
<option value="Y">O</option>
|
|
||||||
<option value="N">X</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:unless="${#lists.isEmpty(crackdownStatus.sailorList)}">
|
</select>
|
||||||
<label for="captainRestriction" class="col-sm-1 col-form-label col-form-label-sm text-center">선장구속</label>
|
|
||||||
<div class="col-sm-2">
|
|
||||||
<th:block th:each="sailor:${crackdownStatus.sailorList}">
|
|
||||||
<th:block th:if="${sailor.position eq 'POS001'}">
|
|
||||||
<select class="form-select form-select-sm sailorInfo" id="captainRestriction">
|
|
||||||
<option value="">선택</option>
|
|
||||||
<option value="Y" th:selected="${sailor.isRestriction eq 'Y'}">O</option>
|
|
||||||
<option value="N" th:selected="${sailor.isRestriction eq 'N'}">X</option>
|
|
||||||
</select>
|
|
||||||
</th:block>
|
|
||||||
</th:block>
|
|
||||||
</div>
|
|
||||||
<label for="navigatingOfficerRestriction" class="col-sm-1 col-form-label col-form-label-sm text-center">항해장구속</label>
|
|
||||||
<div class="col-sm-2">
|
|
||||||
<th:block th:each="sailor:${crackdownStatus.sailorList}">
|
|
||||||
<th:block th:if="${sailor.position eq 'POS002'}">
|
|
||||||
<select class="form-select form-select-sm sailorInfo" id="navigatingOfficerRestriction">
|
|
||||||
<option value="">선택</option>
|
|
||||||
<option value="Y" th:selected="${sailor.isRestriction eq 'Y'}">O</option>
|
|
||||||
<option value="N" th:selected="${sailor.isRestriction eq 'N'}">X</option>
|
|
||||||
</select>
|
|
||||||
</th:block>
|
|
||||||
</th:block>
|
|
||||||
</div>
|
|
||||||
<label for="chiefEngineerRestriction" class="col-sm-1 col-form-label col-form-label-sm text-center">기관장구속</label>
|
|
||||||
<div class="col-sm-2">
|
|
||||||
<th:block th:each="sailor:${crackdownStatus.sailorList}">
|
|
||||||
<th:block th:if="${sailor.position eq 'POS003'}">
|
|
||||||
<select class="form-select form-select-sm sailorInfo" id="chiefEngineerRestriction">
|
|
||||||
<option value="">선택</option>
|
|
||||||
<option value="Y" th:selected="${sailor.isRestriction eq 'Y'}">O</option>
|
|
||||||
<option value="N" th:selected="${sailor.isRestriction eq 'N'}">X</option>
|
|
||||||
</select>
|
|
||||||
</th:block>
|
|
||||||
</th:block>
|
|
||||||
</div>
|
|
||||||
</th:block>
|
|
||||||
</div>
|
|
||||||
<div class="row mb-1">
|
|
||||||
<label for="sailorAddBtn" class="col-sm-1 col-form-label col-form-label-sm text-center">
|
|
||||||
선원구속
|
|
||||||
<button type="button" class="border-0 sailorInfo" id="sailorAddBtn">
|
|
||||||
<i class="bi bi-plus-square text-primary"></i>
|
|
||||||
</button>
|
|
||||||
</label>
|
|
||||||
<div class="col-sm-10 row" id="sailorRestrictionHome">
|
|
||||||
<th:block th:each="sailor:${crackdownStatus.sailorList}">
|
|
||||||
<th:block th:if="${sailor.position eq 'POS005' or sailor.position eq 'POS006'}">
|
|
||||||
<div class="col-4 sailorRestriction">
|
|
||||||
<div class="input-group">
|
|
||||||
<select class="form-select form-select-sm sailorInfo isRestriction normalSailorPosition" style="width: 75px">
|
|
||||||
<option value="">직책</option>
|
|
||||||
<option value="POS005" th:selected="${sailor.position eq 'POS005'}">기타 간부선원</option>
|
|
||||||
<option value="POS006" th:selected="${sailor.position eq 'POS006'}">일반선원 또는 확인불가</option>
|
|
||||||
</select>
|
|
||||||
<select class="form-select form-select-sm sailorInfo isRestriction w-auto normalSailorRestriction">
|
|
||||||
<option value="">선택</option>
|
|
||||||
<option value="Y" th:selected="${sailor.isRestriction eq 'Y'}">O</option>
|
|
||||||
<option value="N" th:selected="${sailor.isRestriction eq 'N'}">X</option>
|
|
||||||
</select>
|
|
||||||
<input type="text" class="form-control form-control-sm sailorInfo normalSailorNm w-auto" placeholder="이름" th:value="${sailor.sailorNameKr}">
|
|
||||||
<button type="button" class="btn btn-sm btn-outline-secondary sailorInfo w-auto opacity-75 sailorRemoveBtn">
|
|
||||||
<i class="bi bi-dash-square text-danger"></i>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</th:block>
|
|
||||||
</th:block>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row mb-1">
|
|
||||||
<label for="exileCnt" 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 processResultInfo" id="exileCnt" name="processResult.exileCnt" placeholder="00명" th:value="${crackdownStatus.processResult.exileCnt}">
|
|
||||||
</div>
|
|
||||||
<label for="exileDt" 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 processResultInfo dateSelector" id="exileDt" name="processResult.exileDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.exileDt}" autocomplete="off">
|
|
||||||
</div>
|
|
||||||
<label for="flight" 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 processResultInfo" id="flight" name="processResult.flight" th:value="${crackdownStatus.processResult.flight}">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row mb-3">
|
|
||||||
<label for="immigrationOfficeName" class="col-sm-1 col-form-label col-form-label-sm text-center">출입국 담당자</label>
|
|
||||||
<div class="col-sm-4">
|
|
||||||
<div class="input-group w-auto">
|
|
||||||
<input type="text" class="form-control form-control-sm processResultInfo" id="immigrationOfficeName" name="processResult.immigrationOfficeName" placeholder="사무소명" th:value="${crackdownStatus.processResult.immigrationOfficeName}">
|
|
||||||
<input type="text" class="form-control form-control-sm processResultInfo" id="immigrationOfficeOfficerName" name="processResult.immigrationOfficeOfficerName" placeholder="이름" th:value="${crackdownStatus.processResult.immigrationOfficeOfficerName}">
|
|
||||||
<input type="text" class="form-control form-control-sm processResultInfo" id="immigrationOfficeOfficerContact" name="processResult.immigrationOfficeOfficerContact" placeholder="연락처" th:value="${crackdownStatus.processResult.immigrationOfficeOfficerContact}">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</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 crackdownStatusInfo" id="casePoliceOfficer" name="casePoliceOfficer" th:value="${asfCov.casePoliceOfficer}">
|
||||||
|
</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 crackdownStatusInfo crackdownPolice" name="crackdownPolice" id="crackdownPolice">
|
||||||
|
<option value="">선택</option>
|
||||||
|
<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>
|
||||||
|
</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 crackdownStatusInfo crackdownBoat" name="crackdownBoat" id="crackdownBoat" th:data-boatcode="${asfCov.crackdownBoat}" disabled>
|
||||||
|
<option value="">단속경찰서를 선택해주세요.</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</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>
|
||||||
|
</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}">
|
||||||
|
</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" name="asfcovActionDetail" th:value="${asfCov.asfcovActionDetail}"></textarea>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer bg-light">
|
<div class="modal-footer bg-light">
|
||||||
<!--<button type="button" class="btn btn-warning" id="saveTempBtn">임시저장</button>-->
|
<!-- <button type="button" class="btn btn-warning" id="saveTempBtn" data-contentStatus="DST001">임시저장</button>-->
|
||||||
<button type="button" class="btn btn-primary" id="saveResultBtn">저장</button>
|
|
||||||
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
|
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
|
||||||
|
<button type="button" class="btn btn-primary" id="saveBtn">저장</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -1,10 +1,69 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
|
||||||
<head>
|
<div class="modal-header bg-dark">
|
||||||
<meta charset="UTF-8">
|
<h5 class="modal-title text-white" id="processResultEditModalLabel" th:text="${asfCov.asfCovKey eq null ? '불법조업 외국어선 처리현황' : '불법조업 외국어선 처리현황'}">></h5>
|
||||||
<title>Title</title>
|
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||||
</head>
|
</div>
|
||||||
<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"
|
||||||
|
data-bs-target="#processResult" type="button" role="tab" aria-controls="processResult" data-processResult-type="processResult"
|
||||||
|
aria-selected="true">상세</button>
|
||||||
|
</li>
|
||||||
|
<li class="nav-item" role="presentation">
|
||||||
|
<button class="nav-link processResultTab" 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: auto;">
|
||||||
|
<div class="tab-pane fade show active" id="processResult" role="tabpanel" aria-labelledby="processResult-tab">
|
||||||
|
<div class="modal-body" id="processResultEditBody">
|
||||||
|
<form action="#" method="post" id="processResultEditForm">
|
||||||
|
<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}">
|
||||||
|
<input type="hidden" name="fbKey" th:value="${asfCov.fbKey}">
|
||||||
|
<input type="hidden" name="wrtOrgan" th:value="${asfCov.wrtOrgan}">
|
||||||
|
<input type="hidden" name="wrtUserNm" th:value="${asfCov.wrtUserNm}">
|
||||||
|
<input type="hidden" name="wrtDt" th:value="${#temporals.format(asfCov.wrtDt, 'yyyy-MM-dd HH:mm')}">
|
||||||
|
<input type="hidden" id="saveYn" name="saveYn">
|
||||||
|
<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 class="form-control form-control-sm" name="caseNum" id="caseNum" th:value="${asfCov.caseNum}" readonly>
|
||||||
|
</div>
|
||||||
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center">사건담당<br>경찰서</label>
|
||||||
|
<div class="col-sm-2">
|
||||||
|
<select class="form-select form-select-sm" name="crackdownPolice" id="crackdownPolice" disabled>
|
||||||
|
<option value="">선택</option>
|
||||||
|
<th:block th:each="commonCode:${session.commonCode.get('CPO')}">
|
||||||
|
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
|
||||||
|
th:selected="${pasfCov.crackdownPolice eq commonCode.itemCd}"></option>
|
||||||
|
</th:block>
|
||||||
|
<option value="etc" th:selected="${asfCov.crackdownPolice ne null && asfCov.crackdownPolice ne '' && !#strings.contains(asfCov.crackdownPolice, 'CPO')}">직접입력</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<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 class="form-control form-control-sm" name="boatNameKr" id="boatNameKr" th:value="${asfCov.boatNameKr}" readonly>
|
||||||
|
</div>
|
||||||
|
|
||||||
</body>
|
</div>
|
||||||
|
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="modal-footer bg-light">
|
||||||
|
<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-secondary" data-bs-dismiss="modal">닫기</button>
|
||||||
|
</div>
|
||||||
</html>
|
</html>
|
||||||
|
|
@ -0,0 +1,107 @@
|
||||||
|
<!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="${md.mdKey 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="designationEditForm">
|
||||||
|
<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="affairKey" th:value="${affair.affairKey}">
|
||||||
|
<input type="hidden" name="affairCategory" th:value="${affair.affairCategory}">
|
||||||
|
<input type="hidden" name="wrtOrgan" th:value="${affair.wrtOrgan}">
|
||||||
|
<input type="hidden" name="wrtPart" th:value="${affair.wrtPart}">
|
||||||
|
<input type="hidden" name="wrtUserSeq" th:value="${affair.wrtUserSeq}">
|
||||||
|
<input type="hidden" name="affairStatus" id="affairStatus" th:value="${affair.affairStatus}">
|
||||||
|
<input type="hidden" name="wrtDt" id="wrtDt" th:value="${#temporals.format(affair.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" id="mdDt" name="mdDt" 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>
|
||||||
|
<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>
|
||||||
|
<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">
|
||||||
|
<input type="text" class="form-control form-control-sm" id="mdTitle" name="mdTitle">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row mb-1"><h6 class="text-center">모니터링 대상자</h6></div>
|
||||||
|
<div class="row mb-1">
|
||||||
|
<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="mdName" name="mdName">
|
||||||
|
</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="mdBirth" name="mdBirth">
|
||||||
|
</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="mdNationality" name="mdNationality">
|
||||||
|
</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="mdAddress" name="mdAddress">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row mb-1">
|
||||||
|
<label for="affairType1" class="col-sm-1 col-form-label col-form-label-sm text-center">소속/계급<br>(직위)</label>
|
||||||
|
<div class="col-sm-2">
|
||||||
|
<input type="text" class="form-control form-control-sm" id="mdRank" name="mdRank">
|
||||||
|
</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="mdCareer" name="mdCareer">
|
||||||
|
</div>
|
||||||
|
<label for="affairType3" 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="mdEtc" name="mdEtc">
|
||||||
|
</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="mdReason" name="mdReason" rows="5" cols="139"></textarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row mb-1">
|
||||||
|
<label for="editor" class="col-sm-1 col-form-label col-form-label-sm text-center">모니터링<br>추진계획</label>
|
||||||
|
<div class="col-sm-11">
|
||||||
|
<div id="editor"></div>
|
||||||
|
<textarea id="content" class="d-none"></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(md.fileList)}">
|
||||||
|
<br>파일을 업로드 해주세요.
|
||||||
|
</th:block>
|
||||||
|
<th:block th:unless="${#arrays.isEmpty(md.fileList)}">
|
||||||
|
<div class='row-col-6' th:each="file:${md.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 bg-light">
|
||||||
|
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
|
||||||
|
<button type="button" class="btn btn-warning" id="saveTempBtn">임시저장</button>
|
||||||
|
<button type="button" class="btn btn-primary" id="saveBtn">저장</button>
|
||||||
|
</div>
|
||||||
|
|
@ -0,0 +1,176 @@
|
||||||
|
<!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/monitoring/designation.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="planTab" 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="contentTitle" th:value="${searchParams.contentTitle}">
|
||||||
|
</div>
|
||||||
|
<div class="col-2">
|
||||||
|
<select class="form-select form-select-sm" name="planState">
|
||||||
|
<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.planState}"></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="planDt" th:selected="${searchParams.dateSelector eq 'planDt'}">시행일</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>제목</th>
|
||||||
|
<th>시행일자</th>
|
||||||
|
<th>관서</th>
|
||||||
|
<th>부서</th>
|
||||||
|
<th>작성자</th>
|
||||||
|
<th>작성일시</th>
|
||||||
|
<th>첨부파일</th>
|
||||||
|
<th>상태</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody class="table-group-divider">
|
||||||
|
<tr class="designationTr" th:each="list:${mdList}">
|
||||||
|
<td th:text="${list.mdTitle}"></td>
|
||||||
|
<td th:text="${list.mdDt}"></td>
|
||||||
|
<td th:text="${list.wrtOrgan}"></td>
|
||||||
|
<td th:text="${list.wrtPart}"></td>
|
||||||
|
<td th:text="|${list.wrtUserGrd} ${list.wrtUserNm}|"></td>
|
||||||
|
<td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
|
||||||
|
<td th:text="${list.fileCnt eq null?'파일 없음':#strings.concat(list.fileCnt,' 건')}"></td>
|
||||||
|
<td th:text="${list.mdState}"></td>
|
||||||
|
<th:block>
|
||||||
|
<input type="hidden" class="mdKey" th:value="${list.mdKey}">
|
||||||
|
</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="designationEditModal" 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="designationEditModalContent">
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="modal fade" id="designationViewModal" 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="designationViewModalBody">
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</html>
|
||||||
|
|
@ -0,0 +1,151 @@
|
||||||
|
<!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(md.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(md.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>
|
||||||
|
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${md.mdDt}"></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="${md.wrtUserNm}"></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="${#temporals.format(md.wrtDt, 'yyyy-MM-dd HH:mm')}"></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="${md.mdState}"></label>
|
||||||
|
</div>
|
||||||
|
<hr>
|
||||||
|
<div class="row mb-1">
|
||||||
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center">제목</label>
|
||||||
|
<label class="col-sm-11 col-form-label col-form-label-sm text-start" th:text="${md.mdTitle}"></label>
|
||||||
|
</div>
|
||||||
|
<hr>
|
||||||
|
<div class="row mb-1"><h6 class="text-center">모니터링 대상자</h6></div>
|
||||||
|
<br>
|
||||||
|
<div class="row">
|
||||||
|
<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="${md.mdName}"></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="${md.mdBirth}"></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="${md.mdNationality}"></label>
|
||||||
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center">소속/계급<br>(직위)</label>
|
||||||
|
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${md.mdRank}"></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="${md.mdAddress}"></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="${md.mdCareer}"></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="${md.mdEtc}"></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="${md.mdReason}"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<hr>
|
||||||
|
<div class="row mb-1">
|
||||||
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center">모니터링<br>추진계획</label>
|
||||||
|
<div class="col-sm-11 form-control-sm" id="contentDiv">
|
||||||
|
<div th:utext="${md.mdPlan}"></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(md.fileList)}">
|
||||||
|
<tr>
|
||||||
|
<td colspan="2">파일이 없습니다.</td>
|
||||||
|
</tr>
|
||||||
|
</th:block>
|
||||||
|
<th:block th:unless="${#lists.isEmpty(md.fileList)}">
|
||||||
|
<th:block th:each="file:${md.fileList}">
|
||||||
|
<tr class="fileInfoTr">
|
||||||
|
<td><a href="#" class="fileDownLink" data-board="affair"
|
||||||
|
th:data-parentkey="${file.mdKey}" 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(md.apprvList)}">
|
||||||
|
<hr>
|
||||||
|
<th:block th:each="apprv:${md.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="|기타의견: ${apprv.etc}|"></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>
|
||||||
|
<div class="col-12" th:if="${(apprvAuth eq 'APC003' or apprvAuth eq 'APC004') and md.mdState eq 'DST002'
|
||||||
|
or (apprvAuth eq 'APC001' or apprvAuth eq 'APC002') and md.mdState eq 'DST004'}">
|
||||||
|
<form action="#" method="post" id="apprvForm">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-10">
|
||||||
|
<input type="hidden" name="mdKey" th:value="${md.mdKey}">
|
||||||
|
<input type="hidden" name="state" id="viewModalApprvValue">
|
||||||
|
<input type="text" class="form-control form-control-sm" name="etc" placeholder="추가의견, 반려사유 기입">
|
||||||
|
<input type="text" class="d-none" id="submitPrevention">
|
||||||
|
</div>
|
||||||
|
<div class="col-auto">
|
||||||
|
<input type="button" class="btn btn-sm btn-success apprvBtn" th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST004':'DST006'}" value="승인">
|
||||||
|
</div>
|
||||||
|
<div class="col-auto">
|
||||||
|
<input type="button" class="btn btn-sm btn-danger apprvBtn" th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST003':'DST005'}" value="반려">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</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:unless="${md.mdState eq 'DST004' or md.mdState eq 'DST006'}"><!--승인 상태일때는 수정 불가 -->
|
||||||
|
<th:block th:if="${userSeq eq md.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
|
||||||
|
<button type="button" class="btn btn-warning" id="editAffairBtn">수정</button>
|
||||||
|
</th:block>
|
||||||
|
</th:block>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
Loading…
Reference in New Issue