Merge branch 'main' of http://xit.xit-git.com:3000/xit-app/fims

src/main/java/cokr/xit/fims/crdn/CrdnQuery.java

@@ -23,6 +23,7 @@ public class CrdnQuery extends CmmnQuery {
 
 	//현재정보
 	private String currentUserId;
+	private String currentUserAcnt;
 	private String currentInstitute;
 
 	//ID
@@ -96,6 +97,15 @@ public class CrdnQuery extends CmmnQuery {
 		return self();
 	}
 
+	public String getCurrentUserAcnt() {
+		return ifEmpty(currentUserAcnt, () -> null);
+	}
+
+	public <T extends CrdnQuery> T setCurrentUserAcnt(String currentUserAcnt) {
+		this.currentUserAcnt = currentUserAcnt;
+		return self();
+	}
+
 	public String getCurrentInstitute() {
 		return ifEmpty(currentInstitute, () -> null);
 	}

src/main/java/cokr/xit/fims/cvlc/service/CrdnCvlcptService.java

@@ -72,7 +72,7 @@ public interface CrdnCvlcptService {
 	 * @param processType 처리 유형, crdnIDs 단속ID목록
 	 * @return 저장여부
 	 */
-	boolean updateAnswerTargetProcessStatus(String processType, String[] crdnIDs);
+	boolean updateAnswerTargetProcessStatus(String processType, String currentUserInstitute, String currentUserAcnt, String[] crdnIDs);
 
 	/** 민원답변 문구 설정 정보를 조회한다.
 	 * @param crdnQuery 조회 조건

src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java

@@ -162,7 +162,7 @@ public class CrdnCvlcptMainBean extends AbstractComponent {
 	 * @param crdnId 단속 ID
 	 * @return 답변 예정 문구
 	 */
-	public String mappingAnswerWords(String crdnId) {
+	public String mappingAnswerWords(String crdnId, String currentUserInstitute, String currentUserAcnt) {
 
 		DataObject dataInfo = crdnInfoMapper.selectCrdnInfo(crdnId);
 
@@ -199,7 +199,7 @@ public class CrdnCvlcptMainBean extends AbstractComponent {
 
 		String joinWords = head + "\n\n" + body + "\n\n" + tail;
 
-		ManagedUser currentUser = userMapper.getUser(UserInfo.current().getAccount(), UserInfo.current().getInstitute());
+		ManagedUser currentUser = userMapper.getUser(currentUserAcnt, currentUserInstitute);
 
 		String completeWords = this.replaceMacroString(joinWords , currentUser.getPhoneNo(), currentUser.getName());
 

src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java

@@ -246,7 +246,7 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv
 
 		//저장된 답변이 없으면
 		if(ifEmpty(dataObject.string("CVLCPT_PRCS_RSLT_CN"), () -> "").equals("")) {
-			String resultWords = crdnCvlcptMainBean.mappingAnswerWords(query.getCrdnId());
+			String resultWords = crdnCvlcptMainBean.mappingAnswerWords(query.getCrdnId(), query.getCurrentInstitute(), query.getCurrentUserAcnt());
 			dataObject.set("CVLCPT_PRCS_RSLT_CN", resultWords);
 		}
 
@@ -628,7 +628,7 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv
 	}
 
 	@Override
-	public boolean updateAnswerTargetProcessStatus(String processType, String[] crdnIDs) {
+	public boolean updateAnswerTargetProcessStatus(String processType, String currentUserInstitute, String currentUserAcnt, String[] crdnIDs) {
 
 		List<DataObject> targetDataList = crdnCvlcptMapper.selectAnswerTargetList(crdnIDs);
 
@@ -639,7 +639,7 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv
 			if(processType.equals("answerExecute")) {
 				crdnCvlcpt.setCvlcptTrsmCd("04");
 				if(ifEmpty(targetDataList.get(i).string("CVLCPT_PRCS_RSLT_CN"), () -> "").equals("")) {
-					String answerWords = crdnCvlcptMainBean.mappingAnswerWords(targetDataList.get(i).string("CRDN_ID"));
+					String answerWords = crdnCvlcptMainBean.mappingAnswerWords(targetDataList.get(i).string("CRDN_ID"), currentUserInstitute, currentUserAcnt);
 					crdnCvlcpt.setCvlcptPrcsRsltCn(answerWords);
 				}
 			} else if(processType.equals("answerComplete")){

src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java

@@ -78,6 +78,8 @@ public class Cvlc02Controller extends ApplicationController {
 		mav.addObject("taskSeCd", urlTaskSeCd);
 
 		query.setTaskSeCd(urlTaskSeCd);
+		query.setCurrentInstitute(currentUser().getInstitute());
+		query.setCurrentUserAcnt(currentUser().getAccount());
 		DataObject cvlcptInfo = crdnCvlcptService.getAnswerPreview(query);
 		mav.addObject("cvlcptInfo", json ? cvlcptInfo : toJson(cvlcptInfo));
 
@@ -113,8 +115,9 @@ public class Cvlc02Controller extends ApplicationController {
 	public ModelAndView updateAnswerTargetProcessStatus(String processType, String... crdnIDs) {
 
 		boolean saved = false;
-
+		String currentInstitute = currentUser().getInstitute();
-		saved = crdnCvlcptService.updateAnswerTargetProcessStatus(processType, crdnIDs);
+		String currentUserAcnt = currentUser().getAccount();
+		saved = crdnCvlcptService.updateAnswerTargetProcessStatus(processType, currentInstitute, currentUserAcnt, crdnIDs);
 
 		return new ModelAndView("jsonView")
 			.addObject("saved", saved);