|
@@ -166,7 +166,7 @@ public class MdjfDjController extends BladeController {
|
|
mdjfDj.setSqName(sq.getDeptName());
|
|
mdjfDj.setSqName(sq.getDeptName());
|
|
}
|
|
}
|
|
List<MdjfRyEntity> mdjfRyList = mdjfryService.getRyByMdId(id);
|
|
List<MdjfRyEntity> mdjfRyList = mdjfryService.getRyByMdId(id);
|
|
- MdjfDjVO mdjfDetail = new MdjfDjVO(mdjfDj, mdjfRyList, new ArrayList<MdjfTjEntity>());
|
|
|
|
|
|
+ MdjfDjVO mdjfDetail = new MdjfDjVO(null, mdjfDj, mdjfRyList, new ArrayList<MdjfTjEntity>());
|
|
return R.data(mdjfDetail);
|
|
return R.data(mdjfDetail);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -221,6 +221,10 @@ public class MdjfDjController extends BladeController {
|
|
}
|
|
}
|
|
mdjftjService.saveBatch(mdjfTjList);
|
|
mdjftjService.saveBatch(mdjfTjList);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ if (null != mdjfdj.getFwId()) {
|
|
|
|
+ fwInfoService.updateMdId(mdjfdj.getFwId(), mdjf.getId());
|
|
|
|
+ }
|
|
return R.data(mdjf.getId());
|
|
return R.data(mdjf.getId());
|
|
}
|
|
}
|
|
|
|
|