From 50bdaf9e32b41a93623fd15aea253017a6f62619 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Wed, 9 Jul 2025 10:06:37 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=A8=A1=E6=9D=BF=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E8=BE=85=E5=8A=A9=E6=A0=B8=E7=AE=97=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TemplateController.java | 7 +- .../entity/AeConfVoucherTemplateEntity.xml | 2 +- .../IAeConfVoucherTemplateService.java | 2 +- .../AeConfVoucherTemplateServiceImpl.java | 136 +++++++++++++++--- 4 files changed, 119 insertions(+), 28 deletions(-) diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/controller/TemplateController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/controller/TemplateController.java index 436ba06f..c8e5444e 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/controller/TemplateController.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/controller/TemplateController.java @@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import java.util.Arrays; import java.util.List; /** @@ -55,10 +56,10 @@ public class TemplateController extends DefaultController { * */ @RequestMapping(value = "/save", method = RequestMethod.POST) - public JsonResultEntity save(@RequestBody AeConfVoucherTemplateEntity entity) { + public JsonResultEntity save(@RequestBody List list) { try { - AeConfVoucherTemplateEntity aeConfVoucherTemplateEntity = templateService.saveEntity(entity); - return getSuccessMessageEntity("请求成功", aeConfVoucherTemplateEntity); + List aeConfVoucherTemplateEntityList = templateService.saveEntity(list); + return getSuccessMessageEntity("请求成功", aeConfVoucherTemplateEntityList); } catch (Exception e) { e.printStackTrace(); return getFailureMessageEntity(e.getMessage()); diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/entity/AeConfVoucherTemplateEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/entity/AeConfVoucherTemplateEntity.xml index d997cb48..c679bad8 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/entity/AeConfVoucherTemplateEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/entity/AeConfVoucherTemplateEntity.xml @@ -599,8 +599,8 @@ #{id} , #{mdmId} , - #{pkGlorgbook} , #{templateTypeId} , + #{pkGlorgbook} , #{glOrgbookCode} , #{glOrgbookName} , #{voucherTypeId} , diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/service/IAeConfVoucherTemplateService.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/service/IAeConfVoucherTemplateService.java index 8bd5d5f8..7b6e13f0 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/service/IAeConfVoucherTemplateService.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/service/IAeConfVoucherTemplateService.java @@ -14,7 +14,7 @@ import java.util.List; public interface IAeConfVoucherTemplateService extends IBaseService{ List queryAll(AeConfVoucherTemplateEntity entity); AeConfVoucherTemplateEntity queryById(AeConfVoucherTemplateEntity entity); - AeConfVoucherTemplateEntity saveEntity(AeConfVoucherTemplateEntity entity); + List saveEntity(List list); AeConfVoucherTemplateEntity updateEntity(AeConfVoucherTemplateEntity entity); AeConfVoucherTemplateEntity deleteEntity(AeConfVoucherTemplateEntity entity); diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/service/impl/AeConfVoucherTemplateServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/service/impl/AeConfVoucherTemplateServiceImpl.java index c152d973..695c7b84 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/service/impl/AeConfVoucherTemplateServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/service/impl/AeConfVoucherTemplateServiceImpl.java @@ -13,13 +13,16 @@ import com.hzya.frame.voucher.ae.comf.template.dao.IAeConfVoucherTemplateAssistD import com.hzya.frame.voucher.ae.comf.template.entity.AeConfVoucherTemplateAssistEntity; import com.hzya.frame.voucher.ae.comf.template.entity.AeConfVoucherTemplateEntity; import com.hzya.frame.voucher.ae.comf.template.dao.IAeConfVoucherTemplateDao; +import com.hzya.frame.voucher.ae.comf.template.service.IAeConfVoucherTemplateAssistService; import com.hzya.frame.voucher.ae.comf.template.service.IAeConfVoucherTemplateService; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import com.hzya.frame.basedao.service.impl.BaseService; +import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; @@ -44,6 +47,11 @@ public class AeConfVoucherTemplateServiceImpl extends BaseService saveEntity(List list) { + List all = new ArrayList<>(); - //校验摘要 - checkAbstract(entity); + for (AeConfVoucherTemplateEntity entity : list) { + if (entity.getId() == null || "".equals(entity.getId())) {//新增 + checkTempNull("saveEntity", entity); + //校验摘要 + checkAbstract(entity); + //查询分类定义 + AeConfSubjectClassificationEntity classificationEntity = new AeConfSubjectClassificationEntity(); + classificationEntity.setId(String.valueOf(entity.getSubjectClassificationId())); + List query = subjectClassificationDao.query(classificationEntity); + AeConfSubjectClassificationEntity ification = query.get(0); + entity.setSubjectClassificationCode(ification.getCode()); + entity.setSubjectClassificationName(ification.getName()); + AeConfVoucherTemplateEntity save = templateDao.save(entity); + all.add(save); + String tId = save.getId(); - //转换摘要 - transformAbstract(entity); + //保存子表，或更新 + List details = new ArrayList<>(); + List assistEntityList = entity.getAssistEntityList(); + for (AeConfVoucherTemplateAssistEntity detail : assistEntityList) { + detail.setVoucherTemplateId(Long.valueOf(tId)); + if (detail.getId() == null || "".equals(detail.getId())) { + AeConfVoucherTemplateAssistEntity aeConfVoucherTemplateAssistEntity = templateAssistService.saveEntity(detail); + details.add(aeConfVoucherTemplateAssistEntity); + } else { + AeConfVoucherTemplateAssistEntity aeConfVoucherTemplateAssistEntity = templateAssistService.updateEntity(detail); + details.add(aeConfVoucherTemplateAssistEntity); + } + } + save.setAssistEntityList(details); + } else {//更新 + checkTempNull("updateEntity", entity); + //校验摘要 + checkAbstract(entity); + //查询分类定义 + AeConfSubjectClassificationEntity classificationEntity = new AeConfSubjectClassificationEntity(); + classificationEntity.setId(String.valueOf(entity.getSubjectClassificationId())); + List query = subjectClassificationDao.query(classificationEntity); + AeConfSubjectClassificationEntity ification = query.get(0); + entity.setSubjectClassificationCode(ification.getCode()); + entity.setSubjectClassificationName(ification.getName()); + AeConfVoucherTemplateEntity update = templateDao.update(entity); + all.add(entity); - //查询分类定义 - AeConfSubjectClassificationEntity classificationEntity = new AeConfSubjectClassificationEntity(); - classificationEntity.setId(String.valueOf(entity.getSubjectClassificationId())); - List query = subjectClassificationDao.query(classificationEntity); - AeConfSubjectClassificationEntity ification = query.get(0); - entity.setSubjectClassificationCode(ification.getCode()); - entity.setSubjectClassificationName(ification.getName()); - - AeConfVoucherTemplateEntity save = templateDao.save(entity); - //保存子表 - if (entity.getAssistEntityList() != null && entity.getAssistEntityList().size() != 0) { - String tempId = save.getId(); - for (AeConfVoucherTemplateAssistEntity assistEntity : entity.getAssistEntityList()) { - assistEntity.setVoucherTemplateId(Long.valueOf(tempId)); - templateAssistDao.save(assistEntity); + String tId = entity.getId(); + //保存子表，或更新 + List details = new ArrayList<>(); + List assistEntityList = entity.getAssistEntityList(); + for (AeConfVoucherTemplateAssistEntity detail : assistEntityList) { + detail.setVoucherTemplateId(Long.valueOf(tId)); + if (detail.getId() == null || "".equals(detail.getId())) { + AeConfVoucherTemplateAssistEntity aeConfVoucherTemplateAssistEntity = templateAssistService.saveEntity(detail); + details.add(aeConfVoucherTemplateAssistEntity); + } else { + AeConfVoucherTemplateAssistEntity aeConfVoucherTemplateAssistEntity = templateAssistService.updateEntity(detail); + details.add(aeConfVoucherTemplateAssistEntity); + } + } + entity.setAssistEntityList(details); } } - return save; + + return all; } +// @Override +// public List saveEntity(List list) { +// for (AeConfVoucherTemplateEntity entity : list) { +// if (entity.getId() == null || "".equals(entity.getId())) { +// checkTempNull("saveEntity", entity); +// +// //转换摘要 +// sb.delete(0, sb.length()); +// transformAbstract(entity); +// +// //校验摘要 +// checkAbstract(entity); +// +// //查询分类定义 +// AeConfSubjectClassificationEntity classificationEntity = new AeConfSubjectClassificationEntity(); +// classificationEntity.setId(String.valueOf(entity.getSubjectClassificationId())); +// List query = subjectClassificationDao.query(classificationEntity); +// AeConfSubjectClassificationEntity ification = query.get(0); +// entity.setSubjectClassificationCode(ification.getCode()); +// entity.setSubjectClassificationName(ification.getName()); +// +// AeConfVoucherTemplateEntity save = templateDao.save(entity); +// //保存子表 +// if (entity.getAssistEntityList() != null && entity.getAssistEntityList().size() != 0) { +// String tempId = save.getId(); +// for (AeConfVoucherTemplateAssistEntity assistEntity : entity.getAssistEntityList()) { +// assistEntity.setVoucherTemplateId(Long.valueOf(tempId)); +// templateAssistDao.save(assistEntity); +// } +// } +// }else { +// updateEntity(entity); +// } +// +// } +// +// return list; +// } /** @@ -170,6 +258,7 @@ public class AeConfVoucherTemplateServiceImpl extends BaseService dbList = mdmModuleDbDao.query(mdmModuleDbEntity); - if(dbList.size()==0||dbList.size()>1){ + if (dbList.size() == 0 || dbList.size() > 1) { return null; } return dbList.get(0); @@ -410,6 +499,7 @@ public class AeConfVoucherTemplateServiceImpl extends BaseService