优化一些问题

src/main/java/com/ygj/yuemum/component/CyScheduled.java

@@ -16,6 +16,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -75,6 +76,8 @@ public class CyScheduled {
         }
         JSONArray jsonArray = jsonObject1.getJSONArray("BizObjectArray");
         List<CustomerInfoFeedbackCyDto> list = convertRtData2CIFBList(jsonArray);
+        // 因为氚云的数据是按时间倒序的，所以这里倒序插入
+        Collections.reverse(list);
         customerInfoFeedbackService.insertInfoFeedbackList(list);
     }
 
@@ -97,9 +100,14 @@ public class CyScheduled {
         }
         JSONArray jsonArray = jsonObject1.getJSONArray("BizObjectArray");
         List<CustomerInfoBasicCyDto> list = convertRtData2CIBList(jsonArray);
+        // 因为氚云的数据是按时间倒序的，所以这里倒序插入
+        Collections.reverse(list);
         customerInfoBasicService.insertInfoBasicList(list);
     }
 
+    /**
+     * 用户跟进表
+     */
     public void initCustomerInfoFollow(int fromRowNum, int toRowNum) {
         JSONObject jsonObject;
         try {
@@ -116,6 +124,8 @@ public class CyScheduled {
         }
         JSONArray jsonArray = jsonObject1.getJSONArray("BizObjectArray");
         List<CustomerInfoFollowCyDto> list = convertRtData2CIFList(jsonArray);
+        // 因为氚云的数据是按时间倒序的，所以这里倒序插入
+        Collections.reverse(list);
         customerInfoFollowService.insertInfoFollowList(list);
     }
 

src/main/java/com/ygj/yuemum/domain/customer/CustomerInfoFollow.java

@@ -52,6 +52,8 @@ public class CustomerInfoFollow implements Serializable {
     /**
      * 预产期
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date edc_date;
 
     /**
@@ -83,6 +85,8 @@ public class CustomerInfoFollow implements Serializable {
 
     private String create_person;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date fb_date;
 
     public CustomerInfoFollow() {

src/main/resources/mybatis/mapper/customer/CustomerInfoBasicDao.xml

@@ -191,7 +191,7 @@
             branche_name,
             fb_customer_name,
             fb_customer_phone,
-            (select p.p_name from packages p where p.p_code = c.p_code) as p_code,
+             p_code,
             fb_wechat_number,
             source_channel,
             customer_state,
@@ -245,6 +245,7 @@
                 #{item}
             </foreach>
         </if>
+        order by id desc
     </select>
 
     <insert id="insertInfoBasicList" >

src/main/resources/mybatis/mapper/customer/CustomerInfoFeedbackMapper.xml

@@ -75,6 +75,7 @@
                 #{item}
             </foreach>
         </if>
+        order by id desc
     </select>
     
     <insert id="insertInfoFeedback" parameterType="com.ygj.yuemum.domain.customer.CustomerInfoFeedback">
@@ -99,14 +100,7 @@
                 fb_customer_name,
                 fb_remarks,
                 store,
-                (
-                    SELECT
-                        p.p_name
-                    FROM
-                        packages p
-                    WHERE
-                        p.p_code = customer_info_feedback.p_code
-                ) AS p_code,
+                p_code,
                 it_on,
                 convenient_time,
                 communication_content,

src/main/resources/mybatis/mapper/customer/CustomerInfoFollowMapper.xml

@@ -207,6 +207,7 @@
                 #{item}
             </foreach>
         </if>
+        order by id desc
     </select>
 
     <insert id="insertInfoFollowList">

src/test/java/com/ygj/yuemum/chuanyun/CyScheduledTest.java

@@ -18,23 +18,22 @@ public class CyScheduledTest {
 
     @Test
     public void testInitCustomerInfoFeedback() {
-        for (int i = 0; i < 30; i++) {
+        for (int i = 30; i >= 0; i--) {
             cyScheduled.initCustomerInfoFeedback(i * base, (i + 1) * base);
         }
     }
 
-
     @Test
     public void testInitCustomerInfoBasic() {
-        for (int i = 0; i < 15; i++) {
+        for (int i = 9; i >= 0; i--) {
             cyScheduled.initCustomerInfoBasic(i * base, (i + 1) * base);
         }
     }
 
     @Test
     public void testInitCustomerInfoFollow() {
-        for (int i = 0; i < 1; i++) {
-            cyScheduled.initCustomerInfoFollow(i , (i + 1));
+        for (int i = 9; i >= 0; i--) {
+            cyScheduled.initCustomerInfoFollow(i * base, (i + 1) * base);
         }
     }
 

src/test/java/com/ygj/yuemum/chuanyun/ScheduledSingleServiceTest.java

@@ -52,9 +52,9 @@ public class ScheduledSingleServiceTest {
 
         paramMap.put("ActionName",   "LoadBizObject");
 
-        paramMap.put("SchemaCode", "ajxhpu8n5e3n2272xda8k38o3");
+        paramMap.put("SchemaCode", "vjtps9qhb4pvp6anvltj3mbz1");
 
-        paramMap.put("BizObjectId", "1611aa3d-ee15-4ada-b56a-1fdd4c6987b5");
+        paramMap.put("BizObjectId", "b0f47e15-7327-4b8c-9df1-975140d8fc84");
 
         //身份认证参数
         Map headers = new HashMap();