From b967a9b6612cdf13dc93be12faa669c26dae6b9d Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Thu, 29 Aug 2024 09:25:36 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8C=87=E6=A0=87=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=96=B0=E5=A2=9E=E6=8C=87=E6=A0=87id=E5=92=8C?= =?UTF-8?q?=E6=8C=87=E6=A0=87=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GbiZbxmbServiceImpl.java | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/impl/GbiZbxmbServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/impl/GbiZbxmbServiceImpl.java index d999a871..661b60bf 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/impl/GbiZbxmbServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/impl/GbiZbxmbServiceImpl.java @@ -72,8 +72,14 @@ public class GbiZbxmbServiceImpl extends BaseService imp if(!checkStr(jsonObject.getString("zblb"))){ return BaseResult.getFailureMessageEntity("请传递指标类别"); } + if(!checkStr(jsonObject.getString("zbid"))){ + return BaseResult.getFailureMessageEntity("请传递指标id"); + } + if(!checkStr(jsonObject.getString("zbdm"))){ + return BaseResult.getFailureMessageEntity("请传递指标代码"); + } GbiZbxmbEntity gbiZbxmbEntity = jsonObject.toJavaObject(GbiZbxmbEntity.class); - try { + /*try { //查询指标id最大值和指标代码最大值 GbiZbxmbEntity gbiZbxmbEntityZbid = gbiZbxmbDao.queryZbidAndZbdm(gbiZbxmbEntity); gbiZbxmbEntity.setZbid(gbiZbxmbEntityZbid.getZbid()); @@ -82,19 +88,20 @@ public class GbiZbxmbServiceImpl extends BaseService imp logger.info("根据会计年度：{}，公司代码：{}，指标类别：{}获取指标id和指标代码失败:{}", jsonObject.getString("kjnd"),jsonObject.getString("gsdm"),jsonObject.getString("zblb"),e.getMessage()); return BaseResult.getFailureMessageEntity("获取指标id和指标代码失败"); - } + }*/ try { GbiZbxmbEntity gbiZbxmb=new GbiZbxmbEntity(); gbiZbxmb.setKjnd(gbiZbxmbEntity.getKjnd()); gbiZbxmb.setGsdm(gbiZbxmbEntity.getGsdm()); gbiZbxmb.setZbid(gbiZbxmbEntity.getZbid()); gbiZbxmb.setZbdm(gbiZbxmbEntity.getZbdm()); - List gbiZbxmbEntities = gbiZbxmbDao.queryGbiZbxmbEntity(gbiZbxmbEntity); + gbiZbxmb.setDataSourceCode(gbiZbxmbEntity.getDataSourceCode()); + List gbiZbxmbEntities = gbiZbxmbDao.queryGbiZbxmbEntity(gbiZbxmb); if(CollectionUtils.isNotEmpty(gbiZbxmbEntities)){ return BaseResult.getFailureMessageEntity("保存指标失败,该指标已经存在"); } }catch (Exception e){ - logger.info("保存项目指标失败:{}",e.getMessage()); + logger.info("根据指标id,指标编码,会计年度,公司代码查询指标是否存在失败:{}",gbiZbxmbEntity.getZbid(),gbiZbxmbEntity.getZbdm(),gbiZbxmbEntity.getKjnd(),gbiZbxmbEntity.getGsdm(),e.getMessage()); return BaseResult.getFailureMessageEntity("保存指标失败"); } //更新其他表得使用状态 @@ -153,6 +160,9 @@ public class GbiZbxmbServiceImpl extends BaseService imp if(!checkStr(jsonObject.getString("zbid"))){ return BaseResult.getFailureMessageEntity("请传递指标id"); } + if(!checkStr(jsonObject.getString("zbdm"))){ + return BaseResult.getFailureMessageEntity("请传递指标代码"); + } GbiZbxmbEntity gbiZbxmbEntity = jsonObject.toJavaObject(GbiZbxmbEntity.class); try { JsonResultEntity jsonResultEntity = updateOtherTable(gbiZbxmbEntity); @@ -198,6 +208,9 @@ public class GbiZbxmbServiceImpl extends BaseService imp if(!checkStr(jsonObject.getString("zbid"))){ return BaseResult.getFailureMessageEntity("请传递指标id"); } + if(!checkStr(jsonObject.getString("zbdm"))){ + return BaseResult.getFailureMessageEntity("请传递指标代码"); + } GbiZbxmbEntity gbiZbxmbEntity = jsonObject.toJavaObject(GbiZbxmbEntity.class); try { gbiZbxmbEntity.setZt("1");