From 7d0aa45cb1b055c487433b97b2c76506afb558b0 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 25 Jan 2022 14:13:35 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/login/security/WebMvcConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 3cc10fc3..d2c92c47 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/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/**"); From 0cb9d6c3f723c3326432e02920ba663adaf46477 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 25 Jan 2022 15:42:57 +0800 Subject: [PATCH 2/5] =?UTF-8?q?label=E5=86=99=E6=88=90=E4=BA=86=20lable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarLawsAttrDetailedListServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 8c6f09cc..b1988063 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -269,7 +269,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl> arr = dicTypeList.stream() .map(item -> { Map map = new HashMap<>(); - map.put("lable", item.getLabel()); + map.put("label", item.getLabel()); map.put("value", item.getValue()); return map; }).collect(Collectors.toList()); From 59e44f1e7eabaacebc83e6be646287879d75d293 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 25 Jan 2022 22:45:37 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BD=93=E7=B3=BB?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=8E=A5=E5=8F=A3=20=E6=96=B0=E5=A2=9E=20?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA"?= =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/slrs/sarResource/entity/TsResource.java | 7 +++++-- .../sarResource/service/impl/TsResourceServiceImpl.java | 9 +++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java index 5fef685e..d0232950 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java @@ -20,7 +20,7 @@ import java.util.List; /** *

- * + * *

* * @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; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index cf74720e..95138325 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -224,6 +224,15 @@ public class TsResourceServiceImpl extends ServiceImpl 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))); } From cde2bb97e85e614d21139f591a9d6de2f22a3bcd Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Wed, 26 Jan 2022 19:19:36 +0800 Subject: [PATCH 4/5] =?UTF-8?q?update:=E4=BF=AE=E6=AD=A3=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E9=80=A0=E6=88=90=E8=A7=A3=E8=AF=BB=E6=97=B6?= =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarFileSplitItemsEOServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 2ccba526..9627961f 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 @@ -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.删除多余节点数据 From b1ecd09547f9cf3dd065a035685f25f97bc5de6f Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 26 Jan 2022 20:37:55 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=88=86=E8=A7=A3=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=20=E6=A0=87=E5=87=86=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E6=B5=81=E7=A8=8B=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandItemsController.java | 8 ++++ .../sarStandItems/dao/SarStandItemsDao.java | 2 + .../impl/SarStandItemsServiceImpl.java | 37 +++++++++++++++++++ .../SarStandItems/SarStandItemsMapper.xml | 14 +++++++ 4 files changed, 61 insertions(+) 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 f43caaab..f28a5e80 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 @@ -53,6 +53,14 @@ public class SarStandItemsController extends BaseController { } } + @ApiOperation(value = "分解单查询") + @GetMapping("/findItemById") + public ResponseMessage findItemById( @RequestParam("type") String type,@RequestParam("ids") String ids){ + String[] Sids=ids.split(","); + List 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){ 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 1e19f4bf..19cc2890 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 @@ -63,6 +63,8 @@ public interface SarStandItemsDao extends BaseMapper { List selectAllItemsByIds(@Param("type") String type,@Param("ids") String[] ids); + List findItemById(@Param("type") String type,@Param("ids") String[] ids); + StandsTimeDto selectStandTime(String standId); List selectStandTimeAll(); 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 bdda5828..5a4693fe 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 @@ -220,6 +220,43 @@ public class SarStandItemsServiceImpl extends ServiceImpl findItemById(String type,String[] ids){ + List list=dao.findItemById(type,ids); + List res=new ArrayList<>(); + List chinese=new ArrayList<>(); + if (null == list || list.isEmpty()){ + return list; + }else { + List integerList=new ArrayList<>(); + Map> 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 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 querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ //排序 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 9a3ddd67..09d36ed4 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 @@ -757,6 +757,20 @@ order by ITEMS_NUM + +