From eeae5e71ee971ec6190c3221d993c47212708fd9 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Tue, 11 Jun 2024 11:12:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=BA=AB=E4=BB=BD=E8=AF=81?= =?UTF-8?q?=E5=8F=B7=E5=90=8C=E6=AD=A5=E6=89=A7=E6=B3=95=E7=A0=81=E6=94=B9?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E4=B8=BA=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnforcementRegistrationController.java | 13 +++++++++---- .../src/main/resources/application.yml | 2 +- .../com/zdxt/code/mapper/Zqyjjdm137344Mapper.java | 1 + .../zdxt/code/service/IZqyjjdm137344Service.java | 1 + .../code/service/impl/Zqyjjdm137344ServiceImpl.java | 5 +++++ .../main/resources/mapper/Zfryjdm2405301Mapper.xml | 2 +- .../main/resources/mapper/Zqyjjdm137344Mapper.xml | 5 +++++ 7 files changed, 23 insertions(+), 6 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java index 367ff92b..defe8db8 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java @@ -3,8 +3,10 @@ package com.zdxt.app.controller; import com.zdxt.code.domain.EnforceRegCount; import com.zdxt.code.domain.EnforcementRegistration; import com.zdxt.code.domain.LinkageDict; +import com.zdxt.code.domain.Zqyjjdm137344; import com.zdxt.code.service.IEnforcementRegistrationService; import com.zdxt.code.service.ILinkageDictService; +import com.zdxt.code.service.IZqyjjdm137344Service; import com.zdxt.common.ZDResponse; import com.zdxt.common.controller.BaseController; import com.zdxt.common.util.StringUtils; @@ -35,6 +37,7 @@ public class AppEnforcementRegistrationController extends BaseController @Autowired private IEnforcementRegistrationService enforcementRegistrationService; @Autowired private ILinkageDictService iLinkageDictService; + @Autowired private IZqyjjdm137344Service iZqyjjdm137344Service; @RequiresPermissions("code:registration:view") @GetMapping() @@ -174,10 +177,12 @@ public class AppEnforcementRegistrationController extends BaseController public ZDResponse queryById(@PathVariable("id") String id) { EnforcementRegistration enforcementRegistration = enforcementRegistrationService.selectEnforcementRegistrationById(id); - LinkageDict ld1 = iLinkageDictService.selectLinkageDictById(enforcementRegistration.getLawEnforcementItem()); - LinkageDict ld2 = iLinkageDictService.selectLinkageDictById(enforcementRegistration.getLawEnforcementBasis()); - enforcementRegistration.setLawEnforcementItemText(ld1.getTitle()); - enforcementRegistration.setLawEnforcementBasisText(ld2.getTitle()); + if (null != enforcementRegistration) { + LinkageDict ld1 = iLinkageDictService.selectLinkageDictById(enforcementRegistration.getLawEnforcementItem()); + Zqyjjdm137344 zq = iZqyjjdm137344Service.getZqyjjdmById(enforcementRegistration.getLawEnforcementBasis()); + enforcementRegistration.setLawEnforcementItemText(null==ld1?"":ld1.getTitle()); + enforcementRegistration.setLawEnforcementBasisText(null==zq?"":zq.getLawName()); + } return ZDResponse.success("查询成功",enforcementRegistration); } diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml index 2b54003c..339f6316 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml @@ -208,7 +208,7 @@ security: allowed: - servernames: 10.76.108.1,10.76.108.3,10.132.108.3,139.186.135.156,jdm.szssfj.cn,58.250.157.161 + servernames: 10.76.108.1,10.76.108.3,10.132.108.3,139.186.135.156,jdm.szssfj.cn,58.250.157.161,127.0.0.1 excel: export: true diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zqyjjdm137344Mapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zqyjjdm137344Mapper.java index 361da57f..039d1498 100755 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zqyjjdm137344Mapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zqyjjdm137344Mapper.java @@ -19,4 +19,5 @@ public interface Zqyjjdm137344Mapper * @return 集合 */ public List selectZqyjjdmList(String searchValue); + public Zqyjjdm137344 getZqyjjdmById(String id); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZqyjjdm137344Service.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZqyjjdm137344Service.java index c1860423..a9756ea9 100755 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZqyjjdm137344Service.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZqyjjdm137344Service.java @@ -21,4 +21,5 @@ public interface IZqyjjdm137344Service * @return 集合 */ public List selectZqyjjdmList(String searchValue); + public Zqyjjdm137344 getZqyjjdmById(String id); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zqyjjdm137344ServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zqyjjdm137344ServiceImpl.java index 93d45639..2493339e 100755 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zqyjjdm137344ServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zqyjjdm137344ServiceImpl.java @@ -36,4 +36,9 @@ public class Zqyjjdm137344ServiceImpl implements IZqyjjdm137344Service public List selectZqyjjdmList(String searchValue) { return zqyjjdm137344Mapper.selectZqyjjdmList(searchValue); } + + @Override + public Zqyjjdm137344 getZqyjjdmById(String id) { + return zqyjjdm137344Mapper.getZqyjjdmById(id); + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml index 2f06ea26..b986730c 100755 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sfzcode_encrypt = #{sfzcodeEncrypt}, - where id = #{id} + where sfzcode = #{sfzcode} \ No newline at end of file diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zqyjjdm137344Mapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zqyjjdm137344Mapper.xml index f95a89f5..9e5b140f 100755 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zqyjjdm137344Mapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zqyjjdm137344Mapper.xml @@ -44,5 +44,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + \ No newline at end of file