From e05cd8b78707d2e44ec8f9e50988929b19095b6b Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 21 Jan 2022 16:27:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AF=84=E4=BB=B7?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=8A=82=E7=82=B9=E5=90=8D=E7=A7=B0=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/QualityEvaluationServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java index f909068e..4c2344b6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java @@ -172,13 +172,13 @@ public class QualityEvaluationServiceImpl extends ServiceImpl Date: Sat, 22 Jan 2022 14:42:23 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E9=A2=97=E7=B2=92=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListServiceImpl.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) 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 8b975cfa..8c6f09cc 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 @@ -4,6 +4,8 @@ import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*; import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService; import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto; +import com.adc.da.sys.common.SelectionResult; +import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,6 +21,7 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** *

@@ -253,11 +256,25 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl> selectTimes(String id) { List standRegionalTimeDto= sarLawsAttrDetailedListDao.selectTimes(id); - Map map = iDicTypeEOService.getDicTypeListCode(); - List> arr = (List>) map.get("COUNTRY"); + +// 查询国家地区字典 + List dicTypeList = dicTypeEODao.getDicTypeByDicId("RFRFRFSCXVB"); + List> arr = dicTypeList.stream() + .map(item -> { + Map map = new HashMap<>(); + map.put("lable", item.getLabel()); + map.put("value", item.getValue()); + return map; + }).collect(Collectors.toList()); +// Map map = iDicTypeEOService.getDicTypeListCode(); +// List> arr = (List>) map.get("COUNTRY"); for (StandRegionalTimeDto list1 : standRegionalTimeDto) { if (StringUtils.isNotBlank(list1.getCountry()) && list1.getCountry().contains(",")) { String[] split = list1.getCountry().split(","); From 412e9a98bec0c224118b0aaf7a57f48a6a9fc4be Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 22 Jan 2022 15:24:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=20=E6=96=87=E6=9C=AC=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=92=8C=E5=88=86=E8=A7=A3=E5=8D=95=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/SarStandItems/SarStandItemsMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 34d1a0e1..9a3ddd67 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 @@ -788,7 +788,8 @@ WHERE b.VALID_FLAG = 0 From 9e7d9f65d4966f88005d3096e2c5db0959bd9282 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 22 Jan 2022 16:38:01 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=B8=A6=E5=85=A5=E6=A0=87=E5=87=86=E7=9A=84?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E4=BD=93=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardsInfoController.java | 42 +++++++++++++++++++ .../entity/SarStandardsInfoEOPage.java | 5 +++ 2 files changed, 47 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index c670d718..e9d30624 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -14,6 +14,8 @@ import com.adc.da.http.Result; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService; +import com.adc.da.slrs.sarStandMenu.dao.SarStandMenuDao; +import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; import com.adc.da.slrs.sarStandardsInfo.entity.*; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.util.LoginUserUtil; @@ -553,6 +555,46 @@ public class SarStandardsInfoController extends BaseController } + @ApiOperation(value = "在入库流程中配置单个标准的 体系目录 体系目录可以是多个") + @PostMapping("/saveStandardsMenuForFlow") + public ResponseMessage saveStandardsMenuForFlow(@RequestBody SarStandardsInfoEOPage standardsInfoEO) throws Exception { + boolean flag = false; + for (String id : Arrays.asList(standardsInfoEO.getMenuIds().split(","))) { + standardsInfoEO.setMenuId(id); + + try { + flag = sarStandardsInfoEOService.updateStandardsMenu(standardsInfoEO); + }catch (NullPointerException e){ + flag = sarStandardsInfoEOService.updateStandInfo(standardsInfoEO); + } + + if (flag){ + break; + } + } + + + + if (flag){ + return Result.success("200","配置成功",true); + } + return Result.error("-1","配置失败"); + + } + + @Autowired + SarStandMenuDao sarStandMenuDao; + @ApiOperation(value = "查询标准所在的 体系目录") + @GetMapping("/getStandMenuId") + public ResponseMessage> getStandMenuId(SarStandMenu getStandId){ + + List sarStandMenus = sarStandMenuDao.selectAllMenuByStandId(getStandId); + + return Result.success(sarStandMenus); + + } + + @ApiOperation(value = "|SarStandardsInfoEO|详情页面查询相近标准") @GetMapping("/selectCloseStand") //@RequiresPermissions("lawss:sarStandardsInfo:list") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java index 62203ee5..9cac67eb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java @@ -103,4 +103,9 @@ public class SarStandardsInfoEOPage extends BasePage { * 日期范围查询发布日期结束 */ private String endIssueTime; + + /** + * 标准添加到体系中的id多个 + */ + private String menuIds; }