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/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()){ 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/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..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,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(@Param("id") 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..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 @@ -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(true); + } + return Result.error(false); + } } 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