From e75ba30197f7032d97bab114e2e7049dd796c5c9 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Tue, 21 Nov 2023 16:41:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandItemsController.java | 17 +++++++++++++++++ .../sarStandItems/entity/SarStandItems.java | 3 +++ .../service/impl/SarStandItemsServiceImpl.java | 3 ++- .../SarFileSplitInfoEOController.java | 1 + .../dao/SarFileSplitItemsEODao.java | 2 ++ .../entity/SarFileSplitItemsEO.java | 1 + .../service/SarFileSplitItemsEOService.java | 1 + .../impl/SarFileSplitItemsEOServiceImpl.java | 5 +++++ .../SarStandItems/SarStandItemsMapper.xml | 4 ++-- .../standardSplit/SarFileSplitInfoEOMapper.xml | 3 ++- .../standardSplit/SarFileSplitItemsEOMapper.xml | 3 +++ 11 files changed, 39 insertions(+), 4 deletions(-) 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 b8642d51..b0165151 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 @@ -177,5 +177,22 @@ public class SarStandItemsController extends BaseController { return Result.success("200",ItemDto); } + @ApiOperation(value = "刷拆解单的显示顺序") + @PostMapping("/refreshSarStandItemDisplaySeq") + public ResponseMessage refreshSarStandItemDisplaySeq(){ + List standItemsList = ServiceImpl.list(); + for (SarStandItems sarStandItems : standItemsList) { + String editFlag = sarStandItems.getEditFlag(); + if (StringUtils.isNotBlank(editFlag)){ + Long displaySeq = sarFileSplitItemsEOService.selectDisplaySeqByEditFlag(editFlag); + if (null!=displaySeq){ + sarStandItems.setDisplaySeq(displaySeq); + ServiceImpl.updateById(sarStandItems); + } + } + } + return Result.success(); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java index 3b230f40..74e6fdea 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java @@ -197,6 +197,9 @@ public class SarStandItems extends BaseEntity { @TableField("edit_flag") private String editFlag; + @ApiModelProperty(value = "显示顺序") + private Long displaySeq; + @TableField(exist = false) private List itemValContent; 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 891e4c7e..0f2c9d6d 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 @@ -296,7 +296,8 @@ public class SarStandItemsServiceImpl extends ServiceImpl String selectByInfoId(String infoId); void selectByName(String itemsName); + + Long selectDisplaySeqByEditFlag(String editFlag); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEO.java index 3156b55c..4d340cfe 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEO.java @@ -69,6 +69,7 @@ public class SarFileSplitItemsEO extends BaseEntity { private String editFlag; private String workFlowShow; + private Long displaySeq; /** * java字段名转换为原始数据库列名。如果不存在则返回null
*

字段列表：

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java index b19e2cac..f2e560bd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java @@ -53,4 +53,5 @@ public interface SarFileSplitItemsEOService { ResponseMessage importSplitItemsInfo(List datasUpdate, String unzipfilepath, SarFileSplitInfoEO sarFileSplitInfoEO, List getSheetTableList); + Long selectDisplaySeqByEditFlag(String editFlag); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java index c2c0cca5..95b44a63 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java @@ -1138,6 +1138,11 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic } } + @Override + public Long selectDisplaySeqByEditFlag(String editFlag) { + return dao.selectDisplaySeqByEditFlag(editFlag); + } + public void changeInfos (StringBuilder resultContent,String reaultItemId,List delMenuIds,List delIds,List resultValList) { //1.更新最终合并的条款内容 if (resultContent != null) { 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 ae17f0f1..582d068d 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 @@ -408,12 +408,12 @@ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml index cf66869b..36605feb 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml @@ -335,7 +335,8 @@ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml index 7f9afaf6..08b91db8 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml @@ -633,5 +633,8 @@ +