From 5731936b24c79785d31a814e79b33bd6e57bce2d Mon Sep 17 00:00:00 2001 From: wxyclub Date: Sun, 26 Nov 2023 18:29:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E6=89=80=E6=9C=89?= =?UTF-8?q?=E7=9A=84=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandItemsController.java | 18 +++++++++++++++++- .../sarStandItems/dao/SarStandItemsDao.java | 7 +++++++ .../service/ISarStandItemsService.java | 5 +++++ .../service/impl/SarStandItemsServiceImpl.java | 13 +++++++++++++ .../SarStandItems/SarStandItemsMapper.xml | 10 ++++++++++ 5 files changed, 52 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index b0165151..24c16108 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -18,6 +18,8 @@ import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO; import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsEOService; import com.adc.da.util.UUIDUtils; import com.adc.da.utils.util.POIReadExcelToHtml; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; import org.apache.commons.io.FileUtils; @@ -194,5 +196,19 @@ public class SarStandItemsController extends BaseController { return Result.success(); } - + // 处理分解单的序号问题 + @GetMapping("/updateDisplaySeq") + public ResponseMessage updateDisplaySeq(){ + List> standIdList = ServiceImpl.getAllStandIdInItems(); + for (Map stand : standIdList) { + List allStandItems = ServiceImpl.getstandItemsByStandId(stand.get("standId"), stand.get("fileType")); + for (int i = 0; i < allStandItems.size(); i++) { + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.eq(SarStandItems::getId, allStandItems.get(i).getId()); + lambdaUpdateWrapper.set(SarStandItems::getDisplaySeq, i+1); + ServiceImpl.update(lambdaUpdateWrapper); + } + } + return Result.success("修改成功"); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java index 7cec98f0..a263bf8f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java @@ -4,12 +4,14 @@ import com.adc.da.slrs.sarStandItems.entity.*; import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; import com.adc.da.sys.common.SelectionResult; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; import java.util.List; +import java.util.Map; import java.util.Set; /** @@ -84,4 +86,9 @@ public interface SarStandItemsDao extends BaseMapper { List getFileTypeHG(@Param("standId") String standId); List findTermsConditions(@Param("idList") List idsList); + + @MapKey("standId") + List> getAllStandIdInItems(); + + List getstandItemsByStandId(String standId, String fileType); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java index 2c2c4635..457c8028 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; +import java.util.Map; /** *

@@ -25,4 +26,8 @@ public interface ISarStandItemsService extends IService { List findItemsTime(String type,String ids); IPage selectLawDto(FindStandDto findStandDto); String sarStandItemsaveBatch(List sarStandItems); + + List> getAllStandIdInItems(); + + List getstandItemsByStandId(String standId, String fileType); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 0f2c9d6d..f42adfa4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -207,6 +207,19 @@ public class SarStandItemsServiceImpl extends ServiceImpl> getAllStandIdInItems() { + return this.baseMapper.getAllStandIdInItems(); + } + + @Override + public List getstandItemsByStandId(String standId, String fileType) { + if (StringUtils.isNotEmpty(standId)){ + return this.baseMapper.getstandItemsByStandId(standId, fileType); + } + return null; + } + public List findAllItems(String type,String[] ids){ List list=dao.selectAllItemsByIds(type,ids); List res=new ArrayList<>(); 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 582d068d..3fb2c3d0 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 @@ -817,5 +817,15 @@ #{item} + +