Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java =================================================================== diff -u -r16052 -r16081 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java (.../MaintainManagerImpl.java) (revision 16052) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java (.../MaintainManagerImpl.java) (revision 16081) @@ -1848,23 +1848,26 @@ qmInstance.setReviewTime(rs.getTimestamp("reviewTime")); qmInstance.setResponsibilityPart(rs.getString("responsibilityPart")); qmInstance.setResult(rs.getString("result")); + qmInstance.setName(formName); + qmInstance.setType(rs.getString("type")); String tousseInstanceId = rs.getString("tousseInstance_id"); if(StringUtils.isNotBlank(tousseInstanceId)){ qmInstance.setTousseInstance(tousseInstanceManager.getTousseInstanceById(tousseInstanceId)); } qmInstance.setSourceId(rs.getLong("id")); qmInstance.setParentId(rs.getLong("qualityMonitoring_id")); + qmInstance.setCreateDate(rs.getTimestamp("dateTime")); + qmInstance.setCreateUserName(rs.getString("registerPerson")); + qmInstance.setOrgUnit(rs.getString("orgUnitName")); + qmInstance.setOrgUnitCoding(rs.getString("orgUnitCoding")); + qmInstance.setRemark(rs.getString("remark")); qmInstance.setFormDefinition(formDefinitionMap.get(formName)); if(qmInstance.getFormDefinition() == null){ + objectDao.saveOrUpdate(qmInstance); continue; //未找到的定义的可能是已经删掉或者改名了监测定义,这种数据直接跳过 // throw new RuntimeException("数据迁移有误,监测项定义未找到"); } - qmInstance.setCreateDate(rs.getTimestamp("dateTime")); - qmInstance.setCreateUserName(rs.getString("registerPerson")); - qmInstance.setOrgUnit(rs.getString("orgUnitName")); - qmInstance.setOrgUnitCoding(rs.getString("orgUnitCoding")); - qmInstance.setRemark(rs.getString("remark")); qmInstanceMap.put(id, qmInstance); }