diff --git a/doc/api.md b/doc/api.md index 40f45e6..29aa78f 100644 --- a/doc/api.md +++ b/doc/api.md @@ -213,7 +213,7 @@ # 诉求登记 ### 1. 列表 - 请求地址 -`GET` `/blade-business/appealReg/list` +`GET` `/blade-business/appealReg/getList` - 请求参数 @@ -232,15 +232,26 @@ "code": 200, "success": true, "data": [ - { - "id": "122555646684684", - "appealUsernames": "张三(身份证号),李四(身份证号)", - "disputeName": "土地纠纷", - "firstRegTime": "2012-05-15 12:30", - "finishTime": "", - "problemDesc": "矛盾描述...........", - "status": 0 - } + { + "id": 4, + "username": "赵文婷", + "cardno": "37234635323******", + "disputeName": "婚恋家庭纠纷", + "firstRegTime": "2023-04-27 00:00:00", + "finishTime": "2023-04-27 00:00:00", + "problemDesc": "咨询独生子女费相关问题。", + "status": 3 + }, + { + "id": 1, + "username": "庄培燕", + "cardno": "37234635323******", + "disputeName": "损害赔偿纠纷", + "firstRegTime": "2023-03-01 00:00:00", + "finishTime": "", + "problemDesc": "来访者为七旬赵大姨,因为村委长期拖欠农民征用口粮地补偿款前来信访,谈话过程中一度情绪崩溃大哭, 经调解员安抚至情绪缓和后离开咨询室。", + "status": 1 + } ], "msg": "操作成功" } @@ -344,7 +355,7 @@ ### 1. 调解记录列表(点击"调解记录") - 请求地址 -`GET` `/blade-business/appealMediate/getList` +`GET` `/blade-business/appealMediate/getMediateList` - 请求参数 @@ -427,7 +438,6 @@ } ``` - ### 3. 根据调解记录id获取详情, 获取 诉求信息, 本次调解记录(参数id指定的调解记录), 所有调解访谈记录列表(带id) - 请求地址 diff --git a/src/main/java/org/springblade/modules/business/controller/AppealMediateController.java b/src/main/java/org/springblade/modules/business/controller/AppealMediateController.java index d68d208..3ba9574 100644 --- a/src/main/java/org/springblade/modules/business/controller/AppealMediateController.java +++ b/src/main/java/org/springblade/modules/business/controller/AppealMediateController.java @@ -22,9 +22,17 @@ import lombok.AllArgsConstructor; import org.springblade.common.constant.CommonConstant; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tenant.annotation.TenantDS; +import org.springblade.core.tool.api.R; +import org.springblade.modules.business.vo.AppealListVO; +import org.springblade.modules.business.vo.AppealMediationVO; +import org.springblade.modules.business.vo.AppealRegVO; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * 控制器 * @@ -38,5 +46,51 @@ import org.springframework.web.bind.annotation.RestController; @Api(value = "诉求调解管理", tags = "诉求调解管理接口") public class AppealMediateController extends BladeController { + /** + * 调解记录列表(点击"调解记录") + * + * @param appealId 诉求ID + * @return + */ + @GetMapping("/getMediateList") + public R getMediateList(String appealId) { + + return null; + } + + /** + * 根据诉求id获取最新的登记信息及所有调解访谈记录列表(点击"诉求调解") + * + * @param appealId 诉求ID + * @return + */ + @GetMapping("/getNewestReg") + public R getNewestReg(String appealId) { + + return null; + } + + /** + * 根据调解记录id获取详情, 获取 诉求信息, 本次调解记录(参数id指定的调解记录), 所有调解访谈记录列表(带id) + * + * @param appealId 诉求ID + * @return + */ + @GetMapping("/detail") + public R detail(String appealId) { + + return null; + } + + /** + * 根据调解记录id获取详情, 获取 诉求信息, 本次调解记录(参数id指定的调解记录), 所有调解访谈记录列表(带id) + * + * @param entity 诉求调解实体 + * @return + */ + @GetMapping("/save") + public R save(@RequestBody AppealMediationVO entity) { + return null; + } } diff --git a/src/main/java/org/springblade/modules/business/controller/AppealRegController.java b/src/main/java/org/springblade/modules/business/controller/AppealRegController.java index d865066..edf46d3 100644 --- a/src/main/java/org/springblade/modules/business/controller/AppealRegController.java +++ b/src/main/java/org/springblade/modules/business/controller/AppealRegController.java @@ -23,10 +23,12 @@ import org.springblade.common.constant.CommonConstant; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tenant.annotation.TenantDS; import org.springblade.core.tool.api.R; -import org.springblade.modules.business.entity.AppealReg; -import org.springblade.modules.business.entity.ServerWindowsDispute; +import org.springblade.modules.business.service.IAppealRegService; +import org.springblade.modules.business.vo.AppealListVO; +import org.springblade.modules.business.vo.AppealRegVO; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; /** @@ -42,6 +44,8 @@ import java.util.Map; @Api(value = "诉求登记管理", tags = "诉求登记管理接口") public class AppealRegController extends BladeController { + private final IAppealRegService regService; + /** * 列表 * @@ -53,9 +57,17 @@ public class AppealRegController extends BladeController { * @param username 代表姓名 * @return */ - @GetMapping("/list") - public R list(String appealStatus, String startTime, String endTime, String appealType, String windowId, String username) { - return null; + @GetMapping("/getList") + public R getList(String appealStatus, String startTime, String endTime, String appealType, String windowId, String username) { + List vos = regService.getList(appealStatus, startTime, endTime, appealType, windowId, username); + + vos.forEach(vo -> { + String cardNo = vo.getCardno(); + + vo.setCardno(cardNo.substring(0, cardNo.length() - 6) + "******"); + }); + + return R.data(vos); } /** @@ -100,7 +112,7 @@ public class AppealRegController extends BladeController { * 保存 */ @PostMapping("/save") - public R save(@RequestBody Map entity) { + public R save(@RequestBody AppealRegVO entity) { return null; } } diff --git a/src/main/java/org/springblade/modules/business/controller/ServerDisputeConfController.java b/src/main/java/org/springblade/modules/business/controller/SwDisputeConfController.java similarity index 84% rename from src/main/java/org/springblade/modules/business/controller/ServerDisputeConfController.java rename to src/main/java/org/springblade/modules/business/controller/SwDisputeConfController.java index 0b9b0fb..e53d516 100644 --- a/src/main/java/org/springblade/modules/business/controller/ServerDisputeConfController.java +++ b/src/main/java/org/springblade/modules/business/controller/SwDisputeConfController.java @@ -5,9 +5,8 @@ import org.springblade.common.constant.CommonConstant; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tenant.annotation.TenantDS; import org.springblade.core.tool.api.R; -import org.springblade.modules.business.entity.ServerWindowsDispute; import org.springblade.modules.business.service.IServerWindowsDisputeService; -import org.springblade.modules.business.vo.ServerWindowsDisputeVO; +import org.springblade.modules.business.vo.SwDisputeVO; import org.springframework.web.bind.annotation.*; /** @@ -19,7 +18,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping(CommonConstant.APPLICATION_NAME_BUSINESS + "/serverDisputeConf") @AllArgsConstructor -public class ServerDisputeConfController extends BladeController { +public class SwDisputeConfController extends BladeController { IServerWindowsDisputeService swDisputeService; @@ -47,7 +46,7 @@ public class ServerDisputeConfController extends BladeController { * 保存 */ @PostMapping("/save") - public R save(@RequestBody ServerWindowsDisputeVO entity) { + public R save(@RequestBody SwDisputeVO entity) { return R.status(swDisputeService.saveEntity(entity)); } diff --git a/src/main/java/org/springblade/modules/business/mapper/AppealRegMapper.java b/src/main/java/org/springblade/modules/business/mapper/AppealRegMapper.java index 235157c..d310f6f 100644 --- a/src/main/java/org/springblade/modules/business/mapper/AppealRegMapper.java +++ b/src/main/java/org/springblade/modules/business/mapper/AppealRegMapper.java @@ -18,6 +18,9 @@ package org.springblade.modules.business.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.springblade.modules.business.entity.AppealReg; +import org.springblade.modules.business.vo.AppealListVO; + +import java.util.List; /** * Mapper 接口 @@ -26,5 +29,5 @@ import org.springblade.modules.business.entity.AppealReg; */ public interface AppealRegMapper extends BaseMapper { - + List getList(String appealStatus, String startTime, String endTime, String appealType, String windowId, String username); } diff --git a/src/main/java/org/springblade/modules/business/mapper/AppealRegMapper.xml b/src/main/java/org/springblade/modules/business/mapper/AppealRegMapper.xml index 6c4145e..458cd77 100644 --- a/src/main/java/org/springblade/modules/business/mapper/AppealRegMapper.xml +++ b/src/main/java/org/springblade/modules/business/mapper/AppealRegMapper.xml @@ -2,4 +2,51 @@ + diff --git a/src/main/java/org/springblade/modules/business/mapper/ServerWindowsDisputeMapper.java b/src/main/java/org/springblade/modules/business/mapper/ServerWindowsDisputeMapper.java index d41194e..60c30e5 100644 --- a/src/main/java/org/springblade/modules/business/mapper/ServerWindowsDisputeMapper.java +++ b/src/main/java/org/springblade/modules/business/mapper/ServerWindowsDisputeMapper.java @@ -20,10 +20,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springblade.modules.business.dto.ServerWindowsDisputeDTO; import org.springblade.modules.business.entity.ServerWindowsDispute; -import org.springblade.modules.business.vo.ServerWindowsDisputeVO; import java.util.List; -import java.util.Map; /** * Mapper 接口 diff --git a/src/main/java/org/springblade/modules/business/service/IAppealRegService.java b/src/main/java/org/springblade/modules/business/service/IAppealRegService.java index 7475ab7..5e2a4e2 100644 --- a/src/main/java/org/springblade/modules/business/service/IAppealRegService.java +++ b/src/main/java/org/springblade/modules/business/service/IAppealRegService.java @@ -17,13 +17,46 @@ package org.springblade.modules.business.service; import org.springblade.core.mp.base.BaseService; +import org.springblade.core.tool.api.R; import org.springblade.modules.business.entity.AppealReg; +import org.springblade.modules.business.vo.AppealListVO; +import org.springblade.modules.business.vo.AppealRegVO; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; /** - * 服务类 + * 服务类 * * @author BladeX */ public interface IAppealRegService extends BaseService { + /** + * 列表 + * + * @param appealStatus 诉求状态 + * @param startTime 登记时间-开始 + * @param endTime 登记时间-结束 + * @param appealType 诉求类型 + * @param windowId 处理窗口ID + * @param username 代表姓名 + * @return + */ + List getList(String appealStatus, String startTime, String endTime, String appealType, String windowId, String username); + + /** + * 根据id获取诉求信息, 上一次调解记录(点击"再次调解") + * + * @param appealId 诉求id + * @return + */ + AppealRegVO getById(String appealId); + + /** + * 保存 + */ + boolean save(AppealRegVO entity); } diff --git a/src/main/java/org/springblade/modules/business/service/IServerWindowsDisputeService.java b/src/main/java/org/springblade/modules/business/service/IServerWindowsDisputeService.java index 58602e7..1fe8bec 100644 --- a/src/main/java/org/springblade/modules/business/service/IServerWindowsDisputeService.java +++ b/src/main/java/org/springblade/modules/business/service/IServerWindowsDisputeService.java @@ -1,12 +1,8 @@ package org.springblade.modules.business.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.springblade.core.tool.api.R; import org.springblade.modules.business.entity.ServerWindowsDispute; -import org.springblade.modules.business.vo.ServerWindowsDisputeVO; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; +import org.springblade.modules.business.vo.SwDisputeVO; import java.util.List; @@ -23,19 +19,19 @@ public interface IServerWindowsDisputeService extends IService getServerWindowList(Long swId); + List getServerWindowList(Long swId); /** * 获取根据id获取详情 * * @param swId 窗口id */ - ServerWindowsDisputeVO detail(Long swId); + SwDisputeVO detail(Long swId); /** * 保存 */ - boolean saveEntity(ServerWindowsDisputeVO vo); + boolean saveEntity(SwDisputeVO vo); /** * 禁用/启用 diff --git a/src/main/java/org/springblade/modules/business/service/impl/AppealRegServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/AppealRegServiceImpl.java index f7ced64..6baf73a 100644 --- a/src/main/java/org/springblade/modules/business/service/impl/AppealRegServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/AppealRegServiceImpl.java @@ -20,8 +20,12 @@ import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.modules.business.entity.AppealReg; import org.springblade.modules.business.mapper.AppealRegMapper; import org.springblade.modules.business.service.IAppealRegService; +import org.springblade.modules.business.vo.AppealListVO; +import org.springblade.modules.business.vo.AppealRegVO; import org.springframework.stereotype.Service; +import java.util.List; + /** * 服务实现类 * @@ -30,4 +34,18 @@ import org.springframework.stereotype.Service; @Service public class AppealRegServiceImpl extends BaseServiceImpl implements IAppealRegService { + @Override + public List getList(String appealStatus, String startTime, String endTime, String appealType, String windowId, String username) { + return baseMapper.getList(appealStatus, startTime, endTime, appealType, windowId, username); + } + + @Override + public AppealRegVO getById(String appealId) { + return null; + } + + @Override + public boolean save(AppealRegVO entity) { + return false; + } } diff --git a/src/main/java/org/springblade/modules/business/service/impl/ServerWindowsDisputeServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/ServerWindowsDisputeServiceImpl.java index dda10b9..8378129 100644 --- a/src/main/java/org/springblade/modules/business/service/impl/ServerWindowsDisputeServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/ServerWindowsDisputeServiceImpl.java @@ -7,7 +7,7 @@ import org.springblade.modules.business.entity.ServerWindowsDispute; import org.springblade.modules.business.mapper.ServerWindowsDisputeMapper; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.modules.business.service.IServerWindowsDisputeService; -import org.springblade.modules.business.vo.ServerWindowsDisputeVO; +import org.springblade.modules.business.vo.SwDisputeVO; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -24,9 +24,9 @@ import java.util.stream.Collectors; public class ServerWindowsDisputeServiceImpl extends BaseServiceImpl implements IServerWindowsDisputeService { @Override - public List getServerWindowList(Long swId) { + public List getServerWindowList(Long swId) { List dtoList = baseMapper.getSwDisputeList(swId); - List voList = new ArrayList<>(); + List voList = new ArrayList<>(); if (Func.isEmpty(dtoList)) { return voList; @@ -38,7 +38,7 @@ public class ServerWindowsDisputeServiceImpl extends BaseServiceImpl dtoList = baseMapper.getSwDisputeList(swId); if (Func.isEmpty(dtoList)) { return null; @@ -62,7 +62,7 @@ public class ServerWindowsDisputeServiceImpl extends BaseServiceImpl