diff --git a/eas-manager/src/main/java/com/mortals/xhx/module/customer/service/impl/CustomerServiceImpl.java b/eas-manager/src/main/java/com/mortals/xhx/module/customer/service/impl/CustomerServiceImpl.java
index 1467ac3192cca872a6b60d02d0f37176d772b830..2809b03911bdc4b15f47e119927cdbd879dfc57a 100644
--- a/eas-manager/src/main/java/com/mortals/xhx/module/customer/service/impl/CustomerServiceImpl.java
+++ b/eas-manager/src/main/java/com/mortals/xhx/module/customer/service/impl/CustomerServiceImpl.java
@@ -1,5 +1,6 @@
package com.mortals.xhx.module.customer.service.impl;
+import cn.hutool.core.util.PhoneUtil;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
@@ -33,9 +34,28 @@ import java.util.List;
@Service("customerService")
public class CustomerServiceImpl extends AbstractCRUDServiceImpl<CustomerDao, CustomerEntity, Long> implements CustomerService {
+ @Override
+ protected void validData(CustomerEntity entity, Context context) throws AppException {
+ if(StringUtils.isEmpty(entity.getContactTelphone())){
+ throw new AppException("鎵嬫満鍙蜂笉鑳戒负绌�");
+ }
+ if(StringUtils.isEmpty(entity.getCustName())){
+ throw new AppException("濮撳悕涓嶈兘涓虹┖");
+ }
+ if(!PhoneUtil.isPhone(entity.getContactTelphone())){
+ throw new AppException("鎵嬫満鍙风爜鏍煎紡涓嶆纭�");
+ }
+ }
+
@Override
protected void saveBefore(CustomerEntity entity, Context context) throws AppException {
this.validData(entity, context);
+ CustomerEntity query = new CustomerEntity();
+ query.setContactTelphone(entity.getContactTelphone());
+ List<CustomerEntity> list = dao.getList(query);
+ if(CollectionUtils.isNotEmpty(list)){
+ throw new AppException("鎵嬫満鍙风爜涓�:"+entity.getContactTelphone()+"鐨勭敤鎴峰凡瀛樺湪");
+ }
if (StringUtils.isNotEmpty(entity.getPassword())) {
try {
entity.setPassword(SecurityUtil.md5DoubleEncoding(entity.getPassword()));
diff --git a/eas-manager/src/main/java/com/mortals/xhx/module/customer/web/CustomerController.java b/eas-manager/src/main/java/com/mortals/xhx/module/customer/web/CustomerController.java
index 90615c08b0f7a62317ea3139ac1494d33d9f73a7..4bebe3179d8aab8736821ef9092fac7515dc464d 100644
--- a/eas-manager/src/main/java/com/mortals/xhx/module/customer/web/CustomerController.java
+++ b/eas-manager/src/main/java/com/mortals/xhx/module/customer/web/CustomerController.java
@@ -45,6 +45,13 @@ public class CustomerController extends BaseCRUDJsonBodyMappingController<Custom
super.init(model, context);
}
+ @Override
+ protected void doListBefore(CustomerEntity query, Map<String, Object> model, Context context) throws AppException {
+ Map<String,String> orderCols = new HashMap<>();
+ orderCols.put("createTime","DESC");
+ query.setOrderCols(orderCols);
+ }
+
@Override
public Rest<Object> list(@RequestBody(required = false) CustomerEntity query) {
Map<String, Object> model = new HashMap();
diff --git a/eas-manager/src/main/java/com/mortals/xhx/module/customer/web/CustomerTrialController.java b/eas-manager/src/main/java/com/mortals/xhx/module/customer/web/CustomerTrialController.java
index 2ffb44ffbc2ca836000a2a0e4242ee3ca002eeb1..d381da602b8964776ebff0fed5d5d14f053e13c2 100644
--- a/eas-manager/src/main/java/com/mortals/xhx/module/customer/web/CustomerTrialController.java
+++ b/eas-manager/src/main/java/com/mortals/xhx/module/customer/web/CustomerTrialController.java
@@ -1,36 +1,23 @@
package com.mortals.xhx.module.customer.web;
-import com.mortals.framework.annotation.UnAuth;
+
+import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.common.IBaseEnum;
-import com.mortals.framework.common.Rest;
-import com.mortals.framework.model.BaseEntity;
-import com.mortals.framework.model.PageInfo;
-import com.mortals.framework.model.Result;
-import com.mortals.framework.utils.ReflectUtils;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
-import com.mortals.xhx.common.code.*;
+import com.mortals.xhx.common.code.MemberLevelEnum;
+import com.mortals.xhx.common.code.TrialAcceptEnum;
+import com.mortals.xhx.module.customer.model.CustomerTrialEntity;
+import com.mortals.xhx.module.customer.service.CustomerTrialService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
-import com.mortals.framework.model.Context;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.module.customer.model.CustomerTrialEntity;
-import com.mortals.xhx.module.customer.model.CustomerTrialQuery;
-import com.mortals.xhx.module.customer.service.CustomerTrialService;
-import org.apache.commons.lang3.ArrayUtils;
-import com.mortals.framework.util.StringUtils;
+
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
-import com.alibaba.fastjson.JSONObject;
-import java.util.Arrays;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import static com.mortals.framework.ap.SysConstains.*;
/**
*
* 瀹㈡埛璇曠敤鐢宠
@@ -56,35 +43,12 @@ public class CustomerTrialController extends BaseCRUDJsonBodyMappingController<C
super.init(model, context);
}
-// @Override
-// public Rest<Object> list(@RequestBody(required = false) CustomerTrialEntity query) {
-// Map<String, Object> model = new HashMap();
-// Rest<Object> ret = new Rest();
-// Context context = this.getContext();
-// String busiDesc = "鏌ヨ" + this.getModuleDesc();
-//
-// int code;
-// try {
-// PageInfo pageInfo = this.buildPageInfo(query);
-// this.doListBefore(query, model, context);
-// Result result = this.getService().findExt(query, pageInfo, context);
-// model.put("data", result.getList());
-// model.put("pageInfo", result.getPageInfo());
-// this.parsePageInfo(model, result.getPageInfo());
-// code = this.doListAfter(query, model, context);
-// this.recordSysLog(this.request, busiDesc + " 銆愭垚鍔熴€�");
-// } catch (Exception var9) {
-// code = -1;
-// this.doException(this.request, busiDesc, model, var9);
-// }
-//
-// this.init(model, context);
-// ret.setCode(code);
-// ret.setData(model);
-// ret.setDict(model.get("dict") == null ? null : (Map)model.remove("dict"));
-// ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
-// return ret;
-// }
+ @Override
+ protected void doListBefore(CustomerTrialEntity query, Map<String, Object> model, Context context) throws AppException {
+ Map<String,String> orderCols = new HashMap<>();
+ orderCols.put("createTime","DESC");
+ query.setOrderCols(orderCols);
+ }
@PostMapping({"accept"})
public String accept(@RequestBody CustomerTrialEntity entity) {
diff --git a/eas-manager/src/main/java/com/mortals/xhx/module/customer/web/CustomerWorkCollectController.java b/eas-manager/src/main/java/com/mortals/xhx/module/customer/web/CustomerWorkCollectController.java
index 281976b56a9905f33277bda00fbca3a1d034e5e0..c41a69e7ac0cb57037ab8da408474469d8116ede 100644
--- a/eas-manager/src/main/java/com/mortals/xhx/module/customer/web/CustomerWorkCollectController.java
+++ b/eas-manager/src/main/java/com/mortals/xhx/module/customer/web/CustomerWorkCollectController.java
@@ -52,6 +52,9 @@ public class CustomerWorkCollectController extends BaseCRUDJsonBodyMappingContro
throw new AppException("闈炴硶鐢ㄦ埛,涓嶅彲璁块棶");
}
query.setCustomerId(this.getCurUser().getId());
+ Map<String,String> orderCols = new HashMap<>();
+ orderCols.put("createTime","DESC");
+ query.setOrderCols(orderCols);
}
@RequestMapping(value = {"delete/masterplateId"},method = {RequestMethod.POST, RequestMethod.GET})
diff --git a/eas-manager/src/main/java/com/mortals/xhx/module/customer/web/CustomerWorkDesignStatController.java b/eas-manager/src/main/java/com/mortals/xhx/module/customer/web/CustomerWorkDesignStatController.java
index 164872a2cec9af31713cb2b10292f0058cb0d45a..33dfedd732d6cb7dcdbeeeab3d86c61598c51575 100644
--- a/eas-manager/src/main/java/com/mortals/xhx/module/customer/web/CustomerWorkDesignStatController.java
+++ b/eas-manager/src/main/java/com/mortals/xhx/module/customer/web/CustomerWorkDesignStatController.java
@@ -55,5 +55,8 @@ public class CustomerWorkDesignStatController extends BaseCRUDJsonBodyMappingCon
throw new AppException("闈炴硶鐢ㄦ埛,涓嶅彲璁块棶");
}
query.setCustomerId(this.getCurUser().getId());
+ Map<String,String> orderCols = new HashMap<>();
+ orderCols.put("createTime","DESC");
+ query.setOrderCols(orderCols);
}
}
\ No newline at end of file
diff --git a/eas-manager/src/main/java/com/mortals/xhx/module/design/web/DesignMasterplateController.java b/eas-manager/src/main/java/com/mortals/xhx/module/design/web/DesignMasterplateController.java
index f145f0d9ffeae930a9fcae8b69f0853a709f8e98..b23e193ac5faf0799dfdc01624260bedd01b9530 100644
--- a/eas-manager/src/main/java/com/mortals/xhx/module/design/web/DesignMasterplateController.java
+++ b/eas-manager/src/main/java/com/mortals/xhx/module/design/web/DesignMasterplateController.java
@@ -55,6 +55,14 @@ public class DesignMasterplateController extends BaseCRUDJsonBodyMappingControll
}
}
+ @Override
+ protected void doListBefore(DesignMasterplateEntity query, Map<String, Object> model, Context context) throws AppException {
+ Map<String,String> orderCols = new HashMap<>();
+ orderCols.put("createTime","DESC");
+ query.setOrderCols(orderCols);
+ }
+
+ @Override
protected int doListAfter(DesignMasterplateEntity query, Map<String, Object> model, Context context) throws AppException {
List<DesignMasterplateEntity> resultList = (List<DesignMasterplateEntity>)model.get("data");
if(CollectionUtils.isNotEmpty(resultList)){
diff --git a/eas-manager/src/main/java/com/mortals/xhx/module/font/web/FontMaterialController.java b/eas-manager/src/main/java/com/mortals/xhx/module/font/web/FontMaterialController.java
index 6253f4e04a792af97f52717553d6f4675dad4d00..38e1c3f84a6c12ff908ca3e373c3db3614a921f9 100644
--- a/eas-manager/src/main/java/com/mortals/xhx/module/font/web/FontMaterialController.java
+++ b/eas-manager/src/main/java/com/mortals/xhx/module/font/web/FontMaterialController.java
@@ -1,28 +1,17 @@
package com.mortals.xhx.module.font.web;
+
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.font.model.FontMaterialEntity;
+import com.mortals.xhx.module.font.service.FontMaterialService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
-import com.mortals.framework.model.Context;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.module.font.model.FontMaterialEntity;
-import com.mortals.xhx.module.font.model.FontMaterialQuery;
-import com.mortals.xhx.module.font.service.FontMaterialService;
-import org.apache.commons.lang3.ArrayUtils;
-import com.mortals.framework.util.StringUtils;
+
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
-import com.alibaba.fastjson.JSONObject;
-import java.util.Arrays;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import static com.mortals.framework.ap.SysConstains.*;
/**
*
* 瀛椾綋绱犳潗
@@ -48,5 +37,11 @@ public class FontMaterialController extends BaseCRUDJsonBodyMappingController<Fo
super.init(model, context);
}
+ @Override
+ protected void doListBefore(FontMaterialEntity query, Map<String, Object> model, Context context) throws AppException {
+ Map<String,String> orderCols = new HashMap<>();
+ orderCols.put("createTime","DESC");
+ query.setOrderCols(orderCols);
+ }
}
\ No newline at end of file
diff --git a/eas-manager/src/main/java/com/mortals/xhx/module/help/web/HelpController.java b/eas-manager/src/main/java/com/mortals/xhx/module/help/web/HelpController.java
index 2cf199a506a039645c9ce3f83a765039c79f4eb4..e7b56752753d0ef13673da1c10cc602f825bbb6a 100644
--- a/eas-manager/src/main/java/com/mortals/xhx/module/help/web/HelpController.java
+++ b/eas-manager/src/main/java/com/mortals/xhx/module/help/web/HelpController.java
@@ -1,16 +1,16 @@
package com.mortals.xhx.module.help.web;
import com.mortals.framework.common.IBaseEnum;
+import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.QuestionStatusEnum;
import com.mortals.xhx.module.help.model.HelpEntity;
import com.mortals.xhx.module.help.service.HelpService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.HashMap;
import java.util.Map;
/**
*
@@ -33,5 +33,11 @@ public class HelpController extends BaseCRUDJsonBodyMappingController<HelpServic
super.init(model, context);
}
+ @Override
+ protected void doListBefore(HelpEntity query, Map<String, Object> model, Context context) throws AppException {
+ Map<String,String> orderCols = new HashMap<>();
+ orderCols.put("createTime","DESC");
+ query.setOrderCols(orderCols);
+ }
}
\ No newline at end of file
diff --git a/eas-manager/src/main/java/com/mortals/xhx/module/help/web/HelpEvaluateController.java b/eas-manager/src/main/java/com/mortals/xhx/module/help/web/HelpEvaluateController.java
index 6591c5a0b1a9b600860a3adcb1e246ada1b486c9..e1882558c511533375b874d92c0e704dc198254c 100644
--- a/eas-manager/src/main/java/com/mortals/xhx/module/help/web/HelpEvaluateController.java
+++ b/eas-manager/src/main/java/com/mortals/xhx/module/help/web/HelpEvaluateController.java
@@ -57,6 +57,14 @@ public class HelpEvaluateController extends BaseCRUDJsonBodyMappingController<He
entity.setOrganization(customerEntity.getOrganization());
}
+ @Override
+ protected void doListBefore(HelpEvaluateEntity query, Map<String, Object> model, Context context) throws AppException {
+ Map<String,String> orderCols = new HashMap<>();
+ orderCols.put("createTime","DESC");
+ query.setOrderCols(orderCols);
+ }
+
+ @Override
protected int doListAfter(HelpEvaluateEntity query, Map<String, Object> model, Context context) throws AppException {
List<HelpEvaluateEntity> evaluateEntities = (List<HelpEvaluateEntity>)model.get("data");
Map<Integer, List<HelpEvaluateEntity>> map = evaluateEntities.stream().collect(Collectors.groupingBy(HelpEvaluateEntity::getEvaluateType));
diff --git a/eas-manager/src/main/java/com/mortals/xhx/module/message/web/MessageController.java b/eas-manager/src/main/java/com/mortals/xhx/module/message/web/MessageController.java
index b855212b0e4ddd638bcd7b01fa43d084dd909386..a7e24e55f0f6a58204eac2295806314906cc1791 100644
--- a/eas-manager/src/main/java/com/mortals/xhx/module/message/web/MessageController.java
+++ b/eas-manager/src/main/java/com/mortals/xhx/module/message/web/MessageController.java
@@ -1,6 +1,7 @@
package com.mortals.xhx.module.message.web;
import com.mortals.framework.common.IBaseEnum;
+import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.common.code.MessageTypeEnum;
@@ -12,6 +13,7 @@ import com.mortals.xhx.module.message.service.MessageService;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.HashMap;
import java.util.Map;
/**
*
@@ -37,6 +39,11 @@ public class MessageController extends BaseCRUDJsonBodyMappingController<Message
super.init(model, context);
}
-
+ @Override
+ protected void doListBefore(MessageEntity query, Map<String, Object> model, Context context) throws AppException {
+ Map<String,String> orderCols = new HashMap<>();
+ orderCols.put("createTime","DESC");
+ query.setOrderCols(orderCols);
+ }
}
\ No newline at end of file
diff --git a/eas-manager/src/main/java/com/mortals/xhx/module/news/web/NewsController.java b/eas-manager/src/main/java/com/mortals/xhx/module/news/web/NewsController.java
index 8422c81a9fe925b819e052a2620a84a41888c21a..42e51d11c084e13034f713f2290349d76c62d693 100644
--- a/eas-manager/src/main/java/com/mortals/xhx/module/news/web/NewsController.java
+++ b/eas-manager/src/main/java/com/mortals/xhx/module/news/web/NewsController.java
@@ -11,6 +11,7 @@ import com.mortals.xhx.module.news.service.NewsService;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.HashMap;
import java.util.Map;
/**
*
@@ -38,6 +39,9 @@ public class NewsController extends BaseCRUDJsonBodyMappingController<NewsServic
@Override
protected void doListBefore(NewsEntity query, Map<String, Object> model, Context context) throws AppException {
query.setCustomerId(this.getCurUser().getId());
+ Map<String,String> orderCols = new HashMap<>();
+ orderCols.put("createTime","DESC");
+ query.setOrderCols(orderCols);
}
@Override
diff --git a/eas-manager/src/main/java/com/mortals/xhx/module/picture/web/BackgroundMaterialController.java b/eas-manager/src/main/java/com/mortals/xhx/module/picture/web/BackgroundMaterialController.java
index ad7e4100c1e04048ef229893d7cae27a3ab02ed0..ae233f75333fa8f6c1beab43b1447c3b7af69e66 100644
--- a/eas-manager/src/main/java/com/mortals/xhx/module/picture/web/BackgroundMaterialController.java
+++ b/eas-manager/src/main/java/com/mortals/xhx/module/picture/web/BackgroundMaterialController.java
@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -40,6 +41,9 @@ public class BackgroundMaterialController extends BaseCRUDJsonBodyMappingContro
@Override
protected void doListBefore(PictureMaterialEntity query, Map<String, Object> model, Context context) throws AppException {
query.setPictureType(PictureTypeEnum.BACKGROUND.getValue());
+ Map<String,String> orderCols = new HashMap<>();
+ orderCols.put("createTime","DESC");
+ query.setOrderCols(orderCols);
}
@Override
diff --git a/eas-manager/src/main/java/com/mortals/xhx/module/picture/web/ElementMaterialController.java b/eas-manager/src/main/java/com/mortals/xhx/module/picture/web/ElementMaterialController.java
index 7b15c6145f9f2bdd70ff331b859f615de912aa19..0a9d0535bff001d75658893aaf37f8ce6f6ae42a 100644
--- a/eas-manager/src/main/java/com/mortals/xhx/module/picture/web/ElementMaterialController.java
+++ b/eas-manager/src/main/java/com/mortals/xhx/module/picture/web/ElementMaterialController.java
@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -40,6 +41,9 @@ public class ElementMaterialController extends BaseCRUDJsonBodyMappingControlle
@Override
protected void doListBefore(PictureMaterialEntity query, Map<String, Object> model, Context context) throws AppException {
query.setPictureType(PictureTypeEnum.ELEMENT.getValue());
+ Map<String,String> orderCols = new HashMap<>();
+ orderCols.put("createTime","DESC");
+ query.setOrderCols(orderCols);
}
@Override
diff --git a/eas-manager/src/main/java/com/mortals/xhx/module/picture/web/PictureMaterialController.java b/eas-manager/src/main/java/com/mortals/xhx/module/picture/web/PictureMaterialController.java
index ec72e5605889398d89ba8d7b55183fcf8bcedcb3..f59452b4fd994e9285cc106011803041649c94b9 100644
--- a/eas-manager/src/main/java/com/mortals/xhx/module/picture/web/PictureMaterialController.java
+++ b/eas-manager/src/main/java/com/mortals/xhx/module/picture/web/PictureMaterialController.java
@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -41,6 +42,9 @@ public class PictureMaterialController extends BaseCRUDJsonBodyMappingController
@Override
protected void doListBefore(PictureMaterialEntity query, Map<String, Object> model, Context context) throws AppException {
query.setPictureType(PictureTypeEnum.PICTURE.getValue());
+ Map<String,String> orderCols = new HashMap<>();
+ orderCols.put("createTime","DESC");
+ query.setOrderCols(orderCols);
}
@Override
diff --git a/eas-manager/src/main/java/com/mortals/xhx/module/proposal/web/ProposalController.java b/eas-manager/src/main/java/com/mortals/xhx/module/proposal/web/ProposalController.java
index 613c6ab34684e2e11d71dee224222eb817446e6a..5421d08ca56c0c4d72847f809744b5483c1aeccf 100644
--- a/eas-manager/src/main/java/com/mortals/xhx/module/proposal/web/ProposalController.java
+++ b/eas-manager/src/main/java/com/mortals/xhx/module/proposal/web/ProposalController.java
@@ -66,6 +66,13 @@ public class ProposalController extends BaseCRUDJsonBodyMappingController<Propos
}
+ @Override
+ protected void doListBefore(ProposalEntity query, Map<String, Object> model, Context context) throws AppException {
+ Map<String,String> orderCols = new HashMap<>();
+ orderCols.put("createTime","DESC");
+ query.setOrderCols(orderCols);
+ }
+
@PostMapping({"reply"})
@RepeatSubmit
public String reply(@RequestBody ProposalEntity entity) {
diff --git a/eas-manager/src/main/java/com/mortals/xhx/module/question/web/QuestionController.java b/eas-manager/src/main/java/com/mortals/xhx/module/question/web/QuestionController.java
index cc186a43f7d47b85d6595d9942074c20b3ef58c3..cf1805c6aa5f052dbe95b8a34de4490764e0e793 100644
--- a/eas-manager/src/main/java/com/mortals/xhx/module/question/web/QuestionController.java
+++ b/eas-manager/src/main/java/com/mortals/xhx/module/question/web/QuestionController.java
@@ -43,6 +43,13 @@ public class QuestionController extends BaseCRUDJsonBodyMappingController<Questi
super.init(model, context);
}
+ @Override
+ protected void doListBefore(QuestionEntity query, Map<String, Object> model, Context context) throws AppException {
+ Map<String,String> orderCols = new HashMap<>();
+ orderCols.put("createTime","DESC");
+ query.setOrderCols(orderCols);
+ }
+
@PostMapping({"evaluate"})
public String evaluate(@RequestBody QuestionEntity entity){
Map<String, Object> model = new HashMap();
diff --git a/eas-manager/src/main/java/com/mortals/xhx/module/question/web/QuestionRecordController.java b/eas-manager/src/main/java/com/mortals/xhx/module/question/web/QuestionRecordController.java
index b6ee61f413cc3c50bb8a8c4acdd77b3944338366..6643860c42fc347d03944b4d4ba09f05a702d7c9 100644
--- a/eas-manager/src/main/java/com/mortals/xhx/module/question/web/QuestionRecordController.java
+++ b/eas-manager/src/main/java/com/mortals/xhx/module/question/web/QuestionRecordController.java
@@ -47,6 +47,13 @@ public class QuestionRecordController extends BaseCRUDJsonBodyMappingController<
super.init(model, context);
}
+ @Override
+ protected void doListBefore(QuestionRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+ Map<String,String> orderCols = new HashMap<>();
+ orderCols.put("createTime","DESC");
+ query.setOrderCols(orderCols);
+ }
+
@PostMapping({"ask"})
public String ask(@RequestBody QuestionRecordEntity entity) {
diff --git a/eas-manager/src/main/java/com/mortals/xhx/module/question/web/QuestionReplyController.java b/eas-manager/src/main/java/com/mortals/xhx/module/question/web/QuestionReplyController.java
index 025fc4bb78629276dbeea4cd526bc49d35ce4815..ec25bb0de9b40d87d6b6c6dcfd79bac839322f82 100644
--- a/eas-manager/src/main/java/com/mortals/xhx/module/question/web/QuestionReplyController.java
+++ b/eas-manager/src/main/java/com/mortals/xhx/module/question/web/QuestionReplyController.java
@@ -1,5 +1,6 @@
package com.mortals.xhx.module.question.web;
+import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.question.model.QuestionReplyEntity;
@@ -7,6 +8,7 @@ import com.mortals.xhx.module.question.service.QuestionReplyService;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.HashMap;
import java.util.Map;
/**
*
@@ -28,5 +30,11 @@ public class QuestionReplyController extends BaseCRUDJsonBodyMappingController<Q
super.init(model, context);
}
+ @Override
+ protected void doListBefore(QuestionReplyEntity query, Map<String, Object> model, Context context) throws AppException {
+ Map<String,String> orderCols = new HashMap<>();
+ orderCols.put("createTime","DESC");
+ query.setOrderCols(orderCols);
+ }
}
\ No newline at end of file