From 8ed181f7ff9fc2a060ae2c405cd89f3f1e7e5ccf Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Fri, 30 Aug 2024 10:12:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=95=86=E5=AD=A6=E9=99=A2?= =?UTF-8?q?=E5=87=AD=E8=AF=81=E6=9F=A5=E8=AF=A2=EF=BC=8C=E4=B8=8D=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8C=87=E6=A0=87=E8=A1=A8=E4=B8=AD=E7=9A=84id?= =?UTF-8?q?=E5=92=8C=E9=87=91=E9=A2=9D=EF=BC=8C=E6=94=B9=E4=B8=BA=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=87=AD=E8=AF=81=E5=86=85=E5=AE=B9=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=8C=87=E6=A0=87id=E5=92=8C=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GbiZbxmbServiceImpl.java | 4 +- .../glPzml/entity/SenderGlPzmlEntity.xml | 4 +- .../service/impl/SenderGlPzmlServiceImpl.java | 37 +++++++------------ .../nxproof/glPznr/dao/ISenderGlPznrDao.java | 2 + .../glPznr/dao/impl/SenderGlPznrDaoImpl.java | 6 +++ .../glPznr/entity/SenderGlPznrEntity.xml | 4 ++ 6 files changed, 28 insertions(+), 29 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 661b60bf..718aafcb 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 @@ -113,8 +113,8 @@ public class GbiZbxmbServiceImpl extends BaseService imp gbiZbxmbEntity.setSfjz("0");//是否结转 gbiZbxmbEntity.setCyskzfs("0");//超预算控制方式 gbiZbxmbEntity.setYjbfb(100.00);//预警百分比 - gbiZbxmbEntity.setPfrid(-1);//批复人id - gbiZbxmbEntity.setShrid(-1);//审核人id + //gbiZbxmbEntity.setPfrid(-1);//批复人id + //gbiZbxmbEntity.setShrid(-1);//审核人id gbiZbxmbEntity.setSjly(1);//数据来源 gbiZbxmbEntity.setXfzt("0");//下发状态 gbiZbxmbEntity.setNcysy(0.00);//年初已使用 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 85d484c3..5b16128d 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 @@ -265,8 +265,6 @@ pzml.idpzh as idpzh, pzml.kjqj as kjqj, pzml.srrq as srrq, - pzml.srID as srID, - pznr.bmdm as bmdm, pzml.pzzy as pzzy, sum(pznr.je) as pzje, pzml.gsdm,pzml.zth,pzml.kjqj,pzml.pzh @@ -280,7 +278,7 @@ pzml.kjqj, pzml.srrq, pzml.pzzy, - pzml.gsdm,pzml.zth,pzml.kjqj,pzml.pzh,pzml.srID,pznr.bmdm + pzml.gsdm,pzml.zth,pzml.kjqj,pzml.pzh 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 203aa79e..41b7a6a2 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 @@ -1,6 +1,5 @@ package com.hzya.frame.grpU8.nxproof.glPzml.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; @@ -8,8 +7,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.basedao.service.impl.BaseService; -import com.hzya.frame.grpU8.nxproof.gbizbxmb.dao.IGbiZbxmbDao; -import com.hzya.frame.grpU8.nxproof.gbizbxmb.entity.GbiZbxmbEntity; import com.hzya.frame.grpU8.nxproof.glPzml.dao.ISenderGlPzmlDao; import com.hzya.frame.grpU8.nxproof.glPzml.entity.SenderGlPzmlEntity; import com.hzya.frame.grpU8.nxproof.glPzml.service.ISenderGlPzmlService; @@ -18,10 +15,7 @@ import com.hzya.frame.grpU8.nxproof.glPznr.entity.SenderGlPznrEntity; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.apache.commons.collections.CollectionUtils; -import org.mybatis.spring.SqlSessionTemplate; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.math.BigDecimal; @@ -45,8 +39,6 @@ public class SenderGlPzmlServiceImpl extends BaseService gbiZbsyrecEntities = gbiZbxmbDao.queryZbxmbByIdpzh(gbiZbxmbEntity); - logger.info("=======根据凭证idpzh:{}查询的指标金额和指标id数据有{}条",pzmlEntity.getIdpzh(),gbiZbsyrecEntities.size()); - if(CollectionUtils.isEmpty(gbiZbsyrecEntities)){ + //根据idpzh查询指标id和指标金额以及部门经济科目 + SenderGlPznrEntity senderGlPznrEntity=new SenderGlPznrEntity(); + senderGlPznrEntity.setIdpzh(pzmlEntity.getIdpzh()); + senderGlPznrEntity.setDataSourceCode(glPzmlEntity.getDataSourceCode()); + List senderGlPznrEntities = senderGlPznrDao.queryGlPznrSxy(senderGlPznrEntity); + logger.info("=======根据凭证idpzh:{}查询的指标金额和指标id以及部门经济科目数据有{}条",pzmlEntity.getIdpzh(),senderGlPznrEntities.size()); + if(CollectionUtils.isEmpty(senderGlPznrEntities)){ jsonObjectParams.put("reimburseItems",new ArrayList<>()); }else{ JSONArray jsonArray=new JSONArray(); - for (GbiZbxmbEntity zbxmbEntity : gbiZbsyrecEntities) { - BigDecimal bigDecimalValueZbxmb = new BigDecimal(zbxmbEntity.getJe()); + for (SenderGlPznrEntity glPznrEntity : senderGlPznrEntities) { + BigDecimal bigDecimalValueZbxmb = new BigDecimal(glPznrEntity.getJe()); BigDecimal roundedValueZbxmb = bigDecimalValueZbxmb.setScale(2, RoundingMode.HALF_UP); JSONObject jsonObjectZbxm=new JSONObject(); - jsonObjectZbxm.put("thirdProjectCode",zbxmbEntity.getZbid()); + jsonObjectZbxm.put("thirdProjectCode",glPznrEntity.getZbid()); jsonObjectZbxm.put("amount",roundedValueZbxmb); - jsonObjectZbxm.put("financialCode",zbxmbEntity.getJjkmdm()); + jsonObjectZbxm.put("financialCode",glPznrEntity.getFzdm5()); jsonArray.add(jsonObjectZbxm); } jsonObjectParams.put("reimburseItems",jsonArray); @@ -763,7 +753,7 @@ public class SenderGlPzmlServiceImpl extends BaseService { Integer deleteGlPznrHealthBureau(SenderGlPznrEntity senderGlPznrEntity); List querySenderGlPznrEntityByIdpzh(SenderGlPznrEntity senderGlPznrEntity); + + List queryGlPznrSxy(SenderGlPznrEntity senderGlPznrEntity); } diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/impl/SenderGlPznrDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/impl/SenderGlPznrDaoImpl.java index a3909627..130d46e0 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/impl/SenderGlPznrDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/impl/SenderGlPznrDaoImpl.java @@ -76,6 +76,12 @@ public class SenderGlPznrDaoImpl extends MybatisGenericDao queryGlPznrSxy(SenderGlPznrEntity senderGlPznrEntity) { + return (List)super.selectList("queryGlPznrSxy",senderGlPznrEntity); + } + } diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.xml index 3d6087d0..3050d78a 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.xml +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.xml @@ -473,6 +473,10 @@ + + insert into gl_pznr(