FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!63
This commit is contained in:
高嵩
2023-04-24 18:28:04 +08:00
parent 4183804ea7 239c535b12
commit ae8b55d16b
10 changed files with 111 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-base/src/main/java/com/adc/da/http/ResponseMessage.java
+4
View File
@@ -27,6 +27,10 @@ public class ResponseMessage<T> {
this.data = data;
}
public ResponseMessage(T data) {
this.data = data;
}
public String getRespCode() {
return this.respCode;
}
adc-da-base/src/main/java/com/adc/da/http/Result.java
+4
View File
@@ -43,4 +43,8 @@ public class Result {
public static <T> ResponseMessage<T> error(String code, String message, T t) {
return new ResponseMessage(code, message, false, t);
}
public static <T> ResponseMessage<T> error( T t) {
return new ResponseMessage(t);
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+68 -1
View File
@@ -4479,7 +4479,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//取出所有数据
QueryWrapper<SarBussionessStand> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.isNotNull("ISSUE_TIME");
objectQueryWrapper.isNotNull("STAND_SORT");
List<SarBussionessStand> sarBussionessStands = baseMapper.selectList(objectQueryWrapper);
if(sarBussionessStands.isEmpty()){
return Result.error("无合法数据更正，发布日期或者标准编号不可为null");
@@ -4553,6 +4552,74 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
e.printStackTrace();
}
}
}else {
if(data!=null && StringUtils.isNotBlank(data.getIssueTime()) && StringUtils.isNotBlank(data.getStandCode())){
// 异常数据 则判断standCode
if(data.getStandCode().contains("Q/QCBFC") || data.getStandCode().contains("Q/FT X") || data.getStandCode().contains("Q/FTX")){
//产品标准三年复审
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,3);
instance.add(Calendar.MONTH,-1);
QueryWrapper<SarBussStandAttrInfo> 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<SarBussStandAttrInfo> 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()){
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java
+3
View File
@@ -101,4 +101,7 @@ public class SarBussionessStandState extends BaseEntity {
@TableField(exist = false)
private String standSort;
@TableField(exist = false)
private String menuId;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java
+3
View File
@@ -74,5 +74,8 @@ public class SarBussionessStandStatePage extends BasePage {
private String QCRBUSS;
private String standSort;
@ApiModelProperty(value = "标准类别")
private String menuId;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java
+5
View File
@@ -99,5 +99,10 @@ public class ZlTreeController extends BaseController<ZlTree> {
return Result.success(zlTree);
}
@GetMapping("/getMoBan")
@ApiOperation("模板下载校验")
public ResponseMessage getMoBan(String id){
return Result.success(iZlTreeService.getMoBan(id));
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java
+2
View File
@@ -21,4 +21,6 @@ public interface ZlTreeDao extends BaseMapper<ZlTree> {
int topping(@Param("id") String id);
@Select("select name from zl_tree where id = #{id}")
String getMoBan(@Param("id") String id);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java
+2
View File
@@ -57,4 +57,6 @@ public interface IZlTreeService extends IService<ZlTree> {
void subordinateTreeNodes(List<String> treeIds,String parentTreeId);
void setResource(ZlTree material);
ResponseMessage getMoBan(String id);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java
+16
View File
@@ -200,4 +200,20 @@ public class ZlTreeServiceImpl extends ServiceImpl<ZlTreeDao, ZlTree> 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);
}
}
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml
+4
View File
@@ -114,6 +114,9 @@
<if test="issueTimeStart == null and issueTimeStart == '' and issueTimeEnd != null and issueTimeEnd != ''">
and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME,'%Y-%m-%d') &lt;= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d')
</if>
<if test="QCDW != null and QCDW != '' " >
and QCDW like concat(concat('%',#{QCDW}),'%')
</if>
</trim>
</sql>
<sql id="SarBussionInfoRole_Where_Clause_Review_Results_N">
@@ -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
<include refid="SarBussionInfoRole_Where_Clause_Review_Results_Buss"/>
) a
</select>