xinyilu/PostDischargePatientManage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改测试问题。

Browse Source
This commit is contained in:
haown 2024-07-12 17:26:54 +08:00
parent 71d6ddbb38
commit da0b0d38b4
9 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
postdischarge-admin/src/main/java/com/xinelu/web/controller/system/SysDictDataController.java
View File

@ -34,7 +34,6 @@ public class SysDictDataController extends BaseController {
@Resource
private ISysDictTypeService dictTypeService;
@PreAuthorize("@ss.hasPermi('system:dict:list')")
@GetMapping("/list")
public TableDataInfo list(SysDictData dictData) {
startPage();
@ -42,7 +41,6 @@ public class SysDictDataController extends BaseController {
return getDataTable(list);
}
@PreAuthorize("@ss.hasPermi('system:dict:list')")
@GetMapping("/getList")
public R<List<SysDictData>> getList(SysDictData dictData) {
List<SysDictData> list = dictDataService.selectDictDataList(dictData);

2
postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandainfo/PropagandaInfoController.java
View File

@ -46,7 +46,6 @@ public class PropagandaInfoController extends BaseController {
* 查询宣教库管理列表
*/
@ApiOperation("分页查询宣教库管理列表")
@PreAuthorize("@ss.hasPermi('manage:propaganda:list')")
@GetMapping("/list")
public TableDataInfo list(PropagandaInfoDto propagandaInfo) {
startPage();
@ -70,7 +69,6 @@ public class PropagandaInfoController extends BaseController {
* 获取宣教库管理详细信息
*/
@ApiOperation("根据id获取宣教库管理详细信息")
@PreAuthorize("@ss.hasPermi('manage:propaganda:query')")
@GetMapping(value = "/{id}")
public R<PropagandaMaterialsVo> getInfo(@PathVariable("id") Long id) {
return R.ok(propagandaInfoService.selectPropagandaInfoById(id));

2
postdischarge-manage/src/main/java/com/xinelu/manage/controller/questioninfo/QuestionInfoController.java
View File

@ -40,7 +40,6 @@ public class QuestionInfoController extends BaseController {
/**
* 查询问卷基本信息列表
*/
@PreAuthorize("@ss.hasPermi('system:question:list')")
@GetMapping("/list")
public TableDataInfo list(QuestionInfoDto questionInfo) {
startPage();
@ -63,7 +62,6 @@ public class QuestionInfoController extends BaseController {
/**
* 获取问卷基本信息详细信息
*/
@PreAuthorize("@ss.hasPermi('system:question:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
if (Objects.isNull(id)) {

1
postdischarge-manage/src/main/java/com/xinelu/manage/controller/scriptInfo/ScriptInfoController.java
View File

@ -40,7 +40,6 @@ public class ScriptInfoController extends BaseController {
* 查询话术信息列表
*/
@ApiOperation("查询话术信息列表")
@PreAuthorize("@ss.hasPermi('manage:script:list')")
@GetMapping("/list")
public TableDataInfo list(ScriptInfoDto scriptInfo) {
startPage();

1
postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java
View File

@ -53,7 +53,6 @@ public class ServicePackageController extends BaseController {
* 查询服务包基础信息列表
*/
@ApiOperation("查询服务包基础信息列表")
@PreAuthorize("@ss.hasPermi('manage:servicepackage:list')")
@GetMapping("/getList")
public R<List<ServicePackageVO>> getList(ServicePackageDto servicePackage) {
return R.ok(servicePackageService.selectList(servicePackage));

18
postdischarge-manage/src/main/java/com/xinelu/manage/controller/textmessage/TextMessageController.java
View File

@ -13,16 +13,21 @@ import com.xinelu.manage.dto.textmessage.TextMessageDTO;
import com.xinelu.manage.dto.textmessage.TextMessageTaskDTO;
import com.xinelu.manage.service.textmessage.ITextMessageService;
import com.xinelu.manage.vo.textmessage.TextMessageTaskVO;
import com.xinelu.manage.vo.textmessage.TextMessageVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
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;
/**
* 短信模板信息Controller
@ -41,7 +46,6 @@ public class TextMessageController extends BaseController {
* 查询短信模板信息列表
*/
@ApiOperation("查询短信模板信息列表")
@PreAuthorize("@ss.hasPermi('manage:message:list')")
@GetMapping("/list")
public TableDataInfo list(TextMessageDTO textMessageDTO) {
PageDomain pageDomain = TableSupport.buildPageRequest();

1
postdischarge-manage/src/main/java/com/xinelu/manage/controller/wechattemplate/WechatTemplateController.java
View File

@ -42,7 +42,6 @@ public class WechatTemplateController extends BaseController {
* 查询微信模板信息列表
*/
@ApiOperation("查询微信模板信息列表")
@PreAuthorize("@ss.hasPermi('manage:template:list')")
@GetMapping("/list")
public TableDataInfo list(WechatTemplateDTO wechatTemplateDto) {
startPage();

4
postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java
View File

@ -719,12 +719,12 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout
signPatientManageRouteNode.setQuestionExpirationDate(Objects.isNull(routeNode.getQuestionExpirationDate()) ? null : routeNode.getQuestionExpirationDate());
signPatientManageRouteNode.setPhoneDialMethod(StringUtils.isBlank(routeNode.getPhoneDialMethod()) ? null : routeNode.getPhoneDialMethod());
}
if (Objects.nonNull(routeNode) && TaskContentEnum.PROPAGANDA_ARTICLE.getInfo().equals(routeNode.getTaskType())) {
if (Objects.nonNull(routeNode) && TaskNodeTypeEnum.PROPAGANDA_ARTICLE.getInfo().equals(routeNode.getTaskNodeType())) {
signPatientManageRouteNode.setPropagandaInfoId(Objects.isNull(routeNode.getPropagandaInfoId()) ? null : routeNode.getPropagandaInfoId());
signPatientManageRouteNode.setPropagandaTitle(StringUtils.isBlank(routeNode.getPropagandaTitle()) ? null : routeNode.getPropagandaTitle());
signPatientManageRouteNode.setPropagandaContent(StringUtils.isBlank(routeNode.getPropagandaContent()) ? null : routeNode.getPropagandaContent());
}
if (Objects.nonNull(routeNode) && TaskContentEnum.TEXT_REMIND.getInfo().equals(routeNode.getTaskType())) {
if (Objects.nonNull(routeNode) && TaskNodeTypeEnum.TEXT_REMIND.getInfo().equals(routeNode.getTaskNodeType())) {
signPatientManageRouteNode.setTextRemindContent(StringUtils.isBlank(routeNode.getTextRemindContent()) ? null : routeNode.getTextRemindContent());
}
signPatientManageRouteNode.setMessagePushSign(Objects.isNull(routeNode.getMessagePushSign()) ? null : routeNode.getMessagePushSign());

2
postdischarge-system/src/main/java/com/xinelu/system/service/impl/SysUserServiceImpl.java
View File

@ -71,7 +71,7 @@ public class SysUserServiceImpl implements ISysUserService {
* @return 用户信息集合信息
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u.user_id", agencyAlias = "u")
@DataScope(deptAlias = "d", agencyAlias = "u")
public List<SysUser> selectUserList(SysUser user) {
return userMapper.selectUserList(user);
}