From 5e582fe6b8f0ecbdaf21ca31730cde4a08af4f2d Mon Sep 17 00:00:00 2001 From: hansha Date: Tue, 16 Apr 2024 16:31:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E3=80=81=E5=B7=A1=E6=9F=A5=E8=AE=B0=E5=BD=95=E7=AD=89=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../szxc/controller/SzxcButieController.java | 27 +++++++++---------- .../szxc/controller/SzxcHelpController.java | 27 +++++++++---------- .../controller/SzxcVisitRecardController.java | 27 +++++++++---------- .../controller/SzxcWishManageController.java | 27 +++++++++---------- .../controller/SzxcWorkRecardController.java | 27 +++++++++---------- .../controller/SzxcXcRecardController.java | 27 +++++++++---------- .../service/impl/SzxcButieServiceImpl.java | 2 ++ .../service/impl/SzxcHelpServiceImpl.java | 11 +++++--- .../service/impl/SzxcJmInfoServiceImpl.java | 1 + .../impl/SzxcVisitRecardServiceImpl.java | 11 +++++--- .../impl/SzxcWishManageServiceImpl.java | 2 ++ .../impl/SzxcWorkRecardServiceImpl.java | 11 +++++--- .../service/impl/SzxcXcRecardServiceImpl.java | 11 +++++--- .../resources/mapper/szxc/SzxcButieMapper.xml | 8 ++++-- .../resources/mapper/szxc/SzxcHelpMapper.xml | 6 ++++- .../mapper/szxc/SzxcJmInfoMapper.xml | 8 +++--- .../mapper/szxc/SzxcVisitRecardMapper.xml | 8 ++++-- .../mapper/szxc/SzxcWishManageMapper.xml | 11 ++++++-- .../mapper/szxc/SzxcWorkRecardMapper.xml | 8 ++++-- .../mapper/szxc/SzxcXcRecardMapper.xml | 8 ++++-- 20 files changed, 153 insertions(+), 115 deletions(-) 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 72c8e73..8c082ec 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 @@ -1,25 +1,19 @@ package com.ruoyi.szxc.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -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.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.szxc.domain.SzxcButie; import com.ruoyi.szxc.service.ISzxcButieService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 补贴管理Controller @@ -77,6 +71,11 @@ public class SzxcButieController extends BaseController @PostMapping public AjaxResult add(@RequestBody SzxcButie szxcButie) { + //根据前端传递过来的部门存储，如果没传则存储当前用户的部门 + if(szxcButie.getDeptId()==null){ + szxcButie.setDeptId(getDeptId()); + } + szxcButie.setUserId(getUserId()); 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 7f96966..07f6ff1 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 @@ -1,25 +1,19 @@ package com.ruoyi.szxc.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -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.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.szxc.domain.SzxcHelp; import com.ruoyi.szxc.service.ISzxcHelpService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 帮办事Controller @@ -77,6 +71,11 @@ public class SzxcHelpController extends BaseController @PostMapping public AjaxResult add(@RequestBody SzxcHelp szxcHelp) { + //根据前端传递过来的部门存储，如果没传则存储当前用户的部门 + if(szxcHelp.getDeptId()==null){ + szxcHelp.setDeptId(getDeptId()); + } + szxcHelp.setUserId(getUserId()); 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 33b957b..d2aa93e 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 @@ -1,25 +1,19 @@ package com.ruoyi.szxc.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -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.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.szxc.domain.SzxcVisitRecard; import com.ruoyi.szxc.service.ISzxcVisitRecardService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 走访记录Controller @@ -77,6 +71,11 @@ public class SzxcVisitRecardController extends BaseController @PostMapping public AjaxResult add(@RequestBody SzxcVisitRecard szxcVisitRecard) { + //根据前端传递过来的部门存储，如果没传则存储当前用户的部门 + if(szxcVisitRecard.getDeptId()==null){ + szxcVisitRecard.setDeptId(getDeptId()); + } + szxcVisitRecard.setUserId(getUserId()); 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 4a9390b..b2968fc 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 @@ -1,25 +1,19 @@ package com.ruoyi.szxc.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -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.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.szxc.domain.SzxcWishManage; import com.ruoyi.szxc.service.ISzxcWishManageService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 心愿管理Controller @@ -77,6 +71,11 @@ public class SzxcWishManageController extends BaseController @PostMapping public AjaxResult add(@RequestBody SzxcWishManage szxcWishManage) { + //根据前端传递过来的部门存储，如果没传则存储当前用户的部门 + if(szxcWishManage.getDeptId()==null){ + szxcWishManage.setDeptId(getDeptId()); + } + szxcWishManage.setUserId(getUserId()); 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 dc8bbb3..f205f93 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 @@ -1,25 +1,19 @@ package com.ruoyi.szxc.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -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.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.szxc.domain.SzxcWorkRecard; import com.ruoyi.szxc.service.ISzxcWorkRecardService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 工作记录Controller @@ -77,6 +71,11 @@ public class SzxcWorkRecardController extends BaseController @PostMapping public AjaxResult add(@RequestBody SzxcWorkRecard szxcWorkRecard) { + //根据前端传递过来的部门存储，如果没传则存储当前用户的部门 + if(szxcWorkRecard.getDeptId()==null){ + szxcWorkRecard.setDeptId(getDeptId()); + } + szxcWorkRecard.setUserId(getUserId()); 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 800c5c5..c177284 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 @@ -1,25 +1,19 @@ package com.ruoyi.szxc.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -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.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.szxc.domain.SzxcXcRecard; import com.ruoyi.szxc.service.ISzxcXcRecardService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 巡查记录Controller @@ -77,6 +71,11 @@ public class SzxcXcRecardController extends BaseController @PostMapping public AjaxResult add(@RequestBody SzxcXcRecard szxcXcRecard) { + //根据前端传递过来的部门存储，如果没传则存储当前用户的部门 + if(szxcXcRecard.getDeptId()==null){ + szxcXcRecard.setDeptId(getDeptId()); + } + szxcXcRecard.setUserId(getUserId()); return toAjax(szxcXcRecardService.insertSzxcXcRecard(szxcXcRecard)); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcButieServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcButieServiceImpl.java index 481c32c..1dcdcce 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcButieServiceImpl.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcButieServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.szxc.service.impl; +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.szxc.domain.SzxcButie; import com.ruoyi.szxc.mapper.SzxcButieMapper; @@ -40,6 +41,7 @@ public class SzxcButieServiceImpl implements ISzxcButieService * @return 补贴管理 */ @Override + @DataScope(deptAlias = "b") public List selectSzxcButieList(SzxcButie szxcButie) { return szxcButieMapper.selectSzxcButieList(szxcButie); diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcHelpServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcHelpServiceImpl.java index 4cfd2e9..89a32d6 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcHelpServiceImpl.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcHelpServiceImpl.java @@ -1,12 +1,14 @@ package com.ruoyi.szxc.service.impl; -import java.util.List; +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.szxc.mapper.SzxcHelpMapper; import com.ruoyi.szxc.domain.SzxcHelp; +import com.ruoyi.szxc.mapper.SzxcHelpMapper; import com.ruoyi.szxc.service.ISzxcHelpService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 帮办事Service业务层处理 @@ -39,6 +41,7 @@ public class SzxcHelpServiceImpl implements ISzxcHelpService * @return 帮办事 */ @Override + @DataScope(deptAlias = "h") public List selectSzxcHelpList(SzxcHelp szxcHelp) { return szxcHelpMapper.selectSzxcHelpList(szxcHelp); diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmInfoServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmInfoServiceImpl.java index f1e084f..1dd274e 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmInfoServiceImpl.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmInfoServiceImpl.java @@ -52,6 +52,7 @@ public class SzxcJmInfoServiceImpl implements ISzxcJmInfoService public List selectSzxcJmInfoList(SzxcJmInfo szxcJmInfo) { List szxcJmInfos = szxcJmInfoMapper.selectSzxcJmInfoList(szxcJmInfo); + //按出生年月计算出年龄 szxcJmInfos.forEach(info->{ Date bornDate = info.getBornDate(); int ageByBirth = GetAgeByBirthdayUtil.getAgeByBirth(bornDate); diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcVisitRecardServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcVisitRecardServiceImpl.java index 258c86c..eeba2fb 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcVisitRecardServiceImpl.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcVisitRecardServiceImpl.java @@ -1,12 +1,14 @@ package com.ruoyi.szxc.service.impl; -import java.util.List; +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.szxc.mapper.SzxcVisitRecardMapper; import com.ruoyi.szxc.domain.SzxcVisitRecard; +import com.ruoyi.szxc.mapper.SzxcVisitRecardMapper; import com.ruoyi.szxc.service.ISzxcVisitRecardService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 走访记录Service业务层处理 @@ -39,6 +41,7 @@ public class SzxcVisitRecardServiceImpl implements ISzxcVisitRecardService * @return 走访记录 */ @Override + @DataScope(deptAlias = "v") public List selectSzxcVisitRecardList(SzxcVisitRecard szxcVisitRecard) { return szxcVisitRecardMapper.selectSzxcVisitRecardList(szxcVisitRecard); diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWishManageServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWishManageServiceImpl.java index 26fb0ff..e3572af 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWishManageServiceImpl.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWishManageServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.szxc.service.impl; +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.szxc.domain.SzxcWishManage; import com.ruoyi.szxc.mapper.SzxcWishManageMapper; @@ -40,6 +41,7 @@ public class SzxcWishManageServiceImpl implements ISzxcWishManageService * @return 心愿管理 */ @Override + @DataScope(deptAlias = "w") public List selectSzxcWishManageList(SzxcWishManage szxcWishManage) { return szxcWishManageMapper.selectSzxcWishManageList(szxcWishManage); diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWorkRecardServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWorkRecardServiceImpl.java index 66377f0..a7b47a9 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWorkRecardServiceImpl.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWorkRecardServiceImpl.java @@ -1,12 +1,14 @@ package com.ruoyi.szxc.service.impl; -import java.util.List; +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.szxc.mapper.SzxcWorkRecardMapper; import com.ruoyi.szxc.domain.SzxcWorkRecard; +import com.ruoyi.szxc.mapper.SzxcWorkRecardMapper; import com.ruoyi.szxc.service.ISzxcWorkRecardService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 工作记录Service业务层处理 @@ -39,6 +41,7 @@ public class SzxcWorkRecardServiceImpl implements ISzxcWorkRecardService * @return 工作记录 */ @Override + @DataScope(deptAlias = "w") public List selectSzxcWorkRecardList(SzxcWorkRecard szxcWorkRecard) { return szxcWorkRecardMapper.selectSzxcWorkRecardList(szxcWorkRecard); diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcXcRecardServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcXcRecardServiceImpl.java index 9ead555..e67a7ff 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcXcRecardServiceImpl.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcXcRecardServiceImpl.java @@ -1,12 +1,14 @@ package com.ruoyi.szxc.service.impl; -import java.util.List; +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.szxc.mapper.SzxcXcRecardMapper; import com.ruoyi.szxc.domain.SzxcXcRecard; +import com.ruoyi.szxc.mapper.SzxcXcRecardMapper; import com.ruoyi.szxc.service.ISzxcXcRecardService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 巡查记录Service业务层处理 @@ -39,6 +41,7 @@ public class SzxcXcRecardServiceImpl implements ISzxcXcRecardService * @return 巡查记录 */ @Override + @DataScope(deptAlias = "x") public List selectSzxcXcRecardList(SzxcXcRecard szxcXcRecard) { return szxcXcRecardMapper.selectSzxcXcRecardList(szxcXcRecard); diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcButieMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcButieMapper.xml index 59bca86..6436297 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcButieMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcButieMapper.xml @@ -34,7 +34,7 @@ diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHelpMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHelpMapper.xml index 64f71a7..d17affc 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHelpMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHelpMapper.xml @@ -33,7 +33,7 @@ diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml index dbcbc83..e13e8f0 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml @@ -45,7 +45,7 @@ - + as v and visiter_name like concat('%', #{visiterName}, '%') and submit_date = #{submitDate} @@ -58,9 +58,13 @@ and audit_result = #{auditResult} and audit_reason = #{auditReason} and sh_remark = #{shRemark} - and dept_id = #{deptId} + and dept_name like concat('%', #{deptName}, '%') and user_id = #{userId} + + + ${params.dataScope} + diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWishManageMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWishManageMapper.xml index d5b815b..f1b8fd6 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWishManageMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWishManageMapper.xml @@ -36,7 +36,7 @@ diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWorkRecardMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWorkRecardMapper.xml index 5c7575f..f8b36c4 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWorkRecardMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWorkRecardMapper.xml @@ -35,7 +35,7 @@ diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXcRecardMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXcRecardMapper.xml index bc11a79..f67d99a 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXcRecardMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXcRecardMapper.xml @@ -39,7 +39,7 @@ From 7f41cda86bf11059fed44cb1469e9f6dde67aa34 Mon Sep 17 00:00:00 2001 From: hansha Date: Wed, 17 Apr 2024 09:47:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E3=80=81=E5=B7=A1=E6=9F=A5=E8=AE=B0=E5=BD=95=E7=AD=89=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=98=AF=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysDeptController.java | 30 +++++++++++-------- ruoyi-szxc/pom.xml | 6 ++++ .../szxc/controller/SzxcButieController.java | 10 +++++++ .../szxc/controller/SzxcHelpController.java | 10 +++++++ .../controller/SzxcVisitRecardController.java | 11 ++++++- .../controller/SzxcWishManageController.java | 11 ++++++- .../controller/SzxcWorkRecardController.java | 11 ++++++- .../controller/SzxcXcRecardController.java | 10 +++++++ 8 files changed, 83 insertions(+), 16 deletions(-) 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)); } From e28934f17c3cd6fcdff91902f317aa217d8f26d5 Mon Sep 17 00:00:00 2001 From: hansha Date: Wed, 17 Apr 2024 10:19:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/login.vue | 2 +- ruoyi-ui/src/views/register.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index 06c09d2..96c298a 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -1,7 +1,7 @@