|
@@ -293,14 +293,16 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
|
|
boolean needUpdateDic = true;
|
|
boolean needUpdateDic = true;
|
|
List<DataMigrationExcel> dataMigrationExcels = new ArrayList<>();
|
|
List<DataMigrationExcel> dataMigrationExcels = new ArrayList<>();
|
|
if(admCont - proCount == 0){
|
|
if(admCont - proCount == 0){
|
|
- dataMigrationExcels = compareCriterionByData(context, migrationInfo, admCont);
|
|
|
|
|
|
+ //TODO 对比标准字典数据
|
|
|
|
+ /* dataMigrationExcels = compareCriterionByData(context, migrationInfo, admCont);
|
|
if(CollUtil.isEmpty(dataMigrationExcels)){
|
|
if(CollUtil.isEmpty(dataMigrationExcels)){
|
|
needUpdateDic = false;
|
|
needUpdateDic = false;
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
|
|
+ needUpdateDic = false;
|
|
}
|
|
}
|
|
//验证失败 需要更新字典
|
|
//验证失败 需要更新字典
|
|
if(needUpdateDic){
|
|
if(needUpdateDic){
|
|
- String msg = "交付数据标准字典与项目现场标准字典不匹配,请联系管理者确认是否需要字典升级";
|
|
|
|
|
|
+ String msg = "交付数据标准字典与项目现场标准字典不匹配(数量不一致),请联系管理者确认是否需要字典升级";
|
|
AdmResponse admResponse = AdmResponse.failure(msg);
|
|
AdmResponse admResponse = AdmResponse.failure(msg);
|
|
DataMigrationExcel dataMigrationExcel = new DataMigrationExcel();
|
|
DataMigrationExcel dataMigrationExcel = new DataMigrationExcel();
|
|
dataMigrationExcel.setId("error");
|
|
dataMigrationExcel.setId("error");
|