Explorar el Código

一些小问题的修改

nahida hace 1 año
padre
commit
b538f27a1d

+ 3 - 1
zksy-admin/src/main/resources/application-druid.yml

@@ -134,4 +134,6 @@ server:
     #最大线程数
     max-threads: 1000
     #最大等待数
-    accept-count: 800
+    accept-count: 800
+  servlet:
+    context-path:

+ 7 - 0
zksy-admin/src/main/resources/application-prod.yml

@@ -134,6 +134,13 @@ server:
     max-threads: 1000
     #最大等待数
     accept-count: 800
+  servlet:
+    context-path: /qyxyfjflserver
+  ssl:
+    key-store: classpath:tomcat.jks
+    key-store-password: 20240520!
+    keyStoreType: JKS
+    keyAlias: tomcat
 management:
   health:
     redis:

+ 7 - 7
zksy-admin/src/main/resources/application.yml

@@ -2,12 +2,12 @@
 server:
   # 服务器的HTTP端口,默认为8080
   port: 20002
-  ssl:
-    key-store: classpath:tomcat.jks
-    key-store-password: 20240520!
-    keyStoreType: JKS
-    keyAlias: tomcat
-  servlet:
+#  ssl:
+#    key-store: classpath:tomcat.jks
+#    key-store-password: 20240520!
+#    keyStoreType: JKS
+#    keyAlias: tomcat
+#  servlet:
 #    session:
 #      cookie:
 #        secure: true
@@ -15,7 +15,7 @@ server:
 #        whitelabel:
 #          enabled: false
     # 应用的访问路径
-    context-path: /qyxyfjflserver
+#    context-path: /qyxyfjflserver
   tomcat:
     # tomcat的URI编码
     uri-encoding: UTF-8

+ 2 - 2
zksy-system/src/main/java/com/zksy/system/basicData/service/impl/CrmHighTechZoneEnterprisesServiceImpl.java

@@ -707,7 +707,7 @@ public class CrmHighTechZoneEnterprisesServiceImpl extends ServiceImpl<CrmHighTe
         XWPFRun topName1 = topName.createRun();
         topName1.setFontSize(8 * 2); // 字体大小,这里以18pt为例,转换为Half Points
         topName1.setBold(true);
-        topName1.setText("怀化高新区信用分级分类监管平台");
+        topName1.setText("怀化高新区信用分级分类服务平台");
         document.createParagraph();
         document.createParagraph();
         document.createParagraph();
@@ -744,7 +744,7 @@ public class CrmHighTechZoneEnterprisesServiceImpl extends ServiceImpl<CrmHighTe
         XWPFRun enterpriseInfo2 = enterpriseInfo.createRun();
         enterpriseInfo2.setFontSize(8 * 2); // 字体大小,这里以18pt为例,转换为Half Points
         enterpriseInfo2.setBold(true);
-        enterpriseInfo2.setText("得         分:" + evaluationReportDetailVoList.get(0).getTotal());
+        enterpriseInfo2.setText("得         分:" + String.format("%.2f", evaluationReportDetailVoList.get(0).getTotal()));
         document.createParagraph();
 
         XWPFParagraph enterpriseInfoPara = document.createParagraph();

+ 13 - 13
zksy-system/src/main/resources/mapper/basicData/CrmHighTechZoneEnterprisesMapper.xml

@@ -454,10 +454,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         COALESCE (
         CASE
 
-        WHEN SUM( ovi.first_quarter_amount + ovi.second_quarter_amount + ovi.third_quarter_amount + ovi.fourth_quarter_amount ) > 100000 THEN
+        WHEN SUM( ovi.first_quarter_amount + ovi.second_quarter_amount + ovi.third_quarter_amount + ovi.fourth_quarter_amount ) > 10000 THEN
         4
-        WHEN SUM( ovi.first_quarter_amount + ovi.second_quarter_amount + ovi.third_quarter_amount + ovi.fourth_quarter_amount ) BETWEEN 20000
-        AND 100000 THEN
+        WHEN SUM( ovi.first_quarter_amount + ovi.second_quarter_amount + ovi.third_quarter_amount + ovi.fourth_quarter_amount ) BETWEEN 2000
+        AND 10000 THEN
         3.5 ELSE 3
         END,
         3
@@ -642,11 +642,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         COALESCE (
         CASE
 
-        WHEN SUM( epi.first_quarter_amount + epi.second_quarter_amount + epi.third_quarter_amount + epi.fourth_quarter_amount ) > 10000000 THEN
+        WHEN SUM( epi.first_quarter_amount + epi.second_quarter_amount + epi.third_quarter_amount + epi.fourth_quarter_amount ) > 1000 THEN
         4
-        WHEN SUM( epi.first_quarter_amount + epi.second_quarter_amount + epi.third_quarter_amount + epi.fourth_quarter_amount ) BETWEEN 1000000
-        AND 10000000 THEN
-        3 ELSE 2
+        WHEN SUM( epi.first_quarter_amount + epi.second_quarter_amount + epi.third_quarter_amount + epi.fourth_quarter_amount ) BETWEEN 100
+        AND 1000 THEN
+        3.5 ELSE 3
         END,
         2
         ) AS taxPaymentScore,
@@ -679,10 +679,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         COALESCE (
         CASE
 
-        WHEN SUM( ovi.first_quarter_amount + ovi.second_quarter_amount + ovi.third_quarter_amount + ovi.fourth_quarter_amount ) > 100000 THEN
+        WHEN SUM( ovi.first_quarter_amount + ovi.second_quarter_amount + ovi.third_quarter_amount + ovi.fourth_quarter_amount ) > 10000 THEN
         4
-        WHEN SUM( ovi.first_quarter_amount + ovi.second_quarter_amount + ovi.third_quarter_amount + ovi.fourth_quarter_amount ) BETWEEN 20000
-        AND 100000 THEN
+        WHEN SUM( ovi.first_quarter_amount + ovi.second_quarter_amount + ovi.third_quarter_amount + ovi.fourth_quarter_amount ) BETWEEN 1000
+        AND 10000 THEN
         3.5 ELSE 3
         END,
         3
@@ -853,10 +853,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         )+ COALESCE (
         CASE
 
-        WHEN SUM( epi.first_quarter_amount + epi.second_quarter_amount + epi.third_quarter_amount + epi.fourth_quarter_amount ) > 10000000 THEN
+        WHEN SUM( epi.first_quarter_amount + epi.second_quarter_amount + epi.third_quarter_amount + epi.fourth_quarter_amount ) > 1000 THEN
         4
-        WHEN SUM( epi.first_quarter_amount + epi.second_quarter_amount + epi.third_quarter_amount + epi.fourth_quarter_amount ) BETWEEN 1000000
-        AND 10000000 THEN
+        WHEN SUM( epi.first_quarter_amount + epi.second_quarter_amount + epi.third_quarter_amount + epi.fourth_quarter_amount ) BETWEEN 100
+        AND 1000 THEN
         3 ELSE 2
         END,
         2