From 160ea20a304d080409f6efd5dc83a403eeb0061e Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Mon, 20 Mar 2023 18:03:58 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix=20:=20=EC=B0=A8=EC=A2=85=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80(=EC=9D=B4=EB=A5=9C=EC=B0=A8,=20?= =?UTF-8?q?=EA=B1=B4=EC=84=A4=EA=B8=B0=EA=B3=84)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/resources/biz/common/js/codeComboData.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/webapp/resources/biz/common/js/codeComboData.js b/src/main/webapp/resources/biz/common/js/codeComboData.js index fab6b19e..b6170912 100644 --- a/src/main/webapp/resources/biz/common/js/codeComboData.js +++ b/src/main/webapp/resources/biz/common/js/codeComboData.js @@ -107,6 +107,8 @@ ComboCodeData = { ,{value: '2', text: '승합'} ,{value: '3', text: '화물'} ,{value: '4', text: '특수'} + ,{value: '5', text: '이륜차'} + ,{value: '6', text: '건설기계'} ] // 단속처리상태코드 : FIM010 From 1f3eac6987c0c484223be46822311468edf85d26 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Tue, 21 Mar 2023 09:19:37 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix=20:=20=EC=A1=B0=ED=9A=8C=EC=A1=B0?= =?UTF-8?q?=EA=B1=B4(=EB=8B=A8=EC=86=8D=EC=9D=BC=EC=9E=90,=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=EC=9D=BC=EC=9E=90)=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlmapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml | 2 +- .../sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/sqlmapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml b/src/main/resources/sqlmapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml index 6b3d66a2..76f9e98c 100644 --- a/src/main/resources/sqlmapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml @@ -115,7 +115,7 @@ - AND trr.reglt_de BETWEEN #{sch_date_from} AND #{sch_date_to} + AND trr.reglt_de BETWEEN REPLACE(#{sch_date_from},'-','') AND REPLACE(#{sch_date_to},'-','') AND SUBSTR(trr.regist_dt,1,8) BETWEEN REPLACE(#{sch_date_from},'-','') AND REPLACE(#{sch_date_to},'-','') diff --git a/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml b/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml index 49309d06..efa344a8 100644 --- a/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml @@ -61,10 +61,10 @@ - AND trr.reglt_de BETWEEN #{sch_date_from} AND #{sch_date_to} + AND trr.reglt_de BETWEEN REPLACE(#{sch_date_from},'-','') AND REPLACE(#{sch_date_to},'-','') - AND trr.regist_dt BETWEEN #{sch_date_from} AND #{sch_date_to} + AND SUBSTR(trr.regist_dt,1,8) BETWEEN REPLACE(#{sch_date_from},'-','') AND REPLACE(#{sch_date_to},'-','') AND INSTR(trr.vhcle_no, #{vhcleNo}) > 0 From b2010b32416e7a0199569d7a90b737d7493320dc Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Tue, 21 Mar 2023 11:54:24 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix=20:=20=EC=9D=B4=EB=AF=B8=EC=A7=80?= =?UTF-8?q?=ED=8E=B8=EC=A7=91=EA=B8=B0=20=EC=88=98=EC=A0=95(redo=20?= =?UTF-8?q?=EB=B9=84=ED=99=9C=EC=84=B1=ED=99=94)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../3rd-party/paintweb/interfaces/default/layout.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/layout.xhtml b/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/layout.xhtml index 9d784e7f..3837df08 100644 --- a/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/layout.xhtml +++ b/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/layout.xhtml @@ -22,7 +22,7 @@ this case the class names will be .paintweb_cmd_historyUndo and .paintweb_command. --> -
  • Redo
    • +
  • Undo
  •