From 59785ae458912fe1c51f225b2b3ab261a113422b Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Wed, 10 Jul 2024 11:11:09 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20NIMS=20=ED=8F=90=EA=B8=B0=EB=B3=B4?= =?UTF-8?q?=EA=B3=A0=20=ED=99=95=EC=9D=B8=20=20=20=20=20=20-=20=EC=83=81?= =?UTF-8?q?=ED=92=88=20=EC=9D=BC=EB=A0=A8=EB=B2=88=ED=98=B8=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=EC=A4=91=20null=EB=A1=9C=20return=20=EB=90=98?= =?UTF-8?q?=EB=8A=94=20=ED=95=AD=EB=AA=A9=EC=9D=B4=20=EC=9E=88=EC=96=B4=20?= =?UTF-8?q?=20=20=20=20=20=20=20=EC=9D=BC=EC=B9=98=20=EB=B9=84=EA=B5=90?= =?UTF-8?q?=EC=8B=9C=20null=20=EC=97=AC=EB=B6=80=EC=97=90=20=EA=B4=80?= =?UTF-8?q?=EA=B3=84=20=EC=97=86=EC=9D=B4=20=EC=B2=98=EB=A6=AC=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20=EC=9C=84=ED=95=B4=20=20=20=20=20=20=20=20Objects.e?= =?UTF-8?q?quals()=20=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/adds/inf/nims/model/NimsApiDto.java | 11 ++++++----- src/main/resources/database/adds_db_update.sql | 11 +++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/main/java/cokr/xit/adds/inf/nims/model/NimsApiDto.java b/src/main/java/cokr/xit/adds/inf/nims/model/NimsApiDto.java index 921a856..27063a5 100644 --- a/src/main/java/cokr/xit/adds/inf/nims/model/NimsApiDto.java +++ b/src/main/java/cokr/xit/adds/inf/nims/model/NimsApiDto.java @@ -3,6 +3,7 @@ package cokr.xit.adds.inf.nims.model; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import javax.validation.Valid; @@ -489,11 +490,11 @@ public class NimsApiDto { if (this.listDtl.size() == mgtDto.getDsuseMgtDtls().size()) { for (DsuseRptInfoDtl rptDtl : this.listDtl) { for (BizNimsDto.DsuseMgtDtl mgtDtl : mgtDto.getDsuseMgtDtls()) { - if (rptDtl.getPrductCd().equals(mgtDtl.getPrductCd()) - && rptDtl.getMnfNo().equals(mgtDtl.getMnfNo()) - && rptDtl.getPrdValidDe().equals(mgtDtl.getPrdValidDe()) - && rptDtl.getMnfSeq().equals(mgtDtl.getMnfSeq()) - && rptDtl.getDsuseQy().equals(mgtDtl.getDsuseQy())) { + if (Objects.equals(rptDtl.getPrductCd(), mgtDtl.getPrductCd()) + && Objects.equals(rptDtl.getMnfNo(), mgtDtl.getMnfNo()) + && Objects.equals(rptDtl.getPrdValidDe(), mgtDtl.getPrdValidDe()) + && Objects.equals(rptDtl.getMnfSeq(), mgtDtl.getMnfSeq()) + && Objects.equals(rptDtl.getDsuseQy(), mgtDtl.getDsuseQy())) { rptDtl.setMatchYn("Y"); break; } diff --git a/src/main/resources/database/adds_db_update.sql b/src/main/resources/database/adds_db_update.sql index 6e16a05..6575d43 100644 --- a/src/main/resources/database/adds_db_update.sql +++ b/src/main/resources/database/adds_db_update.sql @@ -6,6 +6,17 @@ alter table tb_dsuse_mgt alter table tb_dsuse_mgt add dsuse_acdt_de varchar(8) null comment '사고발생일' after dsuse_de; +INSERT INTO tb_grp_action (GRP_ID, ACTION, REG_DT, RGTR) VALUES ('anonymousAction', '/adds/nims/getNimsBsshInfoSt.do', '20240612183715', '0000000000'); +INSERT INTO tb_grp_action (GRP_ID, ACTION, REG_DT, RGTR) VALUES ('anonymousAction', '/adds/nims/getNimsProductInfoKdAndMnfSeqInfo.do', '20240612183715', '0000000000'); +INSERT INTO tb_grp_action (GRP_ID, ACTION, REG_DT, RGTR) VALUES ('managerAciton', '/adds/nims/getNimsBsshInfoSt.do', '20240612183715', '0000000000'); +INSERT INTO tb_grp_action (GRP_ID, ACTION, REG_DT, RGTR) VALUES ('managerAciton', '/adds/nims/getNimsProductInfoKd.do', '20240705161322', '0000000000'); +INSERT INTO tb_grp_action (GRP_ID, ACTION, REG_DT, RGTR) VALUES ('managerAciton', '/adds/nims/getNimsProductInfoKdAndMnfSeqInfo.do', '20240705161322', '0000000000'); +INSERT INTO tb_grp_action (GRP_ID, ACTION, REG_DT, RGTR) VALUES ('managerAciton', '/adds/nims/getNimsProductSeqInfo.do', '20240705161322', '0000000000'); +INSERT INTO tb_grp_action (GRP_ID, ACTION, REG_DT, RGTR) VALUES ('userAction', '/adds/nims/getNimsBsshInfoSt.do', '20240612183715', '0000000000'); +INSERT INTO tb_grp_action (GRP_ID, ACTION, REG_DT, RGTR) VALUES ('userAction', '/adds/nims/getNimsProductInfoKd.do', '20240705161335', '0000000000'); +INSERT INTO tb_grp_action (GRP_ID, ACTION, REG_DT, RGTR) VALUES ('userAction', '/adds/nims/getNimsProductInfoKdAndMnfSeqInfo.do', '20240612183715', '0000000000'); +INSERT INTO tb_grp_action (GRP_ID, ACTION, REG_DT, RGTR) VALUES ('userAction', '/adds/nims/getNimsProductSeqInfo.do', '20240705161335', '0000000000'); + create or replace table tb_dsuse_rslt_img ( dscdmng_rslt_img_id varchar(12) not null comment '폐기관리_결과_이미지_id',