From 1007321491a14a7059da654fa1d153b6f5983eb3 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Tue, 27 Jul 2021 15:55:01 +0800 Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E6=A0=87=E5=87=86=E5=BE=81?= =?UTF-8?q?=E6=B1=82=E6=84=8F=E8=A7=81=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListServiceImpl.java | 2 + .../SarPublicIdeaAllController.java | 7 +--- .../sarStandIdea/entity/DetAllStandDto.java | 36 ++--------------- .../sarStandIdea/entity/SarPublicIdea.java | 3 ++ .../entity/SarPublicIdeaAllSUD.java | 14 +++++++ .../sarStandIdea/entity/SarPublicIdeaDto.java | 21 ++++++++++ .../service/ISarPublicIdeaAllService.java | 3 +- .../Impl/SarPublicIdeaAllServiceImpl.java | 40 ++++++++++++++----- .../Impl/SarPublicIdeaServiceImpl.java | 5 +-- 9 files changed, 79 insertions(+), 52 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAllSUD.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaDto.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 0a8ac441..4b896d7a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -56,6 +56,8 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl map= iDicTypeEOService.getDicTypeListCode(); 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 2c37c5fc..cf6e9944 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 @@ -4,9 +4,7 @@ package com.adc.da.slrs.sarStandIdea.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; 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.GetExcelDto; +import com.adc.da.slrs.sarStandIdea.entity.*; import com.adc.da.slrs.sarStandIdea.service.Impl.SarPublicIdeaAllServiceImpl; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; @@ -18,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; -import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; @@ -51,7 +48,7 @@ public class SarPublicIdeaAllController extends BaseController @ApiOperation(value = "查询全部意见") @GetMapping("/getAllStand") public ResponseMessage getAllStand(DetAllStandDto detAllStandDto){ - IPage publicList =sarPublicIdeaAllImpl.selectAll(detAllStandDto); + IPage publicList =sarPublicIdeaAllImpl.selectAll(detAllStandDto); return Result.success("200",publicList); } 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 b579ec29..a7541e83 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 @@ -1,40 +1,12 @@ package com.adc.da.slrs.sarStandIdea.entity; +import lombok.Data; + +@Data public class DetAllStandDto { Integer page; Integer size; String cid; String userId; - - public Integer getPage() { - return page; - } - - public void setPage(Integer page) { - this.page = page; - } - - public Integer getSize() { - return size; - } - - public void setSize(Integer size) { - this.size = size; - } - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } - - public String getCid() { - return cid; - } - - public void setCid(String cid) { - this.cid = cid; - } + String endTime; } 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 e4774210..0e8f9a0a 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 @@ -57,5 +57,8 @@ public class SarPublicIdea extends BaseEntity { @TableField("category_flag") private String categoryFlag; + @TableField("stand_id") + private String standId; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAllSUD.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAllSUD.java new file mode 100644 index 00000000..4226d043 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAllSUD.java @@ -0,0 +1,14 @@ +package com.adc.da.slrs.sarStandIdea.entity; + +import lombok.Data; + +/** + * //用于增删查改的判断 + * + * @author ZhangZhiYuan + * @date 2021-07-27 + */ +@Data +public class SarPublicIdeaAllSUD extends SarPublicIdeaAll{ + public Integer ideaKey; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaDto.java new file mode 100644 index 00000000..b9243c90 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaDto.java @@ -0,0 +1,21 @@ +package com.adc.da.slrs.sarStandIdea.entity; + +import java.util.Date; + +/** + * //用于查询标准关联信息 + * + * @author ZhangZhiYuan + * @date 2021-07-27 + */ +public class SarPublicIdeaDto { + private String id; + private String category; + private String cid; + private String cname; + private Date startTime; + private Date endTime; + private String categoryFlag; + private String standId; +// private String ; +} 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 09540db3..65ad075f 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 @@ -4,6 +4,7 @@ package com.adc.da.slrs.sarStandIdea.service; 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.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -20,7 +21,7 @@ import javax.servlet.http.HttpServletResponse; public interface ISarPublicIdeaAllService extends IService { - IPage selectAll(DetAllStandDto detAllStandDto); + IPage selectAll(DetAllStandDto detAllStandDto); String add(SarPublicIdeaAll sarPublicIdeaAll); String updateById(SarPublicIdeaAll sarPublicIdeaAll, String autUserid); String delete(DelStandDto delStandDto); 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 6b9f78a3..90abe363 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 @@ -1,12 +1,12 @@ package com.adc.da.slrs.sarStandIdea.service.Impl; -import cn.hutool.core.lang.Snowflake; -import cn.hutool.core.util.IdUtil; +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.service.ISarPublicIdeaAllService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,17 +14,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.nio.charset.StandardCharsets; +import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -44,14 +40,36 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl selectAll(DetAllStandDto detAllStandDto){ + public IPage selectAll(DetAllStandDto detAllStandDto){ + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date Time = null; + try { + Time = sdf.parse(detAllStandDto.getEndTime()); + } catch (ParseException e) { + e.printStackTrace(); + } + QueryWrapper wrapper = new QueryWrapper<>(); 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()); - return userIPage; + 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);} + } + IPage userIPage1 = new Page<>(); + userIPage1.setPages(userIPage.getPages()); + userIPage1.setSize(userIPage.getSize()); + userIPage1.setTotal(userIPage.getTotal()); + userIPage1.setCurrent(userIPage.getCurrent()); + userIPage1.setRecords(list1); + return userIPage1; } @Override 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 4f8161c0..c5064cbb 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 @@ -49,9 +49,8 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl 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); - + .ge(start!=null,"start_time",start) + .le(end!=null,"end_time",end); Page page = new Page<>(p,size); IPage userIPage = sarPublicIdeaDao.selectPage(page, list); System.out.println("总条数"+userIPage.getTotal());