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

Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

Browse Source
This commit is contained in:
SUNJIABIN
2023-04-23 17:15:55 +08:00
parent 369567886f a0faf3ff31
commit d6d82f9441
2 changed files with 73 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java
+34 -1
View File
@@ -9,6 +9,7 @@ import com.adc.da.workFlow.entity.GetQBZXDExcelDto;
import com.adc.da.workFlow.service.ActSarItemsBussEOService;
import com.alibaba.excel.EasyExcel;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -47,7 +49,38 @@ public class ActSarItemsBussEOController extends BaseController<ActSarItemsEO> {
@PostMapping("/processCreateBuss")
public ResponseMessage processCreateBuss(String infoJson) throws Exception {
if (StringUtils.isNotBlank(infoJson)) {
String bussId = actSarItemsEOService.processCreateBuss(infoJson);
JSONObject jsonObject = JSON.parseObject(infoJson);
if(jsonObject!=null){
Object issueTime = jsonObject.get("issueTime");
Object standSort = jsonObject.get("standSort");
if(issueTime!=null && standSort!=null){
String issueTimeStr =issueTime.toString();
String standSortStr = standSort.toString();
if(StringUtils.isNotBlank(issueTimeStr) && StringUtils.isNotBlank(standSortStr)){
if(standSortStr.equals("Q/QCBFC") || standSortStr.equals("Q/FT X") || standSortStr.equals("Q/FTX")){
//产品标准三年复审
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date parse = sdf.parse(issueTimeStr);
Calendar instance = Calendar.getInstance();
instance.setTime(parse);
instance.add(Calendar.YEAR,3);
jsonObject.put("FSRQBUSS",sdf.format(instance.getTime()));
}else {
//技术标准五年复审
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date parse = sdf.parse(issueTimeStr);
Calendar instance = Calendar.getInstance();
instance.setTime(parse);
instance.add(Calendar.YEAR,5);
jsonObject.put("FSRQBUSS",sdf.format(instance.getTime()));
}
}
}
}
String s = jsonObject.toJSONString();
String bussId = actSarItemsEOService.processCreateBuss(s);
return Result.success(bussId);
} else {
return Result.error("传入数据json不能为空");
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+39
View File
@@ -60,6 +60,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -194,6 +195,44 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
}
sarBussionessStandEO.setModifyTime(new Date());
sarBussionessStandEOService.updateSarBussionessStand(sarBussionessStandEO);
QueryWrapper<SarBussStandAttrInfo> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("STAND_ID",sarBussionessStandEO.getId());
List<SarBussStandAttrInfo> sarBussStandAttrInfos = sarBussStandAttrInfoDao.selectList(objectQueryWrapper);
if(!sarBussStandAttrInfos.isEmpty()){
SarBussStandAttrInfo sarBussStandAttrInfo = new SarBussStandAttrInfo();
sarBussStandAttrInfo.setId(sarBussStandAttrInfos.get(0).getId());
//判断是技术标准还是产品标准 如果是技术标准 则2.发布日期和复审日期留一个（逻辑：产品标准经过3年需要复审，技术标准经过5年需要复审）。,其他为技术标准。（如遇新的产品标准编号规则应通知李经理补充。）
//-Q/QCBFC -Q/FT X产品标准
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()));
sarBussStandAttrInfoDao.updateById(sarBussStandAttrInfo);
} 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()));
sarBussStandAttrInfoDao.updateById(sarBussStandAttrInfo);
} catch (ParseException e) {
e.printStackTrace();
}
}
}
}
return Result.success("","修改成功",sarBussionessStandEO);
}