From bbbf1010554ec06e7dc648cc1d76075a3512d0b1 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 9 Sep 2021 15:31:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=EF=BC=81=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarPublicIdeaController.java | 4 +- .../service/ISarPublicIdeaService.java | 2 +- .../Impl/SarPublicIdeaServiceImpl.java | 56 ++++++++++--------- 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java index 35f62d53..a56520f0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java @@ -39,7 +39,7 @@ public class SarPublicIdeaController extends BaseController { @ApiOperation(value = "分页查询") @GetMapping("/SelectAllPage") public ResponseMessage selectAllPage(@RequestParam(defaultValue="1")Integer page,@RequestParam(defaultValue="10")Integer size,String categorg, String cname, - String start, String end){ + String start, String end,String type){ Date startdate = null; Date enddate = null; SimpleDateFormat formater = new SimpleDateFormat(); @@ -54,7 +54,7 @@ public class SarPublicIdeaController extends BaseController { } catch (ParseException e) { e.printStackTrace(); } - IPage Publiclist =sarPublicIdeaService.selectAllP(page,size,categorg,cname,startdate,enddate); + IPage Publiclist =sarPublicIdeaService.selectAllP(page,size,categorg,cname,startdate,enddate,type); return Result.success(Publiclist); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaService.java index 10e58c4a..886d4dc4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaService.java @@ -20,6 +20,6 @@ import java.util.Date; public interface ISarPublicIdeaService extends IService { String add(SarPublicIdea sarPublicIdea); - IPage selectAllP(Integer page, Integer size, String categorg, String cname, Date startdate, Date enddate); + IPage selectAllP(Integer page, Integer size, String categorg, String cname, Date startdate, Date enddate, String type); IPage selectAllDynamic(SeByoDto seByoDto); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java index 9d5b3771..9c2466f9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java @@ -1,7 +1,6 @@ package com.adc.da.slrs.sarStandIdea.service.Impl; - import com.adc.da.slrs.sarStandIdea.dao.SarPublicIdeaDao; import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdea; @@ -22,7 +21,7 @@ import java.util.Date; /** *

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

* * @author super_liu @@ -36,7 +35,7 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl selectAllP(Integer p, Integer size, String category, String cname, Date start, Date end) { + public IPage selectAllP(Integer p, Integer size, String category, String cname, Date start, Date end, String type) { QueryWrapper list = new QueryWrapper<>(); - list.like(StringUtils.isNotEmpty(category),"category",category) - .like(StringUtils.isNotEmpty(cname),"cname",cname) - .ge(start!=null,"start_time",start) - .le(end!=null,"end_time",end) - .orderByAsc("end_time"); - Page page = new Page<>(p,size); + if ("1".equals(type)) { + list.like(StringUtils.isNotEmpty(category), "category", category) + .like(StringUtils.isNotEmpty(cname), "cname", cname) + .ge(start != null, "start_time", start) + .le(end != null, "end_time", end) + .orderByDesc("start_time"); + } else { + list.like(StringUtils.isNotEmpty(category), "category", category) + .like(StringUtils.isNotEmpty(cname), "cname", cname) + .ge(start != null, "start_time", start) + .le(end != null, "end_time", end) + .orderByAsc("end_time"); + } + Page page = new Page<>(p, size); IPage userIPage = sarPublicIdeaDao.selectPage(page, list); - System.out.println("总条数"+userIPage.getTotal()); - System.out.println("总页数"+userIPage.getPages()); + System.out.println("总条数" + userIPage.getTotal()); + System.out.println("总页数" + userIPage.getPages()); return userIPage; } /** - * * @param seByoDto * @return */ @@ -72,33 +78,33 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - if (sar.getCategory()!=null&&sar.getCategory().length()!=0){ - wrapper.like("category",sar.getCategory()); + if (sar.getCategory() != null && sar.getCategory().length() != 0) { + wrapper.like("category", sar.getCategory()); } - if (sar.getCname()!=null&&sar.getCname().length()!=0){ - wrapper.like("cname",sar.getCname()); + if (sar.getCname() != null && sar.getCname().length() != 0) { + wrapper.like("cname", sar.getCname()); } - if (sar.getStartTime()!=null){ - wrapper.le("start_time",sar.getStartTime()); + if (sar.getStartTime() != null) { + wrapper.le("start_time", sar.getStartTime()); } - if (sar.getEndTime()!=null){ - wrapper.gt("end_time",sar.getEndTime()); + if (sar.getEndTime() != null) { + wrapper.gt("end_time", sar.getEndTime()); } Page page = new Page<>(seByoDto.getPage(), seByoDto.getSize()); IPage userIPage = sarPublicIdeaDao.selectPage(page, wrapper); - System.out.println("总条数"+userIPage.getTotal()); - System.out.println("总页数"+userIPage.getPages()); + System.out.println("总条数" + userIPage.getTotal()); + System.out.println("总页数" + userIPage.getPages()); return userIPage; From d4dc194a7975ade49e72bc22800049c1c715e8bc Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 9 Sep 2021 16:11:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B8=85=E5=8D=95=20=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 470fb13a..6c21bd31 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 @@ -66,5 +66,11 @@ public class SarPublicIdea extends BaseEntity { @TableField("uniques") private String uniques; + @TableField("files") + private String files; + + @TableField("files_name") + private String filesName; + } From de8f11cadca439517cc3481f5e19590a5fcd3f24 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 9 Sep 2021 17:18:43 +0800 Subject: [PATCH 3/3] feat: There is no way the --- .../sarBussionessStand/service/ISarBussionessStandService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index 3455a955..349a675c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -24,6 +24,8 @@ public interface ISarBussionessStandService extends IService SarBussionessStand updateSarBussionessStand(SarBussionessStand sarBussionessStandEO) throws Exception; + ResponseMessage createSarBussionessStand(SarBussionessStand sarBussionessStandEO) throws Exception; + List selectStandardsByStandNumber(String replaceStandNum); SarBussionessStand selectStandardsInfoByKey(String id) throws Exception;