diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpReserveController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpReserveController.java index 1f24dd21..5b902af4 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpReserveController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpReserveController.java @@ -66,11 +66,19 @@ public class AppEnfCpReserveController extends EfcodeCpReserveController { } /** - * 拒绝预约 + * 拒绝预约(系统匹配专用分支) */ - @PutMapping("/reject/{id}") - public R reject(@PathVariable String id) { - return cpReserveService.rejectReserve(id); + @PutMapping("/rejectBySystem/{id}") + public R rejectBySystem(@PathVariable String id) { + return cpReserveService.rejectReserveBySystem(id); + } + + /** + * 拒绝预约(手动匹配专用分支) + */ + @PutMapping("/rejectByManual/{id}") + public R rejectByManual(@PathVariable String id) { + return cpReserveService.rejectReserveByManual(id); } /** diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpReserveService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpReserveService.java index 756c5fb5..b6c0347d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpReserveService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpReserveService.java @@ -104,12 +104,20 @@ public interface IEfcodeCpReserveService { R approveReserveByManual(String reserveId); /** - * 拒绝预约 + * 拒绝预约(系统匹配专用分支) * * @param reserveId 预约记录ID * @return 操作结果 */ - R rejectReserve(String reserveId); + R rejectReserveBySystem(String reserveId); + + /** + * 拒绝预约(手动匹配专用分支) + * + * @param reserveId 预约记录ID + * @return 操作结果 + */ + R rejectReserveByManual(String reserveId); /** * 查询同组关联计划(同一planGroupId下的其他预约记录关联的计划信息) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpReserveServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpReserveServiceImpl.java index 5eaef7ac..4aabc9fd 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpReserveServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpReserveServiceImpl.java @@ -572,10 +572,29 @@ public class EfcodeCpReserveServiceImpl implements IEfcodeCpReserveService { } /** - * 拒绝预约 + * 拒绝预约(系统匹配专用分支) */ @Override - public R rejectReserve(String reserveId) { + public R rejectReserveBySystem(String reserveId) { + EfcodeCpReserve reserve = baseMapper.selectById(reserveId); + if (reserve == null) { + return R.fail("预约记录不存在"); + } + if (!Long.valueOf(3L).equals(reserve.getOpStatus())) { + return R.fail("该预约记录已被处理"); + } + reserve.setOpStatus(2L); // 拒绝 + reserve.setOpTime(new Date()); + baseMapper.updateById(reserve); + afterOperate(reserve, "reject"); + return R.ok(); + } + + /** + * 拒绝预约(手动匹配专用分支) + */ + @Override + public R rejectReserveByManual(String reserveId) { EfcodeCpReserve reserve = baseMapper.selectById(reserveId); if (reserve == null) { return R.fail("预约记录不存在"); diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/reserve.js b/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/reserve.js index 58082388..7a871cf6 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/reserve.js +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/reserve.js @@ -17,8 +17,11 @@ export const approveReserve = (id, params, success, error) => { return _put(url, {}, success, error); }; -// 预约处理:拒绝 -export const rejectReserve = (id, success, error) => _put(reserveBaseUrl + "/reject/" + id, {}, success, error); +// 预约处理:拒绝(系统匹配专用) +export const rejectReserveBySystem = (id, success, error) => _put(reserveBaseUrl + "/rejectBySystem/" + id, {}, success, error); + +// 预约处理:拒绝(手动预约专用) +export const rejectReserveByManual = (id, success, error) => _put(reserveBaseUrl + "/rejectByManual/" + id, {}, success, error); // 查询同组关联计划(同planGroupId下的其他预约记录关联的计划信息) export const getReserveGroupMembers = (planGroupId, excludeId, success, error) => _get(reserveBaseUrl + "/groupMembers", { planGroupId, excludeId }, success, error); diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue index b625ab65..c01a1ac4 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue @@ -28,7 +28,7 @@ { @@ -100,6 +99,7 @@ const doLogin = (secretName, secretKey) => { useCommon.SET_ORGAN_NAME(response.data.organName || ""); useCommon.SET_BUREAU_UNIT_ID(response.data.bureauUnitId); useCommon.SET_BUREAU_UNIT_NAME(response.data.bureauUnitName || ""); + console.log("bureauUnitName", response.data.bureauUnitName); console.log("enforcement login success", useCommon.userId); router.push({name: "enforcementHome"}); } else { diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/reserve/cp_reserve_manual.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/reserve/cp_reserve_manual.vue index 6ec22915..5ea5cf33 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/reserve/cp_reserve_manual.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/reserve/cp_reserve_manual.vue @@ -98,7 +98,7 @@