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

优化企标

Browse Source
This commit is contained in:
SUNJIABIN
2023-04-23 18:08:31 +08:00
parent d6d82f9441
commit abc0c63f83
3 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java
+1
View File
@@ -130,5 +130,6 @@ public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
@Select("select * from sar")
String setDtqbbhbuss(String dtqbbhbuss);
String selectByStandCode(String standCode);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+41 -1
View File
@@ -2834,13 +2834,14 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
sarBussionessStand.setStandCode(standCode);
// 根据标准号判断数据是否已存在
//2021年4月9日 此处检查当前是否存在standId
String id = sarBussionessStandEODao.selectByStandCode(sarBussionessStand.getStandCode());
QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>();
queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode())
.eq(standName != null,"STAND_NAME",standName);
List<SarBussionessStand> list = iSarBussionessStandService.list(queryWrapper);
Integer valIdFlag = 0;
for (SarBussionessStand stand :list){
if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){
if ((list.size() >=1 && stand.getId().equals(id))){
valIdFlag = stand.getValidFlag();
if (valIdFlag == 0){
logger.info("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在");
@@ -4648,6 +4649,45 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
// writeWarnings(sarBussionessStandEO);
// 处理属性表信息
if (StringUtils.isNotBlank(sarBussionessStandEO.getSarStandAttrEOStr())) {
if(sarBussionessStandEO!=null && StringUtils.isNotBlank(sarBussionessStandEO.getIssueTime()) && StringUtils.isNotBlank(sarBussionessStandEO.getStandSort())){
if(sarBussionessStandEO.getStandSort().equals("Q/QCBFC") || sarBussionessStandEO.getStandSort().equals("Q/FT X") || sarBussionessStandEO.getStandSort().equals("Q/FTX")){
//产品标准三年复审
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
try {
Date parse = sdf.parse(sarBussionessStandEO.getIssueTime());
Calendar instance = Calendar.getInstance();
instance.setTime(parse);
instance.add(Calendar.YEAR,3);
//sarBussStandAttrInfo.setFsrqBuss(sdf.format(instance.getTime()));
String sarStandAttrEOStr = sarBussionessStandEO.getSarStandAttrEOStr();
if(StringUtils.isNotBlank(sarStandAttrEOStr)){
Map<String,String> sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr);
sarStandAttrMap.put("FSRQBUSS",sdf.format(instance.getTime()));
sarBussionessStandEO.setSarStandAttrEOStr(sarStandAttrMap.toString());
}
} catch (ParseException e) {
e.printStackTrace();
}
}else {
//技术标准五年复审
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
try {
Date parse = sdf.parse(sarBussionessStandEO.getIssueTime());
Calendar instance = Calendar.getInstance();
instance.setTime(parse);
instance.add(Calendar.YEAR,5);
//sarBussStandAttrInfo.setFsrqBuss(sdf.format(instance.getTime()));
String sarStandAttrEOStr = sarBussionessStandEO.getSarStandAttrEOStr();
if(StringUtils.isNotBlank(sarStandAttrEOStr)){
Map<String,String> sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr);
sarStandAttrMap.put("FSRQBUSS",sdf.format(instance.getTime()));
sarBussionessStandEO.setSarStandAttrEOStr(sarStandAttrMap.toString());
}
} catch (ParseException e) {
e.printStackTrace();
}
}
}
createStandAttrInfo(sarBussionessStandEO,false);
}
// 增加关联事件
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+4
View File
@@ -1250,6 +1250,10 @@
and smenu.MENU_ID = '44'
</select>
<select id="selectByStandCode" resultType="java.lang.String">
select id from sar_bussioness_stand where stand_code = #{standCode} and VALID_FLAG = 0 limit 1
</select>
<update id="updateByIdInfo" >
update sar_buss_stand_attr_info ss set ss.FBGBUSS = #{strFile}
where id = #{attfId}