hansha
/
szxc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
main
wanglei 2 years ago
parent 080429afc8 e28934f17c
commit dd3a14180f
24 changed files with 238 additions and 133 deletions
Show Stats Download Patch File Download Diff File

30
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
Unescape View File

@ -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);
}
}

6
ruoyi-szxc/pom.xml
Unescape View File

@ -18,5 +18,11 @@
<artifactId>ruoyi-common</artifactId>
<version>${ruoyi.version}</version>
</dependency>
<!-- 系统模块-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-system</artifactId>
<version>${ruoyi.version}</version>
</dependency>
</dependencies>
</project>

37
ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcButieController.java
Unescape View File

@ -1,25 +1,22 @@
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.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 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.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 补贴管理Controller
@ -33,6 +30,8 @@ public class SzxcButieController extends BaseController
{
@Autowired
private ISzxcButieService szxcButieService;
@Resource
private ISysDeptService deptService;
/**
* 查询补贴管理列表
@ -77,6 +76,16 @@ public class SzxcButieController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody SzxcButie szxcButie)
{
//根据前端传递过来的部门存储，如果没传则存储当前用户的部门
if(szxcButie.getDeptId()==null){
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));
}

37
ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcHelpController.java
Unescape View File

@ -1,25 +1,22 @@
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.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 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.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 帮办事Controller
@ -33,6 +30,8 @@ public class SzxcHelpController extends BaseController
{
@Autowired
private ISzxcHelpService szxcHelpService;
@Resource
private ISysDeptService deptService;
/**
* 查询帮办事列表
@ -77,6 +76,16 @@ public class SzxcHelpController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody SzxcHelp szxcHelp)
{
//根据前端传递过来的部门存储，如果没传则存储当前用户的部门
if(szxcHelp.getDeptId()==null){
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));
}

38
ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcVisitRecardController.java
Unescape View File

@ -1,25 +1,22 @@
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.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 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.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 走访记录Controller
@ -33,7 +30,8 @@ public class SzxcVisitRecardController extends BaseController
{
@Autowired
private ISzxcVisitRecardService szxcVisitRecardService;
@Resource
private ISysDeptService deptService;
/**
* 查询走访记录列表
*/
@ -77,6 +75,16 @@ public class SzxcVisitRecardController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody SzxcVisitRecard szxcVisitRecard)
{
//根据前端传递过来的部门存储，如果没传则存储当前用户的部门
if(szxcVisitRecard.getDeptId()==null){
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));
}

38
ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcWishManageController.java
Unescape View File

@ -1,25 +1,22 @@
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.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 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.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 心愿管理Controller
@ -33,7 +30,8 @@ public class SzxcWishManageController extends BaseController
{
@Autowired
private ISzxcWishManageService szxcWishManageService;
@Resource
private ISysDeptService deptService;
/**
* 查询心愿管理列表
*/
@ -77,6 +75,16 @@ public class SzxcWishManageController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody SzxcWishManage szxcWishManage)
{
//根据前端传递过来的部门存储，如果没传则存储当前用户的部门
if(szxcWishManage.getDeptId()==null){
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));
}

38
ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcWorkRecardController.java
Unescape View File

@ -1,25 +1,22 @@
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.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 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.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 工作记录Controller
@ -33,7 +30,8 @@ public class SzxcWorkRecardController extends BaseController
{
@Autowired
private ISzxcWorkRecardService szxcWorkRecardService;
@Resource
private ISysDeptService deptService;
/**
* 查询工作记录列表
*/
@ -77,6 +75,16 @@ public class SzxcWorkRecardController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody SzxcWorkRecard szxcWorkRecard)
{
//根据前端传递过来的部门存储，如果没传则存储当前用户的部门
if(szxcWorkRecard.getDeptId()==null){
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));
}

37
ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXcRecardController.java
Unescape View File

@ -1,25 +1,22 @@
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.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 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.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 巡查记录Controller
@ -33,6 +30,8 @@ public class SzxcXcRecardController extends BaseController
{
@Autowired
private ISzxcXcRecardService szxcXcRecardService;
@Resource
private ISysDeptService deptService;
/**
* 查询巡查记录列表
@ -77,6 +76,16 @@ public class SzxcXcRecardController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody SzxcXcRecard szxcXcRecard)
{
//根据前端传递过来的部门存储，如果没传则存储当前用户的部门
if(szxcXcRecard.getDeptId()==null){
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));
}

2
ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcButieServiceImpl.java
Unescape View File

@ -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<SzxcButie> selectSzxcButieList(SzxcButie szxcButie)
{
return szxcButieMapper.selectSzxcButieList(szxcButie);

11
ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcHelpServiceImpl.java
Unescape View File

@ -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<SzxcHelp> selectSzxcHelpList(SzxcHelp szxcHelp)
{
return szxcHelpMapper.selectSzxcHelpList(szxcHelp);

1
ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmInfoServiceImpl.java
Unescape View File

@ -52,6 +52,7 @@ public class SzxcJmInfoServiceImpl implements ISzxcJmInfoService
public List<SzxcJmInfo> selectSzxcJmInfoList(SzxcJmInfo szxcJmInfo)
{
List<SzxcJmInfo> szxcJmInfos = szxcJmInfoMapper.selectSzxcJmInfoList(szxcJmInfo);
//按出生年月计算出年龄
szxcJmInfos.forEach(info->{
Date bornDate = info.getBornDate();
int ageByBirth = GetAgeByBirthdayUtil.getAgeByBirth(bornDate);

11
ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcVisitRecardServiceImpl.java
Unescape View File

@ -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<SzxcVisitRecard> selectSzxcVisitRecardList(SzxcVisitRecard szxcVisitRecard)
{
return szxcVisitRecardMapper.selectSzxcVisitRecardList(szxcVisitRecard);

2
ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWishManageServiceImpl.java
Unescape View File

@ -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<SzxcWishManage> selectSzxcWishManageList(SzxcWishManage szxcWishManage)
{
return szxcWishManageMapper.selectSzxcWishManageList(szxcWishManage);

11
ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWorkRecardServiceImpl.java
Unescape View File

@ -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<SzxcWorkRecard> selectSzxcWorkRecardList(SzxcWorkRecard szxcWorkRecard)
{
return szxcWorkRecardMapper.selectSzxcWorkRecardList(szxcWorkRecard);

11
ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcXcRecardServiceImpl.java
Unescape View File

@ -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<SzxcXcRecard> selectSzxcXcRecardList(SzxcXcRecard szxcXcRecard)
{
return szxcXcRecardMapper.selectSzxcXcRecardList(szxcXcRecard);

8
ruoyi-szxc/src/main/resources/mapper/szxc/SzxcButieMapper.xml
Unescape View File

@ -34,7 +34,7 @@
</sql>
<select id="selectSzxcButieList" parameterType="SzxcButie" resultMap="SzxcButieResult">
<include refid="selectSzxcButieVo"/>
<include refid="selectSzxcButieVo"/> as b
<where>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="xmTitle != null and xmTitle != ''"> and xm_title = #{xmTitle}</if>
@ -50,9 +50,13 @@
<if test="auditResult != null and auditResult != ''"> and audit_result = #{auditResult}</if>
<if test="auditReason != null and auditReason != ''"> and audit_reason = #{auditReason}</if>
<if test="auditDeptid != null "> and audit_deptid = #{auditDeptid}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
<!--<if test="deptId != null "> and dept_id = #{deptId}</if>-->
<if test="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
<if test="userId != null "> and user_id = #{userId}</if>
<!--数据范围过滤-->
<if test="params.dataScope != null and params.dataScope != ''">
${params.dataScope}
</if>
</where>
</select>

6
ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHelpMapper.xml
Unescape View File

@ -33,7 +33,7 @@
</sql>
<select id="selectSzxcHelpList" parameterType="SzxcHelp" resultMap="SzxcHelpResult">
<include refid="selectSzxcHelpVo"/>
<include refid="selectSzxcHelpVo"/> as h
<where>
<if test="subName != null and subName != ''"> and sub_name like concat('%', #{subName}, '%')</if>
<if test="subDate != null "> and sub_date = #{subDate}</if>
@ -50,6 +50,10 @@
<if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
<if test="userId != null "> and user_id = #{userId}</if>
<!--数据范围过滤-->
<if test="params.dataScope != null and params.dataScope != ''">
${params.dataScope}
</if>
</where>
</select>

8
ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml
Unescape View File

@ -45,7 +45,7 @@
</sql>
<select id="selectSzxcJmInfoList" parameterType="SzxcJmInfo" resultMap="SzxcJmInfoResult">
<include refid="selectSzxcJmInfoVo"/>
<include refid="selectSzxcJmInfoVo"/> as j
<where>
<!--<if test="deptId != null "> and dept_id = #{deptId}</if>-->
<if test="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
@ -76,9 +76,9 @@
<if test="off != null and off != ''"> and off = #{off}</if>
<if test="userId != null "> and user_id = #{userId}</if>
<!-- <if test="deptId != null "> and dept_id = #{deptId}</if>-->
<if test="deptId != null and deptId != 0">
AND (d.dept_id = #{deptId} OR d.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
</if>
<!--<if test="deptId != null and deptId != 0">
AND (j.dept_id = #{deptId} OR j.dept_id IN ( SELECT s.dept_id FROM sys_dept s WHERE find_in_set(#{deptId}, ancestors) ))
</if>-->
<!-- 数据范围过滤 -->
<if test="params.dataScope != null and params.dataScope !=''">
${params.dataScope}

8
ruoyi-szxc/src/main/resources/mapper/szxc/SzxcVisitRecardMapper.xml
Unescape View File

@ -38,7 +38,7 @@
</sql>
<select id="selectSzxcVisitRecardList" parameterType="SzxcVisitRecard" resultMap="SzxcVisitRecardResult">
<include refid="selectSzxcVisitRecardVo"/>
<include refid="selectSzxcVisitRecardVo"/> as v
<where>
<if test="visiterName != null and visiterName != ''"> and visiter_name like concat('%', #{visiterName}, '%')</if>
<if test="submitDate != null "> and submit_date = #{submitDate}</if>
@ -58,9 +58,13 @@
<if test="auditResult != null and auditResult != ''"> and audit_result = #{auditResult}</if>
<if test="auditReason != null and auditReason != ''"> and audit_reason = #{auditReason}</if>
<if test="shRemark != null and shRemark != ''"> and sh_remark = #{shRemark}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
<!--<if test="deptId != null "> and dept_id = #{deptId}</if>-->
<if test="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
<if test="userId != null "> and user_id = #{userId}</if>
<!--数据范围过滤-->
<if test="params.dataScope != null and params.dataScope != ''">
${params.dataScope}
</if>
</where>
</select>

11
ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWishManageMapper.xml
Unescape View File

@ -36,7 +36,7 @@
</sql>
<select id="selectSzxcWishManageList" parameterType="SzxcWishManage" resultMap="SzxcWishManageResult">
<include refid="selectSzxcWishManageVo"/>
<include refid="selectSzxcWishManageVo"/> as w
<where>
<if test="applyName != null and applyName != ''"> and apply_name like concat('%', #{applyName}, '%')</if>
<if test="applyPhone != null and applyPhone != ''"> and apply_phone = #{applyPhone}</if>
@ -54,8 +54,15 @@
<if test="auditResult != null and auditResult != ''"> and audit_result = #{auditResult}</if>
<if test="auditReason != null and auditReason != ''"> and audit_reason = #{auditReason}</if>
<if test="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
<!-- <if test="deptId != null "> and dept_id = #{deptId}</if>-->
<!--<if test="deptId != null and deptId != 0">
AND (w.dept_id = #{deptId} OR w.dept_id IN ( SELECT s.dept_id FROM sys_dept s WHERE find_in_set(#{deptId}, ancestors) ))
</if>-->
<if test="userId != null "> and user_id = #{userId}</if>
<!--数据范围过滤-->
<if test="params.dataScope != null and params.dataScope != ''">
${params.dataScope}
</if>
</where>
</select>

8
ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWorkRecardMapper.xml
Unescape View File

@ -35,7 +35,7 @@
</sql>
<select id="selectSzxcWorkRecardList" parameterType="SzxcWorkRecard" resultMap="SzxcWorkRecardResult">
<include refid="selectSzxcWorkRecardVo"/>
<include refid="selectSzxcWorkRecardVo"/> w
<where>
<if test="workerName != null and workerName != ''"> and worker_name like concat('%', #{workerName}, '%')</if>
<if test="submitDate != null "> and submit_date = #{submitDate}</if>
@ -52,9 +52,13 @@
<if test="auditResult != null and auditResult != ''"> and audit_result = #{auditResult}</if>
<if test="auditReason != null and auditReason != ''"> and audit_reason = #{auditReason}</if>
<if test="shRemark != null and shRemark != ''"> and sh_remark = #{shRemark}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
<!--<if test="deptId != null "> and dept_id = #{deptId}</if>-->
<if test="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
<if test="userId != null "> and user_id = #{userId}</if>
<!--数据范围过滤-->
<if test="params.dataScope != null and params.dataScope != ''">
${params.dataScope}
</if>
</where>
</select>

8
ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXcRecardMapper.xml
Unescape View File

@ -39,7 +39,7 @@
</sql>
<select id="selectSzxcXcRecardList" parameterType="SzxcXcRecard" resultMap="SzxcXcRecardResult">
<include refid="selectSzxcXcRecardVo"/>
<include refid="selectSzxcXcRecardVo"/> as x
<where>
<if test="xcName != null and xcName != ''"> and xc_name like concat('%', #{xcName}, '%')</if>
<if test="submitDate != null "> and submit_date = #{submitDate}</if>
@ -60,9 +60,13 @@
<if test="auditResult != null and auditResult != ''"> and audit_result = #{auditResult}</if>
<if test="auditReason != null and auditReason != ''"> and audit_reason = #{auditReason}</if>
<if test="shRemark != null and shRemark != ''"> and sh_remark = #{shRemark}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
<!--<if test="deptId != null "> and dept_id = #{deptId}</if>-->
<if test="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
<if test="userId != null "> and user_id = #{userId}</if>
<!--数据范围过滤-->
<if test="params.dataScope != null and params.dataScope != ''">
${params.dataScope}
</if>
</where>
</select>

2
ruoyi-ui/src/views/login.vue
Unescape View File

@ -1,7 +1,7 @@
<template>
<div class="login">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">若依后台管理系统</h3>
<h3 class="title">数字乡村管理系统</h3>
<el-form-item prop="username">
<el-input
v-model="loginForm.username"

2
ruoyi-ui/src/views/register.vue
Unescape View File

@ -1,7 +1,7 @@
<template>
<div class="register">
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">若依后台管理系统</h3>
<h3 class="title">数字乡村管理系统</h3>
<el-form-item prop="username">
<el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />

Write Preview
Loading…
Cancel
Save