Skip to content

A
amos-boot-biz
Commit 22871eb5 authored by 曹盼盼's avatar 曹盼盼
Browse files
Options

修改校验

parent 9d7cc3ec
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 32 deletions
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/VerifyServiceImpl.java
View file @ 22871eb5
...@@ -723,40 +723,47 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper ...@@ -723,40 +723,47 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
//质量问题表添加数据
qualityProblem.setProjectId(verify.getProjectId());
qualityProblem.setSubmitDate(new Date());
Calendar calendar = Calendar.getInstance();
// 获取当前年
int year = calendar.get(Calendar.YEAR);
// 获取当前月
int month = calendar.get(Calendar.MONTH) + 1;
// 获取当前日
int day = calendar.get(Calendar.DATE);
StringBuffer stringBuffer = new StringBuffer( );
stringBuffer.append(year).append(month).append(day);
String date = stringBuffer.toString( );
//获取当前的值并自增
int newNum = atomicNum.incrementAndGet( );
String code =String.format(date+"-WT-"+"%05d", newNum); if (StageEnum.焊接工艺.getStage().equals(verify.getStage()) || StageEnum.敷设质量.getStage().equals(verify.getStage())
qualityProblem.setCode(code); || StageEnum.管道耐压.getStage().equals(verify.getStage()) || StageEnum.定位.getStage().equals(verify.getStage())||
String stage = StageEnum.getDetailVerifyNameMap.get(jsonObject.getString("stage"));//获取效验阶段 StageEnum.回填.getStage().equals(verify.getStage())) {
qualityProblem.setGenerateStage(stage); //质量问题表添加数据
qualityProblem.setProblemDescribe(stage+"不通过"); qualityProblem.setProjectId(verify.getProjectId());
//获取智能监检表id(项目id和检验时间) qualityProblem.setSubmitDate(new Date());
Verify verify2=null; Calendar calendar = Calendar.getInstance();
if (ValidationUtil.isEmpty(jsonObject.getString("manyCode"))) { // 获取当前年
verify2 = verifyMapper.getOnes(verify.getProjectId(), verify.getVerifyTime().toLocaleString(), jsonObject.getString("code"), null); int year = calendar.get(Calendar.YEAR);
} else { // 获取当前月
verify2 = verifyMapper.getOnes(verify.getProjectId(), verify.getVerifyTime().toLocaleString(), null, jsonObject.getString("manyCode")); int month = calendar.get(Calendar.MONTH) + 1;
} // 获取当前日
if(!ValidationUtil.isEmpty(verify2)) { int day = calendar.get(Calendar.DATE);
Long sequenceNbr = verify2.getSequenceNbr(); StringBuffer stringBuffer = new StringBuffer( );
qualityProblem.setStageVerifyId(sequenceNbr); stringBuffer.append(year).append(month).append(day);
String date = stringBuffer.toString( );
//获取当前的值并自增
int newNum = atomicNum.incrementAndGet( );
String code =String.format(date+"-WT-"+"%05d", newNum);
qualityProblem.setCode(code);
String stage = StageEnum.getDetailVerifyNameMap.get(jsonObject.getString("stage"));//获取效验阶段
qualityProblem.setGenerateStage(stage);
qualityProblem.setProblemDescribe(stage+"不通过");
//获取智能监检表id(项目id和检验时间)
Verify verify2=null;
if (ValidationUtil.isEmpty(jsonObject.getString("manyCode"))) {
verify2 = verifyMapper.getOnes(verify.getProjectId(), verify.getVerifyTime().toLocaleString(), jsonObject.getString("code"), null);
} else {
verify2 = verifyMapper.getOnes(verify.getProjectId(), verify.getVerifyTime().toLocaleString(), null, jsonObject.getString("manyCode"));
}
if(!ValidationUtil.isEmpty(verify2)) {
Long sequenceNbr = verify2.getSequenceNbr();
qualityProblem.setStageVerifyId(sequenceNbr);
}
qualityProblemService.save(qualityProblem);
problemInitiationService.start(qualityProblem);
} }
qualityProblemService.save(qualityProblem);
problemInitiationService.start(qualityProblem);
} }
/** cpp /** cpp
* 校验成功需要添加的数据 * 校验成功需要添加的数据
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment