gbpark/invyone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[agent-pipeline] pipe-20260328153638-axu2 round-1

Browse Source
This commit is contained in:
DDD1542
2026-03-29 01:52:38 +09:00
parent 8695be1a8d
commit b7f9e51d62
321 changed files with 9701 additions and 9712 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend-spring/src/main/java/com/erp/service/DepartmentService.java
+38 -38
View File
@@ -19,16 +19,16 @@ public class DepartmentService extends BaseService {
public List<Map<String, Object>> getDepartments(String companyCode) {
Map<String, Object> params = new HashMap<>();
params.put("companyCode", companyCode);
params.put("company_code", companyCode);
List<Map<String, Object>> departments = sqlSession.selectList("department.selectDepartments", params);
// member_count를 int로 변환
for (Map<String, Object> dept : departments) {
Object cnt = dept.get("member_count");
if (cnt != null) {
dept.put("memberCount", ((Number) cnt).intValue());
dept.put("member_count", ((Number) cnt).intValue());
} else {
dept.put("memberCount", 0);
dept.put("member_count", 0);
}
}
return departments;
@@ -36,22 +36,22 @@ public class DepartmentService extends BaseService {
public Map<String, Object> getDepartment(String deptCode) {
Map<String, Object> params = new HashMap<>();
params.put("deptCode", deptCode);
params.put("dept_code", deptCode);
return sqlSession.selectOne("department.selectDepartmentByCode", params);
}
@Transactional
public Map<String, Object> createDepartment(String companyCode, Map<String, Object> body) {
// 프론트엔드는 snake_case로 전송 (Node.js 호환)
String deptName = trimString(bodyParam(body, "dept_name", "deptName"));
String deptName = trimString(bodyParam(body, "dept_name", "dept_name"));
if (deptName == null || deptName.isEmpty()) {
throw new IllegalArgumentException("부서명을 입력해주세요.");
}
// 중복 부서명 확인
Map<String, Object> dupParams = new HashMap<>();
dupParams.put("companyCode", companyCode);
dupParams.put("deptName", deptName);
dupParams.put("company_code", companyCode);
dupParams.put("dept_name", deptName);
Map<String, Object> duplicate = sqlSession.selectOne("department.selectDuplicateDeptName", dupParams);
if (duplicate != null) {
throw new DuplicateDeptNameException("\"" + deptName + "\" 부서가 이미 존재합니다.");
@@ -59,7 +59,7 @@ public class DepartmentService extends BaseService {
// 회사명 조회
Map<String, Object> companyParams = new HashMap<>();
companyParams.put("companyCode", companyCode);
companyParams.put("company_code", companyCode);
Map<String, Object> company = sqlSession.selectOne("department.selectCompanyName", companyParams);
String companyName = (company != null && company.get("company_name") != null)
? (String) company.get("company_name")
@@ -71,34 +71,34 @@ public class DepartmentService extends BaseService {
String deptCode = "DEPT_" + nextNumber;
// 부서 생성
Object parentDeptCode = bodyParam(body, "parent_dept_code", "parentDeptCode");
Object parentDeptCode = bodyParam(body, "parent_dept_code", "parent_dept_code");
Map<String, Object> insertParams = new HashMap<>();
insertParams.put("deptCode", deptCode);
insertParams.put("deptName", deptName);
insertParams.put("companyCode", companyCode);
insertParams.put("companyName", companyName);
insertParams.put("parentDeptCode", parentDeptCode);
insertParams.put("dept_code", deptCode);
insertParams.put("dept_name", deptName);
insertParams.put("company_code", companyCode);
insertParams.put("company_name", companyName);
insertParams.put("parent_dept_code", parentDeptCode);
sqlSession.insert("department.insertDepartment", insertParams);
log.info("부서 생성 성공: deptCode={}, deptName={}", deptCode, deptName);
Map<String, Object> findParams = new HashMap<>();
findParams.put("deptCode", deptCode);
findParams.put("dept_code", deptCode);
return sqlSession.selectOne("department.selectDepartmentByCode", findParams);
}
@Transactional
public Map<String, Object> updateDepartment(String deptCode, Map<String, Object> body) {
String deptName = trimString(bodyParam(body, "dept_name", "deptName"));
String deptName = trimString(bodyParam(body, "dept_name", "dept_name"));
if (deptName == null || deptName.isEmpty()) {
throw new IllegalArgumentException("부서명을 입력해주세요.");
}
Object parentDeptCode = bodyParam(body, "parent_dept_code", "parentDeptCode");
Object parentDeptCode = bodyParam(body, "parent_dept_code", "parent_dept_code");
Map<String, Object> params = new HashMap<>();
params.put("deptCode", deptCode);
params.put("deptName", deptName);
params.put("parentDeptCode", parentDeptCode);
params.put("dept_code", deptCode);
params.put("dept_name", deptName);
params.put("parent_dept_code", parentDeptCode);
int updated = sqlSession.update("department.updateDepartment", params);
if (updated == 0) {
@@ -107,7 +107,7 @@ public class DepartmentService extends BaseService {
log.info("부서 수정 성공: deptCode={}", deptCode);
Map<String, Object> findParams = new HashMap<>();
findParams.put("deptCode", deptCode);
findParams.put("dept_code", deptCode);
return sqlSession.selectOne("department.selectDepartmentByCode", findParams);
}
@@ -115,7 +115,7 @@ public class DepartmentService extends BaseService {
public int deleteDepartment(String deptCode) {
// 하위 부서 확인
Map<String, Object> childParams = new HashMap<>();
childParams.put("deptCode", deptCode);
childParams.put("dept_code", deptCode);
Number childCountNum = sqlSession.selectOne("department.selectChildDeptCount", childParams);
int childCount = childCountNum != null ? childCountNum.intValue() : 0;
if (childCount > 0) {
@@ -124,12 +124,12 @@ public class DepartmentService extends BaseService {
// 부서원 삭제
Map<String, Object> memberParams = new HashMap<>();
memberParams.put("deptCode", deptCode);
memberParams.put("dept_code", deptCode);
int memberCount = sqlSession.delete("department.deleteUserDeptByDeptCode", memberParams);
// 부서 삭제
Map<String, Object> deptParams = new HashMap<>();
deptParams.put("deptCode", deptCode);
deptParams.put("dept_code", deptCode);
int deleted = sqlSession.delete("department.deleteDepartment", deptParams);
if (deleted == 0) {
return -1; // not found
@@ -145,13 +145,13 @@ public class DepartmentService extends BaseService {
public List<Map<String, Object>> getDeptMembers(String deptCode) {
Map<String, Object> params = new HashMap<>();
params.put("deptCode", deptCode);
params.put("dept_code", deptCode);
return sqlSession.selectList("department.selectDeptMembers", params);
}
public List<Map<String, Object>> searchUsers(String companyCode, String search) {
Map<String, Object> params = new HashMap<>();
params.put("companyCode", companyCode);
params.put("company_code", companyCode);
params.put("search", "%" + search + "%");
return sqlSession.selectList("department.searchUsers", params);
}
@@ -160,7 +160,7 @@ public class DepartmentService extends BaseService {
public void addDeptMember(String deptCode, String userId) {
// 사용자 존재 확인
Map<String, Object> userParams = new HashMap<>();
userParams.put("userId", userId);
userParams.put("user_id", userId);
Map<String, Object> user = sqlSession.selectOne("department.selectUserById", userParams);
if (user == null) {
throw new IllegalArgumentException("사용자를 찾을 수 없습니다.");
@@ -168,8 +168,8 @@ public class DepartmentService extends BaseService {
// 이미 부서원인지 확인
Map<String, Object> existParams = new HashMap<>();
existParams.put("userId", userId);
existParams.put("deptCode", deptCode);
existParams.put("user_id", userId);
existParams.put("dept_code", deptCode);
Map<String, Object> existing = sqlSession.selectOne("department.selectExistingMember", existParams);
if (existing != null) {
throw new DuplicateMemberException("이미 해당 부서의 부서원입니다.");
@@ -177,14 +177,14 @@ public class DepartmentService extends BaseService {
// 주 부서가 있는지 확인
Map<String, Object> primaryParams = new HashMap<>();
primaryParams.put("userId", userId);
primaryParams.put("user_id", userId);
Map<String, Object> hasPrimary = sqlSession.selectOne("department.selectUserPrimaryDept", primaryParams);
// 부서원 추가
Map<String, Object> insertParams = new HashMap<>();
insertParams.put("userId", userId);
insertParams.put("deptCode", deptCode);
insertParams.put("isPrimary", hasPrimary == null);
insertParams.put("user_id", userId);
insertParams.put("dept_code", deptCode);
insertParams.put("is_primary", hasPrimary == null);
sqlSession.insert("department.insertDeptMember", insertParams);
log.info("부서원 추가 성공: userId={}, deptCode={}", userId, deptCode);
@@ -193,8 +193,8 @@ public class DepartmentService extends BaseService {
@Transactional
public boolean removeDeptMember(String deptCode, String userId) {
Map<String, Object> params = new HashMap<>();
params.put("userId", userId);
params.put("deptCode", deptCode);
params.put("user_id", userId);
params.put("dept_code", deptCode);
int deleted = sqlSession.delete("department.deleteDeptMember", params);
if (deleted == 0) {
return false;
@@ -207,13 +207,13 @@ public class DepartmentService extends BaseService {
public void setPrimaryDept(String deptCode, String userId) {
// 다른 부서의 주 부서 해제
Map<String, Object> clearParams = new HashMap<>();
clearParams.put("userId", userId);
clearParams.put("user_id", userId);
sqlSession.update("department.clearUserPrimaryDept", clearParams);
// 해당 부서를 주 부서로 설정
Map<String, Object> setParams = new HashMap<>();
setParams.put("userId", userId);
setParams.put("deptCode", deptCode);
setParams.put("user_id", userId);
setParams.put("dept_code", deptCode);
sqlSession.update("department.setUserPrimaryDept", setParams);
log.info("주 부서 설정 성공: userId={}, deptCode={}", userId, deptCode);