diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java index 40b38312..a0f43420 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java @@ -222,4 +222,21 @@ public class EnforcementRegistrationController extends BaseController registration.setParams(params); return ZDResponse.success("查询成功", registration); } + + /** + * 查看预约记录详情 + */ + @GetMapping( "/getByIdToDataFillIn/{id}") + @ResponseBody + public ZDResponse getByIdToDataFillIn(@PathVariable String id) + { + EnforcementRegistration registration = enforcementRegistrationService.getEnforcementRegistrationById(id); + Map params = new HashMap<>(); + LinkageDict tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementItem()); + params.put("lawEnforcementItemText", tmp.getTitle()); + tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementBasis()); + params.put("lawEnforcementBasisText", tmp.getTitle()); + registration.setParams(params); + return ZDResponse.success("查询成功", registration); + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseLawEnforcementController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseLawEnforcementController.java index 76324a08..f88c2553 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseLawEnforcementController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseLawEnforcementController.java @@ -169,4 +169,21 @@ public class EnterpriseLawEnforcementController extends BaseController enfrorcement.setParams(params); return ZDResponse.success("查询成功", enfrorcement); } + + /** + * 查看预约记录详情 + */ + @GetMapping( "/getByIdToDataFillIn/{id}") + @ResponseBody + public ZDResponse getByIdToDataFillIn(@PathVariable String id) + { + EnterpriseLawEnforcement enfrorcement = enterpriseLawEnforcementService.getEnterpriseLawEnforcementById(id); + Map params = new HashMap<>(); + LinkageDict tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckItem()); + params.put("checkItemText", tmp.getTitle()); + tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckRequire()); + params.put("checkRequireText", tmp.getTitle()); + enfrorcement.setParams(params); + return ZDResponse.success("查询成功", enfrorcement); + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java index b4f7b510..5648f2ab 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java @@ -23,6 +23,7 @@ public interface IEnforcementRegistrationService * @return 执法端-执法登记 */ public EnforcementRegistration selectEnforcementRegistrationById(String id); + public EnforcementRegistration getEnforcementRegistrationById(String id); /** * 查询执法端-执法登记列表 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseLawEnforcementService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseLawEnforcementService.java index 3c7ecf42..ff9ff243 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseLawEnforcementService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseLawEnforcementService.java @@ -18,6 +18,7 @@ public interface IEnterpriseLawEnforcementService * @return 企业端-执法部门预约记录 */ public EnterpriseLawEnforcement selectEnterpriseLawEnforcementById(String id); + public EnterpriseLawEnforcement getEnterpriseLawEnforcementById(String id); public EnterpriseLawEnforcement getByUserIdAndZero(); /** diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java index b229afa4..1e3bd917 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java @@ -96,6 +96,11 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat } return enforcementRegistration; } + @Override + public EnforcementRegistration getEnforcementRegistrationById(String id) + { + return enforcementRegistrationMapper.selectEnforcementRegistrationById(id); + } /** * 查询执法端-执法登记列表 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java index 243737d7..1311f781 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java @@ -81,6 +81,11 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc return enterpriseLawEnforcement; } + @Override + public EnterpriseLawEnforcement getEnterpriseLawEnforcementById(String id) + { + return enterpriseLawEnforcementMapper.selectEnterpriseLawEnforcementById(id); + } @Override public EnterpriseLawEnforcement getByUserIdAndZero() {