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/9] =?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/9] =?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/9] =?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/9] =?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; } From 8c5008e86903c89fa8ce2c7faa467213545d41e7 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 22 Jan 2022 19:13:40 +0800 Subject: [PATCH 5/9] =?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:=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E4=BD=93=E7=B3=BB=E7=9B=AE=E5=BD=95=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/sarStandMenu/dao/SarStandMenuDao.java | 2 ++ .../slrs/sarStandMenu/entity/SarStandMenu.java | 5 ++++- .../controller/SarStandardsInfoController.java | 2 +- .../mapper/SarStandMenu/SarStandMenuMapper.xml | 18 +++++++++++++++++- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java index 1c400103..ccda4edd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java @@ -29,4 +29,6 @@ public interface SarStandMenuDao extends BaseMapper { List selectAllMenuByStandId(SarStandMenu sarStandMenuEO); + List getMenuByStandId(SarStandMenu sarStandMenu); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java index b10b9a78..a1421881 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java @@ -15,7 +15,7 @@ import org.springframework.data.annotation.Transient; /** *

- * + * *

* * @author super_liu @@ -58,4 +58,7 @@ public class SarStandMenu extends BaseEntity { private List menuIds; + @TableField(exist = false) + private String menuName; + } 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 e9d30624..ad62cb8b 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 @@ -588,7 +588,7 @@ public class SarStandardsInfoController extends BaseController @GetMapping("/getStandMenuId") public ResponseMessage> getStandMenuId(SarStandMenu getStandId){ - List sarStandMenus = sarStandMenuDao.selectAllMenuByStandId(getStandId); + List sarStandMenus = sarStandMenuDao.getMenuByStandId(getStandId); return Result.success(sarStandMenus); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml index 0425a16a..14246d2d 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml @@ -12,7 +12,7 @@ - valid_flag, menu_id, stand_id, id + valid_flag, menu_id, stand_id, id,menu_name @@ -82,5 +82,21 @@ from SAR_STAND_MENU where stand_id = #{standId} and valid_flag=0 + + From 8f650eeb81204a7df214116bf694f254caabd7cf Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 24 Jan 2022 15:11:59 +0800 Subject: [PATCH 6/9] =?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:=20=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=92=8Cbreak=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandardsInfo/controller/SarStandardsInfoController.java | 2 +- .../mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 ad62cb8b..6e51af8d 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 @@ -568,7 +568,7 @@ public class SarStandardsInfoController extends BaseController flag = sarStandardsInfoEOService.updateStandInfo(standardsInfoEO); } - if (flag){ + if (!flag){ break; } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml index 14246d2d..caba536b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml @@ -12,7 +12,7 @@ - valid_flag, menu_id, stand_id, id,menu_name + valid_flag, menu_id, stand_id, id From 3ebb6c9dc2b29aee9c20d3ad61494eab476608ec Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 24 Jan 2022 16:07:29 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=BA=93=20,=E4=BB=A3?= =?UTF-8?q?=E6=9B=BF=E6=A0=87=E5=87=86=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/sarBussionessStand/entity/SarBussionessStand.java | 5 +++++ .../mapper/sarBussionessStand/SarBussionessStandMapper.xml | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java index 2d6502fe..0879c01d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java @@ -124,6 +124,11 @@ public class SarBussionessStand extends BaseEntity { @TableField(exist = false) private String newStandSn; + /** + * 代替企标标准号 + */ + @TableField(exist = false) + private String DTQBBHBUSS; @TableField(exist = false) @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 7abb5fd4..c7818182 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -22,6 +22,7 @@ + @@ -672,7 +673,7 @@ select * from (select tmp_tb.* from (select - dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow, + dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow,SAR_BUSS_STAND_ATTR_INFO.DTQBBHBUSS, from SAR_BUSSIONESS_STAND From f721b089702104adccbd4f065f1d4aca93c2e2a9 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 24 Jan 2022 18:25:58 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=20=E5=85=B3=E8=81=94=E4=BD=93?= =?UTF-8?q?=E7=B3=BB=E7=9B=AE=E5=BD=95=E6=96=B0=E5=A2=9E=E4=B8=8E=E5=B8=A6?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ActSarItemsEOService.java | 4 ++ .../entity/SarStandardsInfo.java | 3 ++ .../impl/SarStandardsInfoServiceImpl.java | 42 +++++++++++++++---- 3 files changed, 42 insertions(+), 7 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index 57af35b3..a279368a 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -199,8 +199,11 @@ public class ActSarItemsEOService { List standlist = sarStandardsInfoEOService.selectStandardsByStandnumber(standnumber, sarStandardsInfoEO.getStandType()); if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) { sarStandardsInfoEO.setMenuId("64df1d5522bb49c09af2"); + sarStandardsInfoEO.setMenuIds("64df1d5522bb49c09af2,"+sarStandardsInfoEO.getMenuIds()); sarStandardsInfoEO.setCountry("CN"); } else if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "FOREIGN".equals(sarStandardsInfoEO.getStandType())) { + + sarStandardsInfoEO.setMenuIds("22179d54d4e640098e29,"+sarStandardsInfoEO.getMenuIds()); sarStandardsInfoEO.setMenuId("22179d54d4e640098e29"); } //此处判断是否是带入的标准 @@ -1109,6 +1112,7 @@ public class ActSarItemsEOService { case "standSort": sarStandardsInfoEO.setStandSort(valueStr); break; case "standState": sarStandardsInfoEO.setStandState(valueStr); break; case "menuId": sarStandardsInfoEO.setMenuId(valueStr); break; + case "menuIds": sarStandardsInfoEO.setMenuIds(valueStr); break; case "textStatus": sarStandardsInfoEO.setTextStatus(valueStr); break; case "synopsis": sarStandardsInfoEO.setSynopsis(valueStr); break; case "fileWord": diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java index cde2968f..ac30740c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java @@ -186,6 +186,9 @@ public class SarStandardsInfo extends BaseEntity { private String sarStandAttrEOStr; //新增修改时属性表信息 @TableField(exist = false) private String menuId; //目录ID + + @TableField(exist = false) + private String menuIds; //目录ID @TableField(exist = false) private int upReplaceNumFlag; //记录是否修改了替代文件号 @TableField(exist = false) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 244fa967..55c15c85 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -814,13 +814,16 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl Date: Mon, 24 Jan 2022 20:00:01 +0800 Subject: [PATCH 9/9] feat: There is no way the, buss state --- .../SarBussionessStandStateController.java | 51 +++++++++ .../dao/SarBussionessStandStateDao.java | 23 ++++ .../entity/SarBussionessStandState.java | 84 ++++++++++++++ .../entity/SarBussionessStandStatePage.java | 74 ++++++++++++ .../ISarBussionessStandStateService.java | 21 ++++ .../SarBussionessStandStateServiceImpl.java | 30 +++++ .../SarBussionessStandStateMapper.xml | 105 ++++++++++++++++++ 7 files changed, 388 insertions(+) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/controller/SarBussionessStandStateController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/dao/SarBussionessStandStateDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/ISarBussionessStandStateService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/impl/SarBussionessStandStateServiceImpl.java create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/controller/SarBussionessStandStateController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/controller/SarBussionessStandStateController.java new file mode 100644 index 00000000..03275114 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/controller/SarBussionessStandStateController.java @@ -0,0 +1,51 @@ +package com.adc.da.slrs.sarBussionessStandState.controller; + + +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage; +import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService; +import com.adc.da.util.LoginUserUtil; +import com.adc.da.util.utils.StringUtils; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 企业标准信息复审表 前端控制器 + *

+* +* @author super_liu +* @since 2022-01-23 +*/ +@RestController +@Api(tags = "福田标准法规--企业复审信息") +@RequestMapping("/${restPath}/lawss/sarBussionessStandState") +public class SarBussionessStandStateController extends BaseController { + + @Autowired + private ISarBussionessStandStateService bussionessStandStateService; + + /** + * 自定义分页查询列表 + * @param page 标准信息 + * @return + */ + @ApiOperation(value = "|SarBussionessStandState|自定义分页查询列表") + @GetMapping("/getSarBussionStandPage") + //@RequiresPermissions("lawss:sarBussionessStand:getSarBussionStandPage") + public ResponseMessage> getSarBussionessStandStatePage(SarBussionessStandStatePage page) throws Exception { + List rows = bussionessStandStateService.getSarBussionessStandStatePage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/dao/SarBussionessStandStateDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/dao/SarBussionessStandStateDao.java new file mode 100644 index 00000000..fd0fa12e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/dao/SarBussionessStandStateDao.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.sarBussionessStandState.dao; + +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *

+ * 企业标准信息复审表 Mapper 接口 + *

+ * + * @author super_liu + * @since 2022-01-23 + */ +public interface SarBussionessStandStateDao extends BaseMapper { + + List getBussionessStandStatePage(SarBussionessStandStatePage page); + + int getBussionessStandStateCount(SarBussionessStandStatePage page); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java new file mode 100644 index 00000000..6c0ac4e6 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java @@ -0,0 +1,84 @@ +package com.adc.da.slrs.sarBussionessStandState.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 企业标准信息复审表 + *

+ * + * @author super_liu + * @since 2022-01-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="SarBussionessStandState对象", description="企业标准信息复审表") +public class SarBussionessStandState extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键/企业标准信息主键") + @TableField("ID") + private String id; + + @ApiModelProperty(value = "企标ID") + @TableField("STAND_ID") + private String standId; + + @ApiModelProperty(value = "名称") + @TableField("STAND_NAME") + private String standName; + + @ApiModelProperty(value = "企标编号") + @TableField("STAND_CODE") + private String standCode; + + @ApiModelProperty(value = "复审时间") + @TableField("REVIEW_TIME") + private Date reviewTime; + + @ApiModelProperty(value = "发布日期") + @TableField("ISSUE_TIME") + private Date issueTime; + + @ApiModelProperty(value = "复审结果 1 修订、2 废止、3 继续有效") + @TableField("REVIEW_RESULTS") + private Integer reviewResults; + + @ApiModelProperty(value = "复审关联流程编号") + @TableField("REVIEW_PROCESS_NUM") + private String reviewProcessNum; + + @ApiModelProperty(value = "创建日期") + @TableField("CREATION_TIME") + private Date creationTime; + + @ApiModelProperty(value = "更新日期") + @TableField("MODIFY_TIME") + private Date modifyTime; + + @TableField("VALID_FLAG") + private Integer validFlag; + + @ApiModelProperty(value = "参数1") + @TableField("PARAM1") + private Integer param1; + + @ApiModelProperty(value = "参数2") + @TableField("PARAM2") + private String param2; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java new file mode 100644 index 00000000..3cca7a54 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java @@ -0,0 +1,74 @@ +package com.adc.da.slrs.sarBussionessStandState.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.adc.da.sys.common.BasePage; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + *

+ * 企业标准信息复审表 + *

+ * + * @author super_liu + * @since 2022-01-23 + */ +@Data +@ApiModel(value="SarBussionessStandStatePage对象", description="企业标准信息复审表分页") +public class SarBussionessStandStatePage extends BasePage { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键/企业标准信息主键") + private String id; + + @ApiModelProperty(value = "企标ID") + private String standId; + + @ApiModelProperty(value = "名称") + private String standName; + + @ApiModelProperty(value = "企标编号") + private String standCode; + + @ApiModelProperty(value = "复审时间") + private Date reviewTime; + + @ApiModelProperty(value = "发布日期") + private Date issueTime; + + @ApiModelProperty(value = "复审结果 1 修订、2 废止、3 继续有效") + private Integer reviewResults; + + @ApiModelProperty(value = "复审关联流程编号") + private String reviewProcessNum; + + @ApiModelProperty(value = "创建日期") + private Date creationTime; + + @ApiModelProperty(value = "更新日期") + private Date modifyTime; + + private Integer validFlag; + + @ApiModelProperty(value = "参数1") + private Integer param1; + + @ApiModelProperty(value = "参数2") + private String param2; + + private String reviewTimeStart; + private String reviewTimeEnd; + + private String issueTimeStart; + private String issueTimeEnd; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/ISarBussionessStandStateService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/ISarBussionessStandStateService.java new file mode 100644 index 00000000..d0656649 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/ISarBussionessStandStateService.java @@ -0,0 +1,21 @@ +package com.adc.da.slrs.sarBussionessStandState.service; + +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 企业标准信息复审表 服务类 + *

+ * + * @author super_liu + * @since 2022-01-23 + */ +public interface ISarBussionessStandStateService extends IService { + + List getSarBussionessStandStatePage(SarBussionessStandStatePage page) throws Exception; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/impl/SarBussionessStandStateServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/impl/SarBussionessStandStateServiceImpl.java new file mode 100644 index 00000000..ce8fd653 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/impl/SarBussionessStandStateServiceImpl.java @@ -0,0 +1,30 @@ +package com.adc.da.slrs.sarBussionessStandState.service.impl; + +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; +import com.adc.da.slrs.sarBussionessStandState.dao.SarBussionessStandStateDao; +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage; +import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 企业标准信息复审表 服务实现类 + *

+ * + * @author super_liu + * @since 2022-01-23 + */ +@Service +public class SarBussionessStandStateServiceImpl extends ServiceImpl implements ISarBussionessStandStateService { + + @Override + public List getSarBussionessStandStatePage(SarBussionessStandStatePage page) throws Exception{ + Integer rowCount = this.baseMapper.getBussionessStandStateCount(page); + page.getPager().setRowCount(rowCount); + List stateList = this.baseMapper.getBussionessStandStatePage(page); + return stateList; + } +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml new file mode 100644 index 00000000..40aaab54 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml @@ -0,0 +1,105 @@ + + + + + + + + + ID, + STAND_ID, + STAND_NAME, + STAND_CODE, + REVIEW_TIME, + ISSUE_TIME, + REVIEW_RESULTS, + REVIEW_PROCESS_NUM, + CREATION_TIME, + MODIFY_TIME, + VALID_FLAG, + PARAM1, + PARAM2 + + + + where REVIEW_RESULTS IS NULL + AND DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(current_timestamp(), '%Y-%m-%d') AND DATE_ADD(CURDATE(), INTERVAL 30 DAY) + + + and STAND_CODE like concat(concat('%',#{standCode}),'%') + + + and DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%D') >= DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') + + + and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%D') <= DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%D') >= DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') + + + and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%D') <= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + + + + + where REVIEW_RESULTS IS NOT NULL + + + and STAND_CODE like concat(concat('%',#{standCode}),'%') + + + and DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%D') >= DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') + + + and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%D') <= DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%D') >= DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') + + + and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%D') <= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + + + + + + + + +