fix: 处理所有的标准拆分单的顺序

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<SarStandItems> {
         return Result.success();
     }
 
-
+    // 处理分解单的序号问题
+    @GetMapping("/updateDisplaySeq")
+    public ResponseMessage<String> updateDisplaySeq(){
+        List<Map<String,String>> standIdList = ServiceImpl.getAllStandIdInItems();
+        for (Map<String,String> stand : standIdList) {
+            List<SarStandItems> allStandItems = ServiceImpl.getstandItemsByStandId(stand.get("standId"), stand.get("fileType"));
+            for (int i = 0; i < allStandItems.size(); i++) {
+                LambdaUpdateWrapper<SarStandItems> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+                lambdaUpdateWrapper.eq(SarStandItems::getId, allStandItems.get(i).getId());
+                lambdaUpdateWrapper.set(SarStandItems::getDisplaySeq, i+1);
+                ServiceImpl.update(lambdaUpdateWrapper);
+            }
+        }
+        return Result.success("修改成功");
+    }
 }

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<SarStandItems> {
     List<String> getFileTypeHG(@Param("standId") String standId);
 
     List<SarStandItemsDto> findTermsConditions(@Param("idList") List<String> idsList);
+
+    @MapKey("standId")
+    List<Map<String,String>> getAllStandIdInItems();
+
+    List<SarStandItems> getstandItemsByStandId(String standId, String fileType);
 }

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;
 
 /**
  * <p>
@@ -25,4 +26,8 @@ public interface ISarStandItemsService extends IService<SarStandItems> {
     List<SarItemsTime> findItemsTime(String type,String ids);
     IPage<LawsDto> selectLawDto(FindStandDto findStandDto);
     String sarStandItemsaveBatch(List<SarStandItems> sarStandItems);
+
+    List<Map<String,String>> getAllStandIdInItems();
+
+    List<SarStandItems> getstandItemsByStandId(String standId, String fileType);
 }

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

@@ -207,6 +207,19 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
         }
     }
 
+    @Override
+    public List<Map<String,String>> getAllStandIdInItems() {
+        return this.baseMapper.getAllStandIdInItems();
+    }
+
+    @Override
+    public List<SarStandItems> getstandItemsByStandId(String standId, String fileType) {
+        if (StringUtils.isNotEmpty(standId)){
+            return this.baseMapper.getstandItemsByStandId(standId, fileType);
+        }
+        return null;
+    }
+
     public List<SarStandItemsDto> findAllItems(String type,String[] ids){
         List<SarStandItemsDto> list=dao.selectAllItemsByIds(type,ids);
         List<SarStandItemsDto> res=new ArrayList<>();

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

@@ -817,5 +817,15 @@
             #{item}
         </foreach>
     </select>
+    <select id="getAllStandIdInItems" resultType="map">
+        select stand_id as standId,FILE_TYPE as fileType from sar_stand_items where STAND_ID is not null and stand_id!= '' and FILE_TYPE!= '' and file_type is not null group by stand_id, FILE_TYPE;
+    </select>
+    <select id="getstandItemsByStandId" resultType="com.adc.da.slrs.sarStandItems.entity.SarStandItems">
+        SELECT
+        sar_stand_items.*,split_pid(sar_stand_items.ITEMS_NUM,'.') as tt
+        FROM
+        sar_stand_items where STAND_ID = #{standId} and FILE_TYPE = #{fileType}
+         order by tt asc
+    </select>
 
 </mapper>