diff --git a/src/main/java/cokr/xit/fims/base/FimsDepartment.java b/src/main/java/cokr/xit/fims/base/FimsDepartment.java index c82ff5b2..ff33bc48 100644 --- a/src/main/java/cokr/xit/fims/base/FimsDepartment.java +++ b/src/main/java/cokr/xit/fims/base/FimsDepartment.java @@ -11,7 +11,6 @@ import lombok.Setter; @Getter @Setter public class FimsDepartment extends Department { - /** * 민원 연계 구분 코드 */ @@ -116,5 +115,4 @@ public class FimsDepartment extends Department { * 서버 OS */ private String srvrOs; - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/base/service/bean/OgdpBean.java b/src/main/java/cokr/xit/fims/base/service/bean/OgdpBean.java index f51a6aa8..98b4d8f2 100644 --- a/src/main/java/cokr/xit/fims/base/service/bean/OgdpBean.java +++ b/src/main/java/cokr/xit/fims/base/service/bean/OgdpBean.java @@ -36,14 +36,14 @@ public class OgdpBean extends AbstractBean { List ogdpList = new ArrayList<>(); List sggs = sigunguBean.getSigunguList(new SigunguQuery()); - for(DataObject sgg : sggs) { + for (DataObject sgg : sggs) { DataObject noDept = sgg.clone() .set("DEPT_CD", "EMPTY00") .set("DEPT_NM", "(부서 없음)"); ogdpList.add(noDept); List depts = departmentBean.getDepartmentList(new DepartmentQuery().setSggID(sgg.string("SGG_CD"))); - for(DataObject dept : depts) + for (DataObject dept : depts) ogdpList.add(dept.clone()); } @@ -63,20 +63,20 @@ public class OgdpBean extends AbstractBean { public List selectAbleOgdpList(boolean anonymous, String sggCd) { List ogdpList = new ArrayList<>(); SigunguQuery sggQuery = new SigunguQuery(); - if(anonymous) { + if (anonymous) { sggQuery.setSggIDs(sggCd); - } else if(!currentUser().getInstitute().equals("ADMIN00")){ + } else if (!currentUser().getInstitute().equals("ADMIN00")){ sggQuery.setSggIDs(currentUser().getOrgID()); } List sggs = sigunguBean.getSigunguList(sggQuery); - for(DataObject sgg : sggs) { + for (DataObject sgg : sggs) { DataObject noDept = sgg.clone() .set("DEPT_CD", "EMPTY00") .set("DEPT_NM", "(부서 없음)"); ogdpList.add(noDept); List depts = departmentBean.getDepartmentList(new DepartmentQuery().setSggID(sgg.string("SGG_CD"))); - for(DataObject dept : depts) { + for (DataObject dept : depts) { DataObject ogdp = sgg.clone() .set("DEPT_CD", dept.string("DEPT_CD")) .set("DEPT_NM", dept.string("DEPT_NM")); @@ -84,7 +84,7 @@ public class OgdpBean extends AbstractBean { } } - if(!anonymous && "ADMIN00".equals(currentUser().getInstitute())) { + if (!anonymous && "ADMIN00".equals(currentUser().getInstitute())) { ogdpList.add(new DataObject() .set("SGG_CD", "ADMIN") .set("SGG_NM", "관리자 시군구") @@ -117,22 +117,15 @@ public class OgdpBean extends AbstractBean { public void initUserInfo(UserInfo userInfo) { DataObject ogdpInfo = userMapper.getUserInfo(userInfo.getId()); + boolean empty = ogdpInfo == null; Map infoMap = userInfo.getInfo(); - if(ogdpInfo == null) { - infoMap.put("sggCd", ""); - infoMap.put("sggNm", ""); - infoMap.put("instCd", ""); - infoMap.put("instNm", ""); - infoMap.put("deptCd", ""); - infoMap.put("deptNm", ""); - } else { - infoMap.put("sggCd", ogdpInfo.string("SGG_CD")); - infoMap.put("sggNm", ogdpInfo.string("SGG_NM")); - infoMap.put("instCd", ogdpInfo.string("INST_CD")); - infoMap.put("instNm", ogdpInfo.string("INST_NM")); - infoMap.put("deptCd", ogdpInfo.string("DEPT_CD")); - infoMap.put("deptNm", ogdpInfo.string("DEPT_NM")); - } + + infoMap.put("sggCd", !empty ? ogdpInfo.string("SGG_CD") : ""); + infoMap.put("sggNm", !empty ? ogdpInfo.string("SGG_NM") : ""); + infoMap.put("instCd", !empty ? ogdpInfo.string("INST_CD") : ""); + infoMap.put("instNm", !empty ? ogdpInfo.string("INST_NM") : ""); + infoMap.put("deptCd", !empty ? ogdpInfo.string("DEPT_CD") : ""); + infoMap.put("deptNm", !empty ? ogdpInfo.string("DEPT_NM") : ""); userInfo.setInfo(infoMap); } @@ -159,7 +152,7 @@ public class OgdpBean extends AbstractBean { public List getDeptStngList(OgdpQuery query) { // 기본 정렬 if (query.getOrderBy() == null) { - if(query.getFetchSize() > 0) { + if (query.getFetchSize() > 0) { query.setOrderBy("QBODY.DEPT_CD DESC"); } else { query.setOrderBy("D.DEPT_CD DESC"); @@ -173,10 +166,10 @@ public class OgdpBean extends AbstractBean { } public boolean updateDeptStng(FimsDepartment dept) { - return ogdpMapper.updateDeptStng(new DataObject() + return dept != null + && ogdpMapper.updateDeptStng(new DataObject() .set("currentUser", currentUser()) .set("dept", dept) ) == 1; - } } \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/base/web/AuthorityController.java b/src/main/java/cokr/xit/fims/base/web/AuthorityController.java index a67d54ea..aa7a90ab 100644 --- a/src/main/java/cokr/xit/fims/base/web/AuthorityController.java +++ b/src/main/java/cokr/xit/fims/base/web/AuthorityController.java @@ -7,12 +7,10 @@ import cokr.xit.base.security.access.service.AuthorityQuery; @Controller public class AuthorityController extends cokr.xit.base.security.access.web.AuthorityController { - @Override public ModelAndView main() { ModelAndView mav = getAuthorityList(new AuthorityQuery().setFetchAll(true)); mav.setViewName("base/authority/authority-main"); return mav.addObject("authorityList", toJson(mav.getModel().get("authorityList"))); } - } \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/CodeConverter.java b/src/main/java/cokr/xit/fims/cmmn/CodeConverter.java index d7f6ee8a..807ddfaf 100644 --- a/src/main/java/cokr/xit/fims/cmmn/CodeConverter.java +++ b/src/main/java/cokr/xit/fims/cmmn/CodeConverter.java @@ -33,8 +33,8 @@ public class CodeConverter extends AbstractComponent { List commonCodeList = commonCodes.get(codeGroupName); - for(int i = 0, size = commonCodeList != null ? commonCodeList.size() : 0; i < size; i++) { - if(value.replaceAll(Matcher.quoteReplacement(" "), "").equals(commonCodeList.get(i).getValue().replaceAll(Matcher.quoteReplacement(" "), ""))) { + for (int i = 0, size = commonCodeList != null ? commonCodeList.size() : 0; i < size; i++) { + if (value.replaceAll(Matcher.quoteReplacement(" "), "").equals(commonCodeList.get(i).getValue().replaceAll(Matcher.quoteReplacement(" "), ""))) { result = commonCodeList.get(i).getCode(); } } @@ -50,8 +50,8 @@ public class CodeConverter extends AbstractComponent { List commonCodeList = commonCodes.get(codeGroupName); - for(int i = 0, size = commonCodeList != null ? commonCodeList.size() : 0; i < size; i++) { - if(code.equals(commonCodeList.get(i).getCode())) { + for (int i = 0, size = commonCodeList != null ? commonCodeList.size() : 0; i < size; i++) { + if (code.equals(commonCodeList.get(i).getCode())) { result = commonCodeList.get(i).getValue(); } } @@ -81,8 +81,8 @@ public class CodeConverter extends AbstractComponent { List commonCodeList = commonCodes.get(codeGroup); String result = ""; - for(int i = 0; i < commonCodeList.size(); i++) { - if(vltnCd.equals(commonCodeList.get(i).getCode())) { + for (int i = 0; i < commonCodeList.size(); i++) { + if (vltnCd.equals(commonCodeList.get(i).getCode())) { result = commonCodeList.get(i).getValue(); } } @@ -111,11 +111,11 @@ public class CodeConverter extends AbstractComponent { String result = ""; List otherCodeList = getList(type); - if(otherCodeList == null) + if (otherCodeList == null) return result; - for(int i = 0; i < otherCodeList.size(); i++) { - if(uniqId.equals(otherCodeList.get(i).string(type))) { + for (int i = 0; i < otherCodeList.size(); i++) { + if (uniqId.equals(otherCodeList.get(i).string(type))) { result = otherCodeList.get(i).string("NAME"); } } diff --git a/src/main/java/cokr/xit/fims/cmmn/CrdnPayerAddrHstry.java b/src/main/java/cokr/xit/fims/cmmn/CrdnPayerAddrHstry.java index 05756457..a1506af4 100644 --- a/src/main/java/cokr/xit/fims/cmmn/CrdnPayerAddrHstry.java +++ b/src/main/java/cokr/xit/fims/cmmn/CrdnPayerAddrHstry.java @@ -11,25 +11,20 @@ import lombok.Setter; @Getter @Setter public class CrdnPayerAddrHstry extends AbstractEntity { - /** * 주소 이력 ID */ private String addrHstryId; - /** * 단속 ID */ private String crdnId; - /** * 납부자 ID */ private String rtpyrId; - /** * 주소 일련번호 */ private String addrSn; - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/CrdnPayerHstryQuery.java b/src/main/java/cokr/xit/fims/cmmn/CrdnPayerHstryQuery.java index 1eebe88b..1ccc4d0e 100644 --- a/src/main/java/cokr/xit/fims/cmmn/CrdnPayerHstryQuery.java +++ b/src/main/java/cokr/xit/fims/cmmn/CrdnPayerHstryQuery.java @@ -44,5 +44,4 @@ public class CrdnPayerHstryQuery extends CmmnQuery { this.rtpyrId = addrSn; return self(); } - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/CrdnSttsHstry.java b/src/main/java/cokr/xit/fims/cmmn/CrdnSttsHstry.java index cfcac2f8..4451276a 100644 --- a/src/main/java/cokr/xit/fims/cmmn/CrdnSttsHstry.java +++ b/src/main/java/cokr/xit/fims/cmmn/CrdnSttsHstry.java @@ -17,71 +17,56 @@ import lombok.Setter; @Getter @Setter public class CrdnSttsHstry extends AbstractEntity { - /** * 상태 이력 ID */ private String sttsHstryId; - /** * 단속 ID */ private String crdnId; - /** * 이전 상태 코드 */ private String bfrSttsCd; - /** * 이전 상태 변경 일시 */ private String bfrSttsChgDt; - /** * 단속 상태 코드 */ private String crdnSttsCd; - /** * 업무 상세 ID */ private String taskDtlId; - /** * 기타 내용 */ private String etcCn; - /** * 사용 여부 */ private String useYn; - /** * 등록 일시 */ private String regDt; - /** * 등록자 */ private String rgtr; - /** * 수정 일시 */ private String mdfcnDt; - /** * 수정자 */ private String mdfr; - /** * 단속 상태 변경 일시 - TB_CRDN(단속) */ private String crdnSttsChgDt; - -} - +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/CrdnSttsHstryQuery.java b/src/main/java/cokr/xit/fims/cmmn/CrdnSttsHstryQuery.java index 1e04eec8..b2dbdcb5 100644 --- a/src/main/java/cokr/xit/fims/cmmn/CrdnSttsHstryQuery.java +++ b/src/main/java/cokr/xit/fims/cmmn/CrdnSttsHstryQuery.java @@ -54,5 +54,4 @@ public class CrdnSttsHstryQuery extends CmmnQuery { this.taskDtlId = taskDtlId; return self(); } - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/DirectoryStructureToJson.java b/src/main/java/cokr/xit/fims/cmmn/DirectoryStructureToJson.java index 0cdfd47d..38892b80 100644 --- a/src/main/java/cokr/xit/fims/cmmn/DirectoryStructureToJson.java +++ b/src/main/java/cokr/xit/fims/cmmn/DirectoryStructureToJson.java @@ -9,7 +9,7 @@ public class DirectoryStructureToJson { public static Node getNode(File fileNode) throws IOException{ - if(fileNode.isDirectory() || fileNode.getName().equals("files")){ + if (fileNode.isDirectory() || fileNode.getName().equals("files")){ return new Node(fileNode.getName(),"directory", getDirList(fileNode)); }else{ return new Node(fileNode.getName(),"file",null); @@ -19,7 +19,7 @@ public class DirectoryStructureToJson { public static List getDirList(File node) throws IOException{ List children=new ArrayList<>(); - for(File n : node.listFiles()){ + for (File n : node.listFiles()){ children.add(getNode(n)); } return children; @@ -62,4 +62,4 @@ public class DirectoryStructureToJson { this.children = children; } } -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/ExtrArtclStng.java b/src/main/java/cokr/xit/fims/cmmn/ExtrArtclStng.java index 48212a8e..2eb3d05a 100644 --- a/src/main/java/cokr/xit/fims/cmmn/ExtrArtclStng.java +++ b/src/main/java/cokr/xit/fims/cmmn/ExtrArtclStng.java @@ -20,4 +20,4 @@ public class ExtrArtclStng extends AbstractEntity { private String topPstn; //상단 위치 private String widthSz; //영역크기 길이 private String heightSz; //영역크기 높이 -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/ExtrForm.java b/src/main/java/cokr/xit/fims/cmmn/ExtrForm.java index 8a86ee60..9e0e54f9 100644 --- a/src/main/java/cokr/xit/fims/cmmn/ExtrForm.java +++ b/src/main/java/cokr/xit/fims/cmmn/ExtrForm.java @@ -16,4 +16,4 @@ public class ExtrForm extends AbstractEntity { private String mobilePageTmplt; private List extrArtclStngList; private String[] extrFormIDs; -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/ExtrStngQuery.java b/src/main/java/cokr/xit/fims/cmmn/ExtrStngQuery.java index 0db06bd8..8c392854 100644 --- a/src/main/java/cokr/xit/fims/cmmn/ExtrStngQuery.java +++ b/src/main/java/cokr/xit/fims/cmmn/ExtrStngQuery.java @@ -14,5 +14,4 @@ public class ExtrStngQuery extends CmmnQuery { this.tmplatId = tmplatId; return self(); } - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/FimsPrintOption.java b/src/main/java/cokr/xit/fims/cmmn/FimsPrintOption.java index f6f8ad29..f9dbbf85 100644 --- a/src/main/java/cokr/xit/fims/cmmn/FimsPrintOption.java +++ b/src/main/java/cokr/xit/fims/cmmn/FimsPrintOption.java @@ -7,10 +7,8 @@ import lombok.Setter; @Getter @Setter public class FimsPrintOption extends PrintOption { - /** * 업무구분 */ private String taskSeCd; - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/OtptArtclStng.java b/src/main/java/cokr/xit/fims/cmmn/OtptArtclStng.java index 5d34ea1b..2fc4fc3e 100644 --- a/src/main/java/cokr/xit/fims/cmmn/OtptArtclStng.java +++ b/src/main/java/cokr/xit/fims/cmmn/OtptArtclStng.java @@ -26,5 +26,4 @@ public class OtptArtclStng extends AbstractEntity { private String fontSz; //글자크기 private String fontColr; //글자색 private String fontStyle; //글자스타일 - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/OtptForm.java b/src/main/java/cokr/xit/fims/cmmn/OtptForm.java index 6eed04c2..976f3cd5 100644 --- a/src/main/java/cokr/xit/fims/cmmn/OtptForm.java +++ b/src/main/java/cokr/xit/fims/cmmn/OtptForm.java @@ -20,4 +20,4 @@ public class OtptForm extends AbstractEntity { private String otptPhotoCnt; //출력사진 수 private List otptArtclStngList; private String[] otptFormIDs; -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/OtptStngQuery.java b/src/main/java/cokr/xit/fims/cmmn/OtptStngQuery.java index ed3273d7..38f94749 100644 --- a/src/main/java/cokr/xit/fims/cmmn/OtptStngQuery.java +++ b/src/main/java/cokr/xit/fims/cmmn/OtptStngQuery.java @@ -1,12 +1,9 @@ package cokr.xit.fims.cmmn; public class OtptStngQuery extends CmmnQuery { - private static final long serialVersionUID = 1L; - //발송구분코드 private String sndngSeCd; - //출력용지구분코드 private String paperSeCd; @@ -27,5 +24,4 @@ public class OtptStngQuery extends CmmnQuery { this.paperSeCd = paperSeCd; return self(); } - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/OutsourcingArtclStng.java b/src/main/java/cokr/xit/fims/cmmn/OutsourcingArtclStng.java index a60ede7c..504fa5c9 100644 --- a/src/main/java/cokr/xit/fims/cmmn/OutsourcingArtclStng.java +++ b/src/main/java/cokr/xit/fims/cmmn/OutsourcingArtclStng.java @@ -18,4 +18,4 @@ public class OutsourcingArtclStng extends AbstractEntity { private String artclSz; //항목 바이트수 private String paddingDirection; //공백방향 private String formatting; //포매팅 -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/OutsourcingForm.java b/src/main/java/cokr/xit/fims/cmmn/OutsourcingForm.java index df1fc82b..6e54b49e 100644 --- a/src/main/java/cokr/xit/fims/cmmn/OutsourcingForm.java +++ b/src/main/java/cokr/xit/fims/cmmn/OutsourcingForm.java @@ -9,12 +9,10 @@ import lombok.Setter; @Getter @Setter public class OutsourcingForm extends AbstractEntity { - private String outsourcingBscId; private String sggCd; private String taskSeCd; private String sndngSeCd; private List zipArtclStngList; private String[] outsourcingFormIDs; - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/OutsourcingStngQuery.java b/src/main/java/cokr/xit/fims/cmmn/OutsourcingStngQuery.java index eb22b896..cfc66905 100644 --- a/src/main/java/cokr/xit/fims/cmmn/OutsourcingStngQuery.java +++ b/src/main/java/cokr/xit/fims/cmmn/OutsourcingStngQuery.java @@ -1,9 +1,7 @@ package cokr.xit.fims.cmmn; public class OutsourcingStngQuery extends CmmnQuery { - private static final long serialVersionUID = 1L; - //발송구분코드 private String sndngSeCd; @@ -15,5 +13,4 @@ public class OutsourcingStngQuery extends CmmnQuery { this.sndngSeCd = sndngSeCd; return self(); } - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/PredefinedSet.java b/src/main/java/cokr/xit/fims/cmmn/PredefinedSet.java index 1d804481..5d871d86 100644 --- a/src/main/java/cokr/xit/fims/cmmn/PredefinedSet.java +++ b/src/main/java/cokr/xit/fims/cmmn/PredefinedSet.java @@ -1,6 +1,5 @@ package cokr.xit.fims.cmmn; - import lombok.Getter; import lombok.Setter; @@ -23,4 +22,4 @@ public class PredefinedSet { this.downloadData = false; return this; } -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/UnnamedItems.java b/src/main/java/cokr/xit/fims/cmmn/UnnamedItems.java index b440573d..9b68e846 100644 --- a/src/main/java/cokr/xit/fims/cmmn/UnnamedItems.java +++ b/src/main/java/cokr/xit/fims/cmmn/UnnamedItems.java @@ -1,13 +1,13 @@ package cokr.xit.fims.cmmn; public class UnnamedItems { - protected String[] items; public void set(int i, String str) { this.items[i-1] = str; } + public String[] get() { return this.items; } -} +} \ No newline at end of file