fix:邮件跳针图表顺序， 没匹配到规则且延期的商品原因改为OTHER

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -160,7 +160,7 @@ spring:
         master:
           url: jdbc:mysql://127.0.0.1:3306/lg?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: 123456
+          password: 1215225
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
@@ -173,7 +173,7 @@ spring:
     database: 0
     host: 127.0.0.1
     port: 6379
-    password: zxy,1997818
+    password: 1215225
 #mybatis plus 设置
 mybatis-plus:
   mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml,classpath*:com/cuidian/**/xml/*Mapper.xml
@@ -212,7 +212,7 @@ jeecg:
     app: http://localhost:8051
   path:
     #文件上传根目录 设置
-    upload: /opt/upFiles
+    upload: /home/sj/Desktop/Project/LG/upload
     #webapp文件路径
     webapp: /opt/webapp
   shiro:

jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -7,7 +7,7 @@ server:
     include-stacktrace: ALWAYS
     include-message: ALWAYS
   servlet:
-    context-path: /jeecg-boot
+    context-path: /api
   compression:
     enabled: true
     min-response-size: 1024
@@ -158,9 +158,9 @@ spring:
           slow-sql-millis: 5000
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://127.0.0.1:3306/lg?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: root
+          password: 123qwe!@#
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
@@ -212,9 +212,9 @@ jeecg:
     app: http://localhost:8051
   path:
     #文件上传根目录 设置
-    upload: /opt/jeecg-boot/upload
+    upload: D://ProdPlan//upFiles
     #webapp文件路径
-    webapp: /opt/jeecg-boot/webapp
+    webapp: D://ProdPlan//webapp
   shiro:
     excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/**,/api/getUserInfo
   #阿里云oss存储和大鱼短信秘钥配置

lg-code/src/main/java/org/jeecg/modules/ProdPlan/service/impl/ProdPlanServiceImpl.java

@@ -165,10 +165,10 @@ public class ProdPlanServiceImpl extends ServiceImpl<ProdPlanMapper, ProdPlan> i
                     }
                 });
 
-                //没匹配到，且商品为延期商品，置部门及原因为OTHER
+                //没匹配到，且商品为延期商品，置部门及原因为 生产
                 if(delayProduct.getRemark() == null && delayProduct.getOverdueDays() != null && delayProduct.getOverdueDays() > 0) {
-                    delayProduct.setRemark("OTHER");
-                    delayProduct.setDept("OTHER");
+                    delayProduct.setRemark("生产");
+                    delayProduct.setDept("生产");
                 }
 
                 if(toolRules.get(delayProduct.getTool())!=null){
@@ -1157,38 +1157,38 @@ public class ProdPlanServiceImpl extends ServiceImpl<ProdPlanMapper, ProdPlan> i
         Map<String, Integer> deliveredQuantityMap = deliveredQuantityList.stream().collect(Collectors.toMap(DeliveredQuantity::getWeek, DeliveredQuantity::getQuantity));
         ReportDetailVo totalVo = getSummaryDetailVo(detailVos);
         if(totalVo.getWeek1()!=null && deliveredQuantityMap.get(weeks.get(0))!=null && deliveredQuantityMap.get(weeks.get(0))>0) {
-            String lossCellValue = String.valueOf((double)totalVo.getWeek1()/ deliveredQuantityMap.get(weeks.get(0))*100);
+            String lossCellValue = String.valueOf(100-(double)totalVo.getWeek1()/ deliveredQuantityMap.get(weeks.get(0))*100);
             lineData.add(lossCellValue);
         }else{
             lineData.add("");
         }
         if(totalVo.getWeek2()!=null && deliveredQuantityMap.get(weeks.get(1))!=null && deliveredQuantityMap.get(weeks.get(1))>0) {
-            String lossCellValue = String.valueOf((double)totalVo.getWeek2()/ deliveredQuantityMap.get(weeks.get(1))*100);
+            String lossCellValue = String.valueOf(100-(double)totalVo.getWeek2()/ deliveredQuantityMap.get(weeks.get(1))*100);
             lineData.add(lossCellValue);
         } else{
             lineData.add("");
         }
         if(totalVo.getWeek3()!=null && deliveredQuantityMap.get(weeks.get(2))!=null && deliveredQuantityMap.get(weeks.get(2))>0) {
-            String lossCellValue = String.valueOf((double)totalVo.getWeek3()/ deliveredQuantityMap.get(weeks.get(2))*100);
+            String lossCellValue = String.valueOf(100-(double)totalVo.getWeek3()/ deliveredQuantityMap.get(weeks.get(2))*100);
             lineData.add(lossCellValue);
         } else{
             lineData.add("");
         }
 
         if(totalVo.getWeek4()!=null && deliveredQuantityMap.get(weeks.get(3))!=null && deliveredQuantityMap.get(weeks.get(3))>0) {
-            String lossCellValue = String.valueOf((double)totalVo.getWeek4()/ deliveredQuantityMap.get(weeks.get(3))*100);
+            String lossCellValue = String.valueOf(100-(double)totalVo.getWeek4()/ deliveredQuantityMap.get(weeks.get(3))*100);
             lineData.add(lossCellValue);
         } else{
             lineData.add("");
         }
         if(totalVo.getWeek5()!=null && deliveredQuantityMap.get(weeks.get(4))!=null && deliveredQuantityMap.get(weeks.get(4))>0) {
-            String lossCellValue = String.valueOf((double)totalVo.getWeek5()/ deliveredQuantityMap.get(weeks.get(4))*100);
+            String lossCellValue = String.valueOf(100-(double)totalVo.getWeek5()/ deliveredQuantityMap.get(weeks.get(4))*100);
             lineData.add(lossCellValue);
         } else{
             lineData.add("");
         }
         if(totalVo.getWeek6()!=null && deliveredQuantityMap.get(weeks.get(5))!=null && deliveredQuantityMap.get(weeks.get(5))>0) {
-            String lossCellValue = String.valueOf((double)totalVo.getWeek6()/ deliveredQuantityMap.get(weeks.get(5))*100);
+            String lossCellValue = String.valueOf(100-(double)totalVo.getWeek6()/ deliveredQuantityMap.get(weeks.get(5))*100);
             lineData.add(lossCellValue);
         } else{
             lineData.add("");

lg-code/src/main/java/org/jeecg/modules/ProdPlan/util/EmailUtil.java

@@ -169,8 +169,8 @@ public class EmailUtil {
             //设置内容
             BodyPart messageBodyPart = new MimeBodyPart();
             //String htmlText = content + "<img src='cid:image'>";
-            String htmlText = content + "<img src='data:image/png;base64," + Base64.getEncoder().encodeToString(pie)+"'>";;
-            htmlText+= "<img src='data:image/png;base64," + Base64.getEncoder().encodeToString(barLine)+"'>";;
+            String htmlText = content + "<img src='data:image/png;base64," + Base64.getEncoder().encodeToString(barLine)+"'>";;
+            htmlText+= "<img src='data:image/png;base64," + Base64.getEncoder().encodeToString(pie)+"'>";;
             messageBodyPart.setContent(htmlText,"text/html;charset=UTF-8");
 
             //附件