diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java index 59e7588..4bd44f7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java @@ -1,18 +1,5 @@ package com.ruoyi.web.controller.system; -import java.util.List; -import org.apache.commons.lang3.ArrayUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; @@ -21,6 +8,13 @@ import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.service.ISysDeptService; +import org.apache.commons.lang3.ArrayUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 部门信息 @@ -129,4 +123,14 @@ public class SysDeptController extends BaseController deptService.checkDeptDataScope(deptId); return toAjax(deptService.deleteDeptById(deptId)); } + /** + * 根据部门id查询父级部门id及名称 + */ + @GetMapping("/getParentByDeptId") + public AjaxResult getDeptByDeptId(SysDept dept) + { + SysDept sysDept = deptService.selectDeptById(dept.getDeptId()); + SysDept parentDept= deptService.selectDeptById(sysDept.getParentId()); + return success(parentDept); + } } diff --git a/ruoyi-szxc/pom.xml b/ruoyi-szxc/pom.xml index 6da1ec0..4e4d938 100644 --- a/ruoyi-szxc/pom.xml +++ b/ruoyi-szxc/pom.xml @@ -18,5 +18,11 @@ ruoyi-common ${ruoyi.version} + + + com.ruoyi + ruoyi-system + ${ruoyi.version} + \ No newline at end of file diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcButieController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcButieController.java index 8c082ec..1224ec2 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcButieController.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcButieController.java @@ -3,15 +3,18 @@ package com.ruoyi.szxc.controller; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.szxc.domain.SzxcButie; import com.ruoyi.szxc.service.ISzxcButieService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -27,6 +30,8 @@ public class SzxcButieController extends BaseController { @Autowired private ISzxcButieService szxcButieService; + @Resource + private ISysDeptService deptService; /** * 查询补贴管理列表 @@ -76,6 +81,11 @@ public class SzxcButieController extends BaseController szxcButie.setDeptId(getDeptId()); } szxcButie.setUserId(getUserId()); + //根据DeptId存储上级为默认审核部门及id + SysDept sysDept = deptService.selectDeptById(szxcButie.getDeptId()); + SysDept parentDept = deptService.selectDeptById(sysDept.getParentId()); + szxcButie.setAuditDeptid(parentDept.getDeptId()); + szxcButie.setAuditName(parentDept.getDeptName()); return toAjax(szxcButieService.insertSzxcButie(szxcButie)); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcHelpController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcHelpController.java index 07f6ff1..8790002 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcHelpController.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcHelpController.java @@ -3,15 +3,18 @@ package com.ruoyi.szxc.controller; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.szxc.domain.SzxcHelp; import com.ruoyi.szxc.service.ISzxcHelpService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -27,6 +30,8 @@ public class SzxcHelpController extends BaseController { @Autowired private ISzxcHelpService szxcHelpService; + @Resource + private ISysDeptService deptService; /** * 查询帮办事列表 @@ -76,6 +81,11 @@ public class SzxcHelpController extends BaseController szxcHelp.setDeptId(getDeptId()); } szxcHelp.setUserId(getUserId()); + //根据DeptId存储上级为默认审核部门及id + SysDept sysDept = deptService.selectDeptById(szxcHelp.getDeptId()); + SysDept parentDept = deptService.selectDeptById(sysDept.getParentId()); + szxcHelp.setHandleDeptid(parentDept.getDeptId()); + szxcHelp.setHandleDept(parentDept.getDeptName()); return toAjax(szxcHelpService.insertSzxcHelp(szxcHelp)); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcVisitRecardController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcVisitRecardController.java index d2aa93e..6a8f3f6 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcVisitRecardController.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcVisitRecardController.java @@ -3,15 +3,18 @@ package com.ruoyi.szxc.controller; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.szxc.domain.SzxcVisitRecard; import com.ruoyi.szxc.service.ISzxcVisitRecardService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -27,7 +30,8 @@ public class SzxcVisitRecardController extends BaseController { @Autowired private ISzxcVisitRecardService szxcVisitRecardService; - + @Resource + private ISysDeptService deptService; /** * 查询走访记录列表 */ @@ -76,6 +80,11 @@ public class SzxcVisitRecardController extends BaseController szxcVisitRecard.setDeptId(getDeptId()); } szxcVisitRecard.setUserId(getUserId()); + //根据DeptId存储上级为默认审核部门及id + SysDept sysDept = deptService.selectDeptById(szxcVisitRecard.getDeptId()); + SysDept parentDept = deptService.selectDeptById(sysDept.getParentId()); + szxcVisitRecard.setAuditDeptid(parentDept.getDeptId()); + szxcVisitRecard.setAuditName(parentDept.getDeptName()); return toAjax(szxcVisitRecardService.insertSzxcVisitRecard(szxcVisitRecard)); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcWishManageController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcWishManageController.java index b2968fc..ec072d3 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcWishManageController.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcWishManageController.java @@ -3,15 +3,18 @@ package com.ruoyi.szxc.controller; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.szxc.domain.SzxcWishManage; import com.ruoyi.szxc.service.ISzxcWishManageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -27,7 +30,8 @@ public class SzxcWishManageController extends BaseController { @Autowired private ISzxcWishManageService szxcWishManageService; - + @Resource + private ISysDeptService deptService; /** * 查询心愿管理列表 */ @@ -76,6 +80,11 @@ public class SzxcWishManageController extends BaseController szxcWishManage.setDeptId(getDeptId()); } szxcWishManage.setUserId(getUserId()); + //根据DeptId存储上级为默认审核部门及id + SysDept sysDept = deptService.selectDeptById(szxcWishManage.getDeptId()); + SysDept parentDept = deptService.selectDeptById(sysDept.getParentId()); + szxcWishManage.setAuditDeptid(parentDept.getDeptId()); + szxcWishManage.setAuditName(parentDept.getDeptName()); return toAjax(szxcWishManageService.insertSzxcWishManage(szxcWishManage)); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcWorkRecardController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcWorkRecardController.java index f205f93..ce47b8d 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcWorkRecardController.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcWorkRecardController.java @@ -3,15 +3,18 @@ package com.ruoyi.szxc.controller; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.szxc.domain.SzxcWorkRecard; import com.ruoyi.szxc.service.ISzxcWorkRecardService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -27,7 +30,8 @@ public class SzxcWorkRecardController extends BaseController { @Autowired private ISzxcWorkRecardService szxcWorkRecardService; - + @Resource + private ISysDeptService deptService; /** * 查询工作记录列表 */ @@ -76,6 +80,11 @@ public class SzxcWorkRecardController extends BaseController szxcWorkRecard.setDeptId(getDeptId()); } szxcWorkRecard.setUserId(getUserId()); + //根据DeptId存储上级为默认审核部门及id + SysDept sysDept = deptService.selectDeptById(szxcWorkRecard.getDeptId()); + SysDept parentDept = deptService.selectDeptById(sysDept.getParentId()); + szxcWorkRecard.setAuditDeptid(parentDept.getDeptId()); + szxcWorkRecard.setAuditName(parentDept.getDeptName()); return toAjax(szxcWorkRecardService.insertSzxcWorkRecard(szxcWorkRecard)); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXcRecardController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXcRecardController.java index c177284..6a0beae 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXcRecardController.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXcRecardController.java @@ -3,15 +3,18 @@ package com.ruoyi.szxc.controller; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.szxc.domain.SzxcXcRecard; import com.ruoyi.szxc.service.ISzxcXcRecardService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -27,6 +30,8 @@ public class SzxcXcRecardController extends BaseController { @Autowired private ISzxcXcRecardService szxcXcRecardService; + @Resource + private ISysDeptService deptService; /** * 查询巡查记录列表 @@ -76,6 +81,11 @@ public class SzxcXcRecardController extends BaseController szxcXcRecard.setDeptId(getDeptId()); } szxcXcRecard.setUserId(getUserId()); + //根据DeptId存储上级为默认审核部门及id + SysDept sysDept = deptService.selectDeptById(szxcXcRecard.getDeptId()); + SysDept parentDept = deptService.selectDeptById(sysDept.getParentId()); + szxcXcRecard.setAuditDeptid(parentDept.getDeptId()); + szxcXcRecard.setAuditName(parentDept.getDeptName()); return toAjax(szxcXcRecardService.insertSzxcXcRecard(szxcXcRecard)); }