From 852f3dc05f44684e0bea1f6c81ed082abdd2789f Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Mon, 24 Apr 2023 15:21:12 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=8A=82=E7=82=B9=E5=90=8D=E7=A7=B0=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/zlTree/controller/ZlTreeController.java | 5 +++++ .../com/adc/da/slrs/zlTree/dao/ZlTreeDao.java | 2 ++ .../da/slrs/zlTree/service/IZlTreeService.java | 2 ++ .../zlTree/service/impl/ZlTreeServiceImpl.java | 16 ++++++++++++++++ 4 files changed, 25 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java index af8f2dda..18876309 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java @@ -99,5 +99,10 @@ public class ZlTreeController extends BaseController { return Result.success(zlTree); } + @GetMapping("/getMoBan") + @ApiOperation("模板下载校验") + public ResponseMessage getMoBan(String id){ + return Result.success(iZlTreeService.getMoBan(id)); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java index 91971be7..034e3a75 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java @@ -21,4 +21,6 @@ public interface ZlTreeDao extends BaseMapper { int topping(@Param("id") String id); + @Select("select name from zl_tree where id =#{id}") + String getMoBan(String id); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java index 6e9ef9f5..2bd01353 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java @@ -57,4 +57,6 @@ public interface IZlTreeService extends IService { void subordinateTreeNodes(List treeIds,String parentTreeId); void setResource(ZlTree material); + + ResponseMessage getMoBan(String id); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java index 6784de4f..dc8e5e8c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java @@ -200,4 +200,20 @@ public class ZlTreeServiceImpl extends ServiceImpl implements tsRoleMenuDataDao.save(roleId,material.getId()); } } + + /** + * 模板下载 + * @param id + * @return + */ + @Override + public ResponseMessage getMoBan(String id) { + //根据提供的数id获取名称 + String treeName = zlTreeDao.getMoBan(id); + //校验如果节点名称是模板则校验通过 + if (treeName.equals("模板")){ + return Result.success("200","校验通过",true); + } + return Result.success("200","校验未通过",false); + } } From 4c6d51a1bc54c486c003dbe780c02908e7bbeb6f Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Mon, 24 Apr 2023 15:42:28 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java index 034e3a75..729d6216 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java @@ -21,6 +21,6 @@ public interface ZlTreeDao extends BaseMapper { int topping(@Param("id") String id); - @Select("select name from zl_tree where id =#{id}") - String getMoBan(String id); + @Select("select name from zl_tree where id = #{id}") + String getMoBan(@Param("id") String id); } From 62423f39cd0c23a4c25698d7ebb65a0965cb5ff2 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Mon, 24 Apr 2023 15:57:45 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B5=84=E6=96=99?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java index dc8e5e8c..a76099d7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java @@ -212,7 +212,7 @@ public class ZlTreeServiceImpl extends ServiceImpl implements String treeName = zlTreeDao.getMoBan(id); //校验如果节点名称是模板则校验通过 if (treeName.equals("模板")){ - return Result.success("200","校验通过",true); + return Result.success("200","校验通过",treeName); } return Result.success("200","校验未通过",false); } From 7145c343a08103d777bc45b1e23476f4c00ee030 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Mon, 24 Apr 2023 15:59:52 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B5=84=E6=96=99?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java index a76099d7..441268c4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java @@ -214,6 +214,6 @@ public class ZlTreeServiceImpl extends ServiceImpl implements if (treeName.equals("模板")){ return Result.success("200","校验通过",treeName); } - return Result.success("200","校验未通过",false); + return Result.success("200","校验未通过",treeName); } } From 33b495f020fb431877c56a127fe45390c281b7b1 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 24 Apr 2023 16:43:04 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E6=97=B6=E9=97=B4=20=E5=8F=AA=E8=A6=81=E6=9C=89=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E6=97=B6=E9=97=B4=20=E5=B0=B1=E6=B8=85=E6=B4=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 69 ++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 258403bd..df27dc73 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -4479,7 +4479,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl objectQueryWrapper = new QueryWrapper<>(); objectQueryWrapper.isNotNull("ISSUE_TIME"); - objectQueryWrapper.isNotNull("STAND_SORT"); List sarBussionessStands = baseMapper.selectList(objectQueryWrapper); if(sarBussionessStands.isEmpty()){ return Result.error("无合法数据更正，发布日期或者标准编号不可为null"); @@ -4553,6 +4552,74 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarBussStandAttrInfoQueryWrapper = new QueryWrapper<>(); + sarBussStandAttrInfoQueryWrapper.eq("STAND_ID",data.getId()); + SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoService.getOne(sarBussStandAttrInfoQueryWrapper); + if(sarBussStandAttrInfo!=null) { + sarBussStandAttrInfo.setFsrqBuss(sdf.format(instance.getTime())); + + long time = new Date().getTime(); + long ins = instance.getTime().getTime(); + if(time>ins){ + Calendar instanceInfo = Calendar.getInstance(); + instanceInfo.setTime(instance.getTime()); + instanceInfo.add(Calendar.YEAR,3); + sarBussStandAttrInfo.setFsrqBuss(sdf.format(instanceInfo.getTime())); + } + if(StringUtils.isBlank(sarBussStandAttrInfo.getCreationUser())){ + sarBussStandAttrInfo.setCreationUser("zhanglanying"); + } + sarBussStandAttrInfos.add(sarBussStandAttrInfo); + } + + } catch (ParseException e) { + e.printStackTrace(); + } + }else { + //技术标准五年复审 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + try { + Date parse = sdf.parse(data.getIssueTime()); + Calendar instance = Calendar.getInstance(); + instance.setTime(parse); + instance.add(Calendar.YEAR,5); + instance.add(Calendar.MONTH,-1); + QueryWrapper sarBussStandAttrInfoQueryWrapper = new QueryWrapper<>(); + sarBussStandAttrInfoQueryWrapper.eq("STAND_ID",data.getId()); + SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoService.getOne(sarBussStandAttrInfoQueryWrapper); + if(sarBussStandAttrInfo!=null) { + sarBussStandAttrInfo.setFsrqBuss(sdf.format(instance.getTime())); + + long time = new Date().getTime(); + long ins = instance.getTime().getTime(); + if(time>ins){ + Calendar instanceInfo = Calendar.getInstance(); + instanceInfo.setTime(instance.getTime()); + instanceInfo.add(Calendar.YEAR,5); + sarBussStandAttrInfo.setFsrqBuss(sdf.format(instanceInfo.getTime())); + } + if(StringUtils.isBlank(sarBussStandAttrInfo.getCreationUser())){ + sarBussStandAttrInfo.setCreationUser("zhanglanying"); + } + sarBussStandAttrInfos.add(sarBussStandAttrInfo); + } + } catch (ParseException e) { + e.printStackTrace(); + } + } + } } } if(!sarBussStandAttrInfos.isEmpty()){ From 4aed4ea0d9aba7016eff0ef32aa5d37a5221dc02 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Mon, 24 Apr 2023 16:54:23 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B5=84=E6=96=99?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=A0=A1=E9=AA=8C=E6=A8=A1=E6=9D=BF=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/http/ResponseMessage.java | 4 ++++ adc-da-base/src/main/java/com/adc/da/http/Result.java | 4 ++++ .../adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/adc-da-base/src/main/java/com/adc/da/http/ResponseMessage.java b/adc-da-base/src/main/java/com/adc/da/http/ResponseMessage.java index 19300a12..60713a05 100644 --- a/adc-da-base/src/main/java/com/adc/da/http/ResponseMessage.java +++ b/adc-da-base/src/main/java/com/adc/da/http/ResponseMessage.java @@ -27,6 +27,10 @@ public class ResponseMessage { this.data = data; } + public ResponseMessage(T data) { + this.data = data; + } + public String getRespCode() { return this.respCode; } diff --git a/adc-da-base/src/main/java/com/adc/da/http/Result.java b/adc-da-base/src/main/java/com/adc/da/http/Result.java index 5e468ced..07d104a3 100644 --- a/adc-da-base/src/main/java/com/adc/da/http/Result.java +++ b/adc-da-base/src/main/java/com/adc/da/http/Result.java @@ -43,4 +43,8 @@ public class Result { public static ResponseMessage error(String code, String message, T t) { return new ResponseMessage(code, message, false, t); } + + public static ResponseMessage error( T t) { + return new ResponseMessage(t); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java index 441268c4..4ecad43f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java @@ -212,8 +212,8 @@ public class ZlTreeServiceImpl extends ServiceImpl implements String treeName = zlTreeDao.getMoBan(id); //校验如果节点名称是模板则校验通过 if (treeName.equals("模板")){ - return Result.success("200","校验通过",treeName); + return Result.success(true); } - return Result.success("200","校验未通过",treeName); + return Result.error(false); } } From 519ab446005d62fcb56afcf55f1df7a230414941 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 24 Apr 2023 17:21:40 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E8=B5=B7=E8=8D=89=E5=8D=95=E4=BD=8D=20=E6=A8=A1=E7=B3=8A?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarBussionessStandState.java | 3 +++ .../entity/SarBussionessStandStatePage.java | 3 +++ .../sarBussionessStandState/SarBussionessStandStateMapper.xml | 4 ++++ 3 files changed, 10 insertions(+) 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 index 9f09b90d..7c85ce14 100644 --- 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 @@ -101,4 +101,7 @@ public class SarBussionessStandState extends BaseEntity { @TableField(exist = false) private String standSort; + @TableField(exist = false) + private String menuId; + } 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 index c053d6e7..97498020 100644 --- 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 @@ -74,5 +74,8 @@ public class SarBussionessStandStatePage extends BasePage { private String QCRBUSS; private String standSort; + @ApiModelProperty(value = "标准类别") + private String menuId; + } 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 index 1a7fb075..97351c0b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml @@ -114,6 +114,9 @@ and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME,'%Y-%m-%d') <= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + + and QCDW like concat(concat('%',#{QCDW}),'%') + @@ -263,6 +266,7 @@ select count(1) from ( select distinct sar_bussioness_stand.id from sar_bussioness_stand LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand.id + left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id ) a