修改业务显示名称和服务显示名称

pz-system/src/main/java/com/pz/system/domain/vo/OrderCommonVo.java

@@ -56,11 +56,16 @@ public class OrderCommonVo {
     private Float commission;
     private Float commission;
 
 
     /**
     /**
-     * 业务项目
+     * 服务名称名称
      */
      */
     private String project;
     private String project;
 
 
     /**
     /**
+     * 业务名称
+     */
+    private String businessName;
+
+    /**
      * 其他需求
      * 其他需求
      */
      */
     private String description;
     private String description;

pz-system/src/main/resources/mapper/system/DbghOrderMapper.xml

@@ -70,7 +70,8 @@
                total_order.business_id,
                total_order.business_id,
                total_order.status                      as orderStatus,
                total_order.status                      as orderStatus,
                dbgh_order.status                       as serviceStatus,
                dbgh_order.status                       as serviceStatus,
-               business.name                           as project,
+               services.name                           as project,
+               business.name                           as businessName,
                CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
                CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
                CONVERT(services.price, decimal(10, 2)) as commission,
                CONVERT(services.price, decimal(10, 2)) as commission,
                user_vsitor.name                        as userName,
                user_vsitor.name                        as userName,

pz-system/src/main/resources/mapper/system/DbmyOrderMapper.xml

@@ -71,7 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                total_order.business_id,
                total_order.business_id,
                total_order.status                      as orderStatus,
                total_order.status                      as orderStatus,
                dbmy_order.status                       as serviceStatus,
                dbmy_order.status                       as serviceStatus,
-               business.name                           as project,
+               services.name                           as project,
+               business.name                           as businessName,
                CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
                CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
                CONVERT(services.price, decimal(10, 2)) as commission,
                CONVERT(services.price, decimal(10, 2)) as commission,
                dbmy_order.yp_name,
                dbmy_order.yp_name,

pz-system/src/main/resources/mapper/system/DbwzOrderMapper.xml

@@ -72,7 +72,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                total_order.business_id,
                total_order.business_id,
                total_order.status                      as orderStatus,
                total_order.status                      as orderStatus,
                dbwz_order.status                       as serviceStatus,
                dbwz_order.status                       as serviceStatus,
-               business.name                           as project,
+               services.name                           as project,
+               business.name                           as businessName,
                CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
                CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
                CONVERT(services.price, decimal(10, 2)) as commission,
                CONVERT(services.price, decimal(10, 2)) as commission,
                user_vsitor.name                        as userName,
                user_vsitor.name                        as userName,

pz-system/src/main/resources/mapper/system/YypzOrderMapper.xml

@@ -74,7 +74,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                yypz_order.status                       as serviceStatus,
                yypz_order.status                       as serviceStatus,
                yypz_order.phone,
                yypz_order.phone,
                yypz_order.visit_time,
                yypz_order.visit_time,
-               business.name                           as project,
+               services.name                           as project,
+               business.name                           as businessName,
                total_order.evaluation_content,
                total_order.evaluation_content,
                total_order.is_satisfaction             as evaluation_flag,
                total_order.is_satisfaction             as evaluation_flag,
                total_order.remark                      as description,
                total_order.remark                      as description,

pz-system/src/main/resources/mapper/system/ZyphOrderMapper.xml

@@ -76,7 +76,8 @@
                total_order.business_id,
                total_order.business_id,
                total_order.status                                        as orderStatus,
                total_order.status                                        as orderStatus,
                zyph_order.status                                         as serviceStatus,
                zyph_order.status                                         as serviceStatus,
-               business.name                                             as project,
+               services.name                                             as project,
+               business.name                                             as businessName,
                CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
                CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
                CONVERT(services.price, decimal(10, 2))                   as commission,
                CONVERT(services.price, decimal(10, 2))                   as commission,
                user_vsitor.name                                          as userName,
                user_vsitor.name                                          as userName,