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 0c41c1fb..bfa9d148 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 @@ -29,4 +29,17 @@ public interface IAcctVouchInfoService extends IBaseService list = senderGlPzmlDao.querySenderGlPzmlEntity(entity); + PageInfo pageInfo = new PageInfo(list); + JSONObject returnObject = new JSONObject(); + returnObject.put("status","success"); + returnObject.put("data",pageInfo); + returnObject.put("msg","查询成功"); + + return returnObject; + }else { + List list = senderGlPzmlDao.querySenderGlPzmlEntity(entity); + JSONObject returnObject = new JSONObject(); + returnObject.put("status","success"); + returnObject.put("data",list); + returnObject.put("msg","查询成功"); + + return returnObject; + } + } + /** + * @param object + * @return java.lang.Object + * @Author lvleigang + * @Description 查询凭证内容 + * @Date 1:48 下午 2024/8/27 + **/ + @Override + public Object queryPznr(JSONObject object) { + SenderGlPznrEntity entity = getData("jsonStr", object,SenderGlPznrEntity.class); + //判断分页 + if (entity.getPageNum() != null && entity.getPageSize() != null) { + PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); + List list = senderGlPznrDao.querySenderGlPznrEntity(entity); + PageInfo pageInfo = new PageInfo(list); + JSONObject returnObject = new JSONObject(); + returnObject.put("status","success"); + returnObject.put("data",pageInfo); + returnObject.put("msg","查询成功"); + + return returnObject; + }else { + List list = senderGlPznrDao.querySenderGlPznrEntity(entity); + JSONObject returnObject = new JSONObject(); + returnObject.put("status","success"); + returnObject.put("data",list); + returnObject.put("msg","查询成功"); + + return returnObject; + } + } + + /** + * @param object + * @return java.lang.Object + * @Author lvleigang + * @Description 查询凭证 目录 内容 辅助核算 + * @Date 1:48 下午 2024/8/27 + **/ + @Override + public Object queryPz(JSONObject object) { + SenderGlPzmlEntity entity = getData("jsonStr", object,SenderGlPzmlEntity.class); + //判断分页 + if (entity.getIdpzh() != null && !"".equals(entity.getIdpzh())) { + //查询凭证目录 + SenderGlPzmlEntity senderGlPzmlEntity = senderGlPzmlDao.queryPzmlByIdpzh(entity); + if(senderGlPzmlEntity.getIdpzh() != null && !"".equals(senderGlPzmlEntity.getIdpzh())){ + //查询凭证内容 + SenderGlPznrEntity senderGlPznrEntity = new SenderGlPznrEntity(); + senderGlPznrEntity.setDataSourceCode(entity.getDataSourceCode()); + senderGlPznrEntity.setIdpzh(entity.getIdpzh()); + List list = senderGlPznrDao.querySenderGlPznrEntityByIdpzh(senderGlPznrEntity); + //查询辅助核算 + if(list != null && list.size() > 0){ + GlFzxzlEntityDto glFzxzlEntityDto = new GlFzxzlEntityDto(); + glFzxzlEntityDto.setDataSourceCode(entity.getDataSourceCode()); + 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); + //todo 查询数据，设置值 + 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); + } + + } + } + } + } + } + } + } + } + } + } + } + }else { + JSONObject returnObject = new JSONObject(); + returnObject.put("status","false"); + returnObject.put("msg","查询错误，根据idpzh未查询到凭证"); + return returnObject; + } + JSONObject returnObject = new JSONObject(); + returnObject.put("status","success"); + returnObject.put("data",senderGlPzmlEntity); + returnObject.put("msg","查询成功"); + return returnObject; + }else { + JSONObject returnObject = new JSONObject(); + returnObject.put("status","false"); + returnObject.put("msg","查询错误，idpzh为空"); + return returnObject; + } + } } diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/ISenderGlPzmlDao.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/ISenderGlPzmlDao.java index 529198c9..ff54dd7c 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/ISenderGlPzmlDao.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/ISenderGlPzmlDao.java @@ -83,7 +83,6 @@ public interface ISenderGlPzmlDao extends IBaseDao { * **/ Integer deleteGlPzmlHealthBureau(SenderGlPzmlEntity senderGlPzmlEntity); - - + SenderGlPzmlEntity queryPzmlByIdpzh(SenderGlPzmlEntity entity); } 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 9b4655f7..f1d15408 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 @@ -3,6 +3,8 @@ package com.hzya.frame.grpU8.nxproof.glPzml.dao.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity; +import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntityVo; import com.hzya.frame.grpU8.nxproof.glPzml.dao.ISenderGlPzmlDao; import com.hzya.frame.grpU8.nxproof.glPzml.entity.SenderGlPzmlEntity; import org.springframework.stereotype.Repository; @@ -60,5 +62,14 @@ public class SenderGlPzmlDaoImpl extends MybatisGenericDao { * **/ Integer deleteGlPznrHealthBureau(SenderGlPznrEntity senderGlPznrEntity); + List querySenderGlPznrEntityByIdpzh(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 b682b1fb..a3909627 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 @@ -4,6 +4,7 @@ package com.hzya.frame.grpU8.nxproof.glPznr.dao.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntityVo; import com.hzya.frame.grpU8.nxproof.glPznr.dao.ISenderGlPznrDao; import com.hzya.frame.grpU8.nxproof.glPznr.entity.SenderGlPznrEntity; import org.springframework.stereotype.Repository; @@ -68,6 +69,12 @@ public class SenderGlPznrDaoImpl extends MybatisGenericDao querySenderGlPznrEntityByIdpzh(SenderGlPznrEntity senderGlPznrEntity) { + List o = (List) super.selectList(getSqlIdPrifx() + "querySenderGlPznrEntityByIdpzh", senderGlPznrEntity); + return o; + } } 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 238db05c..111e932b 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 @@ -1,8 +1,11 @@ package com.hzya.frame.grpU8.nxproof.glPznr.entity; +import com.alibaba.fastjson.JSONObject; import com.hzya.frame.web.entity.BaseEntity; +import java.util.List; + /** * (GlPznr)实体类 * @@ -109,7 +112,8 @@ private String hzflh; private String cyxfx; private String dqrq; private String glidpznr; - +private String fzhs; + private List fzhslist; public String getBxdid() { return bxdid; } @@ -814,5 +818,20 @@ private String glidpznr; this.jfsqid = jfsqid; } + public String getFzhs() { + return fzhs; + } + + public void setFzhs(String fzhs) { + this.fzhs = fzhs; + } + + public List getFzhslist() { + return fzhslist; + } + + public void setFzhslist(List fzhslist) { + this.fzhslist = fzhslist; + } } 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 3e2eef96..3d6087d0 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 @@ -91,6 +91,7 @@ + @@ -891,6 +892,153 @@ update gl_pznr set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{mo and idpzh = #{idpzh} + + diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/dao/IGlFzxzlDao.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/dao/IGlFzxzlDao.java index 382920c9..2aef0aa6 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/dao/IGlFzxzlDao.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/dao/IGlFzxzlDao.java @@ -1,8 +1,10 @@ package com.hzya.frame.grpU8.nxproof.glfzxzl.dao; +import com.alibaba.fastjson.JSONObject; import com.hzya.frame.basedao.dao.IBaseDao; import com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlEntity; +import com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlEntityDto; import java.util.List; @@ -14,7 +16,6 @@ import java.util.List; */ public interface IGlFzxzlDao extends IBaseDao { - //查询辅助项资料 - List queryGlFzxzlEntity(GlFzxzlEntity glFzxzlEntity); + List queryFzhs(GlFzxzlEntityDto glFzxzlEntityDto); } diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/dao/impl/GlFzxzlDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/dao/impl/GlFzxzlDaoImpl.java index ebc28e5b..1774491a 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/dao/impl/GlFzxzlDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/dao/impl/GlFzxzlDaoImpl.java @@ -1,10 +1,13 @@ package com.hzya.frame.grpU8.nxproof.glfzxzl.dao.impl; +import com.alibaba.fastjson.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.grpU8.nxproof.glPznr.entity.SenderGlPznrEntity; import com.hzya.frame.grpU8.nxproof.glfzxzl.dao.IGlFzxzlDao; import com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlEntity; +import com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlEntityDto; import org.springframework.stereotype.Repository; import java.util.List; @@ -17,11 +20,11 @@ import java.util.List; */ @Repository(value = "GlFzxzlDaoImpl") public class GlFzxzlDaoImpl extends MybatisGenericDao implements IGlFzxzlDao { - - @DS("#glFzxzlEntity.dataSourceCode") + @DS("#glFzxzlEntityDto.dataSourceCode") @Override - public List queryGlFzxzlEntity(GlFzxzlEntity glFzxzlEntity) { - return super.queryByLike(glFzxzlEntity); + public List queryFzhs(GlFzxzlEntityDto glFzxzlEntityDto) { + List o = (List) super.selectList(getSqlIdPrifx() + "queryFzhs", glFzxzlEntityDto); + return o; } } diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntity.xml index d35707fd..fb4e35d0 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntity.xml +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntity.xml @@ -280,5 +280,57 @@ update GL_Fzxzl set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{m delete from GL_Fzxzl where gsdm = #{gsdm} + + diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntityDto.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntityDto.java new file mode 100644 index 00000000..ce16ef7f --- /dev/null +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntityDto.java @@ -0,0 +1,30 @@ +package com.hzya.frame.grpU8.nxproof.glfzxzl.entity; + + +import com.hzya.frame.web.entity.BaseEntity; + +import java.util.List; + + +public class GlFzxzlEntityDto extends BaseEntity { + + private String sfyz; + private List glFzxzlNrEntityDtos; + + public String getSfyz() { + return sfyz; + } + + public void setSfyz(String sfyz) { + this.sfyz = sfyz; + } + + public List getGlFzxzlNrEntityDtos() { + return glFzxzlNrEntityDtos; + } + + public void setGlFzxzlNrEntityDtos(List glFzxzlNrEntityDtos) { + this.glFzxzlNrEntityDtos = glFzxzlNrEntityDtos; + } +} + diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlNrDmEntityDto.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlNrDmEntityDto.java new file mode 100644 index 00000000..3bfee7bf --- /dev/null +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlNrDmEntityDto.java @@ -0,0 +1,29 @@ +package com.hzya.frame.grpU8.nxproof.glfzxzl.entity; + + +import com.hzya.frame.web.entity.BaseEntity; + + +public class GlFzxzlNrDmEntityDto extends BaseEntity { + + private String lbdm; + private String fzdm; + + + public String getLbdm() { + return lbdm; + } + + public void setLbdm(String lbdm) { + this.lbdm = lbdm; + } + + public String getFzdm() { + return fzdm; + } + + public void setFzdm(String fzdm) { + this.fzdm = fzdm; + } +} + diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlNrEntityDto.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlNrEntityDto.java new file mode 100644 index 00000000..779c18fc --- /dev/null +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlNrEntityDto.java @@ -0,0 +1,40 @@ +package com.hzya.frame.grpU8.nxproof.glfzxzl.entity; + + +import com.hzya.frame.web.entity.BaseEntity; + +import java.util.List; + + +public class GlFzxzlNrEntityDto extends BaseEntity { + + private String gsdm; + private String kjnd; + private List glFzxzlNrDmEntityDtos; + + + public String getGsdm() { + return gsdm; + } + + public void setGsdm(String gsdm) { + this.gsdm = gsdm; + } + + public String getKjnd() { + return kjnd; + } + + public void setKjnd(String kjnd) { + this.kjnd = kjnd; + } + + public List getGlFzxzlNrDmEntityDtos() { + return glFzxzlNrDmEntityDtos; + } + + public void setGlFzxzlNrDmEntityDtos(List glFzxzlNrDmEntityDtos) { + this.glFzxzlNrDmEntityDtos = glFzxzlNrDmEntityDtos; + } +} + 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 fd84ff0e..38e82e73 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 @@ -39,6 +39,12 @@ public class GrpU8ServiceImpl implements IGrpU8Service { returnObject.put("msg","请先传递查询类型"); return returnObject; } + if(jsonObject.get("dataSourceCode") == null || "".equals(jsonObject.getString("dataSourceCode"))){ + JSONObject returnObject = new JSONObject(); + returnObject.put("status","false"); + returnObject.put("msg","系统错误请联系管理员"); + return returnObject; + } Object returnObject = null; switch (jsonObject.getString("queryType")){ case "1"://往来单位查询接口 @@ -69,12 +75,15 @@ public class GrpU8ServiceImpl implements IGrpU8Service { returnObject=glXjllxmService.queryEntityPage(object); break; case "10"://总账凭证查询接口 ml + returnObject = acctVouchInfoService.queryPzml(object); break; - case "11"://象山总账凭证查询接口 nr + case "11"://总账凭证查询分路接口 nr + returnObject = acctVouchInfoService.queryPznr(object); break; - case "12"://象山总账凭证查询接口 ml nr fzhs 单个 + case "12"://总账凭证单个查询接口 ml nr fzhs 单个 + returnObject = acctVouchInfoService.queryPz(object); break; - case "13"://象山总账凭证查询接口 ml nr fzhs 分页 + case "13"://总账凭证查询分页接口 ml nr fzhs 分页 break; default: JSONObject jsonObject1 = new JSONObject();