Merge remote-tracking branch 'origin/dev' into test

This commit is contained in:
qianshijiang
2025-12-05 08:56:19 +08:00
5 changed files with 26 additions and 9 deletions

View File

@@ -24,13 +24,13 @@ public interface TmplInscDatBsnService {
* @return 编号 * @return 编号
*/ */
TmplInscDatBsnRespVO createTmplInscDatBsn(@Valid TmplInscDatBsnSaveReqVO createReqVO); TmplInscDatBsnRespVO createTmplInscDatBsn(@Valid TmplInscDatBsnSaveReqVO createReqVO);
/** /**
* 更新业务实例字段值 * 更新业务实例字段值
* *
* @param updateReqVO 更新信息 * @param updateReqVO 更新信息
*/ */
void updateTmplInscDatBsn(@Valid TmplInscDatBsnSaveReqVO updateReqVO); void updateTmplInscDatBsn(@Valid TmplInscDatBsnSaveReqVO updateReqVO);
void updateTmplInscDatBsnBatch(@Valid List<TmplInscDatBsnSaveReqVO> updateReqVOS);
/** /**
* 删除业务实例字段值 * 删除业务实例字段值

View File

@@ -66,6 +66,13 @@ public class TmplInscDatBsnServiceImpl implements TmplInscDatBsnService {
tmplInscDatBsnMapper.insert(saveObj); tmplInscDatBsnMapper.insert(saveObj);
} }
@Override
public void updateTmplInscDatBsnBatch(List<TmplInscDatBsnSaveReqVO> updateReqVOS) {
tmplInscDatBsnMapper.physicalDeleteByBsnIds(updateReqVOS.stream().map(TmplInscDatBsnSaveReqVO::getBsnId).toList());
List<TmplInscDatBsnDO> bean = BeanUtils.toBean(updateReqVOS, TmplInscDatBsnDO.class);
tmplInscDatBsnMapper.insertBatch(bean);
}
@Override @Override
public void deleteTmplInscDatBsn(String id) { public void deleteTmplInscDatBsn(String id) {
// 校验存在 // 校验存在

View File

@@ -31,6 +31,7 @@ public interface TmplInscItmBsnService {
* @param updateReqVO 更新信息 * @param updateReqVO 更新信息
*/ */
void updateTmplInscItmBsn(@Valid TmplInscItmBsnSaveReqVO updateReqVO); void updateTmplInscItmBsn(@Valid TmplInscItmBsnSaveReqVO updateReqVO);
void updateTmplInscItmBsnBatch(@Valid List<TmplInscItmBsnSaveReqVO> updateReqVOS);
/** /**
* 删除业务实例条款值 * 删除业务实例条款值

View File

@@ -71,6 +71,13 @@ public class TmplInscItmBsnServiceImpl implements TmplInscItmBsnService {
tmplInscItmBsnMapper.insert(saveObj); tmplInscItmBsnMapper.insert(saveObj);
} }
@Override
public void updateTmplInscItmBsn(List<TmplInscItmBsnSaveReqVO> updateReqVOS) {
tmplInscItmBsnMapper.physicalDeleteByBsnIds(updateReqVOS.stream().map(TmplInscItmBsnSaveReqVO::getBsnId).toList());
List<TmplInscItmBsnDO> bean = BeanUtils.toBean(updateReqVOS, TmplInscItmBsnDO.class);
tmplInscItmBsnMapper.insertBatch(bean);
}
@Override @Override
public void deleteTmplInscItmBsn(String id) { public void deleteTmplInscItmBsn(String id) {
// 校验存在 // 校验存在

View File

@@ -282,18 +282,20 @@ public class ContractServiceImpl implements ContractService {
// 保存动态字段 // 保存动态字段
List<TmplInscDatBsnSaveReqVO> dynamicsFields = reqVO.getDynamicsFields(); List<TmplInscDatBsnSaveReqVO> dynamicsFields = reqVO.getDynamicsFields();
if (dynamicsFields != null && !dynamicsFields.isEmpty()) { if (dynamicsFields != null && !dynamicsFields.isEmpty()) {
dynamicsFields.forEach(dynamicsField -> { // dynamicsFields.forEach(dynamicsField -> {
dynamicsField.setBsnId(reqVO.getBusinessId().toString()); // dynamicsField.setBsnId(reqVO.getBusinessId().toString());
tmplInscDatBsnService.createTmplInscDatBsn(dynamicsField); // tmplInscDatBsnService.createTmplInscDatBsn(dynamicsField);
}); // });
tmplInscDatBsnService.updateTmplInscDatBsnBatch(dynamicsFields);
} }
// 保存动态条款 // 保存动态条款
List<TmplInscItmBsnSaveReqVO> dynamicsItems = reqVO.getDynamicsItems(); List<TmplInscItmBsnSaveReqVO> dynamicsItems = reqVO.getDynamicsItems();
if (dynamicsItems != null && !dynamicsItems.isEmpty()) { if (dynamicsItems != null && !dynamicsItems.isEmpty()) {
dynamicsItems.forEach(dynamicsItem -> { // dynamicsItems.forEach(dynamicsItem -> {
dynamicsItem.setBsnId(reqVO.getBusinessId().toString()); // dynamicsItem.setBsnId(reqVO.getBusinessId().toString());
tmplInscItmBsnService.createTmplInscItmBsn(dynamicsItem); // tmplInscItmBsnService.createTmplInscItmBsn(dynamicsItem);
}); // });
tmplInscItmBsnService.updateTmplInscItmBsnBatch(dynamicsItems);
} }