외사활동 목록조회 쿼리 수정

저장시 예외처리 동작 수정
master
강석 최 2023-03-07 09:19:41 +09:00
parent 2d79466c8c
commit ccaec40ca6
3 changed files with 16 additions and 5 deletions

View File

@ -39,6 +39,7 @@ public class ActivityCaseController {
mav.addObject("ogCd", loginUser.getOgCd()); mav.addObject("ogCd", loginUser.getOgCd());
activityCase.setWrtOrgan(loginUser.getOgCd()); activityCase.setWrtOrgan(loginUser.getOgCd());
activityCase.setQueryInfo(); activityCase.setQueryInfo();
activityCase.setDownOrganCdList(loginUser.getDownOrganCdList());
mav.addObject("activityCaseList", activityCaseService.selectActivityCaseList(activityCase)); mav.addObject("activityCaseList", activityCaseService.selectActivityCaseList(activityCase));
activityCase.setContentCnt(activityCaseService.selectActivityCaseCnt(activityCase)); activityCase.setContentCnt(activityCaseService.selectActivityCaseCnt(activityCase));
activityCase.setPaginationInfo(); activityCase.setPaginationInfo();

View File

@ -73,11 +73,15 @@ public class ActivityCaseService extends BaseService {
activityCaseInfo.setWrtDt(LocalDateTime.now()); activityCaseInfo.setWrtDt(LocalDateTime.now());
Integer caseKey = aciRepository.save(activityCaseInfo).getCaseKey(); Integer caseKey = aciRepository.save(activityCaseInfo).getCaseKey();
deleteActivityCaseFile(caseKey, deleteFileSeq); deleteActivityCaseFile(caseKey, deleteFileSeq);
saveUploadFiles(caseKey, activityCaseInfo.getMultipartFileList()); if(activityCaseInfo.getMultipartFileList()!=null && activityCaseInfo.getMultipartFileList().size()>0){
for(ActivityCaseApprv apprv: activityCaseInfo.getApprvList()){ saveUploadFiles(caseKey, activityCaseInfo.getMultipartFileList());
apprv.setCaseKey(caseKey); }
if(activityCaseInfo.getApprvList()!=null && activityCaseInfo.getApprvList().size()>0){
for(ActivityCaseApprv apprv: activityCaseInfo.getApprvList()){
apprv.setCaseKey(caseKey);
}
acaRepository.saveAll(activityCaseInfo.getApprvList());
} }
acaRepository.saveAll(activityCaseInfo.getApprvList());
return caseKey; return caseKey;
} }

View File

@ -34,6 +34,12 @@
and b.wrt_dt <= #{endDate}::date+1 and b.wrt_dt <= #{endDate}::date+1
</if> </if>
</if> </if>
<if test="downOrganCdList != null">
and a.wrt_organ in
<foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
#{organCd}
</foreach>
</if>
</where> </where>
</sql> </sql>
<select id="selectActivityCaseList" parameterType="ActivityCaseBoard" resultType="ActivityCaseBoard"> <select id="selectActivityCaseList" parameterType="ActivityCaseBoard" resultType="ActivityCaseBoard">
@ -63,7 +69,7 @@
from activity_case_apprv from activity_case_apprv
group by case_key group by case_key
) c on b.case_key = c.case_key ) c on b.case_key = c.case_key
inner join ( left outer join (
select case_key, count(*) as fileCnt select case_key, count(*) as fileCnt
from activity_case_file from activity_case_file
group by case_key group by case_key