diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderInfo.java index 8e9b302..5267158 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderInfo.java @@ -9,6 +9,7 @@ public class OrderInfo { private int actual_number; private double rate; private String day; + private String name_sub; public String getName() { return name; @@ -57,4 +58,12 @@ public class OrderInfo { public void setDay(String day) { this.day = day; } + + public String getName_sub() { + return name_sub; + } + + public void setName_sub(String name_sub) { + this.name_sub = name_sub; + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index db93835..18c809e 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -328,6 +328,12 @@ FROM (select PLAN_NUMBER length(MATERIAL_NAME)) as name, ORDER_QTY as plan_number, ACTUAL_QTY as actual_number, + substr(MATERIAL_NAME, + instr(MATERIAL_NAME, '-', 1, 1) + 1, + case + when instr(MATERIAL_NAME, ',', 1, 1) < 6 then instr(MATERIAL_NAME, ',', 1, 2) + else instr(MATERIAL_NAME, ',', 1, 1) end-1 - instr(MATERIAL_NAME, '-', 1)) + as name_sub, FINISH_DATE as day, round(ACTUAL_QTY / ORDER_QTY * 100, 2) as rate from IMOS_PR_ORDER