From d54f9284edda9be86d8be5af5204cfbc54f8fdc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Wed, 25 Dec 2024 15:25:21 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=B8=8A=E6=96=99=E6=8A=A5=E5=B7=A5=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=9E=AE=E4=BD=8D=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=202.=E4=BF=AE=E5=A4=8D=E7=94=9F=E6=88=90=E6=9D=90=E8=B4=A8?= =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E6=95=B0=E6=8D=AE=E5=BC=82=E5=B8=B8=E9=97=AE?= =?UTF-8?q?=E9=A2=98=203.=E4=BF=AE=E6=AD=A3=E9=9B=B6=E4=BB=B6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=8A=B6=E6=80=81=E6=9C=AA=E5=88=86=E9=85=8D=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java | 2 +- .../java/com/dsic/gj_erp/controller/zyjh/dto/SljhSearch.java | 1 + src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java | 2 +- src/main/resources/mappers/jhgk/DmYdjhMapper.xml | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java index 21700c9..6502eb7 100644 --- a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java @@ -442,8 +442,8 @@ public class ZyjhController { .eq(StrUtil.isNotEmpty(search.getDcPl()),DmYdjh::getDcPl, search.getDcPl()) .eq(StrUtil.isNotEmpty(search.getKw()),DmYdjh::getKw, search.getKw()) .eq(StrUtil.isNotEmpty(search.getZylx()),DmYdjh::getZylx, search.getZylx()) + .likeRight(StrUtil.isNotEmpty(search.getSlkcdw()),DmYdjh::getSlkcdw,search.getSlkcdw()) .orderByAsc(DmYdjh::getDjh) - ); return new ResultBean<>(list); } diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/SljhSearch.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/SljhSearch.java index fceb5a3..d63700f 100644 --- a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/SljhSearch.java +++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/SljhSearch.java @@ -13,4 +13,5 @@ public class SljhSearch { private String sllsh; private String zt="2"; private String zylx; + private String slkcdw; } diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java index d057162..9a33018 100644 --- a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java @@ -42,7 +42,7 @@ public class ZyjhService extends ServiceImpl { public String getMpDhsjDhh(){ String date=DateUtil.date().toString("yyyyMMdd"); - Long xh = (Long) redisTemplate.opsForHash().get(MPDHSJ_KEY, date); + Object xh = redisTemplate.opsForHash().get(MPDHSJ_KEY, date); if(ObjUtil.isEmpty(xh)){ redisTemplate.opsForHash().put(MPDHSJ_KEY, date,0); } diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml index 729f71c..7fa4fb0 100644 --- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml +++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml @@ -929,8 +929,8 @@ case when isnull(dm_ydjh.qjgrq,'')<>'' then 'Y' else '' end, - '01', - '01','01',dm_ydjh.dmrq dmjhrq,dm_ydjh.pkrq pkjhrq,dm_ydjh.qjgrq qjgjhrq,'01' + '01' qjg_zt, + '01' pk_zt,'01' dm_zt,dm_ydjh.dmrq dmjhrq,dm_ydjh.pkrq pkjhrq,dm_ydjh.qjgrq qjgjhrq,'01' ppzt from dm_ydjh,dm_bom LEFT JOIN dm_qfxq on dm_qfxq.DC_CH=dm_bom.dcch and dm_qfxq.DC_PL=dm_bom.pl and dm_qfxq.DC_FD=dm_bom.fd WHERE