From e5ec5194e19e3486e60e29bd1e17fd4b8770ad66 Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Tue, 27 Aug 2024 09:14:28 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E7=BB=9F=E4=B8=80GrpU8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AcctVouchInfoServiceImpl.java | 3 +- .../frame/grpU8/service/IGrpU8Service.java | 8 +++ .../grpU8/service/impl/GrpU8ServiceImpl.java | 71 +++++++++++++++++++ 3 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 service/src/main/java/com/hzya/frame/grpU8/service/IGrpU8Service.java create mode 100644 service/src/main/java/com/hzya/frame/grpU8/service/impl/GrpU8ServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/impl/AcctVouchInfoServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/impl/AcctVouchInfoServiceImpl.java index b639c516..808374fd 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/impl/AcctVouchInfoServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/impl/AcctVouchInfoServiceImpl.java @@ -71,7 +71,8 @@ public class AcctVouchInfoServiceImpl extends BaseService T getData(String key, JSONObject jsonObject, Class clz) { + if (checkStr(jsonObject.getString(key)) ) { + return jsonObject.getJSONObject(key).toJavaObject(clz); + } + return null; + } + /** + * @param str + * @return void + * @Author lvleigang + * @Description 校验字符串 + * @Date 11:41 上午 2022/12/7 + **/ + protected Boolean checkStr(String str) { + Boolean flag = true; + if (str == null || "".equals(str)) { + flag = false; + } + return flag; + } +} From 5f7860d35cbf56e658712a40ecd8ecaa4674d4ea Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Tue, 27 Aug 2024 09:23:08 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E7=BB=9F=E4=B8=80GrpU8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hzya/frame/grpU8/service/impl/GrpU8ServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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 ef39ce79..e8fd3570 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 @@ -40,6 +40,8 @@ public class GrpU8ServiceImpl implements IGrpU8Service { break; case "10"://总账凭证查询接口 break; + case "11"://象山总账凭证查询接口 + break; default: returnObject = new JSONObject(); returnObject.put("status","false"); From c4d0ec9614a9e5b20a65637044de4f62e7db1e15 Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Tue, 27 Aug 2024 09:29:25 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E7=BB=9F=E4=B8=80GrpU8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../grpU8/service/impl/GrpU8ServiceImpl.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) 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 e8fd3570..c889a9ba 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 @@ -2,13 +2,17 @@ package com.hzya.frame.grpU8.service.impl; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity; +import com.hzya.frame.grpU8.acctVouchInfo.service.IAcctVouchInfoService; import com.hzya.frame.grpU8.service.IGrpU8Service; import org.springframework.stereotype.Service; +import javax.annotation.Resource; + @Service(value = "grpU8Service") public class GrpU8ServiceImpl implements IGrpU8Service { - + @Resource + private IAcctVouchInfoService acctVouchInfoService; @Override public Object queryData(JSONObject object) { JSONObject jsonObject = getData("jsonStr", object,JSONObject.class); @@ -18,11 +22,12 @@ public class GrpU8ServiceImpl implements IGrpU8Service { returnObject.put("msg","请先传递查询类型"); return returnObject; } - JSONObject returnObject = new JSONObject(); + Object returnObject = null; switch (jsonObject.getString("queryType")){ case "1"://往来单位查询接口 break; case "2"://部门查询接口 + returnObject = acctVouchInfoService.queryData(object); break; case "3"://固定辅助核算项查询接口 break; @@ -43,9 +48,10 @@ public class GrpU8ServiceImpl implements IGrpU8Service { case "11"://象山总账凭证查询接口 break; default: - returnObject = new JSONObject(); - returnObject.put("status","false"); - returnObject.put("msg","查询类型错误，请联系管理员"); + JSONObject jsonObject1 = new JSONObject(); + jsonObject1.put("status","false"); + jsonObject1.put("msg","查询类型错误，请联系管理员"); + returnObject = jsonObject1; break; } return returnObject; From 8edfdba5c184c4360586388e7d4ece474b463c9e Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Tue, 27 Aug 2024 10:29:30 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E7=BB=9F=E4=B8=80GrpU8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzya/frame/grpU8/service/impl/GrpU8ServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 c889a9ba..6cc283f9 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 @@ -43,9 +43,13 @@ public class GrpU8ServiceImpl implements IGrpU8Service { break; case "9"://现金流量项目查询接口 break; - case "10"://总账凭证查询接口 + case "10"://总账凭证查询接口 ml break; - case "11"://象山总账凭证查询接口 + case "11"://象山总账凭证查询接口 nr + break; + case "12"://象山总账凭证查询接口 ml nr fzhs 单个 + break; + case "13"://象山总账凭证查询接口 ml nr fzhs 分页 break; default: JSONObject jsonObject1 = new JSONObject(); From 2527d6a8447f11c51795cccf76a1d0b3bfc923bf Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Tue, 27 Aug 2024 17:48:13 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=EF=BC=8C=E7=8E=B0=E9=87=91=E6=B5=81=E9=87=8F=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../grpU8/service/impl/GrpU8ServiceImpl.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) 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 6cc283f9..fd84ff0e 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 @@ -3,7 +3,13 @@ package com.hzya.frame.grpU8.service.impl; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity; import com.hzya.frame.grpU8.acctVouchInfo.service.IAcctVouchInfoService; +import com.hzya.frame.grpU8.nxproof.glfzxzl.service.IGlFzxzlService; +import com.hzya.frame.grpU8.nxproof.glxjllxm.service.IGlXjllxmService; +import com.hzya.frame.grpU8.nxproof.glxmzl.service.ISenderGlXmzlService; +import com.hzya.frame.grpU8.nxproof.pubbmxx.service.ISenderPubbmxxService; +import com.hzya.frame.grpU8.nxproof.pubkszl.service.IPubkszlService; import com.hzya.frame.grpU8.service.IGrpU8Service; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -13,6 +19,17 @@ public class GrpU8ServiceImpl implements IGrpU8Service { @Resource private IAcctVouchInfoService acctVouchInfoService; + @Autowired + private ISenderPubbmxxService senderPubbmxxService; + @Autowired + private IPubkszlService pubkszlService; + @Autowired + private IGlXjllxmService glXjllxmService; + @Autowired + private IGlFzxzlService glFzxzlService; + @Autowired + private ISenderGlXmzlService senderGlXmzlService; + @Override public Object queryData(JSONObject object) { JSONObject jsonObject = getData("jsonStr", object,JSONObject.class); @@ -25,23 +42,31 @@ public class GrpU8ServiceImpl implements IGrpU8Service { Object returnObject = null; switch (jsonObject.getString("queryType")){ case "1"://往来单位查询接口 + returnObject = pubkszlService.queryEntityPage(object); break; case "2"://部门查询接口 returnObject = acctVouchInfoService.queryData(object); break; case "3"://固定辅助核算项查询接口 + returnObject = glFzxzlService.queryEntityPage(object); break; case "4"://项目查询接口 + returnObject = senderGlXmzlService.queryEntityPage(object); break; case "5"://功能科目查询接口 break; case "6"://部门经济科目查询接口 + //部门经济科目是辅助项资料类别为5得数据 + if(jsonObject.getString("lbdm") !=null && jsonObject.getString("lbdm").equals("5")){ + returnObject = glFzxzlService.queryEntityPage(object); + } break; case "7"://科目总账余额查询接口 break; case "8"://科目辅助余额查询接口 break; case "9"://现金流量项目查询接口 + returnObject=glXjllxmService.queryEntityPage(object); break; case "10"://总账凭证查询接口 ml break; From 997ef25be69cad6d286aea8b1811c5a749f735c8 Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Wed, 28 Aug 2024 10:12:13 +0800 Subject: [PATCH 06/19] =?UTF-8?q?=E7=BB=9F=E4=B8=80GrpU8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IAcctVouchInfoService.java | 13 ++ .../impl/AcctVouchInfoServiceImpl.java | 194 +++++++++++++++++- .../nxproof/glPzml/dao/ISenderGlPzmlDao.java | 3 +- .../glPzml/dao/impl/SenderGlPzmlDaoImpl.java | 11 + .../nxproof/glPznr/dao/ISenderGlPznrDao.java | 1 + .../glPznr/dao/impl/SenderGlPznrDaoImpl.java | 7 + .../glPznr/entity/SenderGlPznrEntity.java | 21 +- .../glPznr/entity/SenderGlPznrEntity.xml | 148 +++++++++++++ .../nxproof/glfzxzl/dao/IGlFzxzlDao.java | 5 + .../glfzxzl/dao/impl/GlFzxzlDaoImpl.java | 14 +- .../nxproof/glfzxzl/entity/GlFzxzlEntity.xml | 52 +++++ .../glfzxzl/entity/GlFzxzlEntityDto.java | 30 +++ .../glfzxzl/entity/GlFzxzlNrDmEntityDto.java | 29 +++ .../glfzxzl/entity/GlFzxzlNrEntityDto.java | 40 ++++ .../grpU8/service/impl/GrpU8ServiceImpl.java | 15 +- 15 files changed, 575 insertions(+), 8 deletions(-) create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntityDto.java create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlNrDmEntityDto.java create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlNrEntityDto.java 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 44bdbe8c..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,12 @@ 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; /** * (GL_Fzxzl: table)表数据库访问层 @@ -12,5 +16,6 @@ import com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlEntity; */ public interface IGlFzxzlDao extends IBaseDao { + 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 93466835..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,17 @@ 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; + /** * (GlFzxzl)表数据库访问层 * @@ -13,6 +20,11 @@ import org.springframework.stereotype.Repository; */ @Repository(value = "GlFzxzlDaoImpl") public class GlFzxzlDaoImpl extends MybatisGenericDao implements IGlFzxzlDao { - + @DS("#glFzxzlEntityDto.dataSourceCode") + @Override + 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 6cc283f9..a8a61ab7 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 @@ -22,6 +22,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"://往来单位查询接口 @@ -44,12 +50,15 @@ public class GrpU8ServiceImpl implements IGrpU8Service { case "9"://现金流量项目查询接口 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(); From ee06735f34ca031478bfebf4a2827de5daaedade Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Wed, 28 Aug 2024 10:43:42 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BE=85=E5=8A=A9?= =?UTF-8?q?=E9=A1=B9=E8=B5=84=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nxproof/glfzxzl/dao/IGlFzxzlDao.java | 4 +++ .../glfzxzl/dao/impl/GlFzxzlDaoImpl.java | 11 ++++++- .../glfzxzl/service/IGlFzxzlService.java | 11 +++++++ .../service/impl/GlFzxzlServiceImpl.java | 32 +++++++++++++++++++ 4 files changed, 57 insertions(+), 1 deletion(-) 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 44bdbe8c..382920c9 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 @@ -4,6 +4,8 @@ package com.hzya.frame.grpU8.nxproof.glfzxzl.dao; import com.hzya.frame.basedao.dao.IBaseDao; import com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlEntity; +import java.util.List; + /** * (GL_Fzxzl: table)表数据库访问层 * @@ -12,5 +14,7 @@ import com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlEntity; */ public interface IGlFzxzlDao extends IBaseDao { + //查询辅助项资料 + List queryGlFzxzlEntity(GlFzxzlEntity glFzxzlEntity); } 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 93466835..ebc28e5b 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,14 @@ package com.hzya.frame.grpU8.nxproof.glfzxzl.dao.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.dao.MybatisGenericDao; import com.hzya.frame.grpU8.nxproof.glfzxzl.dao.IGlFzxzlDao; import com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlEntity; import org.springframework.stereotype.Repository; + +import java.util.List; + /** * (GlFzxzl)表数据库访问层 * @@ -13,6 +17,11 @@ import org.springframework.stereotype.Repository; */ @Repository(value = "GlFzxzlDaoImpl") public class GlFzxzlDaoImpl extends MybatisGenericDao implements IGlFzxzlDao { - + + @DS("#glFzxzlEntity.dataSourceCode") + @Override + public List queryGlFzxzlEntity(GlFzxzlEntity glFzxzlEntity) { + return super.queryByLike(glFzxzlEntity); + } } diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/service/IGlFzxzlService.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/service/IGlFzxzlService.java index 7aa8398c..b55f00d9 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/service/IGlFzxzlService.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/service/IGlFzxzlService.java @@ -1,6 +1,7 @@ package com.hzya.frame.grpU8.nxproof.glfzxzl.service; +import com.alibaba.fastjson.JSONObject; import com.hzya.frame.basedao.service.IBaseService; import com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlEntity; @@ -11,4 +12,14 @@ import com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlEntity; * @since 2024-08-06 10:56:29 */ public interface IGlFzxzlService extends IBaseService { + /** + * + * @content 查询辅助项资料 + * @Param + * @Return + * @Author hecan + * @Date 2024/8/27 17:26 + * **/ + Object queryEntityPage(JSONObject json); + } diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/service/impl/GlFzxzlServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/service/impl/GlFzxzlServiceImpl.java index 8d81d7bb..11b92f37 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/service/impl/GlFzxzlServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/service/impl/GlFzxzlServiceImpl.java @@ -1,13 +1,19 @@ package com.hzya.frame.grpU8.nxproof.glfzxzl.service.impl; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; import com.hzya.frame.basedao.service.impl.BaseService; 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.service.IGlFzxzlService; +import com.hzya.frame.grpU8.nxproof.pubkszl.entity.PubkszlEntity; +import com.hzya.frame.web.entity.BaseResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * (GlFzxzl)表服务实现类 * @@ -24,4 +30,30 @@ public class GlFzxzlServiceImpl extends BaseService imple this.glFzxzlDao = dao; this.dao = dao; } + + //查询辅助项资料 + @Override + public Object queryEntityPage(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + GlFzxzlEntity glFzxzlEntity = jsonObject.toJavaObject(GlFzxzlEntity.class); + if(!checkStr(jsonObject.getString("kjnd"))){ + logger.info("========查询辅助项资料传递得会计年度为空=========="); + return BaseResult.getFailureMessageEntity("会计年度为空"); + } + if(!checkStr(jsonObject.getString("gsdm"))){ + logger.info("========查询辅助项资料传递得公司代码为空=========="); + return BaseResult.getFailureMessageEntity("公司代码为空"); + } + try { + List glFzxzlEntities = glFzxzlDao.queryGlFzxzlEntity(glFzxzlEntity); + PageInfo pageInfo=new PageInfo(glFzxzlEntities); + JSONObject object=new JSONObject(); + object.put("pageInfo",pageInfo); + object.put("status","200"); + return object; + }catch (Exception e){ + logger.info("=======根据会计年度：{}，公司代码：{}查询辅助项资料失败======",jsonObject.getString("kjnd"),jsonObject.getString("gsdm"),e.getMessage()); + return BaseResult.getFailureMessageEntity("查询辅助项资料失败"); + } + } } From 57e6eeda10cdcf9ad24d0ea233e256db0e0cdd53 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Wed, 28 Aug 2024 10:49:28 +0800 Subject: [PATCH 08/19] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BE=85=E5=8A=A9?= =?UTF-8?q?=E9=A1=B9=E8=B5=84=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frame/grpU8/nxproof/glfzxzl/dao/IGlFzxzlDao.java | 10 ++++++++++ .../grpU8/nxproof/glfzxzl/dao/impl/GlFzxzlDaoImpl.java | 6 ++++++ 2 files changed, 16 insertions(+) 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 2aef0aa6..9c921736 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 @@ -17,5 +17,15 @@ import java.util.List; public interface IGlFzxzlDao extends IBaseDao { List queryFzhs(GlFzxzlEntityDto glFzxzlEntityDto); + + /** + * + * @content 查询辅助项资料 + * @Param + * @Return + * @Author hecan + * @Date 2024/8/28 10:47 + * **/ + List queryGlFzxzlEntity(GlFzxzlEntity glFzxzlEntity); } 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 1774491a..ed3f6459 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 @@ -26,5 +26,11 @@ public class GlFzxzlDaoImpl extends MybatisGenericDao imp List o = (List) super.selectList(getSqlIdPrifx() + "queryFzhs", glFzxzlEntityDto); return o; } + + @DS("#glFzxzlEntity.dataSourceCode") + @Override + public List queryGlFzxzlEntity(GlFzxzlEntity glFzxzlEntity) { + return super.queryByLike(glFzxzlEntity); + } } From d4aa1d93515c47212103ec330c32889cbbb7c866 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Wed, 28 Aug 2024 11:49:36 +0800 Subject: [PATCH 09/19] =?UTF-8?q?=E7=8E=B0=E9=87=91=E6=B5=81=E9=87=8F?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nxproof/glxjllxm/dao/IGlXjllxmDao.java | 19 ++ .../glxjllxm/dao/impl/GlXjllxmDaoImpl.java | 26 ++ .../glxjllxm/entity/GlXjllxmEntity.java | 150 +++++++++++ .../glxjllxm/entity/GlXjllxmEntity.xml | 252 ++++++++++++++++++ .../glxjllxm/service/IGlXjllxmService.java | 23 ++ .../service/impl/GlXjllxmServiceImpl.java | 58 ++++ 6 files changed, 528 insertions(+) create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/dao/IGlXjllxmDao.java create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/dao/impl/GlXjllxmDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/entity/GlXjllxmEntity.java create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/entity/GlXjllxmEntity.xml create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/service/IGlXjllxmService.java create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/service/impl/GlXjllxmServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/dao/IGlXjllxmDao.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/dao/IGlXjllxmDao.java new file mode 100644 index 00000000..a3914b28 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/dao/IGlXjllxmDao.java @@ -0,0 +1,19 @@ +package com.hzya.frame.grpU8.nxproof.glxjllxm.dao; + +import com.hzya.frame.grpU8.nxproof.glxjllxm.entity.GlXjllxmEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +import java.util.List; + +/** + * (GL_Xjllxm: table)表数据库访问层 + * + * @author makejava + * @since 2024-08-27 15:58:37 + */ +public interface IGlXjllxmDao extends IBaseDao { + //查询现金流量数据 + List queryGlXjllxmEntity(GlXjllxmEntity glXjllxmEntity); + +} + diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/dao/impl/GlXjllxmDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/dao/impl/GlXjllxmDaoImpl.java new file mode 100644 index 00000000..9651ffd4 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/dao/impl/GlXjllxmDaoImpl.java @@ -0,0 +1,26 @@ +package com.hzya.frame.grpU8.nxproof.glxjllxm.dao.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.grpU8.nxproof.glxjllxm.entity.GlXjllxmEntity; +import com.hzya.frame.grpU8.nxproof.glxjllxm.dao.IGlXjllxmDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; + +import java.util.List; + +/** + * (GlXjllxm)表数据库访问层 + * + * @author makejava + * @since 2024-08-27 15:58:37 + */ +@Repository(value = "GlXjllxmDaoImpl") +public class GlXjllxmDaoImpl extends MybatisGenericDao implements IGlXjllxmDao{ + + @DS("#glXjllxmEntity.dataSourceCode") + @Override + public List queryGlXjllxmEntity(GlXjllxmEntity glXjllxmEntity) { + return super.queryByLike(glXjllxmEntity); + } +} + diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/entity/GlXjllxmEntity.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/entity/GlXjllxmEntity.java new file mode 100644 index 00000000..f9b69d54 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/entity/GlXjllxmEntity.java @@ -0,0 +1,150 @@ +package com.hzya.frame.grpU8.nxproof.glxjllxm.entity; + +import com.hzya.frame.web.entity.BaseEntity; +/** + * (GlXjllxm)实体类 + *现金流量项目表 + * @author makejava + * @since 2024-08-27 15:58:37 + */ +public class GlXjllxmEntity extends BaseEntity { + + private String gsdm; + private String zth; + private String kjnd; + private String xjdm; + private String xjmc; + private String zjm; + private String xjlx; + private String syzt; + private String bz; + private Integer jlrId; + private String jlRq; + private Integer xgrId; + private String xgRq; + private String sjly; + private String sfmx; + + + public String getGsdm() { + return gsdm; + } + + public void setGsdm(String gsdm) { + this.gsdm = gsdm; + } + + public String getZth() { + return zth; + } + + public void setZth(String zth) { + this.zth = zth; + } + + public String getKjnd() { + return kjnd; + } + + public void setKjnd(String kjnd) { + this.kjnd = kjnd; + } + + public String getXjdm() { + return xjdm; + } + + public void setXjdm(String xjdm) { + this.xjdm = xjdm; + } + + public String getXjmc() { + return xjmc; + } + + public void setXjmc(String xjmc) { + this.xjmc = xjmc; + } + + public String getZjm() { + return zjm; + } + + public void setZjm(String zjm) { + this.zjm = zjm; + } + + public String getXjlx() { + return xjlx; + } + + public void setXjlx(String xjlx) { + this.xjlx = xjlx; + } + + public String getSyzt() { + return syzt; + } + + public void setSyzt(String syzt) { + this.syzt = syzt; + } + + public String getBz() { + return bz; + } + + public void setBz(String bz) { + this.bz = bz; + } + + public Integer getJlrId() { + return jlrId; + } + + public void setJlrId(Integer jlrId) { + this.jlrId = jlrId; + } + + public String getJlRq() { + return jlRq; + } + + public void setJlRq(String jlRq) { + this.jlRq = jlRq; + } + + public Integer getXgrId() { + return xgrId; + } + + public void setXgrId(Integer xgrId) { + this.xgrId = xgrId; + } + + public String getXgRq() { + return xgRq; + } + + public void setXgRq(String xgRq) { + this.xgRq = xgRq; + } + + public String getSjly() { + return sjly; + } + + public void setSjly(String sjly) { + this.sjly = sjly; + } + + public String getSfmx() { + return sfmx; + } + + public void setSfmx(String sfmx) { + this.sfmx = sfmx; + } + +} + diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/entity/GlXjllxmEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/entity/GlXjllxmEntity.xml new file mode 100644 index 00000000..a2615aba --- /dev/null +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/entity/GlXjllxmEntity.xml @@ -0,0 +1,252 @@ + + + + + + + + + + + + + + + + + + + + + + + + gsdm + ,ZTH + ,kjnd + ,xjdm + ,xjmc + ,zjm + ,xjlx + ,syzt + ,bz + ,Jlr_ID + ,Jl_RQ + ,Xgr_ID + ,Xg_RQ + ,Sjly + ,sfmx + + + + + + + + + + + + + + + + insert into GL_Xjllxm( + + gsdm , + ZTH , + kjnd , + xjdm , + xjmc , + zjm , + xjlx , + syzt , + bz , + Jlr_ID , + Jl_RQ , + Xgr_ID , + Xg_RQ , + Sjly , + sfmx , + + )values( + + #{gsdm} , + #{zth} , + #{kjnd} , + #{xjdm} , + #{xjmc} , + #{zjm} , + #{xjlx} , + #{syzt} , + #{bz} , + #{jlrId} , + #{jlRq} , + #{xgrId} , + #{xgRq} , + #{sjly} , + #{sfmx} , + + ) + + + + insert into GL_Xjllxm(xjmc, zjm, xjlx, syzt, bz, Jlr_ID, Jl_RQ, Xgr_ID, Xg_RQ, Sjly, sfmx, sts) + values + + (#{entity.xjmc},#{entity.zjm},#{entity.xjlx},#{entity.syzt},#{entity.bz},#{entity.jlrId},#{entity.jlRq},#{entity.xgrId},#{entity.xgRq},#{entity.sjly},#{entity.sfmx}, 'Y') + + + + + insert into GL_Xjllxm(xjmc, zjm, xjlx, syzt, bz, Jlr_ID, Jl_RQ, Xgr_ID, Xg_RQ, Sjly, sfmx) + values + + (#{entity.xjmc},#{entity.zjm},#{entity.xjlx},#{entity.syzt},#{entity.bz},#{entity.jlrId},#{entity.jlRq},#{entity.xgrId},#{entity.xgRq},#{entity.sjly},#{entity.sfmx}) + + on duplicate key update + xjmc = values(xjmc), + zjm = values(zjm), + xjlx = values(xjlx), + syzt = values(syzt), + bz = values(bz), + Jlr_ID = values(Jlr_ID), + Jl_RQ = values(Jl_RQ), + Xgr_ID = values(Xgr_ID), + Xg_RQ = values(Xg_RQ), + Sjly = values(Sjly), + sfmx = values(sfmx) + + +update GL_Xjllxm set + + xjmc = #{xjmc}, + zjm = #{zjm}, + xjlx = #{xjlx}, + syzt = #{syzt}, + bz = #{bz}, + Jlr_ID = #{jlrId}, + Jl_RQ = #{jlRq}, + Xgr_ID = #{xgrId}, + Xg_RQ = #{xgRq}, + Sjly = #{sjly}, + sfmx = #{sfmx}, + +where gsdm = #{gsdm} + + + +update GL_Xjllxm set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where gsdm = #{gsdm} + + + +update GL_Xjllxm set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and gsdm = #{gsdm} + and ZTH = #{zth} + and kjnd = #{kjnd} + and xjdm = #{xjdm} + and xjmc = #{xjmc} + and zjm = #{zjm} + and xjlx = #{xjlx} + and syzt = #{syzt} + and bz = #{bz} + and Jlr_ID = #{jlrId} + and Jl_RQ = #{jlRq} + and Xgr_ID = #{xgrId} + and Xg_RQ = #{xgRq} + and Sjly = #{sjly} + and sfmx = #{sfmx} + and sts='Y' + + + + + delete from GL_Xjllxm where gsdm = #{gsdm} + + + + diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/service/IGlXjllxmService.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/service/IGlXjllxmService.java new file mode 100644 index 00000000..8de65f0c --- /dev/null +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/service/IGlXjllxmService.java @@ -0,0 +1,23 @@ +package com.hzya.frame.grpU8.nxproof.glxjllxm.service; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.grpU8.nxproof.glxjllxm.entity.GlXjllxmEntity; +import com.hzya.frame.basedao.service.IBaseService; +/** + * (GlXjllxm)表服务接口 + * + * @author makejava + * @since 2024-08-27 15:58:38 + */ +public interface IGlXjllxmService extends IBaseService{ + + /** + * + * @content 分页查询现金流量项目数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/8/27 16:07 + * **/ + Object queryEntityPage(JSONObject json); +} diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/service/impl/GlXjllxmServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/service/impl/GlXjllxmServiceImpl.java new file mode 100644 index 00000000..420bbec6 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glxjllxm/service/impl/GlXjllxmServiceImpl.java @@ -0,0 +1,58 @@ +package com.hzya.frame.grpU8.nxproof.glxjllxm.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; +import com.hzya.frame.grpU8.nxproof.glxjllxm.entity.GlXjllxmEntity; +import com.hzya.frame.grpU8.nxproof.glxjllxm.dao.IGlXjllxmDao; +import com.hzya.frame.grpU8.nxproof.glxjllxm.service.IGlXjllxmService; +import com.hzya.frame.web.entity.BaseResult; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; +import com.hzya.frame.basedao.service.impl.BaseService; + +import java.util.List; + +/** + * (GlXjllxm)表服务实现类 + * + * @author makejava + * @since 2024-08-27 15:58:38 + */ +@Service(value = "GlXjllxmServiceImpl") +public class GlXjllxmServiceImpl extends BaseService implements IGlXjllxmService { + + private IGlXjllxmDao glXjllxmDao; + + @Autowired + public void setGlXjllxmDao(IGlXjllxmDao dao) { + this.glXjllxmDao = dao; + this.dao = dao; + } + + //分页查询现金流量项目数据 + @Override + public Object queryEntityPage(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + GlXjllxmEntity glXjllxmEntity = jsonObject.toJavaObject(GlXjllxmEntity.class); + if(!checkStr(jsonObject.getString("kjnd"))){ + logger.info("========查询现金流量项目数据传递得会计年度为空=========="); + return BaseResult.getFailureMessageEntity("会计年度为空"); + } + if(!checkStr(jsonObject.getString("gsdm"))){ + logger.info("========查询现金流量项目数据传递得公司代码为空=========="); + return BaseResult.getFailureMessageEntity("公司代码为空"); + } + try { + List glXjllxmEntities = glXjllxmDao.queryGlXjllxmEntity(glXjllxmEntity); + PageInfo pageInfo=new PageInfo(glXjllxmEntities); + JSONObject object=new JSONObject(); + object.put("pageInfo",pageInfo); + object.put("status","200"); + return object; + }catch (Exception e){ + logger.info("=======根据会计年度：{}，公司代码：{}查询现金流量项目失败======",jsonObject.getString("kjnd"),jsonObject.getString("gsdm"),e.getMessage()); + return BaseResult.getFailureMessageEntity("查询现金流量项目失败"); + } + } +} From a083af8a7995331ed2eed5007d969154cd11124a Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Wed, 28 Aug 2024 11:50:04 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nxproof/pubkszl/dao/IPubkszlDao.java | 29 + .../pubkszl/dao/impl/PubkszlDaoImpl.java | 44 + .../nxproof/pubkszl/entity/PubkszlEntity.java | 834 +++++++++++++ .../nxproof/pubkszl/entity/PubkszlEntity.xml | 1096 +++++++++++++++++ .../pubkszl/service/IPubkszlService.java | 53 + .../service/impl/PubkszlServiceImpl.java | 74 ++ 6 files changed, 2130 insertions(+) create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/dao/IPubkszlDao.java create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/dao/impl/PubkszlDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/entity/PubkszlEntity.java create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/entity/PubkszlEntity.xml create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/service/IPubkszlService.java create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/service/impl/PubkszlServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/dao/IPubkszlDao.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/dao/IPubkszlDao.java new file mode 100644 index 00000000..c0bb7728 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/dao/IPubkszlDao.java @@ -0,0 +1,29 @@ +package com.hzya.frame.grpU8.nxproof.pubkszl.dao; + +import com.hzya.frame.grpU8.nxproof.pubkszl.entity.PubkszlEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +import java.util.List; + +/** + * (PUBKSZL: table)表数据库访问层 + * + * @author makejava + * @since 2024-08-27 15:56:53 + */ +public interface IPubkszlDao extends IBaseDao { + + //查询往来单位数据 + List queryPubkszlEntity(PubkszlEntity pubkszlEntity); + + //新增往来单位数据 + PubkszlEntity savePubkszlEntity(PubkszlEntity pubkszlEntity); + + //修改往来单位数据 + PubkszlEntity updatePubkszlEntity(PubkszlEntity pubkszlEntity); + + //删除往来单位数据 + Integer deletePubkszlEntity(PubkszlEntity pubkszlEntity); + +} + diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/dao/impl/PubkszlDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/dao/impl/PubkszlDaoImpl.java new file mode 100644 index 00000000..4cf2ed95 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/dao/impl/PubkszlDaoImpl.java @@ -0,0 +1,44 @@ +package com.hzya.frame.grpU8.nxproof.pubkszl.dao.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.grpU8.nxproof.pubkszl.entity.PubkszlEntity; +import com.hzya.frame.grpU8.nxproof.pubkszl.dao.IPubkszlDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; + +import java.util.List; + +/** + * (Pubkszl)表数据库访问层 + * + * @author makejava + * @since 2024-08-27 15:56:53 + */ +@Repository(value = "PubkszlDaoImpl") +public class PubkszlDaoImpl extends MybatisGenericDao implements IPubkszlDao{ + + @DS("#pubkszlEntity.dataSourceCode") + @Override + public List queryPubkszlEntity(PubkszlEntity pubkszlEntity) { + return super.queryByLike(pubkszlEntity); + } + + @DS("#pubkszlEntity.dataSourceCode") + @Override + public PubkszlEntity savePubkszlEntity(PubkszlEntity pubkszlEntity) { + return super.save(pubkszlEntity); + } + + @DS("#pubkszlEntity.dataSourceCode") + @Override + public PubkszlEntity updatePubkszlEntity(PubkszlEntity pubkszlEntity) { + return super.update(pubkszlEntity); + } + + @DS("#pubkszlEntity.dataSourceCode") + @Override + public Integer deletePubkszlEntity(PubkszlEntity pubkszlEntity) { + return super.delete("PubkszlEntity_delete_kszl",pubkszlEntity); + } +} + diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/entity/PubkszlEntity.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/entity/PubkszlEntity.java new file mode 100644 index 00000000..ff9f80b3 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/entity/PubkszlEntity.java @@ -0,0 +1,834 @@ +package com.hzya.frame.grpU8.nxproof.pubkszl.entity; + +import com.hzya.frame.web.entity.BaseEntity; +/** + * (Pubkszl)实体类 + *往来单位(客商资料)表 + * @author makejava + * @since 2024-08-27 15:56:53 + */ +public class PubkszlEntity extends BaseEntity { + + private String gsdm; + private String kjnd; + private String dwdm; + private String dwmc; + private String jym; + private String dwqc; + private String dqdm; + private String txdz; + private String yb; + private String lxrxm; + private String tel; + private String fax; + private String email; + private String http; + private String sjdwdm; + private String zzsh; + private String yyzh; + private String frdbxm; + private String jyfw; + private String khyh; + private String zh; + private String yszkkmdm; + private String yfzkkmdm; + private String dwwb; + private String bizh; + private Integer xyts; + private Integer xyed; + private String sftzjy; + private String sfxykz; + private String sfkh; + private String sfcj; + private String sfgys; + private String sfjtndw; + private String syzt; + private String bz; + private Integer jlrId; + private String jlRq; + private Integer xgrId; + private String xgRq; + private String sjly; + private String dyzwzth; + private String dyzwztmc; + private String dysjk; + private String dyzwztckkm; + private String dyckkm; + private String dyckzh; + private String dyyhckzh; + private String dyyhxjzh; + private String bzly; + private String bzsyzt; + private String bzbz1; + private String bzbz2; + private String bzbz3; + private String bzbz4; + private String bzbz5; + private String bzbz6; + private String bzbz7; + private String sfysdw; + private String dwxz; + private String sh; + private String dwfzr; + private String cwfzr; + private String dwjbr; + private String dwgbm; + private String sfmx; + private String yhbm; + private String mqkpbz; + private String hkfs; + private String pjmaxsl; + private String dwjb; + private String gkjzzf; + private String webmemberid; + private String sjlbdm; + private String bemDwjb; + private String yuszkkmdm; + private String yufzkkmdm; + private String maxrsqje; + private String maxdjsqje; + private String maxsqjebl; + private String unittype; + private String zjyhdm; + private String zjyhmc; + private String sqyhdm; + private String sqyhmc; + private String yqguid; + private String nsrsbh; + private String orgcode; + private String dwsx; + private String dycwckkm; + private String wbdwdm; + private String wbdwmc; + + + 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 String getDwdm() { + return dwdm; + } + + public void setDwdm(String dwdm) { + this.dwdm = dwdm; + } + + public String getDwmc() { + return dwmc; + } + + public void setDwmc(String dwmc) { + this.dwmc = dwmc; + } + + public String getJym() { + return jym; + } + + public void setJym(String jym) { + this.jym = jym; + } + + public String getDwqc() { + return dwqc; + } + + public void setDwqc(String dwqc) { + this.dwqc = dwqc; + } + + public String getDqdm() { + return dqdm; + } + + public void setDqdm(String dqdm) { + this.dqdm = dqdm; + } + + public String getTxdz() { + return txdz; + } + + public void setTxdz(String txdz) { + this.txdz = txdz; + } + + public String getYb() { + return yb; + } + + public void setYb(String yb) { + this.yb = yb; + } + + public String getLxrxm() { + return lxrxm; + } + + public void setLxrxm(String lxrxm) { + this.lxrxm = lxrxm; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getHttp() { + return http; + } + + public void setHttp(String http) { + this.http = http; + } + + public String getSjdwdm() { + return sjdwdm; + } + + public void setSjdwdm(String sjdwdm) { + this.sjdwdm = sjdwdm; + } + + public String getZzsh() { + return zzsh; + } + + public void setZzsh(String zzsh) { + this.zzsh = zzsh; + } + + public String getYyzh() { + return yyzh; + } + + public void setYyzh(String yyzh) { + this.yyzh = yyzh; + } + + public String getFrdbxm() { + return frdbxm; + } + + public void setFrdbxm(String frdbxm) { + this.frdbxm = frdbxm; + } + + public String getJyfw() { + return jyfw; + } + + public void setJyfw(String jyfw) { + this.jyfw = jyfw; + } + + public String getKhyh() { + return khyh; + } + + public void setKhyh(String khyh) { + this.khyh = khyh; + } + + public String getZh() { + return zh; + } + + public void setZh(String zh) { + this.zh = zh; + } + + public String getYszkkmdm() { + return yszkkmdm; + } + + public void setYszkkmdm(String yszkkmdm) { + this.yszkkmdm = yszkkmdm; + } + + public String getYfzkkmdm() { + return yfzkkmdm; + } + + public void setYfzkkmdm(String yfzkkmdm) { + this.yfzkkmdm = yfzkkmdm; + } + + public String getDwwb() { + return dwwb; + } + + public void setDwwb(String dwwb) { + this.dwwb = dwwb; + } + + public String getBizh() { + return bizh; + } + + public void setBizh(String bizh) { + this.bizh = bizh; + } + + public Integer getXyts() { + return xyts; + } + + public void setXyts(Integer xyts) { + this.xyts = xyts; + } + + public Integer getXyed() { + return xyed; + } + + public void setXyed(Integer xyed) { + this.xyed = xyed; + } + + public String getSftzjy() { + return sftzjy; + } + + public void setSftzjy(String sftzjy) { + this.sftzjy = sftzjy; + } + + public String getSfxykz() { + return sfxykz; + } + + public void setSfxykz(String sfxykz) { + this.sfxykz = sfxykz; + } + + public String getSfkh() { + return sfkh; + } + + public void setSfkh(String sfkh) { + this.sfkh = sfkh; + } + + public String getSfcj() { + return sfcj; + } + + public void setSfcj(String sfcj) { + this.sfcj = sfcj; + } + + public String getSfgys() { + return sfgys; + } + + public void setSfgys(String sfgys) { + this.sfgys = sfgys; + } + + public String getSfjtndw() { + return sfjtndw; + } + + public void setSfjtndw(String sfjtndw) { + this.sfjtndw = sfjtndw; + } + + public String getSyzt() { + return syzt; + } + + public void setSyzt(String syzt) { + this.syzt = syzt; + } + + public String getBz() { + return bz; + } + + public void setBz(String bz) { + this.bz = bz; + } + + public Integer getJlrId() { + return jlrId; + } + + public void setJlrId(Integer jlrId) { + this.jlrId = jlrId; + } + + public String getJlRq() { + return jlRq; + } + + public void setJlRq(String jlRq) { + this.jlRq = jlRq; + } + + public Integer getXgrId() { + return xgrId; + } + + public void setXgrId(Integer xgrId) { + this.xgrId = xgrId; + } + + public String getXgRq() { + return xgRq; + } + + public void setXgRq(String xgRq) { + this.xgRq = xgRq; + } + + public String getSjly() { + return sjly; + } + + public void setSjly(String sjly) { + this.sjly = sjly; + } + + public String getDyzwzth() { + return dyzwzth; + } + + public void setDyzwzth(String dyzwzth) { + this.dyzwzth = dyzwzth; + } + + public String getDyzwztmc() { + return dyzwztmc; + } + + public void setDyzwztmc(String dyzwztmc) { + this.dyzwztmc = dyzwztmc; + } + + public String getDysjk() { + return dysjk; + } + + public void setDysjk(String dysjk) { + this.dysjk = dysjk; + } + + public String getDyzwztckkm() { + return dyzwztckkm; + } + + public void setDyzwztckkm(String dyzwztckkm) { + this.dyzwztckkm = dyzwztckkm; + } + + public String getDyckkm() { + return dyckkm; + } + + public void setDyckkm(String dyckkm) { + this.dyckkm = dyckkm; + } + + public String getDyckzh() { + return dyckzh; + } + + public void setDyckzh(String dyckzh) { + this.dyckzh = dyckzh; + } + + public String getDyyhckzh() { + return dyyhckzh; + } + + public void setDyyhckzh(String dyyhckzh) { + this.dyyhckzh = dyyhckzh; + } + + public String getDyyhxjzh() { + return dyyhxjzh; + } + + public void setDyyhxjzh(String dyyhxjzh) { + this.dyyhxjzh = dyyhxjzh; + } + + public String getBzly() { + return bzly; + } + + public void setBzly(String bzly) { + this.bzly = bzly; + } + + public String getBzsyzt() { + return bzsyzt; + } + + public void setBzsyzt(String bzsyzt) { + this.bzsyzt = bzsyzt; + } + + public String getBzbz1() { + return bzbz1; + } + + public void setBzbz1(String bzbz1) { + this.bzbz1 = bzbz1; + } + + public String getBzbz2() { + return bzbz2; + } + + public void setBzbz2(String bzbz2) { + this.bzbz2 = bzbz2; + } + + public String getBzbz3() { + return bzbz3; + } + + public void setBzbz3(String bzbz3) { + this.bzbz3 = bzbz3; + } + + public String getBzbz4() { + return bzbz4; + } + + public void setBzbz4(String bzbz4) { + this.bzbz4 = bzbz4; + } + + public String getBzbz5() { + return bzbz5; + } + + public void setBzbz5(String bzbz5) { + this.bzbz5 = bzbz5; + } + + public String getBzbz6() { + return bzbz6; + } + + public void setBzbz6(String bzbz6) { + this.bzbz6 = bzbz6; + } + + public String getBzbz7() { + return bzbz7; + } + + public void setBzbz7(String bzbz7) { + this.bzbz7 = bzbz7; + } + + public String getSfysdw() { + return sfysdw; + } + + public void setSfysdw(String sfysdw) { + this.sfysdw = sfysdw; + } + + public String getDwxz() { + return dwxz; + } + + public void setDwxz(String dwxz) { + this.dwxz = dwxz; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getDwfzr() { + return dwfzr; + } + + public void setDwfzr(String dwfzr) { + this.dwfzr = dwfzr; + } + + public String getCwfzr() { + return cwfzr; + } + + public void setCwfzr(String cwfzr) { + this.cwfzr = cwfzr; + } + + public String getDwjbr() { + return dwjbr; + } + + public void setDwjbr(String dwjbr) { + this.dwjbr = dwjbr; + } + + public String getDwgbm() { + return dwgbm; + } + + public void setDwgbm(String dwgbm) { + this.dwgbm = dwgbm; + } + + public String getSfmx() { + return sfmx; + } + + public void setSfmx(String sfmx) { + this.sfmx = sfmx; + } + + public String getYhbm() { + return yhbm; + } + + public void setYhbm(String yhbm) { + this.yhbm = yhbm; + } + + public String getMqkpbz() { + return mqkpbz; + } + + public void setMqkpbz(String mqkpbz) { + this.mqkpbz = mqkpbz; + } + + public String getHkfs() { + return hkfs; + } + + public void setHkfs(String hkfs) { + this.hkfs = hkfs; + } + + public String getPjmaxsl() { + return pjmaxsl; + } + + public void setPjmaxsl(String pjmaxsl) { + this.pjmaxsl = pjmaxsl; + } + + public String getDwjb() { + return dwjb; + } + + public void setDwjb(String dwjb) { + this.dwjb = dwjb; + } + + public String getGkjzzf() { + return gkjzzf; + } + + public void setGkjzzf(String gkjzzf) { + this.gkjzzf = gkjzzf; + } + + public String getWebmemberid() { + return webmemberid; + } + + public void setWebmemberid(String webmemberid) { + this.webmemberid = webmemberid; + } + + public String getSjlbdm() { + return sjlbdm; + } + + public void setSjlbdm(String sjlbdm) { + this.sjlbdm = sjlbdm; + } + + public String getBemDwjb() { + return bemDwjb; + } + + public void setBemDwjb(String bemDwjb) { + this.bemDwjb = bemDwjb; + } + + public String getYuszkkmdm() { + return yuszkkmdm; + } + + public void setYuszkkmdm(String yuszkkmdm) { + this.yuszkkmdm = yuszkkmdm; + } + + public String getYufzkkmdm() { + return yufzkkmdm; + } + + public void setYufzkkmdm(String yufzkkmdm) { + this.yufzkkmdm = yufzkkmdm; + } + + public String getMaxrsqje() { + return maxrsqje; + } + + public void setMaxrsqje(String maxrsqje) { + this.maxrsqje = maxrsqje; + } + + public String getMaxdjsqje() { + return maxdjsqje; + } + + public void setMaxdjsqje(String maxdjsqje) { + this.maxdjsqje = maxdjsqje; + } + + public String getMaxsqjebl() { + return maxsqjebl; + } + + public void setMaxsqjebl(String maxsqjebl) { + this.maxsqjebl = maxsqjebl; + } + + public String getUnittype() { + return unittype; + } + + public void setUnittype(String unittype) { + this.unittype = unittype; + } + + public String getZjyhdm() { + return zjyhdm; + } + + public void setZjyhdm(String zjyhdm) { + this.zjyhdm = zjyhdm; + } + + public String getZjyhmc() { + return zjyhmc; + } + + public void setZjyhmc(String zjyhmc) { + this.zjyhmc = zjyhmc; + } + + public String getSqyhdm() { + return sqyhdm; + } + + public void setSqyhdm(String sqyhdm) { + this.sqyhdm = sqyhdm; + } + + public String getSqyhmc() { + return sqyhmc; + } + + public void setSqyhmc(String sqyhmc) { + this.sqyhmc = sqyhmc; + } + + public String getYqguid() { + return yqguid; + } + + public void setYqguid(String yqguid) { + this.yqguid = yqguid; + } + + public String getNsrsbh() { + return nsrsbh; + } + + public void setNsrsbh(String nsrsbh) { + this.nsrsbh = nsrsbh; + } + + public String getOrgcode() { + return orgcode; + } + + public void setOrgcode(String orgcode) { + this.orgcode = orgcode; + } + + public String getDwsx() { + return dwsx; + } + + public void setDwsx(String dwsx) { + this.dwsx = dwsx; + } + + public String getDycwckkm() { + return dycwckkm; + } + + public void setDycwckkm(String dycwckkm) { + this.dycwckkm = dycwckkm; + } + + public String getWbdwdm() { + return wbdwdm; + } + + public void setWbdwdm(String wbdwdm) { + this.wbdwdm = wbdwdm; + } + + public String getWbdwmc() { + return wbdwmc; + } + + public void setWbdwmc(String wbdwmc) { + this.wbdwmc = wbdwmc; + } + +} + diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/entity/PubkszlEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/entity/PubkszlEntity.xml new file mode 100644 index 00000000..318fda44 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/entity/PubkszlEntity.xml @@ -0,0 +1,1096 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + gsdm + ,kjnd + ,dwdm + ,dwmc + ,jym + ,dwqc + ,dqdm + ,txdz + ,yb + ,lxrxm + ,tel + ,fax + ,email + ,http + ,sjdwdm + ,zzsh + ,yyzh + ,frdbxm + ,jyfw + ,khyh + ,zh + ,yszkkmdm + ,yfzkkmdm + ,dwwb + ,bizh + ,xyts + ,xyed + ,sftzjy + ,sfxykz + ,sfkh + ,sfcj + ,sfgys + ,sfjtndw + ,syzt + ,bz + ,JLR_ID + ,JL_RQ + ,XGR_ID + ,XG_RQ + ,Sjly + ,dyzwzth + ,dyzwztmc + ,dysjk + ,dyzwztckkm + ,dyckkm + ,dyckzh + ,dyyhckzh + ,dyyhxjzh + ,bzly + ,bzSYzt + ,bzbz1 + ,bzbz2 + ,bzbz3 + ,bzbz4 + ,bzbz5 + ,bzbz6 + ,bzbz7 + ,sfysdw + ,dwxz + ,sh + ,dwfzr + ,cwfzr + ,dwjbr + ,dwgbm + ,SFMX + ,YHBM + ,MQKPBZ + ,HKFS + ,PJMAXSL + ,dwjb + ,GKJZZF + ,WebMemberID + ,sjlbdm + ,BEM_DWJB + ,yuszkkmdm + ,yufzkkmdm + ,MAXRSQJE + ,MAXDJSQJE + ,MAXSQJEBL + ,UnitType + ,ZJYHDM + ,ZJYHMC + ,SQYHDM + ,SQYHMC + ,YQGUID + ,NSRSBH + ,OrgCode + ,DWSX + ,DYCWCKKM + ,WBDWDM + ,WBDWMC + + + + + + + + + + + + + + + + insert into PUBKSZL( + + gsdm , + kjnd , + dwdm , + dwmc , + jym , + dwqc , + dqdm , + txdz , + yb , + lxrxm , + tel , + fax , + email , + http , + sjdwdm , + zzsh , + yyzh , + frdbxm , + jyfw , + khyh , + zh , + yszkkmdm , + yfzkkmdm , + dwwb , + bizh , + xyts , + xyed , + sftzjy , + sfxykz , + sfkh , + sfcj , + sfgys , + sfjtndw , + syzt , + bz , + JLR_ID , + JL_RQ , + XGR_ID , + XG_RQ , + Sjly , + dyzwzth , + dyzwztmc , + dysjk , + dyzwztckkm , + dyckkm , + dyckzh , + dyyhckzh , + dyyhxjzh , + bzly , + bzSYzt , + bzbz1 , + bzbz2 , + bzbz3 , + bzbz4 , + bzbz5 , + bzbz6 , + bzbz7 , + sfysdw , + dwxz , + sh , + dwfzr , + cwfzr , + dwjbr , + dwgbm , + SFMX , + YHBM , + MQKPBZ , + HKFS , + PJMAXSL , + dwjb , + GKJZZF , + WebMemberID , + sjlbdm , + BEM_DWJB , + yuszkkmdm , + yufzkkmdm , + MAXRSQJE , + MAXDJSQJE , + MAXSQJEBL , + UnitType , + ZJYHDM , + ZJYHMC , + SQYHDM , + SQYHMC , + YQGUID , + NSRSBH , + OrgCode , + DWSX , + DYCWCKKM , + WBDWDM , + WBDWMC , + + )values( + + #{gsdm} , + #{kjnd} , + #{dwdm} , + #{dwmc} , + #{jym} , + #{dwqc} , + #{dqdm} , + #{txdz} , + #{yb} , + #{lxrxm} , + #{tel} , + #{fax} , + #{email} , + #{http} , + #{sjdwdm} , + #{zzsh} , + #{yyzh} , + #{frdbxm} , + #{jyfw} , + #{khyh} , + #{zh} , + #{yszkkmdm} , + #{yfzkkmdm} , + #{dwwb} , + #{bizh} , + #{xyts} , + #{xyed} , + #{sftzjy} , + #{sfxykz} , + #{sfkh} , + #{sfcj} , + #{sfgys} , + #{sfjtndw} , + #{syzt} , + #{bz} , + #{jlrId} , + #{jlRq} , + #{xgrId} , + #{xgRq} , + #{sjly} , + #{dyzwzth} , + #{dyzwztmc} , + #{dysjk} , + #{dyzwztckkm} , + #{dyckkm} , + #{dyckzh} , + #{dyyhckzh} , + #{dyyhxjzh} , + #{bzly} , + #{bzsyzt} , + #{bzbz1} , + #{bzbz2} , + #{bzbz3} , + #{bzbz4} , + #{bzbz5} , + #{bzbz6} , + #{bzbz7} , + #{sfysdw} , + #{dwxz} , + #{sh} , + #{dwfzr} , + #{cwfzr} , + #{dwjbr} , + #{dwgbm} , + #{sfmx} , + #{yhbm} , + #{mqkpbz} , + #{hkfs} , + #{pjmaxsl} , + #{dwjb} , + #{gkjzzf} , + #{webmemberid} , + #{sjlbdm} , + #{bemDwjb} , + #{yuszkkmdm} , + #{yufzkkmdm} , + #{maxrsqje} , + #{maxdjsqje} , + #{maxsqjebl} , + #{unittype} , + #{zjyhdm} , + #{zjyhmc} , + #{sqyhdm} , + #{sqyhmc} , + #{yqguid} , + #{nsrsbh} , + #{orgcode} , + #{dwsx} , + #{dycwckkm} , + #{wbdwdm} , + #{wbdwmc} , + + ) + + + + insert into PUBKSZL(dwmc, jym, dwqc, dqdm, txdz, yb, lxrxm, tel, fax, email, http, sjdwdm, zzsh, yyzh, frdbxm, jyfw, khyh, zh, yszkkmdm, yfzkkmdm, dwwb, bizh, xyts, xyed, sftzjy, sfxykz, sfkh, sfcj, sfgys, sfjtndw, syzt, bz, JLR_ID, JL_RQ, XGR_ID, XG_RQ, Sjly, dyzwzth, dyzwztmc, dysjk, dyzwztckkm, dyckkm, dyckzh, dyyhckzh, dyyhxjzh, bzly, bzSYzt, bzbz1, bzbz2, bzbz3, bzbz4, bzbz5, bzbz6, bzbz7, sfysdw, dwxz, sh, dwfzr, cwfzr, dwjbr, dwgbm, SFMX, YHBM, MQKPBZ, HKFS, PJMAXSL, dwjb, GKJZZF, WebMemberID, sjlbdm, BEM_DWJB, yuszkkmdm, yufzkkmdm, MAXRSQJE, MAXDJSQJE, MAXSQJEBL, UnitType, ZJYHDM, ZJYHMC, SQYHDM, SQYHMC, YQGUID, NSRSBH, OrgCode, DWSX, DYCWCKKM, WBDWDM, WBDWMC, sts) + values + + (#{entity.dwmc},#{entity.jym},#{entity.dwqc},#{entity.dqdm},#{entity.txdz},#{entity.yb},#{entity.lxrxm},#{entity.tel},#{entity.fax},#{entity.email},#{entity.http},#{entity.sjdwdm},#{entity.zzsh},#{entity.yyzh},#{entity.frdbxm},#{entity.jyfw},#{entity.khyh},#{entity.zh},#{entity.yszkkmdm},#{entity.yfzkkmdm},#{entity.dwwb},#{entity.bizh},#{entity.xyts},#{entity.xyed},#{entity.sftzjy},#{entity.sfxykz},#{entity.sfkh},#{entity.sfcj},#{entity.sfgys},#{entity.sfjtndw},#{entity.syzt},#{entity.bz},#{entity.jlrId},#{entity.jlRq},#{entity.xgrId},#{entity.xgRq},#{entity.sjly},#{entity.dyzwzth},#{entity.dyzwztmc},#{entity.dysjk},#{entity.dyzwztckkm},#{entity.dyckkm},#{entity.dyckzh},#{entity.dyyhckzh},#{entity.dyyhxjzh},#{entity.bzly},#{entity.bzsyzt},#{entity.bzbz1},#{entity.bzbz2},#{entity.bzbz3},#{entity.bzbz4},#{entity.bzbz5},#{entity.bzbz6},#{entity.bzbz7},#{entity.sfysdw},#{entity.dwxz},#{entity.sh},#{entity.dwfzr},#{entity.cwfzr},#{entity.dwjbr},#{entity.dwgbm},#{entity.sfmx},#{entity.yhbm},#{entity.mqkpbz},#{entity.hkfs},#{entity.pjmaxsl},#{entity.dwjb},#{entity.gkjzzf},#{entity.webmemberid},#{entity.sjlbdm},#{entity.bemDwjb},#{entity.yuszkkmdm},#{entity.yufzkkmdm},#{entity.maxrsqje},#{entity.maxdjsqje},#{entity.maxsqjebl},#{entity.unittype},#{entity.zjyhdm},#{entity.zjyhmc},#{entity.sqyhdm},#{entity.sqyhmc},#{entity.yqguid},#{entity.nsrsbh},#{entity.orgcode},#{entity.dwsx},#{entity.dycwckkm},#{entity.wbdwdm},#{entity.wbdwmc}, 'Y') + + + + + insert into PUBKSZL(dwmc, jym, dwqc, dqdm, txdz, yb, lxrxm, tel, fax, email, http, sjdwdm, zzsh, yyzh, frdbxm, jyfw, khyh, zh, yszkkmdm, yfzkkmdm, dwwb, bizh, xyts, xyed, sftzjy, sfxykz, sfkh, sfcj, sfgys, sfjtndw, syzt, bz, JLR_ID, JL_RQ, XGR_ID, XG_RQ, Sjly, dyzwzth, dyzwztmc, dysjk, dyzwztckkm, dyckkm, dyckzh, dyyhckzh, dyyhxjzh, bzly, bzSYzt, bzbz1, bzbz2, bzbz3, bzbz4, bzbz5, bzbz6, bzbz7, sfysdw, dwxz, sh, dwfzr, cwfzr, dwjbr, dwgbm, SFMX, YHBM, MQKPBZ, HKFS, PJMAXSL, dwjb, GKJZZF, WebMemberID, sjlbdm, BEM_DWJB, yuszkkmdm, yufzkkmdm, MAXRSQJE, MAXDJSQJE, MAXSQJEBL, UnitType, ZJYHDM, ZJYHMC, SQYHDM, SQYHMC, YQGUID, NSRSBH, OrgCode, DWSX, DYCWCKKM, WBDWDM, WBDWMC) + values + + (#{entity.dwmc},#{entity.jym},#{entity.dwqc},#{entity.dqdm},#{entity.txdz},#{entity.yb},#{entity.lxrxm},#{entity.tel},#{entity.fax},#{entity.email},#{entity.http},#{entity.sjdwdm},#{entity.zzsh},#{entity.yyzh},#{entity.frdbxm},#{entity.jyfw},#{entity.khyh},#{entity.zh},#{entity.yszkkmdm},#{entity.yfzkkmdm},#{entity.dwwb},#{entity.bizh},#{entity.xyts},#{entity.xyed},#{entity.sftzjy},#{entity.sfxykz},#{entity.sfkh},#{entity.sfcj},#{entity.sfgys},#{entity.sfjtndw},#{entity.syzt},#{entity.bz},#{entity.jlrId},#{entity.jlRq},#{entity.xgrId},#{entity.xgRq},#{entity.sjly},#{entity.dyzwzth},#{entity.dyzwztmc},#{entity.dysjk},#{entity.dyzwztckkm},#{entity.dyckkm},#{entity.dyckzh},#{entity.dyyhckzh},#{entity.dyyhxjzh},#{entity.bzly},#{entity.bzsyzt},#{entity.bzbz1},#{entity.bzbz2},#{entity.bzbz3},#{entity.bzbz4},#{entity.bzbz5},#{entity.bzbz6},#{entity.bzbz7},#{entity.sfysdw},#{entity.dwxz},#{entity.sh},#{entity.dwfzr},#{entity.cwfzr},#{entity.dwjbr},#{entity.dwgbm},#{entity.sfmx},#{entity.yhbm},#{entity.mqkpbz},#{entity.hkfs},#{entity.pjmaxsl},#{entity.dwjb},#{entity.gkjzzf},#{entity.webmemberid},#{entity.sjlbdm},#{entity.bemDwjb},#{entity.yuszkkmdm},#{entity.yufzkkmdm},#{entity.maxrsqje},#{entity.maxdjsqje},#{entity.maxsqjebl},#{entity.unittype},#{entity.zjyhdm},#{entity.zjyhmc},#{entity.sqyhdm},#{entity.sqyhmc},#{entity.yqguid},#{entity.nsrsbh},#{entity.orgcode},#{entity.dwsx},#{entity.dycwckkm},#{entity.wbdwdm},#{entity.wbdwmc}) + + on duplicate key update + dwmc = values(dwmc), + jym = values(jym), + dwqc = values(dwqc), + dqdm = values(dqdm), + txdz = values(txdz), + yb = values(yb), + lxrxm = values(lxrxm), + tel = values(tel), + fax = values(fax), + email = values(email), + http = values(http), + sjdwdm = values(sjdwdm), + zzsh = values(zzsh), + yyzh = values(yyzh), + frdbxm = values(frdbxm), + jyfw = values(jyfw), + khyh = values(khyh), + zh = values(zh), + yszkkmdm = values(yszkkmdm), + yfzkkmdm = values(yfzkkmdm), + dwwb = values(dwwb), + bizh = values(bizh), + xyts = values(xyts), + xyed = values(xyed), + sftzjy = values(sftzjy), + sfxykz = values(sfxykz), + sfkh = values(sfkh), + sfcj = values(sfcj), + sfgys = values(sfgys), + sfjtndw = values(sfjtndw), + syzt = values(syzt), + bz = values(bz), + JLR_ID = values(JLR_ID), + JL_RQ = values(JL_RQ), + XGR_ID = values(XGR_ID), + XG_RQ = values(XG_RQ), + Sjly = values(Sjly), + dyzwzth = values(dyzwzth), + dyzwztmc = values(dyzwztmc), + dysjk = values(dysjk), + dyzwztckkm = values(dyzwztckkm), + dyckkm = values(dyckkm), + dyckzh = values(dyckzh), + dyyhckzh = values(dyyhckzh), + dyyhxjzh = values(dyyhxjzh), + bzly = values(bzly), + bzSYzt = values(bzSYzt), + bzbz1 = values(bzbz1), + bzbz2 = values(bzbz2), + bzbz3 = values(bzbz3), + bzbz4 = values(bzbz4), + bzbz5 = values(bzbz5), + bzbz6 = values(bzbz6), + bzbz7 = values(bzbz7), + sfysdw = values(sfysdw), + dwxz = values(dwxz), + sh = values(sh), + dwfzr = values(dwfzr), + cwfzr = values(cwfzr), + dwjbr = values(dwjbr), + dwgbm = values(dwgbm), + SFMX = values(SFMX), + YHBM = values(YHBM), + MQKPBZ = values(MQKPBZ), + HKFS = values(HKFS), + PJMAXSL = values(PJMAXSL), + dwjb = values(dwjb), + GKJZZF = values(GKJZZF), + WebMemberID = values(WebMemberID), + sjlbdm = values(sjlbdm), + BEM_DWJB = values(BEM_DWJB), + yuszkkmdm = values(yuszkkmdm), + yufzkkmdm = values(yufzkkmdm), + MAXRSQJE = values(MAXRSQJE), + MAXDJSQJE = values(MAXDJSQJE), + MAXSQJEBL = values(MAXSQJEBL), + UnitType = values(UnitType), + ZJYHDM = values(ZJYHDM), + ZJYHMC = values(ZJYHMC), + SQYHDM = values(SQYHDM), + SQYHMC = values(SQYHMC), + YQGUID = values(YQGUID), + NSRSBH = values(NSRSBH), + OrgCode = values(OrgCode), + DWSX = values(DWSX), + DYCWCKKM = values(DYCWCKKM), + WBDWDM = values(WBDWDM), + WBDWMC = values(WBDWMC) + + +update PUBKSZL set + + dwmc = #{dwmc}, + jym = #{jym}, + dwqc = #{dwqc}, + dqdm = #{dqdm}, + txdz = #{txdz}, + yb = #{yb}, + lxrxm = #{lxrxm}, + tel = #{tel}, + fax = #{fax}, + email = #{email}, + http = #{http}, + sjdwdm = #{sjdwdm}, + zzsh = #{zzsh}, + yyzh = #{yyzh}, + frdbxm = #{frdbxm}, + jyfw = #{jyfw}, + khyh = #{khyh}, + zh = #{zh}, + yszkkmdm = #{yszkkmdm}, + yfzkkmdm = #{yfzkkmdm}, + dwwb = #{dwwb}, + bizh = #{bizh}, + xyts = #{xyts}, + xyed = #{xyed}, + sftzjy = #{sftzjy}, + sfxykz = #{sfxykz}, + sfkh = #{sfkh}, + sfcj = #{sfcj}, + sfgys = #{sfgys}, + sfjtndw = #{sfjtndw}, + syzt = #{syzt}, + bz = #{bz}, + JLR_ID = #{jlrId}, + JL_RQ = #{jlRq}, + XGR_ID = #{xgrId}, + XG_RQ = #{xgRq}, + Sjly = #{sjly}, + dyzwzth = #{dyzwzth}, + dyzwztmc = #{dyzwztmc}, + dysjk = #{dysjk}, + dyzwztckkm = #{dyzwztckkm}, + dyckkm = #{dyckkm}, + dyckzh = #{dyckzh}, + dyyhckzh = #{dyyhckzh}, + dyyhxjzh = #{dyyhxjzh}, + bzly = #{bzly}, + bzSYzt = #{bzsyzt}, + bzbz1 = #{bzbz1}, + bzbz2 = #{bzbz2}, + bzbz3 = #{bzbz3}, + bzbz4 = #{bzbz4}, + bzbz5 = #{bzbz5}, + bzbz6 = #{bzbz6}, + bzbz7 = #{bzbz7}, + sfysdw = #{sfysdw}, + dwxz = #{dwxz}, + sh = #{sh}, + dwfzr = #{dwfzr}, + cwfzr = #{cwfzr}, + dwjbr = #{dwjbr}, + dwgbm = #{dwgbm}, + SFMX = #{sfmx}, + YHBM = #{yhbm}, + MQKPBZ = #{mqkpbz}, + HKFS = #{hkfs}, + PJMAXSL = #{pjmaxsl}, + dwjb = #{dwjb}, + GKJZZF = #{gkjzzf}, + WebMemberID = #{webmemberid}, + sjlbdm = #{sjlbdm}, + BEM_DWJB = #{bemDwjb}, + yuszkkmdm = #{yuszkkmdm}, + yufzkkmdm = #{yufzkkmdm}, + MAXRSQJE = #{maxrsqje}, + MAXDJSQJE = #{maxdjsqje}, + MAXSQJEBL = #{maxsqjebl}, + UnitType = #{unittype}, + ZJYHDM = #{zjyhdm}, + ZJYHMC = #{zjyhmc}, + SQYHDM = #{sqyhdm}, + SQYHMC = #{sqyhmc}, + YQGUID = #{yqguid}, + NSRSBH = #{nsrsbh}, + OrgCode = #{orgcode}, + DWSX = #{dwsx}, + DYCWCKKM = #{dycwckkm}, + WBDWDM = #{wbdwdm}, + WBDWMC = #{wbdwmc}, + +where gsdm = #{gsdm} and kjnd=#{kjnd} and dwdm=#{dwdm} + + + +update PUBKSZL set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where gsdm = #{gsdm} + + + +update PUBKSZL set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and gsdm = #{gsdm} + and kjnd = #{kjnd} + and dwdm = #{dwdm} + and dwmc = #{dwmc} + and jym = #{jym} + and dwqc = #{dwqc} + and dqdm = #{dqdm} + and txdz = #{txdz} + and yb = #{yb} + and lxrxm = #{lxrxm} + and tel = #{tel} + and fax = #{fax} + and email = #{email} + and http = #{http} + and sjdwdm = #{sjdwdm} + and zzsh = #{zzsh} + and yyzh = #{yyzh} + and frdbxm = #{frdbxm} + and jyfw = #{jyfw} + and khyh = #{khyh} + and zh = #{zh} + and yszkkmdm = #{yszkkmdm} + and yfzkkmdm = #{yfzkkmdm} + and dwwb = #{dwwb} + and bizh = #{bizh} + and xyts = #{xyts} + and xyed = #{xyed} + and sftzjy = #{sftzjy} + and sfxykz = #{sfxykz} + and sfkh = #{sfkh} + and sfcj = #{sfcj} + and sfgys = #{sfgys} + and sfjtndw = #{sfjtndw} + and syzt = #{syzt} + and bz = #{bz} + and JLR_ID = #{jlrId} + and JL_RQ = #{jlRq} + and XGR_ID = #{xgrId} + and XG_RQ = #{xgRq} + and Sjly = #{sjly} + and dyzwzth = #{dyzwzth} + and dyzwztmc = #{dyzwztmc} + and dysjk = #{dysjk} + and dyzwztckkm = #{dyzwztckkm} + and dyckkm = #{dyckkm} + and dyckzh = #{dyckzh} + and dyyhckzh = #{dyyhckzh} + and dyyhxjzh = #{dyyhxjzh} + and bzly = #{bzly} + and bzSYzt = #{bzsyzt} + and bzbz1 = #{bzbz1} + and bzbz2 = #{bzbz2} + and bzbz3 = #{bzbz3} + and bzbz4 = #{bzbz4} + and bzbz5 = #{bzbz5} + and bzbz6 = #{bzbz6} + and bzbz7 = #{bzbz7} + and sfysdw = #{sfysdw} + and dwxz = #{dwxz} + and sh = #{sh} + and dwfzr = #{dwfzr} + and cwfzr = #{cwfzr} + and dwjbr = #{dwjbr} + and dwgbm = #{dwgbm} + and SFMX = #{sfmx} + and YHBM = #{yhbm} + and MQKPBZ = #{mqkpbz} + and HKFS = #{hkfs} + and PJMAXSL = #{pjmaxsl} + and dwjb = #{dwjb} + and GKJZZF = #{gkjzzf} + and WebMemberID = #{webmemberid} + and sjlbdm = #{sjlbdm} + and BEM_DWJB = #{bemDwjb} + and yuszkkmdm = #{yuszkkmdm} + and yufzkkmdm = #{yufzkkmdm} + and MAXRSQJE = #{maxrsqje} + and MAXDJSQJE = #{maxdjsqje} + and MAXSQJEBL = #{maxsqjebl} + and UnitType = #{unittype} + and ZJYHDM = #{zjyhdm} + and ZJYHMC = #{zjyhmc} + and SQYHDM = #{sqyhdm} + and SQYHMC = #{sqyhmc} + and YQGUID = #{yqguid} + and NSRSBH = #{nsrsbh} + and OrgCode = #{orgcode} + and DWSX = #{dwsx} + and DYCWCKKM = #{dycwckkm} + and WBDWDM = #{wbdwdm} + and WBDWMC = #{wbdwmc} + and sts='Y' + + + + + delete from PUBKSZL where gsdm = #{gsdm} + + + + + delete from PUBKSZL where gsdm = #{gsdm} and kjnd=#{kjnd} and dwdm =#{dwdm} + + + + + diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/service/IPubkszlService.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/service/IPubkszlService.java new file mode 100644 index 00000000..bbe95cd1 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/service/IPubkszlService.java @@ -0,0 +1,53 @@ +package com.hzya.frame.grpU8.nxproof.pubkszl.service; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.grpU8.nxproof.pubkszl.entity.PubkszlEntity; +import com.hzya.frame.basedao.service.IBaseService; +/** + * (Pubkszl)表服务接口 + * + * @author makejava + * @since 2024-08-27 15:56:54 + */ +public interface IPubkszlService extends IBaseService{ + + /** + * + * @content 分页查询往来单位（客商资料）数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/8/27 16:23 + * **/ + Object queryEntityPage(JSONObject json); + + /** + * + * @content 新增往来单位（客商资料）数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/8/27 17:45 + * **/ + Object saveEntity(JSONObject json); + + /** + * + * @content 更新往来单位（客商资料）数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/8/27 17:45 + * **/ + Object updateEntity(JSONObject json); + + /** + * + * @content 删除往来单位（客商资料）数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/8/27 17:45 + * **/ + Object deleteEntity(JSONObject json); +} diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/service/impl/PubkszlServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/service/impl/PubkszlServiceImpl.java new file mode 100644 index 00000000..47f982ab --- /dev/null +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkszl/service/impl/PubkszlServiceImpl.java @@ -0,0 +1,74 @@ +package com.hzya.frame.grpU8.nxproof.pubkszl.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; +import com.hzya.frame.grpU8.nxproof.glxjllxm.entity.GlXjllxmEntity; +import com.hzya.frame.grpU8.nxproof.pubkszl.entity.PubkszlEntity; +import com.hzya.frame.grpU8.nxproof.pubkszl.dao.IPubkszlDao; +import com.hzya.frame.grpU8.nxproof.pubkszl.service.IPubkszlService; +import com.hzya.frame.web.entity.BaseResult; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; +import com.hzya.frame.basedao.service.impl.BaseService; + +import java.util.List; + +/** + * (Pubkszl)表服务实现类 + * + * @author makejava + * @since 2024-08-27 15:56:54 + */ +@Service(value = "PubkszlServiceImpl") +public class PubkszlServiceImpl extends BaseService implements IPubkszlService { + + private IPubkszlDao pubkszlDao; + + @Autowired + public void setPubkszlDao(IPubkszlDao dao) { + this.pubkszlDao = dao; + this.dao = dao; + } + + //分页查询往来单位数据 + @Override + public Object queryEntityPage(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + PubkszlEntity pubkszlEntity = jsonObject.toJavaObject(PubkszlEntity.class); + if(!checkStr(jsonObject.getString("kjnd"))){ + logger.info("========查询往来单位传递得会计年度为空=========="); + return BaseResult.getFailureMessageEntity("会计年度为空"); + } + if(!checkStr(jsonObject.getString("gsdm"))){ + logger.info("========查询往来单位传递得公司代码为空=========="); + return BaseResult.getFailureMessageEntity("公司代码为空"); + } + try { + List pubkszlEntities = pubkszlDao.queryPubkszlEntity(pubkszlEntity); + PageInfo pageInfo=new PageInfo(pubkszlEntities); + JSONObject object=new JSONObject(); + object.put("pageInfo",pageInfo); + object.put("status","200"); + return object; + }catch (Exception e){ + logger.info("=======根据会计年度：{}，公司代码：{}查询往来单位失败======",jsonObject.getString("kjnd"),jsonObject.getString("gsdm"),e.getMessage()); + return BaseResult.getFailureMessageEntity("查询往来单位失败"); + } + } + + @Override + public Object saveEntity(JSONObject json) { + return null; + } + + @Override + public Object updateEntity(JSONObject json) { + return null; + } + + @Override + public Object deleteEntity(JSONObject json) { + return null; + } +} From 0f8232cee96b86308aee80c99820c85dd96c75f8 Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Wed, 28 Aug 2024 11:54:54 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E7=BB=9F=E4=B8=80GrpU8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AcctVouchInfoServiceImpl.java | 1 + .../nxproof/glPzml/entity/SenderGlPzmlEntity.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/impl/AcctVouchInfoServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/impl/AcctVouchInfoServiceImpl.java index 6835947a..21f9507d 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/impl/AcctVouchInfoServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/impl/AcctVouchInfoServiceImpl.java @@ -202,6 +202,7 @@ public class AcctVouchInfoServiceImpl extends BaseService list = senderGlPznrDao.querySenderGlPznrEntityByIdpzh(senderGlPznrEntity); + senderGlPzmlEntity.setSenderGlPznrEntities(list); //查询辅助核算 if(list != null && list.size() > 0){ GlFzxzlEntityDto glFzxzlEntityDto = new GlFzxzlEntityDto(); diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.java index bcaf3369..8923dd0a 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.java @@ -1,8 +1,11 @@ package com.hzya.frame.grpU8.nxproof.glPzml.entity; +import com.hzya.frame.grpU8.nxproof.glPznr.entity.SenderGlPznrEntity; import com.hzya.frame.web.entity.BaseEntity; +import java.util.List; + /** * (GlPzml)实体类 * @@ -53,7 +56,7 @@ public class SenderGlPzmlEntity extends BaseEntity { private String pzsbm; private String stamp; private String yspzje; - + private List senderGlPznrEntities; public String getPzsbm() { return pzsbm; } @@ -366,6 +369,12 @@ public class SenderGlPzmlEntity extends BaseEntity { this.yspzzs = yspzzs; } + public List getSenderGlPznrEntities() { + return senderGlPznrEntities; + } + public void setSenderGlPznrEntities(List senderGlPznrEntities) { + this.senderGlPznrEntities = senderGlPznrEntities; + } } From 3d10ed9f1f9f7ca6c771ad3f45611690a4ec1c45 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Wed, 28 Aug 2024 14:00:41 +0800 Subject: [PATCH 12/19] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=A7=91=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzya/frame/grpU8/service/impl/GrpU8ServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 38e82e73..e393ab69 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 @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity; import com.hzya.frame.grpU8.acctVouchInfo.service.IAcctVouchInfoService; import com.hzya.frame.grpU8.nxproof.glfzxzl.service.IGlFzxzlService; +import com.hzya.frame.grpU8.nxproof.glkmxx.service.ISenderGlKmxxService; import com.hzya.frame.grpU8.nxproof.glxjllxm.service.IGlXjllxmService; import com.hzya.frame.grpU8.nxproof.glxmzl.service.ISenderGlXmzlService; import com.hzya.frame.grpU8.nxproof.pubbmxx.service.ISenderPubbmxxService; @@ -29,6 +30,8 @@ public class GrpU8ServiceImpl implements IGrpU8Service { private IGlFzxzlService glFzxzlService; @Autowired private ISenderGlXmzlService senderGlXmzlService; + @Autowired + private ISenderGlKmxxService senderGlKmxxService; @Override public Object queryData(JSONObject object) { @@ -60,6 +63,10 @@ public class GrpU8ServiceImpl implements IGrpU8Service { returnObject = senderGlXmzlService.queryEntityPage(object); break; case "5"://功能科目查询接口 + //功能科目是辅助项资料类别为4得数据 + if(jsonObject.getString("lbdm") !=null && jsonObject.getString("lbdm").equals("4")){ + returnObject = glFzxzlService.queryEntityPage(object); + } break; case "6"://部门经济科目查询接口 //部门经济科目是辅助项资料类别为5得数据 @@ -68,6 +75,7 @@ public class GrpU8ServiceImpl implements IGrpU8Service { } break; case "7"://科目总账余额查询接口 + returnObject = senderGlKmxxService.queryKmxxLedgerBalance(object); break; case "8"://科目辅助余额查询接口 break; From 4d99f0f66a32316e9cad2f150440ac2d011bb06d Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Wed, 28 Aug 2024 18:23:36 +0800 Subject: [PATCH 13/19] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nxproof/gbizbxmb/dao/IGbiZbxmbDao.java | 40 ++++++++ .../gbizbxmb/dao/impl/GbiZbxmbDaoImpl.java | 24 +++++ .../gbizbxmb/entity/GbiZbxmbEntity.java | 12 ++- .../gbizbxmb/entity/GbiZbxmbEntity.xml | 21 +++-- .../gbizbxmb/service/IGbiZbxmbService.java | 10 ++ .../service/impl/GbiZbxmbServiceImpl.java | 79 +++++++++++++--- .../nxproof/glPzml/dao/ISenderGlPzmlDao.java | 10 ++ .../glPzml/dao/impl/SenderGlPzmlDaoImpl.java | 6 ++ .../glPzml/entity/SenderGlPzmlEntity.xml | 25 +++++ .../glPzml/service/ISenderGlPzmlService.java | 12 +-- .../service/impl/SenderGlPzmlServiceImpl.java | 92 ++++++++++++++----- .../grpU8/nxproof/glczrz/dao/IGlCzrzDao.java | 10 ++ .../glczrz/dao/impl/GlCzrzDaoImpl.java | 8 ++ .../nxproof/glczrz/entity/GlCzrzEntity.xml | 16 ++-- .../nxproof/glfzxzl/dao/IGlFzxzlDao.java | 10 ++ .../glfzxzl/dao/impl/GlFzxzlDaoImpl.java | 6 ++ .../nxproof/glkmxx/dao/ISenderGlKmxxDao.java | 10 ++ .../glkmxx/dao/impl/SenderGlKmxxDaoImpl.java | 8 ++ .../glkmxx/entity/SenderGlKmxxEntity.xml | 38 ++++++++ .../glkmxx/service/ISenderGlKmxxService.java | 10 ++ .../service/impl/SenderGlKmxxServiceImpl.java | 32 +++++++ .../grpU8/nxproof/zbwhsz/dao/IZbWhszDao.java | 10 ++ .../zbwhsz/dao/impl/ZbWhszDaoImpl.java | 8 +- .../grpU8/nxproof/zbzbly/dao/IZbZblyDao.java | 10 ++ .../zbzbly/dao/impl/ZbZblyDaoImpl.java | 8 +- 25 files changed, 450 insertions(+), 65 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/dao/IGbiZbxmbDao.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/dao/IGbiZbxmbDao.java index 106536d3..3a003e38 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/dao/IGbiZbxmbDao.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/dao/IGbiZbxmbDao.java @@ -38,4 +38,44 @@ public interface IGbiZbxmbDao extends IBaseDao { * @Date 2024/8/14 17:15 * **/ List queryZbxmbByIdpzh(GbiZbxmbEntity gbiZbxmbEntity); + + /** + * + * @content 查询项目指标数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/8/28 15:52 + * **/ + List queryGbiZbxmbEntity(GbiZbxmbEntity gbiZbxmbEntity); + + /** + * + * @content 保存项目指标数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/8/28 17:04 + * **/ + GbiZbxmbEntity saveGbiZbxmbEntity(GbiZbxmbEntity gbiZbxmbEntity); + + /** + * + * @content 更新项目指标数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/8/28 17:05 + * **/ + GbiZbxmbEntity updateGbiZbxmbEntity(GbiZbxmbEntity gbiZbxmbEntity); + + /** + * + * @content 删除项目指标数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/8/28 17:09 + * **/ + Integer deleteGbiZbxmbEntity(GbiZbxmbEntity gbiZbxmbEntity); } diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/dao/impl/GbiZbxmbDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/dao/impl/GbiZbxmbDaoImpl.java index c2c72a54..d90fe622 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/dao/impl/GbiZbxmbDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/dao/impl/GbiZbxmbDaoImpl.java @@ -36,5 +36,29 @@ public class GbiZbxmbDaoImpl extends MybatisGenericDao i return (List)super.selectList("queryZbxmbByIdpzh",gbiZbxmbEntity); } + @Override + @DS("#gbiZbxmbEntity.dataSourceCode") + public List queryGbiZbxmbEntity(GbiZbxmbEntity gbiZbxmbEntity) { + return super.query(gbiZbxmbEntity); + } + + @Override + @DS("#gbiZbxmbEntity.dataSourceCode") + public GbiZbxmbEntity saveGbiZbxmbEntity(GbiZbxmbEntity gbiZbxmbEntity) { + return super.save(gbiZbxmbEntity); + } + + @Override + @DS("#gbiZbxmbEntity.dataSourceCode") + public GbiZbxmbEntity updateGbiZbxmbEntity(GbiZbxmbEntity gbiZbxmbEntity) { + return super.update(gbiZbxmbEntity); + } + + @Override + @DS("#gbiZbxmbEntity.dataSourceCode") + public Integer deleteGbiZbxmbEntity(GbiZbxmbEntity gbiZbxmbEntity) { + return super.delete("GbiZbxmbEntity_delete_zbxmb",gbiZbxmbEntity); + } + } diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/entity/GbiZbxmbEntity.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/entity/GbiZbxmbEntity.java index 242f8fd8..6b3bb94b 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/entity/GbiZbxmbEntity.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/entity/GbiZbxmbEntity.java @@ -1,5 +1,6 @@ package com.hzya.frame.grpU8.nxproof.gbizbxmb.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.hzya.frame.web.entity.BaseEntity; /** * (GbiZbxmb)实体类 @@ -110,7 +111,8 @@ public class GbiZbxmbEntity extends BaseEntity { private String lrrq; private String lrsj; private Integer shrid; - private String shr; + + private String auditor; private String shrq; private String shsj; private Integer pfrid; @@ -966,12 +968,12 @@ public class GbiZbxmbEntity extends BaseEntity { this.shrid = shrid; } - public String getShr() { - return shr; + public String getAuditor() { + return auditor; } - public void setShr(String shr) { - this.shr = shr; + public void setAuditor(String auditor) { + this.auditor = auditor; } public String getShrq() { diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/entity/GbiZbxmbEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/entity/GbiZbxmbEntity.xml index e23f2bfd..7d00d2c4 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/entity/GbiZbxmbEntity.xml +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/entity/GbiZbxmbEntity.xml @@ -179,7 +179,7 @@ ,XMDM ,XMMC ,GNKMDM - ,GNKMMC + ,GNKMMC ,JJKMDM ,JJKMMC ,FZ6DM @@ -246,7 +246,7 @@ ,LRRQ ,LRSJ ,SHRID - ,SHR + ,SHR as auditor ,SHRQ ,SHSJ ,PFRID @@ -392,7 +392,6 @@ and LRRQ = #{lrrq} and LRSJ = #{lrsj} and SHRID = #{shrid} - and SHR = #{shr} and SHRQ = #{shrq} and SHSJ = #{shsj} and PFRID = #{pfrid} @@ -901,7 +900,7 @@ - + insert into gbi_zbxmb( ZBID , @@ -1005,7 +1004,7 @@ LRRQ , LRSJ , SHRID , - SHR , + SHR , SHRQ , SHSJ , PFRID , @@ -1147,7 +1146,7 @@ #{lrrq} , #{lrsj} , #{shrid} , - #{shr} , + #{auditor} , #{shrq} , #{shsj} , #{pfrid} , @@ -1440,7 +1439,7 @@ update gbi_zbxmb set LRRQ = #{lrrq}, LRSJ = #{lrsj}, SHRID = #{shrid}, - SHR = #{shr}, + SHR = #{auditor}, SHRQ = #{shrq}, SHSJ = #{shsj}, PFRID = #{pfrid}, @@ -1479,7 +1478,7 @@ update gbi_zbxmb set KZZL7MC = #{kzzl7mc}, EDWZC = #{edwzc}, -where ZBID = #{zbid} +where ZBID = #{zbid} and KJND=#{kjnd} and GSDM=#{gsdm} and ZBDM = #{zbdm} @@ -1642,5 +1641,11 @@ update gbi_zbxmb set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{ delete from gbi_zbxmb where ZBID = #{zbid} + + + delete from gbi_zbxmb where ZBID = #{zbid} and KJND=#{kjnd} and GSDM=#{gsdm} and ZBDM = #{zbdm} + + + diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/IGbiZbxmbService.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/IGbiZbxmbService.java index de6dd430..5d568e47 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/IGbiZbxmbService.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/IGbiZbxmbService.java @@ -39,4 +39,14 @@ public interface IGbiZbxmbService extends IBaseService{ * @Date 2024/8/7 14:50 * **/ Object deleteGbiZbxmb(JSONObject jsonObject); + + /** + * + * @content 查询项目指标 + * @Param + * @Return + * @Author hecan + * @Date 2024/8/28 15:47 + * **/ + Object queryEntityPage(JSONObject json); } 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 dc984aac..d999a871 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 @@ -2,6 +2,7 @@ package com.hzya.frame.grpU8.nxproof.gbizbxmb.service.impl; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; import com.hzya.frame.grpU8.nxproof.gbizbxmb.entity.GbiZbxmbEntity; import com.hzya.frame.grpU8.nxproof.gbizbxmb.dao.IGbiZbxmbDao; import com.hzya.frame.grpU8.nxproof.gbizbxmb.service.IGbiZbxmbService; @@ -19,11 +20,13 @@ import com.hzya.frame.grpU8.nxproof.zbzbly.dao.IZbZblyDao; import com.hzya.frame.grpU8.nxproof.zbzbly.entity.ZbZblyEntity; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; +import org.apache.commons.collections.CollectionUtils; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Resource; import com.hzya.frame.basedao.service.impl.BaseService; +import java.util.List; import java.util.UUID; /** @@ -80,6 +83,20 @@ public class GbiZbxmbServiceImpl extends BaseService imp 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); + if(CollectionUtils.isNotEmpty(gbiZbxmbEntities)){ + return BaseResult.getFailureMessageEntity("保存指标失败,该指标已经存在"); + } + }catch (Exception e){ + logger.info("保存项目指标失败:{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("保存指标失败"); + } //更新其他表得使用状态 JsonResultEntity jsonResultEntity = updateOtherTable(gbiZbxmbEntity); //保存指标项目表 @@ -97,9 +114,10 @@ public class GbiZbxmbServiceImpl extends BaseService imp gbiZbxmbEntity.setSjzbid(0);//上级指标id logger.info("=========开始保存指标项目表========="); - GbiZbxmbEntity save = gbiZbxmbDao.save(gbiZbxmbEntity); + GbiZbxmbEntity save = gbiZbxmbDao.saveGbiZbxmbEntity(gbiZbxmbEntity); logger.info("==========指标项目表保存完毕======"); GlCzrzEntity glCzrzEntity=new GlCzrzEntity(); + glCzrzEntity.setDataSourceCode(gbiZbxmbEntity.getDataSourceCode()); glCzrzEntity.setStation("yusuanzhibiaobaocun"); logger.info("==========开始查询操作日志的最大值no======"); GlCzrzEntity glCzrzEntityNo = glCzrzDao.queryCzrzNo(glCzrzEntity); @@ -108,14 +126,14 @@ public class GbiZbxmbServiceImpl extends BaseService imp glCzrzEntity.setName("0.指标保存"); glCzrzEntity.setCznr("增加指标"+gbiZbxmbEntity.getZbid()+"(MXZB)"); logger.info("==========开始保存操作日志======"); - glCzrzDao.save(glCzrzEntity); + glCzrzDao.saveGlCzrzEntity(glCzrzEntity); logger.info("==========操作日志保存完毕======"); JSONObject jsonObjectSave=new JSONObject(); jsonObjectSave.put("status","200"); jsonObjectSave.put("zbxm",save); return jsonObjectSave; }catch (Exception e){ - logger.info("保存预算指标失败:{}",e.getMessage()); + logger.info("根据会计年度:{},公司代码:{},指标id:{},指标代码:{}保存项目指标失败:{}",gbiZbxmbEntity.getKjnd(),gbiZbxmbEntity.getGsdm(),gbiZbxmbEntity.getZbid(),gbiZbxmbEntity.getZbdm(),e.getMessage()); return BaseResult.getFailureMessageEntity("保存指标失败"); } } @@ -141,9 +159,10 @@ public class GbiZbxmbServiceImpl extends BaseService imp gbiZbxmbEntity.setZt("1"); gbiZbxmbEntity.setNcysy(0.00);//年初已使用 logger.info("=========开始更新指标项目表========="); - GbiZbxmbEntity save = gbiZbxmbDao.update(gbiZbxmbEntity); + GbiZbxmbEntity save = gbiZbxmbDao.updateGbiZbxmbEntity(gbiZbxmbEntity); logger.info("==========指标项目表更新完毕======"); GlCzrzEntity glCzrzEntity=new GlCzrzEntity(); + glCzrzEntity.setDataSourceCode(gbiZbxmbEntity.getDataSourceCode()); glCzrzEntity.setStation("yusuanzhibiaobaocun"); logger.info("==========开始查询操作日志的最大值no======"); GlCzrzEntity glCzrzEntityNo = glCzrzDao.queryCzrzNo(glCzrzEntity); @@ -152,7 +171,7 @@ public class GbiZbxmbServiceImpl extends BaseService imp glCzrzEntity.setName("0.指标修改"); glCzrzEntity.setCznr("修改指标"+gbiZbxmbEntity.getZbid()+"(MXZB)"); logger.info("==========开始保存操作日志======"); - glCzrzDao.save(glCzrzEntity); + glCzrzDao.saveGlCzrzEntity(glCzrzEntity); logger.info("==========操作日志保存完毕======"); JSONObject jsonObjectUpdate =new JSONObject(); jsonObjectUpdate.put("status","200"); @@ -183,9 +202,10 @@ public class GbiZbxmbServiceImpl extends BaseService imp try { gbiZbxmbEntity.setZt("1"); logger.info("=========开始删除指标项目表========="); - int delete = gbiZbxmbDao.delete("entity_delete", gbiZbxmbEntity); + int delete = gbiZbxmbDao.deleteGbiZbxmbEntity(gbiZbxmbEntity); logger.info("==========指标项目表删除完毕======"); GlCzrzEntity glCzrzEntity=new GlCzrzEntity(); + glCzrzEntity.setDataSourceCode(gbiZbxmbEntity.getDataSourceCode()); glCzrzEntity.setStation("yusuanzhibiaobaocun"); logger.info("==========开始查询操作日志的最大值no======"); GlCzrzEntity glCzrzEntityNo = glCzrzDao.queryCzrzNo(glCzrzEntity); @@ -194,7 +214,7 @@ public class GbiZbxmbServiceImpl extends BaseService imp glCzrzEntity.setName("0.指标删除"); glCzrzEntity.setCznr("删除指标"+gbiZbxmbEntity.getZbid()+"(MXZB)"); logger.info("==========开始保存操作日志======"); - glCzrzDao.save(glCzrzEntity); + glCzrzDao.saveGlCzrzEntity(glCzrzEntity); logger.info("==========操作日志保存完毕======"); JSONObject jsonObjectDelete =new JSONObject(); jsonObjectDelete.put("status","200"); @@ -206,6 +226,30 @@ public class GbiZbxmbServiceImpl extends BaseService imp } } + //查询项目指标 + @Override + public Object queryEntityPage(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + if(!checkStr(jsonObject.getString("gsdm"))){ + return BaseResult.getFailureMessageEntity("请传递公司代码"); + } + if(!checkStr(jsonObject.getString("kjnd"))){ + return BaseResult.getFailureMessageEntity("请传递会计年度"); + } + GbiZbxmbEntity gbiZbxmbEntity = jsonObject.toJavaObject(GbiZbxmbEntity.class); + try { + List gbiZbxmbEntities = gbiZbxmbDao.queryGbiZbxmbEntity(gbiZbxmbEntity); + JSONObject object=new JSONObject(); + PageInfo pageInfo=new PageInfo(gbiZbxmbEntities); + object.put("pageInfo",pageInfo); + object.put("status","200"); + return object; + }catch (Exception e){ + logger.info("根据公司代码:{},会计年度:{},指标代码:{}，指标id:{}查询指标项目失败:{}",gbiZbxmbEntity.getGsdm(),gbiZbxmbEntity.getKjnd(),gbiZbxmbEntity.getZbdm(),gbiZbxmbEntity.getZbid(),e.getMessage()); + return BaseResult.getFailureMessageEntity("查询指标失败"); + } + } + private JsonResultEntity updateOtherTable(GbiZbxmbEntity gbiZbxmbEntity){ try { @@ -216,8 +260,9 @@ public class GbiZbxmbServiceImpl extends BaseService imp pubbmxxEntity.setGsdm(gbiZbxmbEntity.getGsdm()); pubbmxxEntity.setKjnd(gbiZbxmbEntity.getKjnd()); pubbmxxEntity.setBmdm(gbiZbxmbEntity.getBmdm()); + pubbmxxEntity.setDataSourceCode(gbiZbxmbEntity.getDataSourceCode()); pubbmxxEntity.setSyzt("1"); - pubbmxxDao.update(pubbmxxEntity); + pubbmxxDao.updatePubbmxxHealthBureau(pubbmxxEntity); logger.info("===========更新部门信息得使用状态完毕========="); } }catch (Exception e){ @@ -231,9 +276,10 @@ public class GbiZbxmbServiceImpl extends BaseService imp glXmzlEntity.setGsdm(gbiZbxmbEntity.getGsdm()); glXmzlEntity.setKjnd(gbiZbxmbEntity.getKjnd()); glXmzlEntity.setXmdm(gbiZbxmbEntity.getXmdm()); + glXmzlEntity.setDataSourceCode(gbiZbxmbEntity.getDataSourceCode()); glXmzlEntity.setSyzt("1"); logger.info("===========开始更新项目资料得使用状态========="); - glXmzlDao.update(glXmzlEntity); + glXmzlDao.updateGlXmzlHealthBureau(glXmzlEntity); logger.info("===========更新项目资料得使用状态完毕========="); } }catch (Exception e){ @@ -247,9 +293,10 @@ public class GbiZbxmbServiceImpl extends BaseService imp zbWhszEntity.setGsdm(gbiZbxmbEntity.getGsdm()); zbWhszEntity.setKjnd(gbiZbxmbEntity.getKjnd()); zbWhszEntity.setWhdm(gbiZbxmbEntity.getWhdm()); + zbWhszEntity.setDataSourceCode(gbiZbxmbEntity.getDataSourceCode()); zbWhszEntity.setSyzt("1"); logger.info("===========开始更新文号得使用状态========="); - zbWhszDao.update(zbWhszEntity); + zbWhszDao.updateZbWhszEntity(zbWhszEntity); logger.info("===========更新文号得使用状态完毕========="); } }catch (Exception e){ @@ -263,9 +310,10 @@ public class GbiZbxmbServiceImpl extends BaseService imp zblyEntity.setGsdm(gbiZbxmbEntity.getGsdm()); zblyEntity.setKjnd(gbiZbxmbEntity.getKjnd()); zblyEntity.setZblydm(gbiZbxmbEntity.getZblydm()); + zblyEntity.setDataSourceCode(gbiZbxmbEntity.getDataSourceCode()); zblyEntity.setSyzt("1"); logger.info("===========开始更新指标来源得使用状态========="); - zbZblyDao.update(zblyEntity); + zbZblyDao.updateZbZblyEntity(zblyEntity); logger.info("===========更新指标来源得使用状态完毕========="); } }catch (Exception e){ @@ -278,13 +326,14 @@ public class GbiZbxmbServiceImpl extends BaseService imp GlFzxzlEntity glFzxzlEntity=new GlFzxzlEntity(); glFzxzlEntity.setGsdm(gbiZbxmbEntity.getGsdm()); glFzxzlEntity.setKjnd(gbiZbxmbEntity.getKjnd()); + glFzxzlEntity.setDataSourceCode(gbiZbxmbEntity.getDataSourceCode()); glFzxzlEntity.setSyzt("1"); try { if(StrUtil.isNotEmpty(gbiZbxmbEntity.getJjkmdm()) && StrUtil.isNotEmpty(gbiZbxmbEntity.getJjkmmc())) { logger.info("===========开始更新辅助项资料(部门经济科目)得使用状态========="); glFzxzlEntity.setFzdm(gbiZbxmbEntity.getJjkmdm()); glFzxzlEntity.setLbdm("5"); - glFzxzlDao.update(glFzxzlEntity); + glFzxzlDao.updateGlFzxzlEntity(glFzxzlEntity); logger.info("===========更新辅助项资料(部门经济科目)得使用状态完毕========="); } }catch (Exception e){ @@ -297,7 +346,7 @@ public class GbiZbxmbServiceImpl extends BaseService imp glFzxzlEntity.setLbdm("6"); glFzxzlEntity.setFzdm(gbiZbxmbEntity.getFz6dm()); logger.info("===========开始更新辅助项资料(资金性质)得使用状态========="); - glFzxzlDao.update(glFzxzlEntity); + glFzxzlDao.updateGlFzxzlEntity(glFzxzlEntity); logger.info("===========更新辅助项资料(资金性质)得使用状态完毕========="); } }catch (Exception e){ @@ -310,7 +359,7 @@ public class GbiZbxmbServiceImpl extends BaseService imp glFzxzlEntity.setLbdm("8"); glFzxzlEntity.setFzdm(gbiZbxmbEntity.getFz8dm()); logger.info("===========开始更新辅助项资料(国库项目)得使用状态========="); - glFzxzlDao.update(glFzxzlEntity); + glFzxzlDao.updateGlFzxzlEntity(glFzxzlEntity); logger.info("===========更新辅助项资料(国库项目)得使用状态完毕========="); } }catch (Exception e){ @@ -323,7 +372,7 @@ public class GbiZbxmbServiceImpl extends BaseService imp glFzxzlEntity.setLbdm("9"); glFzxzlEntity.setFzdm(gbiZbxmbEntity.getFz9dm()); logger.info("===========开始更新辅助项资料(经费类型I)得使用状态========="); - glFzxzlDao.update(glFzxzlEntity); + glFzxzlDao.updateGlFzxzlEntity(glFzxzlEntity); logger.info("===========更新辅助项资料(经费类型I)得使用状态完毕========="); } }catch (Exception e){ 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 ff54dd7c..2eb82a12 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 @@ -84,5 +84,15 @@ public interface ISenderGlPzmlDao extends IBaseDao { Integer deleteGlPzmlHealthBureau(SenderGlPzmlEntity senderGlPzmlEntity); SenderGlPzmlEntity queryPzmlByIdpzh(SenderGlPzmlEntity entity); + + /** + * + * @content 查询凭证 商学院 + * @Param + * @Return + * @Author hecan + * @Date 2024/8/14 16:25 + * **/ + List queryGlPzmlSxy(SenderGlPzmlEntity senderGlPzmlEntity); } 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 f1d15408..57b3a152 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 @@ -70,6 +70,12 @@ 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/glPzml/entity/SenderGlPzmlEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml index 86d48292..85d484c3 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 @@ -259,6 +259,31 @@ + + + insert into gl_pzml( diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/ISenderGlPzmlService.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/ISenderGlPzmlService.java index ad085e24..5a712832 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/ISenderGlPzmlService.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/ISenderGlPzmlService.java @@ -94,12 +94,12 @@ public interface ISenderGlPzmlService extends IBaseService pzmlEntities = senderGlPzmlDao.query(glPzmlEntity); - if(CollectionUtils.isEmpty(pzmlEntities)){ + List list = senderGlPzmlDao.queryGlPzmlSxy(glPzmlEntity); + if(CollectionUtils.isEmpty(list)){ return BaseResult.getSuccessMessageEntity("没有需要同步得凭证",null); } - for (SenderGlPzmlEntity pzmlEntity : pzmlEntities) { - String pzNum = pzmlEntity.getGsdm() + "_" + pzmlEntity.getZth() + "_" + pzmlEntity.getKjqj() + "_" + pzmlEntity.getPzh(); - JSONObject jsonObjectParams=new JSONObject(); - jsonObjectParams.put("code",pzmlEntity.getIdpzh());//pzid - jsonObjectParams.put("budgetYear",pzmlEntity.getKjqj().substring(0,4));//预算年度 - jsonObjectParams.put("applyDate",DateUtil.format(new Date(),"yyyy-MM-dd"));//日期 - jsonObjectParams.put("userCode","");//用户编码 - jsonObjectParams.put("depCode","");//部门编码 - jsonObjectParams.put("description",pzmlEntity.getPzzy());//说明 - jsonObjectParams.put("amount",pzmlEntity.getPzje());//金额 - jsonObjectParams.put("pzNum",pzNum);//凭证号 例如：公司代码+账套号+会计期间+凭证号：001_001_202408_付款_1 - JSONArray jsonArray=new JSONArray(); - jsonArray.add(jsonObjectParams); - JSONObject jsonObjectData=new JSONObject(); - jsonObjectData.put("data",jsonArray); - - + try { + String result=null; + for (SenderGlPzmlEntity pzmlEntity : list) { + String pzNum = pzmlEntity.getGsdm() + "_" + pzmlEntity.getZth() + "_" + pzmlEntity.getKjqj() + "_" + pzmlEntity.getPzh(); + //转换日期，如将20240514转为2024-05-14 + SimpleDateFormat inputFormat = new SimpleDateFormat("yyyyMMdd"); + SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd"); + Date date = inputFormat.parse(pzmlEntity.getSrrq()); + String outputDateString = outputFormat.format(date); + //将金额四舍五入 + BigDecimal bigDecimalValue = new BigDecimal(pzmlEntity.getPzje()); + BigDecimal roundedValue = bigDecimalValue.setScale(2, + RoundingMode.HALF_UP); + JSONObject jsonObjectParams=new JSONObject(); + jsonObjectParams.put("code",pzmlEntity.getIdpzh());//pzid + jsonObjectParams.put("budgetYear",pzmlEntity.getKjqj().substring(0,4));//预算年度 + jsonObjectParams.put("applyDate",outputDateString);//日期 + jsonObjectParams.put("userCode",pzmlEntity.getSrid());//用户编码 + jsonObjectParams.put("depCode","A518");//部门编码 + jsonObjectParams.put("description",pzmlEntity.getPzzy());//说明 + jsonObjectParams.put("amount",roundedValue.doubleValue());//金额 + jsonObjectParams.put("pzNum",pzNum);//凭证号 例如：公司代码+账套号+会计期间+凭证号：001_001_202408_付款_1 + //根据idpzh查询指标id和指标金额 + GbiZbxmbEntity gbiZbxmbEntity=new GbiZbxmbEntity(); + gbiZbxmbEntity.setDjId(pzmlEntity.getIdpzh()); + gbiZbxmbEntity.setKjnd(pzmlEntity.getKjqj().substring(0,4)); + gbiZbxmbEntity.setDataSourceCode(glPzmlEntity.getDataSourceCode()); + List gbiZbsyrecEntities = gbiZbxmbDao.queryZbxmbByIdpzh(gbiZbxmbEntity); + logger.info("=======根据凭证idpzh:{}查询的指标金额和指标id数据有{}条",pzmlEntity.getIdpzh(),gbiZbsyrecEntities.size()); + if(CollectionUtils.isEmpty(gbiZbsyrecEntities)){ + jsonObjectParams.put("reimburseItems",new ArrayList<>()); + }else{ + JSONArray jsonArray=new JSONArray(); + for (GbiZbxmbEntity zbxmbEntity : gbiZbsyrecEntities) { + BigDecimal bigDecimalValueZbxmb = new BigDecimal(zbxmbEntity.getJe()); + BigDecimal roundedValueZbxmb = bigDecimalValueZbxmb.setScale(2, RoundingMode.HALF_UP); + JSONObject jsonObjectZbxm=new JSONObject(); + jsonObjectZbxm.put("thirdProjectCode",zbxmbEntity.getZbid()); + jsonObjectZbxm.put("amount",roundedValueZbxmb); + jsonObjectZbxm.put("financialCode",zbxmbEntity.getJjkmdm()); + jsonArray.add(jsonObjectZbxm); + } + jsonObjectParams.put("reimburseItems",jsonArray); + } + JSONArray jsonArray=new JSONArray(); + jsonArray.add(jsonObjectParams); + JSONObject jsonObjectData=new JSONObject(); + jsonObjectData.put("data",jsonArray); + String params = jsonObjectData.toJSONString(); + logger.info("调用商学院凭证保存接口请求参数：{}",params); + result = HttpRequest.post(URLTest + "/nky/service/zsApi/saveZJSYPZReimburse?accessToken="+token).header("Content-Type", "application/json;charset=UTF-8").timeout(30000).body(params).execute().body(); + logger.info("调用商学院凭证保存接口返回参数：{}",result); + } + JSONObject jsonObjectResult=new JSONObject(); + jsonObjectResult.put("status","200"); + jsonObjectResult.put("pzml",result); + return jsonObjectResult; + }catch (Exception e){ + logger.info("根据凭证idpzh:{}查询指标失败:{}",glPzmlEntity.getIdpzh(),e.getMessage()); + return BaseResult.getFailureMessageEntity("根据凭证查询指标失败"); } - return null; } diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/dao/IGlCzrzDao.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/dao/IGlCzrzDao.java index 519fc008..122ccdf5 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/dao/IGlCzrzDao.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/dao/IGlCzrzDao.java @@ -21,5 +21,15 @@ public interface IGlCzrzDao extends IBaseDao { * @Date 2024/8/6 15:45 * **/ GlCzrzEntity queryCzrzNo(GlCzrzEntity glCzrzEntity); + + /** + * + * @content 保存操作日志 + * @Param + * @Return + * @Author hecan + * @Date 2024/8/28 17:11 + * **/ + GlCzrzEntity saveGlCzrzEntity(GlCzrzEntity glCzrzEntity); } diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/dao/impl/GlCzrzDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/dao/impl/GlCzrzDaoImpl.java index 7c7d01de..392485dd 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/dao/impl/GlCzrzDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/dao/impl/GlCzrzDaoImpl.java @@ -1,6 +1,7 @@ package com.hzya.frame.grpU8.nxproof.glczrz.dao.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.dao.MybatisGenericDao; import com.hzya.frame.grpU8.nxproof.glczrz.dao.IGlCzrzDao; import com.hzya.frame.grpU8.nxproof.glczrz.entity.GlCzrzEntity; @@ -15,8 +16,15 @@ import org.springframework.stereotype.Repository; public class GlCzrzDaoImpl extends MybatisGenericDao implements IGlCzrzDao { @Override + @DS("#glCzrzEntity.dataSourceCode") public GlCzrzEntity queryCzrzNo(GlCzrzEntity glCzrzEntity) { return (GlCzrzEntity)super.selectOne("queryCzrzNo",glCzrzEntity); } + + @Override + @DS("#glCzrzEntity.dataSourceCode") + public GlCzrzEntity saveGlCzrzEntity(GlCzrzEntity glCzrzEntity) { + return super.save(glCzrzEntity); + } } diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/entity/GlCzrzEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/entity/GlCzrzEntity.xml index e7fb2dba..aaee2d85 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/entity/GlCzrzEntity.xml +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/entity/GlCzrzEntity.xml @@ -106,10 +106,10 @@ no , name , - date , - zwrq , - qssj , - zzsj , + date , + zwrq , + qssj , + zzsj , cznr , CZNRKZ , station @@ -118,10 +118,10 @@ #{no} , #{name} , - select convert(char(8),getdate(),112), - select convert(char(8),getdate(),112) , - select convert(char(8),getdate(),108) , - select convert(char(8),getdate(),108) , + convert(char(8),getdate(),112), + convert(char(8),getdate(),112) , + convert(char(8),getdate(),108) , + convert(char(8),getdate(),108) , #{cznr} , #{cznrkz} , #{station} 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 9c921736..47e98eda 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 @@ -27,5 +27,15 @@ public interface IGlFzxzlDao extends IBaseDao { * @Date 2024/8/28 10:47 * **/ List queryGlFzxzlEntity(GlFzxzlEntity glFzxzlEntity); + + /** + * + * @content 更新辅助项资料 + * @Param + * @Return + * @Author hecan + * @Date 2024/8/28 17:14 + * **/ + GlFzxzlEntity updateGlFzxzlEntity(GlFzxzlEntity glFzxzlEntity); } 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 ed3f6459..60d04b44 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 @@ -32,5 +32,11 @@ public class GlFzxzlDaoImpl extends MybatisGenericDao imp public List queryGlFzxzlEntity(GlFzxzlEntity glFzxzlEntity) { return super.queryByLike(glFzxzlEntity); } + + @Override + @DS("#glFzxzlEntity.dataSourceCode") + public GlFzxzlEntity updateGlFzxzlEntity(GlFzxzlEntity glFzxzlEntity) { + return super.update(glFzxzlEntity); + } } diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/dao/ISenderGlKmxxDao.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/dao/ISenderGlKmxxDao.java index 90bace5d..5541d21c 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/dao/ISenderGlKmxxDao.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/dao/ISenderGlKmxxDao.java @@ -3,6 +3,7 @@ package com.hzya.frame.grpU8.nxproof.glkmxx.dao; import com.hzya.frame.basedao.dao.IBaseDao; import com.hzya.frame.grpU8.nxproof.glkmxx.entity.SenderGlKmxxEntity; +import com.hzya.frame.grpU8.nxproof.glkmxx.entity.SenderGlKmxxEntityDto; import java.util.List; @@ -85,6 +86,15 @@ public interface ISenderGlKmxxDao extends IBaseDao { * **/ Integer deleteGlKmxxHealthBureau(SenderGlKmxxEntity senderGlKmxxEntity); + /** + * + * @content 查询科目总账余额表数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/8/28 11:27 + * **/ + List queryAccountLedgerBalance(SenderGlKmxxEntityDto senderGlKmxxEntityDto); } diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/dao/impl/SenderGlKmxxDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/dao/impl/SenderGlKmxxDaoImpl.java index a5bd55a6..e5d1d9ed 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/dao/impl/SenderGlKmxxDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/dao/impl/SenderGlKmxxDaoImpl.java @@ -6,6 +6,7 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.dao.MybatisGenericDao; import com.hzya.frame.grpU8.nxproof.glkmxx.dao.ISenderGlKmxxDao; import com.hzya.frame.grpU8.nxproof.glkmxx.entity.SenderGlKmxxEntity; +import com.hzya.frame.grpU8.nxproof.glkmxx.entity.SenderGlKmxxEntityDto; import org.springframework.stereotype.Repository; import java.util.List; @@ -61,5 +62,12 @@ public class SenderGlKmxxDaoImpl extends MybatisGenericDao queryAccountLedgerBalance(SenderGlKmxxEntityDto senderGlKmxxEntityDto) { + return (List) super.selectList("queryAccountLedgerBalance",senderGlKmxxEntityDto); + } } diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/entity/SenderGlKmxxEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/entity/SenderGlKmxxEntity.xml index a07a595f..d2216774 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/entity/SenderGlKmxxEntity.xml +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/entity/SenderGlKmxxEntity.xml @@ -270,6 +270,44 @@ + + + insert into gl_kmxx( diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/service/ISenderGlKmxxService.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/service/ISenderGlKmxxService.java index 0aee3a36..0d254060 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/service/ISenderGlKmxxService.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/service/ISenderGlKmxxService.java @@ -88,5 +88,15 @@ public interface ISenderGlKmxxService extends IBaseService senderGlKmxxEntityDtos = senderGlKmxxDao.queryAccountLedgerBalance(receiverGlKmxxEntityDto); + PageInfo pageInfo=new PageInfo(senderGlKmxxEntityDtos); + JSONObject object=new JSONObject(); + object.put("pageInfo",pageInfo); + object.put("status","200"); + return object; + }catch (Exception e){ + logger.info("根据账套号:{}和科目代码：{}以及会计年度：{}查询科目总账余额信息失败:{}", receiverGlKmxxEntityDto.getZth(), receiverGlKmxxEntityDto.getKmdm(), receiverGlKmxxEntityDto.getKjnd(), e.getMessage()); + return BaseResult.getFailureMessageEntity("查询科目总账余额失败"); + } + } } diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/dao/IZbWhszDao.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/dao/IZbWhszDao.java index 4e0179c8..205307a4 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/dao/IZbWhszDao.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/dao/IZbWhszDao.java @@ -12,5 +12,15 @@ import com.hzya.frame.grpU8.nxproof.zbwhsz.entity.ZbWhszEntity; */ public interface IZbWhszDao extends IBaseDao { + /** + * + * @content 更新文号 + * @Param + * @Return + * @Author hecan + * @Date 2024/8/28 17:20 + * **/ + ZbWhszEntity updateZbWhszEntity(ZbWhszEntity zbWhszEntity); + } diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/dao/impl/ZbWhszDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/dao/impl/ZbWhszDaoImpl.java index 600a4432..89ab7e32 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/dao/impl/ZbWhszDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/dao/impl/ZbWhszDaoImpl.java @@ -1,6 +1,7 @@ package com.hzya.frame.grpU8.nxproof.zbwhsz.dao.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.dao.MybatisGenericDao; import com.hzya.frame.grpU8.nxproof.zbwhsz.dao.IZbWhszDao; import com.hzya.frame.grpU8.nxproof.zbwhsz.entity.ZbWhszEntity; @@ -13,6 +14,11 @@ import org.springframework.stereotype.Repository; */ @Repository(value = "ZbWhszDaoImpl") public class ZbWhszDaoImpl extends MybatisGenericDao implements IZbWhszDao { - + + @Override + @DS("#zbWhszEntity.dataSourceCode") + public ZbWhszEntity updateZbWhszEntity(ZbWhszEntity zbWhszEntity) { + return super.update(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 356a6ff2..f8209872 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 @@ -12,5 +12,15 @@ import com.hzya.frame.grpU8.nxproof.zbzbly.entity.ZbZblyEntity; */ public interface IZbZblyDao extends IBaseDao { + /** + * + * @content 更新指标来源 + * @Param + * @Return + * @Author hecan + * @Date 2024/8/28 17:22 + * **/ + ZbZblyEntity updateZbZblyEntity(ZbZblyEntity zblyEntity); + } diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/dao/impl/ZbZblyDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/dao/impl/ZbZblyDaoImpl.java index 40814ced..2bdc8054 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/dao/impl/ZbZblyDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/dao/impl/ZbZblyDaoImpl.java @@ -1,6 +1,7 @@ package com.hzya.frame.grpU8.nxproof.zbzbly.dao.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.dao.MybatisGenericDao; import com.hzya.frame.grpU8.nxproof.zbzbly.dao.IZbZblyDao; import com.hzya.frame.grpU8.nxproof.zbzbly.entity.ZbZblyEntity; @@ -13,6 +14,11 @@ import org.springframework.stereotype.Repository; */ @Repository(value = "ZbZblyDaoImpl") public class ZbZblyDaoImpl extends MybatisGenericDao implements IZbZblyDao { - + + @Override + @DS("#zblyEntity.dataSourceCode") + public ZbZblyEntity updateZbZblyEntity(ZbZblyEntity zblyEntity) { + return super.update(zblyEntity); + } } 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 14/19] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=96=B0=E5=A2=9E=E6=8C=87=E6=A0=87id?= =?UTF-8?q?=E5=92=8C=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"); From f6ee41cfe5090e50c1c840e42d4bd31e4a6c14e4 Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Thu, 29 Aug 2024 10:19:01 +0800 Subject: [PATCH 15/19] =?UTF-8?q?=E5=87=AD=E8=AF=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-llg.yml | 21 +++++------- .../glPznr/entity/SenderGlPznrEntity.xml | 1 - .../nxproof/glfzxzl/entity/GlFzxzlEntity.xml | 33 +++---------------- .../frame/webapp/web/init/FlywayConfig.java | 2 +- 4 files changed, 14 insertions(+), 43 deletions(-) diff --git a/buildpackage/src/main/resources/application-llg.yml b/buildpackage/src/main/resources/application-llg.yml index 0a16527c..0b33d662 100644 --- a/buildpackage/src/main/resources/application-llg.yml +++ b/buildpackage/src/main/resources/application-llg.yml @@ -23,22 +23,19 @@ spring: dynamic: druid: filters: stat,log4j2 + validationQuery: SELECT 1 # 验证数据库服务可用性的sql.用来检测连接是否有效的sql 因数据库方言而差, 例如 oracle 应该写成 SELECT 1 FROM DUAL datasource: master: -# url: jdbc:dm://hzya.ufyct.com:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle -# username: hzyazt + +# url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true +# username: root # password: 62e4295b615a30dbf3b8ee96f41c820b -# driver-class-name: dm.jdbc.driver.DmDriver -# type: com.alibaba.druid.pool.DruidDataSource - url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true - username: root +# driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 + + url: jdbc:sqlserver://192.168.2.247:9433;DatabaseName=businesscenter;encrypt=false;trustServerCertificate=true + username: sa password: 62e4295b615a30dbf3b8ee96f41c820b - driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 -# url: jdbc:dm://hzya.ufyct.com:9040/businesscenter?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8 -# url: jdbc:dm://hzya.ufyct.com:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle -# username: hzyazt -# password: 62e4295b615a30dbf3b8ee96f41c820b -# driver-class-name: dm.jdbc.driver.DmDriver + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver savefile: # 文件保存路径 path: /Users/apple/Desktop/log/local 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..cdd53c87 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 @@ -145,7 +145,6 @@ , ZBID , EDID , JFSQID - , fzdm10 , fzdm11 , fzdm12 , fzdm13 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 fb4e35d0..de8a862a 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 @@ -282,29 +282,6 @@ update GL_Fzxzl set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{m diff --git a/webapp/src/main/java/com/hzya/frame/webapp/web/init/FlywayConfig.java b/webapp/src/main/java/com/hzya/frame/webapp/web/init/FlywayConfig.java index 8630f562..4dda931a 100644 --- a/webapp/src/main/java/com/hzya/frame/webapp/web/init/FlywayConfig.java +++ b/webapp/src/main/java/com/hzya/frame/webapp/web/init/FlywayConfig.java @@ -48,7 +48,7 @@ public class FlywayConfig { @PostConstruct public void migrateOrder() { - if("false".equals(enabled)){ + if(!"false".equals(enabled)){ String pwd = AESUtil.decrypt(password); DynamicRoutingDataSource ds = (DynamicRoutingDataSource) dataSource; DataSource dsDatasource = null; From c501b0418eaf7382ab72a2058dc0075311f05497 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Thu, 29 Aug 2024 10:32:26 +0800 Subject: [PATCH 16/19] =?UTF-8?q?=E7=A7=91=E7=9B=AE=E4=BF=A1=E6=81=AFDTO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glkmxx/entity/SenderGlKmxxEntityDto.java | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/entity/SenderGlKmxxEntityDto.java diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/entity/SenderGlKmxxEntityDto.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/entity/SenderGlKmxxEntityDto.java new file mode 100644 index 00000000..d88d1684 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/entity/SenderGlKmxxEntityDto.java @@ -0,0 +1,58 @@ +package com.hzya.frame.grpU8.nxproof.glkmxx.entity; + +public class SenderGlKmxxEntityDto extends SenderGlKmxxEntity{ + private String qc;//期初数据 + private String bqj;//本期借方 + private String bqd;//本期贷方 + private String qm;//期末数据 + private String ljj;//累加借方 + private String ljd;//累加贷方 + + public String getQc() { + return qc; + } + + public void setQc(String qc) { + this.qc = qc; + } + + public String getBqj() { + return bqj; + } + + public void setBqj(String bqj) { + this.bqj = bqj; + } + + public String getBqd() { + return bqd; + } + + public void setBqd(String bqd) { + this.bqd = bqd; + } + + public String getQm() { + return qm; + } + + public void setQm(String qm) { + this.qm = qm; + } + + public String getLjj() { + return ljj; + } + + public void setLjj(String ljj) { + this.ljj = ljj; + } + + public String getLjd() { + return ljd; + } + + public void setLjd(String ljd) { + this.ljd = ljd; + } +} From f9ba6ac3dda479e2a21d586d9360aa26f276337d Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Thu, 29 Aug 2024 15:13:42 +0800 Subject: [PATCH 17/19] =?UTF-8?q?=E5=87=AD=E8=AF=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-llg.yml | 2 + .../service/IAcctVouchInfoService.java | 2 + .../impl/AcctVouchInfoServiceImpl.java | 132 +++++++++++++++++- .../glPzml/dao/impl/SenderGlPzmlDaoImpl.java | 6 +- .../glPznr/entity/SenderGlPznrEntity.java | 9 ++ .../glPznr/entity/SenderGlPznrEntity.xml | 8 ++ .../grpU8/service/impl/GrpU8ServiceImpl.java | 1 + 7 files changed, 154 insertions(+), 6 deletions(-) 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(); 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 18/19] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=95=86=E5=AD=A6?= =?UTF-8?q?=E9=99=A2=E5=87=AD=E8=AF=81=E6=9F=A5=E8=AF=A2=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8C=87=E6=A0=87=E8=A1=A8=E4=B8=AD=E7=9A=84?= =?UTF-8?q?id=E5=92=8C=E9=87=91=E9=A2=9D=EF=BC=8C=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=87=AD=E8=AF=81=E5=86=85=E5=AE=B9=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=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( 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 19/19] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E3=80=82=E8=81=8C=E5=91=98=EF=BC=8C=E6=8C=87=E6=A0=87=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=A0=B9=E6=8D=AE=E7=BC=96=E7=A0=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=AD=98=E5=9C=A8=E5=88=99=E4=B8=8D=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E4=B9=9F=E4=B8=8D=E6=9B=B4=E6=96=B0=EF=BC=8C=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E8=AF=A5=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); + + }