优化委托列表导出

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EntrustMapper.xml

@@ -77,8 +77,8 @@
         ) as 是否加急,
         IF(ISNULL(e.project_name),'',e.project_name) as 项目名称,
         IF(ISNULL(e.project_code),'',e.project_code)  as 项目编号,
-        IF(ISNULL(su.name),'',su.name) su.name as 委托人,
-        IF(ISNULL(c.name),'',c.name) c.name as 委托单位,
+        IF(ISNULL(su.name),'',su.name) as 委托人,
+        IF(ISNULL(c.name),'',c.name) as 委托单位,
         IF(ISNULL(e.entrust_date),'',e.entrust_date)  as 委托日期,
         IF(ISNULL(e.sample_num),'',e.sample_num) as 样品数量,
         (

cement-business/src/main/resources/application.yml

@@ -40,25 +40,25 @@ mybatis-plus:
   mapper-locations: classpath:/cn/wise/sc/cement/business/mapper/xml/*Mapper.xml
 
 #正式服务器
-weixin:
-  corpId: wwc7ae84e6af6ba921
-  agentIdPC: 1000151
-  agentSecretPC: h4K-GL1y7pCADFZQ7m1tO1GOSa3zU4kGEItFknvwOAg
-  agentId: 1000150
-  agentSecret: zWIO_kt36d1jta3R76s6WmKFdfs2TuJ1wTQu1IXO0Fc
-  backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system
-  systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wwc7ae84e6af6ba921&redirect_uri=https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,'
+#weixin:
+#  corpId: wwc7ae84e6af6ba921
+#  agentIdPC: 1000151
+#  agentSecretPC: h4K-GL1y7pCADFZQ7m1tO1GOSa3zU4kGEItFknvwOAg
+#  agentId: 1000150
+#  agentSecret: zWIO_kt36d1jta3R76s6WmKFdfs2TuJ1wTQu1IXO0Fc
+#  backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system
+#  systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wwc7ae84e6af6ba921&redirect_uri=https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,'
 
 
 #测试服务器
-#weixin:
-#  corpId: ww348f91b2573c1867
-#  agentId: 1000002
-#  agentIdPC: 1000003
-#  agentSecret: gFa_7XvXtCaoeAYERzjRwwz_OTJkJfgBb8weOKjmI3o
-#  agentSecretPC: itCLYcwl9ggA9VfZam_iz96Ikp9StDFfVr4Adb0yY7A
-#  backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system
-#  systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww348f91b2573c1867&redirect_uri=https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,'
+weixin:
+  corpId: ww348f91b2573c1867
+  agentId: 1000002
+  agentIdPC: 1000003
+  agentSecret: gFa_7XvXtCaoeAYERzjRwwz_OTJkJfgBb8weOKjmI3o
+  agentSecretPC: itCLYcwl9ggA9VfZam_iz96Ikp9StDFfVr4Adb0yY7A
+  backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system
+  systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww348f91b2573c1867&redirect_uri=https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,'
 
 
 

cement-business/target/classes/application.yml

@@ -40,25 +40,25 @@ mybatis-plus:
   mapper-locations: classpath:/cn/wise/sc/cement/business/mapper/xml/*Mapper.xml
 
 #正式服务器
-weixin:
-  corpId: wwc7ae84e6af6ba921
-  agentIdPC: 1000151
-  agentSecretPC: h4K-GL1y7pCADFZQ7m1tO1GOSa3zU4kGEItFknvwOAg
-  agentId: 1000150
-  agentSecret: zWIO_kt36d1jta3R76s6WmKFdfs2TuJ1wTQu1IXO0Fc
-  backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system
-  systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wwc7ae84e6af6ba921&redirect_uri=https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,'
+#weixin:
+#  corpId: wwc7ae84e6af6ba921
+#  agentIdPC: 1000151
+#  agentSecretPC: h4K-GL1y7pCADFZQ7m1tO1GOSa3zU4kGEItFknvwOAg
+#  agentId: 1000150
+#  agentSecret: zWIO_kt36d1jta3R76s6WmKFdfs2TuJ1wTQu1IXO0Fc
+#  backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system
+#  systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wwc7ae84e6af6ba921&redirect_uri=https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,'
 
 
 #测试服务器
-#weixin:
-#  corpId: ww348f91b2573c1867
-#  agentId: 1000002
-#  agentIdPC: 1000003
-#  agentSecret: gFa_7XvXtCaoeAYERzjRwwz_OTJkJfgBb8weOKjmI3o
-#  agentSecretPC: itCLYcwl9ggA9VfZam_iz96Ikp9StDFfVr4Adb0yY7A
-#  backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system
-#  systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww348f91b2573c1867&redirect_uri=https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,'
+weixin:
+  corpId: ww348f91b2573c1867
+  agentId: 1000002
+  agentIdPC: 1000003
+  agentSecret: gFa_7XvXtCaoeAYERzjRwwz_OTJkJfgBb8weOKjmI3o
+  agentSecretPC: itCLYcwl9ggA9VfZam_iz96Ikp9StDFfVr4Adb0yY7A
+  backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system
+  systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww348f91b2573c1867&redirect_uri=https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,'
 
 
 

cement-business/target/classes/cn/wise/sc/cement/business/mapper/EntrustMapper.xml

@@ -67,7 +67,7 @@
         SELECT
         (@i:=@i+1) as 序号,
         e.id as entrustId,
-        e.entrust_code as 委托编号,
+        IF(ISNULL(e.entrust_code),'',e.entrust_code) as 委托编号,
         (
         CASE e.is_urgent
         WHEN 0 THEN '不加急'
@@ -75,12 +75,12 @@
         ELSE NULL
         END
         ) as 是否加急,
-        e.project_name as 项目名称,
-        e.project_code as 项目编号,
-        su.name as 委托人,
-        c.name as 委托单位,
-        e.entrust_date as 委托日期,
-        e.sample_num as 样品数量,
+        IF(ISNULL(e.project_name),'',e.project_name) as 项目名称,
+        IF(ISNULL(e.project_code),'',e.project_code)  as 项目编号,
+        IF(ISNULL(su.name),'',su.name) su.name as 委托人,
+        IF(ISNULL(c.name),'',c.name) c.name as 委托单位,
+        IF(ISNULL(e.entrust_date),'',e.entrust_date)   as 委托日期,
+        IF(ISNULL(e.sample_num),'',e.sample_num)  as 样品数量,
         (
         CASE e.status
         WHEN 0 THEN '未评审'