diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastBController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastBController.java new file mode 100644 index 00000000..0450cb9f --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastBController.java @@ -0,0 +1,70 @@ +package com.hzya.frame.voucher.ae.comf.subject.controller; + +import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectContrastBEntity; +import com.hzya.frame.voucher.ae.comf.subject.service.IAeConfSubjectContrastBService; +import com.hzya.frame.voucher.ae.comf.subject.service.IAeConfSubjectContrastService; +import com.hzya.frame.web.action.DefaultController; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * Created by zydd on 2025-05-30 15:13 + */ +@RestController +@RequestMapping("/ae/conf/subjectContrastB") +public class ContrastBController extends DefaultController { + + @Autowired + private IAeConfSubjectContrastService contrastService; + @Autowired + private IAeConfSubjectContrastBService contrastBService; + + @RequestMapping(value = "/queryAllByContrastId", method = RequestMethod.POST) + public JsonResultEntity queryAllByContrastId(@RequestBody AeConfSubjectContrastBEntity entity){ + try { + List all = contrastBService.queryAllByContrastId(entity); + return getSuccessMessageEntity("请求成功",all); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity("请求失败",e.getMessage()); + } + } + @RequestMapping(value = "/saveList", method = RequestMethod.POST) + public JsonResultEntity saveList(@RequestBody List list){ + try { + List all = contrastBService.saveListEntity(list); + return getSuccessMessageEntity("请求成功",all); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity("请求失败",e.getMessage()); + } + } + + @RequestMapping(value = "/updateList", method = RequestMethod.POST) + public JsonResultEntity updateList(@RequestBody List list){ + try { + List all = contrastBService.updateList(list); + return getSuccessMessageEntity("请求成功",all); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity("请求失败",e.getMessage()); + } + } + + @RequestMapping(value = "/deleteList", method = RequestMethod.POST) + public JsonResultEntity deleteList(@RequestBody List list){ + try { + contrastBService.deleteList(list); + return getSuccessMessageEntity("请求成功",null); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity("请求失败",e.getMessage()); + } + } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastController.java index 0f8351f9..29b3fda9 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastController.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastController.java @@ -53,4 +53,24 @@ public class ContrastController extends DefaultController { return getFailureMessageEntity("请求失败",e.getMessage()); } } + @RequestMapping(value = "/update", method = RequestMethod.POST) + public JsonResultEntity update(@RequestBody AeConfSubjectContrastEntity entity){ + try { + AeConfSubjectContrastEntity save = aeConfSubjectContrastService.updateEntity(entity); + return getSuccessMessageEntity("请求成功",save); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity("请求失败",e.getMessage()); + } + } + @RequestMapping(value = "/delete", method = RequestMethod.POST) + public JsonResultEntity delete(@RequestBody AeConfSubjectContrastEntity entity){ + try { + AeConfSubjectContrastEntity save = aeConfSubjectContrastService.deleteEntity(entity); + return getSuccessMessageEntity("请求成功",save); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity("请求失败",e.getMessage()); + } + } } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.java index 85d4c1dd..6d01b5ad 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.java @@ -134,6 +134,42 @@ public class AeConfSubjectContrastBEntity extends BaseEntity { * 来源档案值9 */ private String factorid9; + /** + * 来源档案名称1 + */ + private String factorname1; + /** + * 来源档案名称2 + */ + private String factorname2; + /** + * 来源档案名称3 + */ + private String factorname3; + /** + * 来源档案名称4 + */ + private String factorname4; + /** + * 来源档案名称5 + */ + private String factorname5; + /** + * 来源档案名称6 + */ + private String factorname6; + /** + * 来源档案名称7 + */ + private String factorname7; + /** + * 来源档案名称8 + */ + private String factorname8; + /** + * 来源档案名称9 + */ + private String factorname9; /** * 备注 */ diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.xml index 7eb1b099..dcd31a73 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.xml @@ -35,6 +35,15 @@ + + + + + + + + + @@ -85,7 +94,16 @@ ,factorid7 ,factorid8 ,factorid9 - ,remark + ,factorname1 + ,factorname2 + ,factorname3 + ,factorname4 + ,factorname5 + ,factorname6 + ,factorname7 + ,factorname8 + ,factorname9 + ,remark ,def1 ,def2 ,def3 @@ -357,7 +375,6 @@ useGeneratedKeys="true"> insert into ae_conf_subject_contrast_b( - id , contrast_id , pk_corp , desdocvalue , @@ -388,6 +405,15 @@ factorid7 , factorid8 , factorid9 , + factorname1 , + factorname2 , + factorname3 , + factorname4 , + factorname5 , + factorname6 , + factorname7 , + factorname8 , + factorname9 , remark , def1 , def2 , @@ -410,7 +436,6 @@ )values( - #{id} , #{contrastId} , #{pkCorp} , #{desdocvalue} , @@ -441,6 +466,15 @@ #{factorid7} , #{factorid8} , #{factorid9} , + #{factorname1} , + #{factorname2} , + #{factorname3} , + #{factorname4} , + #{factorname5} , + #{factorname6} , + #{factorname7} , + #{factorname8} , + #{factorname9} , #{remark} , #{def1} , #{def2} , diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastEntity.xml index 474930f4..017492d2 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastEntity.xml @@ -16,6 +16,8 @@ + + @@ -50,7 +52,9 @@ ,pk_corp ,corp_type ,desdocid - ,pk_setcorp1 + ,desdoccode + ,desdocname + ,pk_setcorp1 ,remark ,def1 ,def2 @@ -250,6 +254,8 @@ pk_corp , corp_type , desdocid , + desdoccode , + desdocname , pk_setcorp1 , remark , def1 , @@ -286,6 +292,8 @@ #{pkCorp} , #{corpType} , #{desdocId} , + #{desdocCode} , + #{desdocName} , #{pkSetcorp1} , #{remark} , #{def1} , diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastBService.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastBService.java index f9a7b2c3..ab857077 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastBService.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastBService.java @@ -2,6 +2,9 @@ package com.hzya.frame.voucher.ae.comf.subject.service; import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectContrastBEntity; import com.hzya.frame.basedao.service.IBaseService; + +import java.util.List; + /** * 会计事项(accounting_event)-配置-科目对照_子表(AeConfSubjectContrastB)表服务接口 * @@ -9,4 +12,11 @@ import com.hzya.frame.basedao.service.IBaseService; * @since 2025-06-05 15:13:29 */ public interface IAeConfSubjectContrastBService extends IBaseService{ + List queryAllByContrastId(AeConfSubjectContrastBEntity entity); + + List saveListEntity(List list); + + List updateList(List list); + + void deleteList(List list); } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastService.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastService.java index 7bafe351..0ddbce99 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastService.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastService.java @@ -17,4 +17,6 @@ public interface IAeConfSubjectContrastService extends IBaseService implements IAeConfSubjectContrastBService { - + private IAeConfSubjectContrastBDao aeConfSubjectContrastBDao; - + @Autowired - public void setAeConfSubjectContrastBDao(IAeConfSubjectContrastBDao dao) { - this.aeConfSubjectContrastBDao = dao; - this.dao = dao; - } + public void setAeConfSubjectContrastBDao(IAeConfSubjectContrastBDao dao) { + this.aeConfSubjectContrastBDao = dao; + this.dao = dao; + } + + @Autowired + private IAeConfSubjectContrastDao aeConfSubjectContrastDao; + + /** + * 根据contrastId查询所有子表 + */ + @Override + public List queryAllByContrastId(AeConfSubjectContrastBEntity entity) { + Assert.notNull(entity.getContrastId(), "根据科目对照子表查询，所属所有子表时，contrastId不能为空"); + AeConfSubjectContrastBEntity aeConfSubjectContrastBEntity = new AeConfSubjectContrastBEntity(); + aeConfSubjectContrastBEntity.setContrastId(entity.getContrastId()); + List query = aeConfSubjectContrastBDao.query(aeConfSubjectContrastBEntity); + return query; + } + + /** + * 依次保存批量新增 + */ + @Override + public List saveListEntity(List list) { + if (list == null || list.size() == 0) { + Assert.state(false, "批量新增科目对照子表时，子表不能为空。"); + } + for (AeConfSubjectContrastBEntity aeConfSubjectContrastBEntity : list) { + Assert.notNull(aeConfSubjectContrastBEntity.getContrastId(), "新增科目对照子表时，contrastId不能为空"); + Assert.notNull(aeConfSubjectContrastBEntity.getPkCorp(), "新增科目对照子表时，公司主键不能为空"); + } + //检查主表是否存在 + AeConfSubjectContrastEntity aeConfSubjectContrastEntity = new AeConfSubjectContrastEntity(); + aeConfSubjectContrastEntity.setId(String.valueOf(list.get(0).getContrastId())); + List query = aeConfSubjectContrastDao.query(aeConfSubjectContrastEntity); + if (query == null || query.size() == 0) { + Assert.state(false, "新增科目对照子表时，主表不存在。"); + } + List all = new ArrayList<>(); + for (AeConfSubjectContrastBEntity aeConfSubjectContrastBEntity : list) { + AeConfSubjectContrastBEntity save = aeConfSubjectContrastBDao.save(aeConfSubjectContrastBEntity); + all.add(save); + } + return all; + } + + @Override + public List updateList(List list) { + if (list == null || list.size() == 0) { + Assert.state(false, "批量修改科目对照子表时，子表不能为空。"); + } + for (AeConfSubjectContrastBEntity aeConfSubjectContrastBEntity : list) { + Assert.notNull(aeConfSubjectContrastBEntity.getId(), "修改科目对照子表时，子表id不能为空"); + Assert.notNull(aeConfSubjectContrastBEntity.getContrastId(), "修改科目对照子表时，主表不能为空"); + Assert.notNull(aeConfSubjectContrastBEntity.getPkCorp(), "修改科目对照子表时，子表公司主键不能为空"); + } + //检查主表是否存在 + AeConfSubjectContrastEntity aeConfSubjectContrastEntity = new AeConfSubjectContrastEntity(); + aeConfSubjectContrastEntity.setId(String.valueOf(list.get(0).getContrastId())); + List query = aeConfSubjectContrastDao.query(aeConfSubjectContrastEntity); + if (query == null || query.size() == 0) { + Assert.state(false, "修改科目对照子表时，主表不存在。"); + } + for (AeConfSubjectContrastBEntity aeConfSubjectContrastBEntity : list) { + aeConfSubjectContrastBDao.update(aeConfSubjectContrastBEntity); + } + return list; + } + + @Override + public void deleteList(List list) { + for (AeConfSubjectContrastBEntity aeConfSubjectContrastBEntity : list) { + Assert.notNull(aeConfSubjectContrastBEntity.getId(), "删除科目对照子表时，子表id不能为空"); + } + for (AeConfSubjectContrastBEntity aeConfSubjectContrastBEntity : list) { + aeConfSubjectContrastBDao.logicRemove(aeConfSubjectContrastBEntity); + } + + } + + } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastServiceImpl.java index befdd0d5..4d906291 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastServiceImpl.java @@ -86,16 +86,13 @@ public class AeConfSubjectContrastServiceImpl extends BaseService contrastBList = entity.getContrastBEntityList(); - Assert.notNull(contrastBList, "科目对照表新增时，来源档案不能为空！"); - if (contrastBList == null || contrastBList.size() == 0) { - Assert.state(false, "科目对照表新增时，来源档案VOS不能为空！"); - } - if (contrastBList.size() > 9) { - Assert.state(false, "科目对照表新增时，来源档案VOS最多为9个！"); - } - - //主表显示列数 -// String[] split = entity.getSourceIds().split(","); +// Assert.notNull(contrastBList, "科目对照表新增时，来源档案不能为空！"); +// if (contrastBList == null || contrastBList.size() == 0) { +// Assert.state(false, "科目对照表新增时，来源档案VOS不能为空！"); +// } +// if (contrastBList.size() > 9) { +// Assert.state(false, "科目对照表新增时，来源档案VOS最多为9个！"); +// } // //校验子表 // for (int i = 1; i <= split.length; i++) { @@ -115,12 +112,51 @@ public class AeConfSubjectContrastServiceImpl extends BaseService query = aeConfSubjectContrastDao.query(aeConfSubjectContrastEntity); + if (query == null || query.size() == 0) { + Assert.state(false, "科目对照表修改时，科目对照表id：{}，未查询到科目对照！", entity.getId()); + } + deleteEntity(entity); + saveEntity(entity); + return null; + } + + /** + * 将原有的主子表全部删除 + */ + @Override + public AeConfSubjectContrastEntity deleteEntity(AeConfSubjectContrastEntity entity) throws Exception { + Assert.notNull(entity.getId(), "科目对照表删除时，科目对照表id不能为空！"); + aeConfSubjectContrastDao.logicRemove(entity); + //查询子表 + AeConfSubjectContrastBEntity ContrastBEntity = new AeConfSubjectContrastBEntity(); + ContrastBEntity.setContrastId(Long.valueOf(entity.getId())); + List query = aeConfSubjectContrastBDao.query(ContrastBEntity); + for (AeConfSubjectContrastBEntity aeConfSubjectContrastBEntity : query) { + aeConfSubjectContrastBDao.logicRemove(aeConfSubjectContrastBEntity); + } + return null; + } }