Commit af7b57bd authored by suhuiguang's avatar suhuiguang

fix(jyjc) :检验检测结果回传

1.增加按照不合格项生成是否有检查项字段保持和页面约束统一。规则:有不合格项时,回填true,否则false
parent 28908153
...@@ -695,11 +695,16 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR ...@@ -695,11 +695,16 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
jyjcInspectionResult.setInspectionEndDate(r.getInspectionEndDate()); jyjcInspectionResult.setInspectionEndDate(r.getInspectionEndDate());
jyjcInspectionResult.setInspectionResultSummary(r.getInspectionResultSummary()); jyjcInspectionResult.setInspectionResultSummary(r.getInspectionResultSummary());
jyjcInspectionResult.setNonConformance(JSON.toJSONString(r.getNonConformance())); jyjcInspectionResult.setNonConformance(JSON.toJSONString(r.getNonConformance()));
jyjcInspectionResult.setIsExistNc(this.buildIsExistNc(r.getNonConformance()));
jyjcInspectionResult.setRemark("同步数据"); jyjcInspectionResult.setRemark("同步数据");
jyjcInspectionResult.setTraceId(r.getTraceId()); jyjcInspectionResult.setTraceId(r.getTraceId());
updateResultList.add(jyjcInspectionResult); updateResultList.add(jyjcInspectionResult);
} }
private Boolean buildIsExistNc(JSONArray nonConformance) {
return nonConformance != null && !nonConformance.isEmpty();
}
private String getUserSeqByPersonCode(String innerPersonCode) { private String getUserSeqByPersonCode(String innerPersonCode) {
if (StrUtil.isNotEmpty(innerPersonCode)) { if (StrUtil.isNotEmpty(innerPersonCode)) {
List<TzsUserInfo> tzsUserInfos = tzsUserInfoMapper.selectList(new LambdaQueryWrapper<TzsUserInfo>() List<TzsUserInfo> tzsUserInfos = tzsUserInfoMapper.selectList(new LambdaQueryWrapper<TzsUserInfo>()
......
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