Merge branch 'develop_master' into FOTON

adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java

@@ -110,8 +110,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
     addInterceptor.excludePathPatterns("/api/lawss/activiti/loginMobile");
 
 
-//    //测试接口使用
-    addInterceptor.excludePathPatterns("/api/**");
+////    //测试接口使用
+//    addInterceptor.excludePathPatterns("/api/**");
 
 
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java

@@ -269,7 +269,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
         List<Map<String, String>> arr = dicTypeList.stream()
                 .map(item -> {
                     Map<String, String> map = new HashMap<>();
-                    map.put("lable", item.getLabel());
+                    map.put("label", item.getLabel());
                     map.put("value", item.getValue());
                     return map;
                 }).collect(Collectors.toList());

adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java

@@ -20,7 +20,7 @@ import java.util.List;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author zyl
@@ -65,7 +65,7 @@ public class TsResource extends BaseEntity {
     @ApiModelProperty(value = "排序序号")
     @TableField("DISPLAY_SEQ")
     private Integer displaySeq;
-    
+
 
     @ApiModelProperty(value = "是否有效")
     @TableField("VALID_FLAG")
@@ -100,4 +100,7 @@ public class TsResource extends BaseEntity {
     @TableField(exist=false)
     private String userId;
 
+    @TableField(exist = false)
+    private String isFlow;
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java

@@ -224,6 +224,15 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
             TsResourceQueryWrapper.like("PARENT_IDS",resource.getId());
             TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ");
             List<TsResource> children=dao.selectList(TsResourceQueryWrapper);
+
+            /**
+             * 入库流程去除我的收藏 flow
+             */
+            if ( tsResource.getIsFlow()!=null && "flow".equals(tsResource.getIsFlow())){
+                children=children.stream()
+                        .filter(item->!"我的收藏".equals(item.getMenuName()))
+                        .collect(Collectors.toList());
+            }
             resource.setChildren(recursionGetListChildrenStand((resource),(children)));
         }
 

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

@@ -53,6 +53,14 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
         }
     }
 
+    @ApiOperation(value = "分解单查询")
+    @GetMapping("/findItemById")
+    public ResponseMessage findItemById( @RequestParam("type") String type,@RequestParam("ids") String ids){
+        String[] Sids=ids.split(",");
+        List<SarStandItemsDto> ItemDto = ServiceImpl.findItemById(type,Sids);
+        return Result.success("200",ItemDto);
+    }
+
     @ApiOperation(value = "项目评估流程分解单查询")
     @GetMapping("/workflowFindItems")
     public ResponseMessage workflowFindItems( @RequestParam("ids") String ids,@RequestParam("types") String types){

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java

@@ -63,6 +63,8 @@ public interface SarStandItemsDao extends BaseMapper<SarStandItems> {
 
     List<SarStandItemsDto> selectAllItemsByIds(@Param("type") String type,@Param("ids") String[] ids);
 
+    List<SarStandItemsDto> findItemById(@Param("type") String type,@Param("ids") String[] ids);
+
     StandsTimeDto selectStandTime(String standId);
 
     List<StandsTimeDto> selectStandTimeAll();

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

@@ -220,6 +220,43 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
         }
     }
 
+    public List<SarStandItemsDto> findItemById(String type,String[] ids){
+        List<SarStandItemsDto> list=dao.findItemById(type,ids);
+        List<SarStandItemsDto> res=new ArrayList<>();
+        List<SarStandItemsDto> chinese=new ArrayList<>();
+        if (null == list || list.isEmpty()){
+            return list;
+        }else {
+            List<Integer> integerList=new ArrayList<>();
+            Map<Integer,List<SarStandItemsDto>> map=new HashMap<>();
+            list.forEach(sarStandItemsDto -> {
+                int a= sarStandItemsDto.getItemsNum().indexOf(".");
+                String mark=sarStandItemsDto.getItemsNum();
+                if (a>0){
+                    mark=mark.substring(0,a);
+                }
+                try {
+                    if (null != map.get(Integer.valueOf(mark))) {
+                        map.get(Integer.valueOf(mark)).add(sarStandItemsDto);
+                    } else {
+                        integerList.add(Integer.valueOf(mark));
+                        List<SarStandItemsDto> middle = new ArrayList<>();
+                        middle.add(sarStandItemsDto);
+                        map.put(Integer.valueOf(mark), middle);
+                    }
+                }catch (Exception e){
+                    chinese.add(sarStandItemsDto);
+                }
+            });
+            Collections.sort(integerList);
+            integerList.forEach(integer -> {
+                res.addAll(map.get(integer));
+            });
+            res.addAll(chinese);
+            return res;
+        }
+    }
+
 
     public List<SarStandItems> querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
         //排序

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

@@ -980,6 +980,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
             SarFileSplitItemsEO newItems = new SarFileSplitItemsEO();
             newItems.setId(reaultItemId);
             newItems.setItermsConditions(resultContent.toString());
+            newItems.setWorkFlowShow("1");
             dao.updateByPrimaryKeySelective(newItems);
         }
         // 2.删除多余节点数据

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

@@ -757,6 +757,20 @@
         </if>
         order by ITEMS_NUM
     </select>
+
+    <select id="findItemById" resultType="com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto">
+        select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer,XCXSSRQ as xcxssrq,ZCCSSRQ as zccssrq ,read_content as technicalRequir ,compared_with_previous as changePoint
+        ,TERMS_CONDITIONS as termsConditions
+        from SAR_STAND_ITEMS
+        where FILE_TYPE=#{type}
+        <if test="ids != null">
+            and ID in
+            <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        order by ITEMS_NUM
+    </select>
     <select id="selectStandTime" resultType="com.adc.da.slrs.sarStandItems.entity.StandsTimeDto">
         select STAND_ID,XCXSSRQ,ZCCSSRQ
         from sar_stand_attr_info