diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java index 9463a978..df4a4074 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java @@ -182,8 +182,12 @@ public class ResultController { // 첩보수집활동 > 외사경찰 견문관 @GetMapping("/affairListModal") public ModelAndView affairListModal(@AuthenticationPrincipal UserInfo loginUser, AffairBoard affair){ ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairResult/affairListModal"); - affair.setWrtUserSeq(loginUser.getUserSeq()); - affair.setRatingOrgan(loginUser.getOgCd()); + if(affair.getWrtUserSeq() == null) { + affair.setWrtUserSeq(loginUser.getUserSeq()); + } + if(affair.getWrtOrgan() == null) { + affair.setWrtOrgan(loginUser.getOgCd()); + } affair.setFirstIndex(0); affair.setRowCnt(9999); mav.addObject("affairList", affairService.selectAffairBoardList(affair)); diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java index 33086ee7..1a5ffbfb 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java @@ -2,6 +2,7 @@ package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork; import com.dbnt.faisp.main.authMgt.service.AuthMgtService; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.IntelligenceAnalyze; +import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.IntelligenceAnalyzeApprv; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlan; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlanApprv; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.service.IntelligenceNetworkService; @@ -154,7 +155,7 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외 } @GetMapping("/intelligenceAnalyzeList/{type}") - public ModelAndView intelligenceAnalyzeList(@AuthenticationPrincipal UserInfo loginUser,@PathVariable("type") String type, OperationPlan op){ + public ModelAndView intelligenceAnalyzeList(@AuthenticationPrincipal UserInfo loginUser,@PathVariable("type") String type, IntelligenceAnalyze ia){ ModelAndView mav = new ModelAndView("igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeList"); //메뉴권한 확인 @@ -163,10 +164,10 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외 switch (accessAuth){ case "ACC001": // 조회 case "ACC002": // 작성 // 자신이 작성한 문서만 열람가능 - op.setWrtUserSeq(loginUser.getUserSeq()); + ia.setWrtUserSeq(loginUser.getUserSeq()); break; case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능 - op.setDownOrganCdList(loginUser.getDownOrganCdList()); + ia.setDownOrganCdList(loginUser.getDownOrganCdList()); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); break; } @@ -174,10 +175,10 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외 switch (accessAuth){ case "ACC001": // 조회 case "ACC002": // 작성 // 자신의 관서 내에서 작성한 문서만 열람가능 - op.setWrtOrgan(loginUser.getOgCd()); + ia.setWrtOrgan(loginUser.getOgCd()); break; case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능 - op.setDownOrganCdList(loginUser.getDownOrganCdList()); + ia.setDownOrganCdList(loginUser.getDownOrganCdList()); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); break; } @@ -187,10 +188,10 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외 if(type.equals("stay")) { if(apprvAuth==null) { if(!accessAuth.equals("ACC003")){ - op.setWrtUserSeq(loginUser.getUserSeq()); - op.setUserType("normalStayList"); + ia.setWrtUserSeq(loginUser.getUserSeq()); + ia.setUserType("normalStayList"); }else{ - op.setUserType("managerStayList"); + ia.setUserType("managerStayList"); } }else{ mav.addObject("userNm", loginUser.getUserNm()); @@ -199,17 +200,17 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외 case "APC003": // 계장 // 결재대기 문서 조회 case "APC002": // 부장대행 case "APC001": // 부장 // 결재대기 문서 조회 - op.setOpState("DST002"); + ia.setIaState("DST002"); break; } } }else if(type.equals("commit")){ if(apprvAuth==null) { if(!accessAuth.equals("ACC003")){ - op.setWrtUserSeq(loginUser.getUserSeq()); - op.setUserType("normalCommitList"); + ia.setWrtUserSeq(loginUser.getUserSeq()); + ia.setUserType("normalCommitList"); }else{ - op.setUserType("managerCommitList"); + ia.setUserType("managerCommitList"); } }else{ switch (apprvAuth) { @@ -217,7 +218,7 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외 case "APC003": // 계장 // case "APC002": // 부장대행 case "APC001": // 부장 // - op.setUserType("sectionCommitList"); + ia.setUserType("sectionCommitList"); break; } } @@ -225,14 +226,14 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외 mav.addObject("accessAuth", accessAuth); mav.addObject("apprvAuth", apprvAuth); - op.setQueryInfo(); - mav.addObject("opList", intelligenceNetworkService.selectOperationPlanList(op)); - op.setContentCnt(intelligenceNetworkService.selectOperationPlanListCnt(op)); - op.setPaginationInfo(); + ia.setQueryInfo(); + mav.addObject("iaList", intelligenceNetworkService.selectIntelligenceAnalyzeList(ia)); + ia.setContentCnt(intelligenceNetworkService.selectIntelligenceAnalyzeListCnt(ia)); + ia.setPaginationInfo(); mav.addObject("type", type); mav.addObject("searchUrl", "/intelligenceNetwork/intelligenceAnalyzeList/"+type); - mav.addObject("searchParams", op); + mav.addObject("searchParams", ia); return mav; } @@ -240,7 +241,11 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외 public ModelAndView intelligenceAnalyzeEditModal(@AuthenticationPrincipal UserInfo loginUser, IntelligenceAnalyze ia){ ModelAndView mav = new ModelAndView("igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeEditModal"); if(ia.getIaKey()!=null){ - + ia = intelligenceNetworkService.selectIntelligenceAnalyze(ia); + ia.setAffairList(intelligenceNetworkService.selectIntelligenceAnalyzeAffairKey(ia)); + }else { + ia.setWrtOrgan(loginUser.getOgCd()); + ia.setWrtUserSeq(loginUser.getUserSeq()); } mav.addObject("ia", ia); @@ -270,6 +275,28 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외 } return intelligenceNetworkService.saveIntelligenceAnalyze(ia); } + + @GetMapping("/intelligenceAnalyzeViewModal") + public ModelAndView intelligenceAnalyzeViewModal(@AuthenticationPrincipal UserInfo loginUser, IntelligenceAnalyze ia){ + ModelAndView mav = new ModelAndView("igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeViewModal"); + ia = intelligenceNetworkService.selectIntelligenceAnalyze(ia); + ia.setApprvList(intelligenceNetworkService.selectIntelligenceAnalyzeApprv(ia)); + mav.addObject("ia", ia); + mav.addObject("userSeq",loginUser.getUserSeq()); + //메뉴권한 확인 + mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/intelligenceAnalyzeList/all").get(0).getAccessAuth()); + mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/intelligenceAnalyzeList/all").get(0).getApprovalAuth()); + return mav; + } + + @PostMapping("/intelligenceAnalyzeChange") + public Integer intelligenceAnalyzeChange(@AuthenticationPrincipal UserInfo loginUser, IntelligenceAnalyzeApprv apprv){ + apprv.setUserSeq(loginUser.getUserSeq()); + apprv.setUserGrd(loginUser.getTitleCd()); + apprv.setUserNm(loginUser.getUserNm()); + apprv.setSaveDt(LocalDateTime.now()); + return intelligenceNetworkService.intelligenceAnalyzeChange(apprv); + } } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/mapper/IntelligenceNetworkMapper.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/mapper/IntelligenceNetworkMapper.java index 0be3c08f..cab34a89 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/mapper/IntelligenceNetworkMapper.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/mapper/IntelligenceNetworkMapper.java @@ -16,6 +16,14 @@ public interface IntelligenceNetworkMapper { IntelligenceAnalyze selectAffairCnt(IntelligenceAnalyze ia); + List selectIntelligenceAnalyzeList(IntelligenceAnalyze ia); + + Integer selectIntelligenceAnalyzeListCnt(IntelligenceAnalyze ia); + + IntelligenceAnalyze selectIntelligenceAnalyze(IntelligenceAnalyze ia); + + List selectIntelligenceAnalyzeAffairKey(IntelligenceAnalyze ia); + } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/IntelligenceAnalyze.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/IntelligenceAnalyze.java index 43afe79a..23cfe906 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/IntelligenceAnalyze.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/IntelligenceAnalyze.java @@ -34,13 +34,13 @@ public class IntelligenceAnalyze extends BaseModel { @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate iaEdate; @Column(name = "fi_cnt") - private Integer fiCnt; + private Integer fiCnt=0; @Column(name = "fa_cnt") - private Integer faCnt; + private Integer faCnt=0; @Column(name = "work_cnt") - private Integer workCnt; + private Integer workCnt=0; @Column(name = "arrest_cnt") - private Integer arrestCnt; + private Integer arrestCnt=0; @Column(name = "foreign_affairs") private String foreignAffairs; @Column(name = "work") @@ -71,6 +71,8 @@ public class IntelligenceAnalyze extends BaseModel { @Transient private String userType; @Transient + private List apprvList; + @Transient private List affairList; @Transient private Integer totalCnt; @@ -84,5 +86,7 @@ public class IntelligenceAnalyze extends BaseModel { private Integer joCnt; @Transient private Integer muCnt; + @Transient + private Integer iaTotal; } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/IntelligenceAnalyzeApprv.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/IntelligenceAnalyzeApprv.java new file mode 100644 index 00000000..d1eb630e --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/IntelligenceAnalyzeApprv.java @@ -0,0 +1,49 @@ +package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model; + +import lombok.*; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; +import java.time.LocalDateTime; + +@Getter +@Setter +@Entity +@NoArgsConstructor +@DynamicInsert +@DynamicUpdate +@Table(name = "intelligence_analyze_apprv") +@IdClass(IntelligenceAnalyzeApprv.IntelligenceAnalyzeApprvId.class) +public class IntelligenceAnalyzeApprv { + @Id + @Column(name = "ia_key") + private Integer iaKey; + @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 = "opinion") + private String opinion; + @Column(name = "Instruction") + private String Instruction; + @Column(name = "save_dt") + private LocalDateTime saveDt; + + @Embeddable + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class IntelligenceAnalyzeApprvId implements Serializable { + private Integer iaKey; + private Integer apprvSeq; + } +} diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/repository/IntelligenceAnalyzeApprvRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/repository/IntelligenceAnalyzeApprvRepository.java new file mode 100644 index 00000000..f915b8b3 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/repository/IntelligenceAnalyzeApprvRepository.java @@ -0,0 +1,18 @@ +package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository; + +import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.IntelligenceAnalyzeApprv; + +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.Optional; + + +public interface IntelligenceAnalyzeApprvRepository extends JpaRepository { + + List findByIaKey(Integer iaKey); + + Optional findTopByIaKeyOrderByApprvSeqDesc(Integer iaKey); + + +} diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/service/IntelligenceNetworkService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/service/IntelligenceNetworkService.java index f4c8b4f6..6833975b 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/service/IntelligenceNetworkService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/service/IntelligenceNetworkService.java @@ -5,11 +5,13 @@ import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.config.FileInfo; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.mapper.IntelligenceNetworkMapper; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.IntelligenceAnalyze; +import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.IntelligenceAnalyzeApprv; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.IntelligenceAnalyzeToAffair; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlan; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlanApprv; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlanFile; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlanFile.OperationPlanFileId; +import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository.IntelligenceAnalyzeApprvRepository; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository.IntelligenceAnalyzeRepository; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository.IntelligenceAnalyzeToAffairRepository; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository.OperationPlanApprvRepository; @@ -34,6 +36,7 @@ public class IntelligenceNetworkService extends BaseService { private final OperationPlanRepository operationPlanRepository; private final IntelligenceAnalyzeRepository intelligenceAnalyzeRepository; private final IntelligenceAnalyzeToAffairRepository intelligenceAnalyzeToAffairRepository; + private final IntelligenceAnalyzeApprvRepository intelligenceAnalyzeApprvRepository; private final IntelligenceNetworkMapper intelligenceNetworkMapper; @Transactional @@ -153,6 +156,49 @@ public class IntelligenceNetworkService extends BaseService { } return iaKey; } + + public List selectIntelligenceAnalyzeList(IntelligenceAnalyze ia) { + return intelligenceNetworkMapper.selectIntelligenceAnalyzeList(ia); + } + + public Integer selectIntelligenceAnalyzeListCnt(IntelligenceAnalyze ia) { + return intelligenceNetworkMapper.selectIntelligenceAnalyzeListCnt(ia); + } + + public IntelligenceAnalyze selectIntelligenceAnalyze(IntelligenceAnalyze ia) { + return intelligenceNetworkMapper.selectIntelligenceAnalyze(ia); + } + + public List selectIntelligenceAnalyzeAffairKey(IntelligenceAnalyze ia) { + return intelligenceNetworkMapper.selectIntelligenceAnalyzeAffairKey(ia); + } + + public List selectIntelligenceAnalyzeApprv(IntelligenceAnalyze ia) { + return intelligenceAnalyzeApprvRepository.findByIaKey(ia.getIaKey()); + } + + @Transactional + public Integer intelligenceAnalyzeChange(IntelligenceAnalyzeApprv apprv) { + IntelligenceAnalyze saveIntelligenceAnalyze = intelligenceAnalyzeRepository.findById(apprv.getIaKey()).orElse(null); + saveIntelligenceAnalyze.setIaState(apprv.getState()); + IntelligenceAnalyzeApprv lastApprv = intelligenceAnalyzeApprvRepository.findTopByIaKeyOrderByApprvSeqDesc(apprv.getIaKey()).orElse(null); + apprv.setApprvSeq(lastApprv==null?1:lastApprv.getApprvSeq()+1); + intelligenceAnalyzeApprvRepository.save(apprv); + + switch (apprv.getState()){ + case "DST003": + case "DST005": + // 반려시 작성자에게 반려 알림 발송 + userAlarmService.sendAlarmToWrtUser(saveIntelligenceAnalyze.getIaKey(), saveIntelligenceAnalyze.getWrtUserSeq(), 34,"외사첩보망 견문관리 운영실적에 문서가 반려되었습니다."); + break; + case "DST004": + case "DST006": + // 부장승인시 작성자에게 승인 알림 발송 + userAlarmService.sendAlarmToWrtUser(saveIntelligenceAnalyze.getIaKey(), saveIntelligenceAnalyze.getWrtUserSeq(), 34,"외사첩보망 견문관리 운영실적에 문서가 승인되었습니다."); + break; + } + return apprv.getIaKey(); + } diff --git a/src/main/resources/mybatisMapper/AffairMapper.xml b/src/main/resources/mybatisMapper/AffairMapper.xml index ada4fc64..63f0b927 100644 --- a/src/main/resources/mybatisMapper/AffairMapper.xml +++ b/src/main/resources/mybatisMapper/AffairMapper.xml @@ -42,9 +42,14 @@ and a.wrt_dt <= #{endDate}::date+1 - - and c.rating_organ = #{ratingOrgan} - + + + and c.rating_organ = #{ratingOrgan} + + + and (c.organ_up != 'T' or c.organ_up is null) + + and a.wrt_organ in diff --git a/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml b/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml index a7079373..cb78929f 100644 --- a/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml +++ b/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml @@ -123,4 +123,281 @@ + + + + and wrt_user_seq = #{wrtUserSeq} + + + and wrt_organ = #{wrtOrgan} + + + and ia_state = #{iaState} + + + and wrt_dt >= #{startDate}::date + + + and wrt_dt <= #{endDate}::date+1 + + + and wrt_organ in + + #{organCd} + + + + + and ia_state in ('DST002') + + + and ia_state in ('DST003', 'DST004', 'DST005', 'DST006') + + + and ia_state in ('DST003', 'DST004', 'DST005', 'DST006') + + + and ia_state in ('DST002') + + + and ia_state in ('DST003', 'DST004', 'DST005', 'DST006') + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/js/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyze.js b/src/main/resources/static/js/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyze.js index 631d2764..74d719b8 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyze.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyze.js @@ -7,23 +7,23 @@ $(function(){ }) $(document).on('click', '#allTab', function (){ - location.href = "/intelligenceNetwork/operationPlanList/all"; + location.href = "/intelligenceNetwork/intelligenceAnalyzeList/all"; }) $(document).on('click', '#stayTab', function (){ - location.href = "/intelligenceNetwork/operationPlanList/stay"; + location.href = "/intelligenceNetwork/intelligenceAnalyzeList/stay"; }) $(document).on('click', '#commitTab', function (){ - location.href = "/intelligenceNetwork/operationPlanList/commit"; + location.href = "/intelligenceNetwork/intelligenceAnalyzeList/commit"; }) $(document).on('click', '#addBtn', function (){ getIntelligenceAnalyzeEditModal(null); }) -function getIntelligenceAnalyzeEditModal(opKey){ +function getIntelligenceAnalyzeEditModal(iaKey){ $.ajax({ url: '/intelligenceNetwork/intelligenceAnalyzeEditModal', - data: {opKey: opKey}, + data: {iaKey: iaKey}, type: 'GET', dataType:"html", success: function(html){ @@ -43,8 +43,11 @@ function getIntelligenceAnalyzeEditModal(opKey){ } $(document).on('click', '#affairModalBtn', function (){ - const workStartDt = $("#iaSdate").val() - const workEndDt = $("#iaEdate").val() + const affairKey = $("input[name=affairList]"); + console.log(affairKey); + console.log(affairKey.val()); + const workStartDt = $("#iaSdate").val(); + const workEndDt = $("#iaEdate").val(); if(!workStartDt||!workEndDt){ alert("실적기간을 입력해주세요."); }else{ @@ -54,12 +57,19 @@ $(document).on('click', '#affairModalBtn', function (){ startDate: workStartDt, endDate: workEndDt, affairCategory:"CAT216", + wrtUserSeq:$("input[name=wrtUserSeq]").val(), + wrtOrgan:$("input[name=wrtOrgan]").val(), affairStatus:"DST006" }, type: 'GET', dataType:"html", success: function(html){ - $("#affairListModalContent").empty().append(html) + $("#affairListModalContent").empty().append(html); + if(affairKey.val() != ""){ + for(var i=0; i - - + + + + + + + + + + + + + + + + - + @@ -169,9 +183,9 @@ -