diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/ActivityCaseController.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/ActivityCaseController.java index 0e85cd78..4ed95f1c 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/ActivityCaseController.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/ActivityCaseController.java @@ -2,21 +2,15 @@ package com.dbnt.faisp.main.counterIntelligence.activityCase; import com.dbnt.faisp.main.authMgt.service.AuthMgtService; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; -import com.dbnt.faisp.main.counterIntelligence.activityCase.model.ActivityCase; -import com.dbnt.faisp.main.counterIntelligence.activityCase.model.ActivityCaseApprv; -import com.dbnt.faisp.main.counterIntelligence.activityCase.model.ActivityCaseBoard; -import com.dbnt.faisp.main.counterIntelligence.activityCase.model.ActivityCaseInfo; +import com.dbnt.faisp.main.counterIntelligence.activityCase.model.*; import com.dbnt.faisp.main.counterIntelligence.activityCase.service.ActivityCaseService; -import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceWork; import com.dbnt.faisp.main.userInfo.model.UserInfo; -import com.dbnt.faisp.main.userInfo.service.UserInfoService; 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 @@ -26,7 +20,6 @@ public class ActivityCaseController { private final ActivityCaseService activityCaseService; private final AuthMgtService authMgtService; - private final CodeMgtService codeMgtService; @GetMapping("/activityCaseList") public ModelAndView activityCaseListPage(@AuthenticationPrincipal UserInfo loginUser, ActivityCaseBoard activityCase){ @@ -94,14 +87,14 @@ public class ActivityCaseController { } @GetMapping("/activityCaseSummaryModal") - public ModelAndView activityCaseSummaryModal(@AuthenticationPrincipal UserInfo loginUser, ActivityCaseBoard activityCase){ + public ModelAndView activityCaseSummaryModal(@AuthenticationPrincipal UserInfo loginUser, ActivityCaseSummary activityCase){ ModelAndView mav = new ModelAndView("counterIntelligence/activityCase/activityCaseSummaryModal"); - mav.addObject("activityCaseList", activityCaseService.selectActivityCaseList(activityCase)); + mav.addObject("activityCaseList", activityCaseService.selectActivityCaseInfoList(activityCase.getReceiptKey())); return mav; } @GetMapping("/activityCaseViewModal") - public ModelAndView activityCaseViewModal(@AuthenticationPrincipal UserInfo loginUser, ActivityCaseBoard activityCase){ + public ModelAndView activityCaseViewModal(@AuthenticationPrincipal UserInfo loginUser, ActivityCaseSummary activityCase){ ModelAndView mav = null; ActivityCaseInfo activityCaseInfo = activityCaseService.selectActivityCaseInfo(activityCase.getCaseKey()); switch (activityCaseInfo.getCaseType()){ diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/mapper/ActivityCaseMapper.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/mapper/ActivityCaseMapper.java index 73ca35af..f2fb6874 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/mapper/ActivityCaseMapper.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/mapper/ActivityCaseMapper.java @@ -2,9 +2,7 @@ package com.dbnt.faisp.main.counterIntelligence.activityCase.mapper; import com.dbnt.faisp.main.counterIntelligence.activityCase.model.ActivityCase; import com.dbnt.faisp.main.counterIntelligence.activityCase.model.ActivityCaseBoard; -import com.dbnt.faisp.main.counterIntelligence.model.CiWorkStatistics; -import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceActivity; -import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceWork; +import com.dbnt.faisp.main.counterIntelligence.activityCase.model.ActivityCaseSummary; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -14,10 +12,11 @@ import java.util.Map; @Mapper public interface ActivityCaseMapper { - List selectActivityCaseList(ActivityCaseBoard activityCase); - + List selectActivityCaseList(ActivityCaseBoard activityCase); Integer selectActivityCaseCnt(ActivityCaseBoard activityCase); + List selectActivityCaseInfoList(Integer receiptKey); + Integer selectReceiptNum(int year); Integer selectCaseNum(Map map); } diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseApprv.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseApprv.java index d0f6f45f..8a38fac0 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseApprv.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseApprv.java @@ -25,8 +25,6 @@ public class ActivityCaseApprv { @Id @Column(name = "user_seq") private Integer userSeq; - @Column(name = "apprv_path") - private String apprvPath; @Column(name = "apprv_type") private String apprvType; @Column(name = "og_cd") diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseBoard.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseBoard.java index 76b24702..baee7d1c 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseBoard.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseBoard.java @@ -4,13 +4,9 @@ import com.dbnt.faisp.config.BaseModel; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.List; @Getter @Setter @@ -23,13 +19,12 @@ public class ActivityCaseBoard extends BaseModel { private Integer wrtUserSeq; private String wrtUserGrd; private String wrtUserNm; - private Integer caseKey; - private String caseNum; - private LocalDate reportDate; + private Integer reportCnt; private String caseType; + private String caseNum; private String title; + private LocalDate reportDate; private LocalDateTime wrtDt; - private Integer apprvCnt; - private Integer allCnt; - private Integer fileCnt; + private String suspectNm; + private Integer suspectCnt; } diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseSummary.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseSummary.java new file mode 100644 index 00000000..bb938b8b --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseSummary.java @@ -0,0 +1,35 @@ +package com.dbnt.faisp.main.counterIntelligence.activityCase.model; + +import com.dbnt.faisp.config.BaseModel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@NoArgsConstructor +public class ActivityCaseSummary extends BaseModel { + private Integer receiptKey; + private String receiptNum; + private String wrtOrgan; + private String wrtPart; + private Integer wrtUserSeq; + private String wrtUserGrd; + private String wrtUserNm; + private Integer caseKey; + private String caseNum; + private LocalDate reportDate; + private String caseType; + private String title; + private LocalDateTime wrtDt; + private Integer apprvCnt; + private Integer allCnt; + private Integer fileCnt; +} diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/service/ActivityCaseService.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/service/ActivityCaseService.java index 439a7f45..91a48e04 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/service/ActivityCaseService.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/service/ActivityCaseService.java @@ -29,7 +29,7 @@ public class ActivityCaseService extends BaseService { private final ActivityCaseApprvRepository acaRepository; private final ActivityCaseMapper acMapper; - public List selectActivityCaseList(ActivityCaseBoard activityCase){ + public List selectActivityCaseList(ActivityCaseBoard activityCase){ return acMapper.selectActivityCaseList(activityCase); } public Integer selectActivityCaseCnt(ActivityCaseBoard activityCase){ @@ -135,14 +135,18 @@ public class ActivityCaseService extends BaseService { } private String makeReceiptNum(int year){ - String receiptNum = "00"+acMapper.selectReceiptNum(year); - return year+"-"+receiptNum.substring(receiptNum.length()-3); + String receiptNum = "000"+acMapper.selectReceiptNum(year); + return year+"-"+receiptNum.substring(receiptNum.length()-4); } private String makeCaseNum(int year, String receiptNum){ Map params = new HashMap<>(); params.put("receiptNum", receiptNum); params.put("year", year); - String caseNum = "00"+acMapper.selectCaseNum(params); - return year+"-"+caseNum.substring(caseNum.length()-3); + String caseNum = "000"+acMapper.selectCaseNum(params); + return year+"-"+caseNum.substring(caseNum.length()-4); + } + + public List selectActivityCaseInfoList(Integer receiptKey) { + return acMapper.selectActivityCaseInfoList(receiptKey); } } diff --git a/src/main/resources/mybatisMapper/ActivityCaseMapper.xml b/src/main/resources/mybatisMapper/ActivityCaseMapper.xml index 06f47fc5..01919b65 100644 --- a/src/main/resources/mybatisMapper/ActivityCaseMapper.xml +++ b/src/main/resources/mybatisMapper/ActivityCaseMapper.xml @@ -20,18 +20,18 @@ - and b.report_date >= #{startDate}::date + and c.report_date >= #{startDate}::date - and b.report_date <= #{endDate}::date+1 + and c.report_date <= #{endDate}::date+1 - and b.wrt_dt >= #{startDate}::date + and c.wrt_dt >= #{startDate}::date - and b.wrt_dt <= #{endDate}::date+1 + and c.wrt_dt <= #{endDate}::date+1 @@ -43,6 +43,69 @@ + + + - + + + + + + + + + + + + - - - - - - - - - + diff --git a/src/main/resources/templates/counterIntelligence/activityCase/apprvDiv.html b/src/main/resources/templates/counterIntelligence/activityCase/apprvDiv.html index 917d60dd..ac92ed0a 100644 --- a/src/main/resources/templates/counterIntelligence/activityCase/apprvDiv.html +++ b/src/main/resources/templates/counterIntelligence/activityCase/apprvDiv.html @@ -11,13 +11,6 @@
-
- -
- -
- -
+ +
+ +