From 80226d5cfb59c83c148e4d0e42cf8d63c139e3e2 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Thu, 29 Jul 2021 11:14:47 +0800 Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListController.java | 3 +- .../dao/SarLawsAttrDetailedListDao.java | 2 + .../entity/LawsDto.java | 3 ++ .../ISarLawsAttrDetailedListService.java | 3 +- .../SarLawsAttrDetailedListServiceImpl.java | 20 +++++-- .../impl/SarLawsDetailedListServiceImpl.java | 49 ++++++++--------- .../slrs/sarStandIdea/entity/GetExcelDto.java | 2 +- .../SarStandItems/SarStandItemsMapper.xml | 1 - .../SarLawsAttrDetailedListMapper.xml | 54 +++++++++++++++++-- 9 files changed, 99 insertions(+), 38 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java index 254106fd..47156302 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java @@ -11,6 +11,7 @@ import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListS import com.adc.da.sys.service.IDicTypeEOService; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -60,7 +61,7 @@ public class SarLawsAttrDetailedListController extends BaseController laws = iSarLawsAttrDetailedList.selectLaws(sarFindDto); + IPage laws = iSarLawsAttrDetailedList.selectLaws(sarFindDto); return Result.success("200",laws); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java index baffd3c1..6dba1030 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java @@ -25,6 +25,8 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size); //根据标准id查出数据 List selectLawsById(@Param("param1") List LawsIds, @Param("sarFindDto") SarFindDto sarFindDto); + //根据标准id查出数据用于清单查询 + List selectLawsByIdList(@Param("param1") List LawsIds, @Param("sarFindDto") SarFindDto sarFindDto); //用于导出 List selectLawsByIdE(@Param("param1") List LawsIds); //根据标准id查出数据 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index 5fd67bcf..007690bf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -112,4 +112,7 @@ public class LawsDto { @ApiModelProperty(value = "1") private String standType; + + @ApiModelProperty(value = "文本状态") + private String textStatus; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java index 0474c233..6c113eff 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.service; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*; import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletResponse; @@ -18,7 +19,7 @@ import java.util.Map; */ public interface ISarLawsAttrDetailedListService extends IService { - List selectLaws(SarFindDto sarFindDto); + IPage selectLaws(SarFindDto sarFindDto); Boolean insertDetailedList(String id,List timeDto); Boolean updateDetailedLaws(String id,List timeDtos); void exportExcel(HttpServletResponse response, StandExcelVo standExcelVo); 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 4b896d7a..cad04ba8 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 @@ -3,11 +3,12 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.service.impl; import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*; import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService; -import com.adc.da.slrs.sarLawsDetailedList.entity.SarLawsDetailedList; import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto; import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.springframework.beans.factory.annotation.Autowired; @@ -36,7 +37,13 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl selectLaws(SarFindDto sarFindDto) { + public IPage selectLaws(SarFindDto sarFindDto) { + //获取封装信息 + IPage pageRes = new Page<>(sarFindDto.getPage(), sarFindDto.getSize()); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("detailed_list_id", sarFindDto.getId()); + IPage selectPage = sarLawsAttrDetailedListDao.selectPage(pageRes,wrapper); + //查询标准id List lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize()); if (CollectionUtils.isEmpty(lawsIds)){ return null; @@ -168,7 +175,14 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl list1 = new Page<>(); + list1.setRecords(list); + list1.setCurrent(selectPage.getCurrent()); + list1.setTotal(selectPage.getTotal()); + list1.setSize(selectPage.getSize()); + list1.setPages(selectPage.getPages()); + return list1; } //向清单表和主表中的关联表插入信息 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 01697f77..c22780bd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -60,10 +60,6 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); - if ("1".equals(detailedUpDto.getSortKey()) && detailedUpDto.getInforlist().contains(",")) { + if ( detailedUpDto.getInforlist().contains(",")) { String[] id = detailedUpDto.getInforlist().split(","); String[] putTime = detailedUpDto.getInforlist1().split(","); String[] zcc = detailedUpDto.getInforlist2().split(","); String[] xcx = detailedUpDto.getInforlist3().split(","); - for (int a = 0; a < id.length; a++) { - TimeDto dto = new TimeDto(); - dto.setStandId(id[a]); - if (putTime[a]==null) { - dto.setPutTime(null); - } else { - dto.setPutTime(putTime[a]); + for (int a = 0; a < id.length; a++) { + TimeDto dto = new TimeDto(); + dto.setStandId(id[a]); + if (putTime.length<=a) { + dto.setPutTime(null); + } else { + dto.setPutTime(putTime[a]); + } + if (putTime.length<=a) { + dto.setXcxssrqgj(null); + } else { + dto.setXcxssrqgj(xcx[a]); + } + if (putTime.length<=a) { + dto.setZccssrqgj(null); + } else { + dto.setZccssrqgj(zcc[a]); + } + timeDto.add(dto); } - if (putTime[a]==null) { - dto.setXcxssrqgj(null); - } else { - dto.setXcxssrqgj(xcx[a]); - } - if (putTime[a]==null) { - dto.setZccssrqgj(null); - } else { - dto.setZccssrqgj(zcc[a]); - } - timeDto.add(dto); - } } else { TimeDto dto = new TimeDto(); dto.setStandId(detailedUpDto.getInforlist()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java index 86c3cdb7..37b2a020 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java @@ -25,7 +25,7 @@ public class GetExcelDto { @ExcelProperty("章节编号") private String partCode; - @ExcelProperty("内容") + @ExcelProperty("修改意见内容(包括理由或依据)") private String content; @ExcelProperty("提出人") private String userName; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index a77962cc..121a16f4 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -646,7 +646,6 @@ select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer from SAR_STAND_ITEMS where FILE_TYPE=#{type} - and STAND_ID in diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index eedd123f..745bb3e1 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -5,7 +5,7 @@ +