From 521c7545cc6d3fe71215a6e799f2391f3866dc31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Tue, 19 Mar 2024 15:36:14 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=9B=B4=E8=A7=82=E5=9B=BE=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gj_erp/service/fd/DmCzfddybService.java | 12 ++- .../com/dsic/gj_erp/service/fd/TpImpl.java | 83 ++++++++++--------- 2 files changed, 47 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/service/fd/DmCzfddybService.java b/src/main/java/com/dsic/gj_erp/service/fd/DmCzfddybService.java index b142cc2..ed74b77 100644 --- a/src/main/java/com/dsic/gj_erp/service/fd/DmCzfddybService.java +++ b/src/main/java/com/dsic/gj_erp/service/fd/DmCzfddybService.java @@ -91,18 +91,16 @@ public class DmCzfddybService extends ServiceImpl { if(StringUtils.isNotBlank(bmbm)&& bmbm.length()>2){ czbhs = czjbbService.list(new QueryWrapper() - .select("replace(czbh,'#','') AS czbh") - .in("yzbs", "N", "H").ne("isnull(czjc,'')", "") + .select("replace(cbbm,'#','') AS cbbm") .ne("isnull(wgbs,'N')","Y").eq(" isnull(cims_bs,'')","Y"). eq("left(gcqy,1)","0"). - orderBy(true, true, "wgbs", "left(czbh,charindex('-',czbh)-1)", "len(czbh)", "czbh" + orderBy(true, true, "wgbs", "left(czbh,charindex('-',cbbm)-1)", "len(cbbm)", "czbh" )); }else{ czbhs = czjbbService.list(new QueryWrapper() - .select("replace(czbh,'#','') AS czbh") - .in("yzbs", "N", "H").ne("isnull(czjc,'')", ""). - orderBy(true, true, "wgbs", "left(czbh,charindex('-',czbh)-1)", "len(czbh)", "czbh" - )); + .select("replace(cbbm,'#','') AS cbbm") + .gt("charindex('-',cbbm)-1",0) + .orderBy(true, true, "wgbs", "left(cbbm,charindex('-',cbbm)-1)", "len(cbbm)", "cbbm")); } // 只显示海工名船 简称不等于空 diff --git a/src/main/java/com/dsic/gj_erp/service/fd/TpImpl.java b/src/main/java/com/dsic/gj_erp/service/fd/TpImpl.java index de04232..94649c1 100644 --- a/src/main/java/com/dsic/gj_erp/service/fd/TpImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/fd/TpImpl.java @@ -9,6 +9,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -57,48 +58,48 @@ public class TpImpl { } public List findTppsQk(Map map) { - List tppsQks = tpbMapper.findTppsQk(map); - for (TppsQk t : tppsQks) { -// if(t.getPssl().compareTo(new BigDecimal("100"))==0){ -// if(StringUtils.isNotBlank(t.getps)) + List tppsQks = new ArrayList<>(); +// for (TppsQk t : tppsQks) { +//// if(t.getPssl().compareTo(new BigDecimal("100"))==0){ +//// if(StringUtils.isNotBlank(t.getps)) +//// +//// }else +// //最小值 不为空 不用显示了 // -// }else - //最小值 不为空 不用显示了 - - if (StringUtils.isNotBlank(t.getQfpsrq())) { - // t.setYjtgq(t.getQfpsrq1()); - - //最小的不爲空 用最大的 jprkrq - - } else if (StringUtils.isNotBlank(t.getMinjprkrq())){ - - Date date = DateUtil.parse(t.getMaxjprkrq()); - - t.setYgpprq(DateUtil.format( DateUtil.offsetDay(date, 2), "yyyy/MM/dd")); - //System.out.println("date = " + t.getMaxjprkrq()+"111"+t.getYgpprq()); - - } else if (StringUtils.isNotBlank(t.getFkpprq())) { //反馈配送 - t.setYjtgq(t.getFkpprq()); - } else if (StringUtils.isNotBlank(t.getYgpprq())) { - t.setYjtgq(t.getYgpprq()); - } else { - t.setYjtgq(""); - } - if ("9999/99/99".equals(t.getSjpsrqmax())) { - t.setSjpsrqmax(""); - } - - if(t.getXqsl().compareTo(t.getPssl())==0){ - - }else{ - t.setPssl0(((t.getPssl().add(t.getPssl0())).divide(t.getXqsl(), BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) ); - t.setPssl5(((t.getPssl().add(t.getPssl5())).divide(t.getXqsl(),BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) ); - t.setPssl10(((t.getPssl().add(t.getPssl10())).divide(t.getXqsl(),BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) ); - t.setPssl15(((t.getPssl().add(t.getPssl15())).divide(t.getXqsl(),BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) ); - } - - - } +// if (StringUtils.isNotBlank(t.getQfpsrq())) { +// // t.setYjtgq(t.getQfpsrq1()); +// +// //最小的不爲空 用最大的 jprkrq +// +// } else if (StringUtils.isNotBlank(t.getMinjprkrq())){ +// +// Date date = DateUtil.parse(t.getMaxjprkrq()); +// +// t.setYgpprq(DateUtil.format( DateUtil.offsetDay(date, 2), "yyyy/MM/dd")); +// //System.out.println("date = " + t.getMaxjprkrq()+"111"+t.getYgpprq()); +// +// } else if (StringUtils.isNotBlank(t.getFkpprq())) { //反馈配送 +// t.setYjtgq(t.getFkpprq()); +// } else if (StringUtils.isNotBlank(t.getYgpprq())) { +// t.setYjtgq(t.getYgpprq()); +// } else { +// t.setYjtgq(""); +// } +// if ("9999/99/99".equals(t.getSjpsrqmax())) { +// t.setSjpsrqmax(""); +// } +// +// if(t.getXqsl().compareTo(t.getPssl())==0){ +// +// }else{ +// t.setPssl0(((t.getPssl().add(t.getPssl0())).divide(t.getXqsl(), BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) ); +// t.setPssl5(((t.getPssl().add(t.getPssl5())).divide(t.getXqsl(),BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) ); +// t.setPssl10(((t.getPssl().add(t.getPssl10())).divide(t.getXqsl(),BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) ); +// t.setPssl15(((t.getPssl().add(t.getPssl15())).divide(t.getXqsl(),BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) ); +// } +// +// +// } return tppsQks; } }