From 540cde8ca1081ee10ddef79f2eeb384a39e9eead Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Wed, 4 Sep 2024 16:14:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=83=A8=E9=97=A8=E3=80=82?= =?UTF-8?q?=E8=81=8C=E5=91=98=EF=BC=8C=E6=8C=87=E6=A0=87=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E6=A0=B9=E6=8D=AE=E7=BC=96=E7=A0=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=88=99=E4=B8=8D=E4=BF=9D=E5=AD=98=E4=B9=9F?= =?UTF-8?q?=E4=B8=8D=E6=9B=B4=E6=96=B0=EF=BC=8C=E8=BF=94=E5=9B=9E=E8=AF=A5?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E5=B7=B2=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GbiZbxmbServiceImpl.java | 23 +++++++++++++++---- .../glPzml/entity/SenderGlPzmlEntity.xml | 2 +- .../service/impl/SenderGlPzmlServiceImpl.java | 11 ++++++--- .../impl/SenderPubbmxxServiceImpl.java | 17 ++++++++++++-- .../impl/SenderPubzyxxServiceImpl.java | 19 +++++++++++++-- .../grpU8/nxproof/zbwhsz/dao/IZbWhszDao.java | 2 +- .../grpU8/nxproof/zbzbly/dao/IZbZblyDao.java | 3 ++- 7 files changed, 63 insertions(+), 14 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 718aafcb..4f9f177f 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 @@ -78,6 +78,18 @@ public class GbiZbxmbServiceImpl extends BaseService imp if(!checkStr(jsonObject.getString("zbdm"))){ return BaseResult.getFailureMessageEntity("请传递指标代码"); } + if(!checkStr(jsonObject.getString("lrrq"))){ + return BaseResult.getFailureMessageEntity("请传递录入日期"); + } + if(!checkStr(jsonObject.getString("lrsj"))){ + return BaseResult.getFailureMessageEntity("请传递录入时间"); + } + if(!checkStr(jsonObject.getString("ysfadm"))){ + return BaseResult.getFailureMessageEntity("请传递预算方案代码"); + } + if(!checkStr(jsonObject.getString("ysfamc"))){ + return BaseResult.getFailureMessageEntity("请传递预算方案名称"); + } GbiZbxmbEntity gbiZbxmbEntity = jsonObject.toJavaObject(GbiZbxmbEntity.class); /*try { //查询指标id最大值和指标代码最大值 @@ -98,7 +110,8 @@ public class GbiZbxmbServiceImpl extends BaseService imp gbiZbxmb.setDataSourceCode(gbiZbxmbEntity.getDataSourceCode()); List gbiZbxmbEntities = gbiZbxmbDao.queryGbiZbxmbEntity(gbiZbxmb); if(CollectionUtils.isNotEmpty(gbiZbxmbEntities)){ - return BaseResult.getFailureMessageEntity("保存指标失败,该指标已经存在"); + logger.info("指标id：{}和编码：{}在公司代码为：{}和会计年度为{}中已经存在",gbiZbxmbEntity.getZbid(),gbiZbxmbEntity.getZbdm(),gbiZbxmbEntity.getGsdm(),gbiZbxmbEntity.getKjnd()); + return BaseResult.getFailureMessageEntity("该指标已经存在，不保存"); } }catch (Exception e){ logger.info("根据指标id,指标编码,会计年度,公司代码查询指标是否存在失败:{}",gbiZbxmbEntity.getZbid(),gbiZbxmbEntity.getZbdm(),gbiZbxmbEntity.getKjnd(),gbiZbxmbEntity.getGsdm(),e.getMessage()); @@ -108,7 +121,7 @@ public class GbiZbxmbServiceImpl extends BaseService imp JsonResultEntity jsonResultEntity = updateOtherTable(gbiZbxmbEntity); //保存指标项目表 try { - gbiZbxmbEntity.setZt("1");//状态为1为保存 + gbiZbxmbEntity.setZt("3"); gbiZbxmbEntity.setIdzbbh(String.valueOf(UUID.randomUUID()));//IDZBBH gbiZbxmbEntity.setSfjz("0");//是否结转 gbiZbxmbEntity.setCyskzfs("0");//超预算控制方式 @@ -119,6 +132,7 @@ public class GbiZbxmbServiceImpl extends BaseService imp gbiZbxmbEntity.setXfzt("0");//下发状态 gbiZbxmbEntity.setNcysy(0.00);//年初已使用 gbiZbxmbEntity.setSjzbid(0);//上级指标id + gbiZbxmbEntity.setModule("全部");//模块 logger.info("=========开始保存指标项目表========="); GbiZbxmbEntity save = gbiZbxmbDao.saveGbiZbxmbEntity(gbiZbxmbEntity); @@ -166,7 +180,8 @@ public class GbiZbxmbServiceImpl extends BaseService imp GbiZbxmbEntity gbiZbxmbEntity = jsonObject.toJavaObject(GbiZbxmbEntity.class); try { JsonResultEntity jsonResultEntity = updateOtherTable(gbiZbxmbEntity); - gbiZbxmbEntity.setZt("1"); + gbiZbxmbEntity.setZt("3"); + gbiZbxmbEntity.setModule("全部");//模块 gbiZbxmbEntity.setNcysy(0.00);//年初已使用 logger.info("=========开始更新指标项目表========="); GbiZbxmbEntity save = gbiZbxmbDao.updateGbiZbxmbEntity(gbiZbxmbEntity); @@ -213,7 +228,7 @@ public class GbiZbxmbServiceImpl extends BaseService imp } GbiZbxmbEntity gbiZbxmbEntity = jsonObject.toJavaObject(GbiZbxmbEntity.class); try { - gbiZbxmbEntity.setZt("1"); + gbiZbxmbEntity.setZt("3"); logger.info("=========开始删除指标项目表========="); int delete = gbiZbxmbDao.deleteGbiZbxmbEntity(gbiZbxmbEntity); logger.info("==========指标项目表删除完毕======"); diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml index 5b16128d..46ce768f 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml @@ -272,7 +272,7 @@ left join gl_pznr pznr on pznr.idpzh=pzml.idpzh and pzml.kjqj=pznr.kjqj and pzml.idpzh = #{idpzh} - and pzml.kjqj =#{kjqj} and pznr.kjqj =#{kjqj} and pznr.zbid!=0 + and (pzml.srrq>=#{srrq} or pzml.shrq >=#{shrq} or pzml.jzrq>=#{jzrq}) and pznr.zbid!=0 group by pzml.idpzh, pzml.kjqj, diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java index 41b7a6a2..d010f2c6 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java @@ -670,10 +670,15 @@ public class SenderGlPzmlServiceImpl extends BaseService senderPubbmxxEntities = queryEntityPageHealthBureau(senderPubbmxxEntity); - if(CollectionUtils.isEmpty(senderPubbmxxEntities)){ + if(CollectionUtils.isNotEmpty(senderPubbmxxEntities)){ + logger.info("====根据公司编码:{}，会计年度:{}，部门代码:{}查询数据有{}条",receiverPubbmxxEntity.getGsdm(),receiverPubbmxxEntity.getKjnd(),receiverPubbmxxEntity.getBmdm(),senderPubbmxxEntities.size()); + logger.info("部门代码:{}在公司代码为：{}和会计年度为{}中已经存在",receiverPubbmxxEntity.getBmdm(),receiverPubbmxxEntity.getGsdm(),receiverPubbmxxEntity.getKjnd()); + return BaseResult.getFailureMessageEntity("该部门编码已经存在,不保存"); + }else{ + receiverPubbmxxEntity.setId(receiverPubbmxxEntity.getGsdm()+'-'+receiverPubbmxxEntity.getKjnd()+'-'+receiverPubbmxxEntity.getBmdm()); + logger.info("==========开始保存公司编码为：{}得部门信息，id为:{}=========",receiverPubbmxxEntity.getGsdm(),receiverPubbmxxEntity.getId()); + SenderPubbmxxEntity receiverPubbmxxEntity1 = senderPubbmxxDao.savePubbmxxHealthBureau(receiverPubbmxxEntity); + JSONObject jsonObject1=new JSONObject(); + jsonObject1.put("status","200"); + jsonObject1.put("bmxx",receiverPubbmxxEntity1); + return jsonObject1; + } + /*if(CollectionUtils.isEmpty(senderPubbmxxEntities)){ receiverPubbmxxEntity.setId(receiverPubbmxxEntity.getGsdm()+'-'+receiverPubbmxxEntity.getKjnd()+'-'+receiverPubbmxxEntity.getBmdm()); logger.info("==========开始保存公司编码为：{}得部门信息，id为:{}=========",receiverPubbmxxEntity.getGsdm(),receiverPubbmxxEntity.getId()); SenderPubbmxxEntity receiverPubbmxxEntity1 = senderPubbmxxDao.savePubbmxxHealthBureau(receiverPubbmxxEntity); @@ -354,7 +367,7 @@ public class SenderPubbmxxServiceImpl extends BaseService senderPubzyxxEntities = queryEntityPageHealthBureau(senderPubzyxxEntity); - if(CollectionUtils.isEmpty(senderPubzyxxEntities)){ + if(CollectionUtils.isNotEmpty(senderPubzyxxEntities)){ + logger.info("====根据公司编码:{}，会计年度:{}，职员代码:{}查询数据有{}条",receiverPubzyxxEntity.getGsdm(),receiverPubzyxxEntity.getKjnd(),receiverPubzyxxEntity.getZydm(),senderPubzyxxEntities.size()); + logger.info("职员代码:{}在公司代码为：{}和会计年度为{}中已经存在",receiverPubzyxxEntity.getZydm(),receiverPubzyxxEntity.getGsdm(),receiverPubzyxxEntity.getKjnd()); + return BaseResult.getFailureMessageEntity("该职员编码已经存在,不保存"); + }else{ + receiverPubzyxxEntity.setSyzt("0"); + receiverPubzyxxEntity.setGlzt("0"); + receiverPubzyxxEntity.setId(receiverPubzyxxEntity.getGsdm()+'-'+receiverPubzyxxEntity.getKjnd()+'-'+receiverPubzyxxEntity.getZydm()); + logger.info("==========开始保存公司编码为：{}得人员信息，id为:{}=========",receiverPubzyxxEntity.getGsdm(),receiverPubzyxxEntity.getId()); + SenderPubzyxxEntity receiverPubzyxxEntity1 = senderPubzyxxDao.savePubzyxxHealthBureau(receiverPubzyxxEntity); + JSONObject jsonObject1=new JSONObject(); + jsonObject1.put("status","200"); + jsonObject1.put("zyxx",receiverPubzyxxEntity1); + return jsonObject1; + } + /*if(CollectionUtils.isEmpty(senderPubzyxxEntities)){ receiverPubzyxxEntity.setSyzt("0"); receiverPubzyxxEntity.setGlzt("0"); receiverPubzyxxEntity.setId(receiverPubzyxxEntity.getGsdm()+'-'+receiverPubzyxxEntity.getKjnd()+'-'+receiverPubzyxxEntity.getZydm()); @@ -344,7 +359,7 @@ public class SenderPubzyxxServiceImpl extends BaseService { - /** * * @content 更新文号 @@ -22,5 +21,6 @@ public interface IZbWhszDao extends IBaseDao { * **/ ZbWhszEntity updateZbWhszEntity(ZbWhszEntity zbWhszEntity); + } diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/dao/IZbZblyDao.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/dao/IZbZblyDao.java index f8209872..2752127d 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/dao/IZbZblyDao.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/dao/IZbZblyDao.java @@ -11,7 +11,6 @@ import com.hzya.frame.grpU8.nxproof.zbzbly.entity.ZbZblyEntity; * @since 2024-08-06 10:54:31 */ public interface IZbZblyDao extends IBaseDao { - /** * * @content 更新指标来源 @@ -22,5 +21,7 @@ public interface IZbZblyDao extends IBaseDao { * **/ ZbZblyEntity updateZbZblyEntity(ZbZblyEntity zblyEntity); + + }