diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index cf6e9944..0c2868c0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -52,6 +52,14 @@ public class SarPublicIdeaAllController extends BaseController return Result.success("200",publicList); } + + @ApiOperation(value = "查询全部意见") + @GetMapping("/checkIsShow") + public ResponseMessage checkIsShow(DetAllStandDto detAllStandDto){ + String publicList =sarPublicIdeaAllImpl.checkIsShow(detAllStandDto); + return Result.success("200",publicList); + } + @ApiOperation(value = "增加意见") @PostMapping("/insetStand") public ResponseMessage addAllStand(SarPublicIdeaAll sar){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaAllService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaAllService.java index 65ad075f..dfdb027e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaAllService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaAllService.java @@ -26,4 +26,5 @@ public interface ISarPublicIdeaAllService extends IService { String updateById(SarPublicIdeaAll sarPublicIdeaAll, String autUserid); String delete(DelStandDto delStandDto); String del(String id); + String checkIsShow(DetAllStandDto detAllStandDto); } 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 2d75de77..484b8f86 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 @@ -3,10 +3,7 @@ package com.adc.da.slrs.sarStandIdea.service.Impl; import com.adc.da.slrs.sarLawsDetailedList.Util.BeanConverUtil; import com.adc.da.slrs.sarStandIdea.dao.SarPublicIdeaAllDao; -import com.adc.da.slrs.sarStandIdea.entity.DelStandDto; -import com.adc.da.slrs.sarStandIdea.entity.DetAllStandDto; -import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll; -import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAllSUD; +import com.adc.da.slrs.sarStandIdea.entity.*; import com.adc.da.slrs.sarStandIdea.service.ISarPublicIdeaAllService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -25,7 +22,7 @@ import java.util.List; /** *

- * 服务实现类 + * 服务实现类 *

* * @author super_liu @@ -38,10 +35,9 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl selectAll(DetAllStandDto detAllStandDto){ - if (detAllStandDto.getEndTime()!=null){ + public IPage selectAll(DetAllStandDto detAllStandDto) { + if (detAllStandDto.getEndTime() != null) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Date Time = null; try { @@ -50,18 +46,18 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq("CID",detAllStandDto.getCid()); - Page page = new Page<>(detAllStandDto.getPage(),detAllStandDto.getSize()); + wrapper.eq("CID", detAllStandDto.getCid()); + Page page = new Page<>(detAllStandDto.getPage(), detAllStandDto.getSize()); IPage userIPage = sarPublicIdeaAllDao.selectPage(page, wrapper); - System.out.println("总条数"+userIPage.getTotal()); - System.out.println("总页数"+userIPage.getPages()); - List list= userIPage.getRecords(); + System.out.println("总条数" + userIPage.getTotal()); + System.out.println("总页数" + userIPage.getPages()); + List list = userIPage.getRecords(); List list1 = new ArrayList<>(); list1 = BeanConverUtil.converList(list, SarPublicIdeaAllSUD.class); - for (SarPublicIdeaAllSUD sud:list1){ - if (Time.compareTo(new Date())>=0)sud.setIdeaKey(0); - else {sud.setIdeaKey(1);} - } +// for (SarPublicIdeaAllSUD sud:list1){ +// if (Time.compareTo(new Date())>=0)sud.setIdeaKey(0); +// else {sud.setIdeaKey(1);} +// } IPage userIPage1 = new Page<>(); userIPage1.setPages(userIPage.getPages()); userIPage1.setSize(userIPage.getSize()); @@ -69,19 +65,19 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq("CID",detAllStandDto.getCid()); - Page page = new Page<>(detAllStandDto.getPage(),detAllStandDto.getSize()); + wrapper.eq("CID", detAllStandDto.getCid()); + Page page = new Page<>(detAllStandDto.getPage(), detAllStandDto.getSize()); IPage userIPage = sarPublicIdeaAllDao.selectPage(page, wrapper); - System.out.println("总条数"+userIPage.getTotal()); - System.out.println("总页数"+userIPage.getPages()); - List list= userIPage.getRecords(); + System.out.println("总条数" + userIPage.getTotal()); + System.out.println("总页数" + userIPage.getPages()); + List list = userIPage.getRecords(); List list1 = new ArrayList<>(); list1 = BeanConverUtil.converList(list, SarPublicIdeaAllSUD.class); - for (SarPublicIdeaAllSUD sud:list1){ - sud.setIdeaKey(0); - } +// for (SarPublicIdeaAllSUD sud:list1){ +// sud.setIdeaKey(0); +// } IPage userIPage1 = new Page<>(); userIPage1.setPages(userIPage.getPages()); userIPage1.setSize(userIPage.getSize()); @@ -90,9 +86,23 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl= 0) return "0"; + else { + return "1"; + } } @Override @@ -105,10 +115,10 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl