From 93df5bc09e9132998aff04a5a94f1bb9df3fdbd2 Mon Sep 17 00:00:00 2001 From: little-cat-sweet <2116400472@qq.com> Date: Tue, 3 Aug 2021 18:15:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8D=8F=E8=AE=AE=E7=AE=A1=E7=90=86=E7=BB=99?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhpc/general/controller/XhpcAgreementController.java | 7 +++++++ .../xhpc/general/controller/XhpcDictBizController.java | 3 +++ .../java/com/xhpc/general/mapper/XhpcAgreementMapper.java | 4 ++++ .../java/com/xhpc/general/mapper/XhpcDictBizMapper.java | 3 ++- .../com/xhpc/general/service/IXhpcAgreementService.java | 2 ++ .../com/xhpc/general/service/IXhpcDictBizService.java | 3 +++ .../xhpc/general/service/XhpcAgreementServiceImpl.java | 7 +++++++ .../com/xhpc/general/service/XhpcDictBizServiceImpl.java | 1 - .../src/main/resources/mapper/XhpcAgreementMapper.xml | 8 ++++++++ 9 files changed, 36 insertions(+), 2 deletions(-) diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcAgreementController.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcAgreementController.java index 2cbd66fd..f4bb73ef 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcAgreementController.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcAgreementController.java @@ -54,4 +54,11 @@ public class XhpcAgreementController extends BaseController { return AjaxResult.success(iXhpcAgreementService.selectAgreementItem(agreementId)); } + @GetMapping("/getContent") + public AjaxResult getContent(@RequestParam String title,@RequestParam Integer type){ + + return AjaxResult.success(iXhpcAgreementService.selectContent(title,type)); + } + + } diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcDictBizController.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcDictBizController.java index 183d42f7..ae6e2d50 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcDictBizController.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcDictBizController.java @@ -62,6 +62,9 @@ public class XhpcDictBizController extends BaseController { } + + + /** * Adding a childItem to the table(xhpc_dict_biz) * @param parentId diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/mapper/XhpcAgreementMapper.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/mapper/XhpcAgreementMapper.java index dbced962..8d5b5e14 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/mapper/XhpcAgreementMapper.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/mapper/XhpcAgreementMapper.java @@ -1,6 +1,7 @@ package com.xhpc.general.mapper; import com.xhpc.general.domain.XhpcAgreement; +import org.apache.commons.math3.genetics.Fitness; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -31,4 +32,7 @@ public interface XhpcAgreementMapper { List selectAgreementItems(@Param("title") String title, @Param("createBy") String createBy, @Param("type") Integer type); XhpcAgreement selectAgreementItem(@Param("agreementId") Long agreementId); + + + XhpcAgreement selectContentType(@Param("title") String title,@Param("type") Integer type); } diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/mapper/XhpcDictBizMapper.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/mapper/XhpcDictBizMapper.java index 18d7b34b..2ee72b70 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/mapper/XhpcDictBizMapper.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/mapper/XhpcDictBizMapper.java @@ -89,6 +89,8 @@ public interface XhpcDictBizMapper { */ List selectChildDictionaryItemsByCodeAndName(@Param("id") Long parentId, @Param("code") String code, @Param("name") String name); + + /** * Updating the main item by code,dictValue,sort * @param dictBizId @@ -139,5 +141,4 @@ public interface XhpcDictBizMapper { void updateChildCodeAfterParentChanged(@Param("code") String code,@Param("id") Long id); - } diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcAgreementService.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcAgreementService.java index b2548bd0..9f602c2c 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcAgreementService.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcAgreementService.java @@ -25,4 +25,6 @@ public interface IXhpcAgreementService { List selectAgreementItems(String title, String createBy,Integer type); XhpcAgreement selectAgreementItem(Long agreementId); + + XhpcAgreement selectContent(String title,Integer type); } diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcDictBizService.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcDictBizService.java index 95628f32..6ae9e4c9 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcDictBizService.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcDictBizService.java @@ -110,4 +110,7 @@ public interface IXhpcDictBizService { * Deleting a bundle of parent item. */ AjaxResult deleteParentItems(String ids); + + + } diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcAgreementServiceImpl.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcAgreementServiceImpl.java index 94bd9c16..0e668318 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcAgreementServiceImpl.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcAgreementServiceImpl.java @@ -110,4 +110,11 @@ public class XhpcAgreementServiceImpl implements IXhpcAgreementService { return xhpcAgreementMapper.selectAgreementItem(agreementId); } + + + @Override + public XhpcAgreement selectContent(String title,Integer type) { + + return xhpcAgreementMapper.selectContentType(title,type); + } } diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcDictBizServiceImpl.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcDictBizServiceImpl.java index eb036266..413fbe0d 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcDictBizServiceImpl.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcDictBizServiceImpl.java @@ -89,7 +89,6 @@ public class XhpcDictBizServiceImpl implements IXhpcDictBizService{ return AjaxResult.success(xhpcDictionary); } - @Override @Transactional public AjaxResult addAChildDictionaryItem(Long parentId, String code, String dictKey, String dictValue,Integer sort) { diff --git a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcAgreementMapper.xml b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcAgreementMapper.xml index 374e0273..a87ba8fe 100644 --- a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcAgreementMapper.xml +++ b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcAgreementMapper.xml @@ -62,4 +62,12 @@ from xhpc_agreement where agreement_id=#{agreementId} + + + \ No newline at end of file