yusm 1 năm trước cách đây
mục cha
commit
c11c1ee467

+ 2 - 0
fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/TaskServiceImpl.java

@@ -29,6 +29,8 @@ import java.io.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

+ 5 - 5
fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/TaskMapper.xml

@@ -91,13 +91,13 @@
         select task.* ,
                custom.custom_name,
                business_opportunity.name businessName,
-              `order`.order_name ,
+              `sales_order`.order_name ,
                clue.clue_name,
                contacts.name contacts_name ,contacts.phone
         from task
             left join  custom on task.custom_id=custom.id
             left join  business_opportunity on task.business_opportunity_id=business_opportunity.id
-            left join  `order` on task.order_id=`order`.id
+            left join  `sales_order` on task.order_id=`sales_order`.id
             left join  clue on task.clue_id=clue.id
             left join  contacts on task.contacts_id=contacts.id
 
@@ -120,7 +120,7 @@
                 AND business_opportunity.name LIKE CONCAT('%', #{businessName}, '%')
             </if>
             <if test=" orderName!= null and orderName != ''">
-                AND `order`.order_name LIKE CONCAT('%', #{orderName}, '%')
+                AND `sales_order`.order_name LIKE CONCAT('%', #{orderName}, '%')
             </if>
             <if test=" clueName!= null and clueName != ''">
                 AND clue.clue_name LIKE CONCAT('%', #{clueName}, '%')
@@ -158,7 +158,7 @@
         from task
         left join  custom on task.custom_id=custom.id
         left join  business_opportunity on task.business_opportunity_id=business_opportunity.id
-        left join  `order` on task.order_id=`order`.id
+        left join  `sales_order` on task.order_id=`sales_order`.id
         left join  clue on task.clue_id=clue.id
         left join  contacts on task.contacts_id=contacts.id
 
@@ -181,7 +181,7 @@
                 AND business_opportunity.name LIKE CONCAT('%', #{businessName}, '%')
             </if>
             <if test=" orderName!= null and orderName != ''">
-                AND `order`.order_name LIKE CONCAT('%', #{orderName}, '%')
+                AND `sales_order`.order_name LIKE CONCAT('%', #{orderName}, '%')
             </if>
             <if test=" clueName!= null and clueName != ''">
                 AND clue.clue_name LIKE CONCAT('%', #{clueName}, '%')