diff --git a/buildpackage/src/main/resources/application-llg.yml b/buildpackage/src/main/resources/application-llg.yml index 0b33d662..04576afa 100644 --- a/buildpackage/src/main/resources/application-llg.yml +++ b/buildpackage/src/main/resources/application-llg.yml @@ -39,6 +39,8 @@ spring: savefile: # 文件保存路径 path: /Users/apple/Desktop/log/local + pluginpath: + tomcatpath: zt: url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface cbs8: diff --git a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java index bfa9d148..15425963 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java +++ b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java @@ -42,4 +42,6 @@ public interface IAcctVouchInfoService extends IBaseService 0) { glFzxzlEntityDto.setGlFzxzlNrEntityDtos(glFzxzlNrEntityDtos); - //todo 查询数据,设置值 + // 查询数据,设置值 List fzhss = glFzxzlDao.queryFzhs(glFzxzlEntityDto); if(fzhss != null && fzhss.size() > 0){ for (int i = 0; i < list.size(); i++) { @@ -296,4 +296,134 @@ public class AcctVouchInfoServiceImpl extends BaseService list = senderGlPzmlDao.querySenderGlPzmlEntity(entity); + PageInfo pageInfo = new PageInfo(list); + doPznrAndPzmlFzhs(list,entity.getDataSourceCode()); + JSONObject returnObject = new JSONObject(); + returnObject.put("status","success"); + returnObject.put("data",pageInfo); + returnObject.put("msg","查询成功"); + return returnObject; + }else { + JSONObject returnObject = new JSONObject(); + returnObject.put("status","false"); + returnObject.put("msg","请先传递分页参数"); + return returnObject; + } + } + + /** + * @Author lvleigang + * @Description 处理凭证内容和辅助核算 + * @Date 2:15 下午 2024/8/29 + * @param senderGlPzmlEntities + * @param dataSourceCode + * @return void + **/ + private void doPznrAndPzmlFzhs(List senderGlPzmlEntities, String dataSourceCode) { + if(senderGlPzmlEntities == null || senderGlPzmlEntities.size() == 0 ){ + return; + } + //查询凭证内容 + List idpzhs = new ArrayList<>(); + for (int i = 0; i < senderGlPzmlEntities.size(); i++) { + idpzhs.add(senderGlPzmlEntities.get(i).getIdpzh()); + } + SenderGlPznrEntity senderGlPznrEntity = new SenderGlPznrEntity(); + senderGlPznrEntity.setDataSourceCode(dataSourceCode); + senderGlPznrEntity.setIdpzhs(idpzhs); + List list = senderGlPznrDao.querySenderGlPznrEntityByIdpzh(senderGlPznrEntity); + if(list == null || list.size() == 0 ){ + return; + } + GlFzxzlEntityDto glFzxzlEntityDto = new GlFzxzlEntityDto(); + glFzxzlEntityDto.setDataSourceCode(dataSourceCode); + glFzxzlEntityDto.setSfyz("0"); + List glFzxzlNrEntityDtos = new ArrayList<>(); + for (int i = 0; i < list.size(); i++) { + if(list.get(i).getKjqj() != null && list.get(i).getKjqj().length() >= 4){ + GlFzxzlNrEntityDto glFzxzlNrEntityDto = new GlFzxzlNrEntityDto(); + glFzxzlNrEntityDto.setGsdm(list.get(i).getGsdm()); + glFzxzlNrEntityDto.setKjnd(list.get(i).getKjqj().substring(0,4)); + List glFzxzlNrDmEntityDtos = new ArrayList<>(); + + if(list.get(i).getFzhs() != null && !"".equals(list.get(i).getFzhs())){ + JSONObject jsonObject = (JSONObject) JSONObject.toJSON(list.get(i)); + String[] fzhs = list.get(i).getFzhs().split(","); + if(fzhs != null && fzhs.length > 0){ + for (int i1 = 0; i1 < fzhs.length; i1++) { + if(fzhs[i1] != null && !"".equals(fzhs[i1])){ + if(jsonObject.get("fzdm"+fzhs[i1]) != null && !"".equals(jsonObject.get("fzdm"+fzhs[i1]))){ + GlFzxzlNrDmEntityDto glFzxzlNrDmEntityDto = new GlFzxzlNrDmEntityDto(); + glFzxzlNrDmEntityDto.setLbdm(fzhs[i1]); + glFzxzlNrDmEntityDto.setFzdm(jsonObject.getString("fzdm"+fzhs[i1])); + glFzxzlNrDmEntityDtos.add(glFzxzlNrDmEntityDto); + } + } + } + } + } + if(glFzxzlNrDmEntityDtos.size() > 0){ + glFzxzlNrEntityDto.setGlFzxzlNrDmEntityDtos(glFzxzlNrDmEntityDtos); + glFzxzlNrEntityDtos.add(glFzxzlNrEntityDto); + } + } + } + if(glFzxzlNrEntityDtos.size() > 0) { + glFzxzlEntityDto.setGlFzxzlNrEntityDtos(glFzxzlNrEntityDtos); + // 查询数据,设置值 + List fzhss = glFzxzlDao.queryFzhs(glFzxzlEntityDto); + if(fzhss != null && fzhss.size() > 0){ + for (int i = 0; i < list.size(); i++) { + List fzhslist = new ArrayList<>(); + list.get(i).setFzhslist(fzhslist); + if (list.get(i).getKjqj() != null && list.get(i).getKjqj().length() >= 4) { + if (list.get(i).getFzhs() != null && !"".equals(list.get(i).getFzhs())) { + JSONObject jsonObject = (JSONObject) JSONObject.toJSON(list.get(i)); + String[] fzhs = list.get(i).getFzhs().split(","); + if (fzhs != null && fzhs.length > 0) { + for (int i1 = 0; i1 < fzhs.length; i1++) { + if (fzhs[i1] != null && !"".equals(fzhs[i1])) { + if (jsonObject.get("fzdm" + fzhs[i1]) != null && !"".equals(jsonObject.get("fzdm" + fzhs[i1]))) { + for (int i2 = 0; i2 < fzhss.size(); i2++) { + if(fzhss.get(i2).getString("lbdm").equals(fzhs[i1]) + && fzhss.get(i2).getString("gsdm").equals(list.get(i).getGsdm()) + && fzhss.get(i2).getString("kjnd").equals(list.get(i).getKjqj().substring(0,4)) + && fzhss.get(i2).getString("fzdm").equals(jsonObject.get("fzdm" + fzhs[i1])) + ){ + JSONObject a = new JSONObject(); + a.put("lbdm",fzhss.get(i2).getString("lbdm")); + a.put("fzdm",fzhss.get(i2).getString("fzdm")); + a.put("fzmc",fzhss.get(i2).getString("fzmc")); + fzhslist.add(a); + } + + } + } + } + } + } + } + } + } + } + } + + for (int i = 0; i < senderGlPzmlEntities.size(); i++) { + List senderGlPznrEntities = new ArrayList<>(); + for (int i1 = 0; i1 < list.size(); i1++) { + if(senderGlPzmlEntities.get(i).getIdpzh().equals(list.get(i1).getIdpzh())){ + senderGlPznrEntities.add(list.get(i1)); + } + } + senderGlPzmlEntities.get(i).setSenderGlPznrEntities(senderGlPznrEntities); + } + } } diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/impl/SenderGlPzmlDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/impl/SenderGlPzmlDaoImpl.java index c311f17d..8a228126 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/impl/SenderGlPzmlDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/impl/SenderGlPzmlDaoImpl.java @@ -77,11 +77,7 @@ public class SenderGlPzmlDaoImpl extends MybatisGenericDao queryGlPzmlSxy(SenderGlPzmlEntity senderGlPzmlEntity) { - return (List) super.selectList("queryGlPzmlSxy",senderGlPzmlEntity); - } + } diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.java index 111e932b..fa5c46e0 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.java @@ -114,6 +114,7 @@ private String dqrq; private String glidpznr; private String fzhs; private List fzhslist; + private List idpzhs; public String getBxdid() { return bxdid; } @@ -833,5 +834,13 @@ private String fzhs; public void setFzhslist(List fzhslist) { this.fzhslist = fzhslist; } + + public List getIdpzhs() { + return idpzhs; + } + + public void setIdpzhs(List idpzhs) { + this.idpzhs = idpzhs; + } } 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 cdd53c87..75c2fa5e 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 @@ -1036,6 +1036,14 @@ update gl_pznr set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{mo and pznr.ZBID like concat('%',#{zbid},'%') and pznr.EDID like concat('%',#{edid},'%') and pznr.JFSQID like concat('%',#{jfsqid},'%') + + AND pznr.idpzh in + + #{item} + + + diff --git a/service/src/main/java/com/hzya/frame/grpU8/service/impl/GrpU8ServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/service/impl/GrpU8ServiceImpl.java index e393ab69..1b7b52b1 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/service/impl/GrpU8ServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/service/impl/GrpU8ServiceImpl.java @@ -92,6 +92,7 @@ public class GrpU8ServiceImpl implements IGrpU8Service { returnObject = acctVouchInfoService.queryPz(object); break; case "13"://总账凭证查询分页接口 ml nr fzhs 分页 + returnObject = acctVouchInfoService.queryPzPage(object); break; default: JSONObject jsonObject1 = new JSONObject();