From dcfedac4bf6dd4c145feca984ab0a1f2a23cc938 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 20 Aug 2021 15:20:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E6=B5=81=E7=A8=8B=E6=B1=87=E6=80=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarLawsDetailedListController.java | 1 - .../controller/SarPublicIdeaAllController.java | 8 ++++++++ .../adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java | 6 ++++++ .../adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java | 1 + .../adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java | 3 +++ .../adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java | 3 +++ .../service/Impl/SarPublicIdeaAllServiceImpl.java | 2 +- .../mapper/sarStandIdea/SarPublicIdeaAllMapper.xml | 6 ++++++ 8 files changed, 28 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java index 146af0f1..fb33ca82 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java @@ -114,7 +114,6 @@ public class SarLawsDetailedListController extends BaseController return Result.success("200",publicList); } + @ApiOperation(value = "查询流程汇总-公共意见") + @GetMapping("/getPublicIdea") + public ResponseMessage getPublicIdea(@Param("unique") String unique){ + List publicList =sarPublicIdeaAllDao.getPublicIdea(unique); + return Result.success("200",publicList); + } + @ApiOperation(value = "查询全部意见") @GetMapping("/checkIsShow") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java index 8db66f76..3719ea86 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java @@ -3,6 +3,11 @@ package com.adc.da.slrs.sarStandIdea.dao; import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.io.Serializable; +import java.util.Collection; +import java.util.List; /** *

@@ -15,4 +20,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SarPublicIdeaAllDao extends BaseMapper { + List getPublicIdea(@Param("unique")String unique); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java index e0da9d35..d18ba855 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java @@ -10,4 +10,5 @@ public class DetAllStandDto { String userId; String endTime; String Account; + String ideaId; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java index 37c296ba..470fb13a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java @@ -63,5 +63,8 @@ public class SarPublicIdea extends BaseEntity { @TableField("stand_type") private String standType; + @TableField("uniques") + private String uniques; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java index 54e7ba1c..c50619dd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java @@ -58,6 +58,9 @@ public class SarPublicIdeaAll extends BaseEntity { @TableField("new_text") private String newText; + @TableField("idea_id") + private String ideaId; + public static final String CID = "cid"; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java index 7f34cc6c..99547e00 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java @@ -49,7 +49,7 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq("CID", detAllStandDto.getCid()); + wrapper.eq("idea_id", detAllStandDto.getIdeaId()); Page page = new Page<>(detAllStandDto.getPage(), detAllStandDto.getSize()); IPage userIPage = sarPublicIdeaAllDao.selectPage(page, wrapper); System.out.println("总条数" + userIPage.getTotal()); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index b0c8772d..9c776392 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -1,4 +1,10 @@ + +