fix: 标准拆分排序问题修改

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java

@@ -177,5 +177,22 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
         return Result.success("200",ItemDto);
     }
 
+    @ApiOperation(value = "刷拆解单的显示顺序")
+    @PostMapping("/refreshSarStandItemDisplaySeq")
+    public ResponseMessage refreshSarStandItemDisplaySeq(){
+        List<SarStandItems> 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();
+    }
+
 
 }

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<FileSplitValExportDto> itemValContent;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java

@@ -296,7 +296,8 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
                 default:page.setOrder("ASC");
             }
         }else {
-            page.setOrderBy("ITEMS_NUM");
+//            page.setOrderBy("ITEMS_NUM");
+            page.setOrderBy("display_seq");
             page.setOrder("ASC");
         }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java

@@ -206,6 +206,7 @@ public class SarFileSplitInfoEOController extends BaseController<SarFileSplitInf
                         sarStandItem.setItemsNum(item.getItemsNum());
                         sarStandItem.setId(UUIDUtils.randomUUID20());
                         sarStandItem.setFileType(sarFileSplitInfoEO.getFileType());
+                        sarStandItem.setDisplaySeq(item.getDisplaySeq());
 
                         sarStandItem.setEditFlag(item.getEditFlag());
                         return sarStandItem;

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java

@@ -65,4 +65,6 @@ public interface SarFileSplitItemsEODao extends BaseMapper<SarFileSplitItemsEO>
     String selectByInfoId(String infoId);
 
     void selectByName(String itemsName);
+
+    Long selectDisplaySeqByEditFlag(String editFlag);
 }

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字段名转换为原始数据库列名。<b>如果不存在则返回null</b><br>
      * <p>字段列表：</p>

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java

@@ -53,4 +53,5 @@ public interface SarFileSplitItemsEOService {
 
     ResponseMessage<SarFileSplitItemsEO> importSplitItemsInfo(List<SarFileSplitItemsImportDto> datasUpdate, String unzipfilepath, SarFileSplitInfoEO sarFileSplitInfoEO, List<SplitTableInfo> getSheetTableList);
 
+    Long selectDisplaySeqByEditFlag(String editFlag);
 }

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<String> delMenuIds,List<String> delIds,List<SarFileSplitItemsValEO> resultValList) {
         //1.更新最终合并的条款内容
         if (resultContent != null) {

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml

@@ -408,12 +408,12 @@
     <select id="querySarItemAndInterpretation" resultMap="sarItemVOResultMap"
             parameterType="com.adc.da.slrs.sarStandItems.entity.FindSarItemsPageReqDTO">
         SELECT
-        sar_stand_items.*,split_pid(sar_stand_items.ITEMS_NUM,'.') as tt
+        sar_stand_items.*
         FROM
         sar_stand_items
         <include refid="sarItemWhere"/>
         <if test="orderBy !=null and orderBy!=''">
-            order by tt ${order}
+        order by ${orderBy} ${order}
         </if>
         LIMIT ${pager.startIndex-1},${pageSize}
     </select>

adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml

@@ -335,7 +335,8 @@
   </delete>
 
     <select id="querySame" resultType="com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO" parameterType="com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO">
-        select * from SAR_FILE_SPLIT_ITEMS
+        select *, (SELECT DISPLAY_SEQ displaySeq from SAR_FILE_SPLIT_MENU where SAR_FILE_SPLIT_MENU.ID = SAR_FILE_SPLIT_ITEMS.MENU_ID limit 1) displaySeq
+        from SAR_FILE_SPLIT_ITEMS
         LEFT JOIN SAR_FILE_SPLIT_INFO ON SAR_FILE_SPLIT_ITEMS.INFO_ID = SAR_FILE_SPLIT_INFO.ID
         where SAR_FILE_SPLIT_INFO.ID = #{id}
     </select>

adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml

@@ -633,5 +633,8 @@
     <select id="selectByName">
         select ITEMS_NAME from sar_file_split_items where ITEMS_NAME like '%' #{itemsName} '%';
     </select>
+    <select id="selectDisplaySeqByEditFlag" resultType="long">
+        select DISPLAY_SEQ from sar_file_edit_menu where ID = (select menu_id from sar_file_split_items where edit_flag=#{editFlag})
+    </select>
 
 </mapper>