Merge remote-tracking branch 'origin/dev/icss' into dev/icss

icss-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -89,6 +89,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         inquiryInfoSave.setDataJson(saveInquiryVO.getDataJson());
         if (inquiryInfo == null) {
             inquiryInfoSave.setGmtCreate(now);
+            inquiryInfoSave.setGmtModified(now);
             this.save(inquiryInfoSave);
             inquiryId = inquiryInfoSave.getId();
         } else {
@@ -196,9 +197,9 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             queryWrapper.le("gmt_create", hisInquirysVO.getEndDate());
         }
         if (hisInquirysVO.getOrderType() == 1) {
-            queryWrapper.orderByDesc("gmt_create");
+            queryWrapper.orderByDesc("gmt_modified");
         } else if (hisInquirysVO.getOrderType() == 2) {
-            queryWrapper.orderByAsc("gmt_create");
+            queryWrapper.orderByAsc("gmt_modified");
         }
         List<InquiryInfo> inquiryInfoList = this.list(queryWrapper);
         if (inquiryInfoList.size() == 0) {