Ver código fonte

私有客户 可以勾选排序 1、按剩余时间 2、按创建时间
sort: 0 剩余 1创建 sortType: 0正序 1倒序 (待前端)

anderx 6 anos atrás
pai
commit
a95ec0efa8

+ 11 - 1
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -191,6 +191,7 @@
 		<if test="area != null">
 			and b.area = #{area,jdbcType=INTEGER}
 		</if>
+		order by a.create_time
 		 <if test="page_sql != null">
     		${page_sql}
    		 </if>
@@ -226,6 +227,7 @@
 		<if test="area != null">
 			and b.area = #{area,jdbcType=INTEGER}
 		</if>
+		
 	</select>
 	<select id="selectSignPersonalCustomerList" resultType="com.goafanti.customer.bo.CustomerListOut">
 			select 
@@ -457,7 +459,15 @@
 		<if test="level != null">
 			and t0.level = #{level,jdbcType=INTEGER}
 		</if>
-		 order by orderTime 
+		<if test="sort != 1">
+		   order by orderTime 
+		</if>
+		<if test="sort == 1"> 
+		 order by t0.create_time 
+		 </if>
+		 <if test="sortType == 1">
+		 		desc
+		 </if>
 		 <if test="page_sql != null">
     		${page_sql}
    		 </if>

+ 3 - 3
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -51,7 +51,7 @@ import com.goafanti.customer.service.CustomerService;
 import com.goafanti.customer.service.impl.AdminOrgAnnualReportServiceImpl;
 
 @RestController
-@RequestMapping("/api/admin/customer")
+@RequestMapping("/open/api/admin/customer")
 public class AdminCustomerApiController extends BaseApiController{
 	@Resource
 	private CustomerService customerService;
@@ -111,9 +111,9 @@ public class AdminCustomerApiController extends BaseApiController{
 	
 	/** 私有单位客户列表 **/
 	@RequestMapping(value = "/listPrivateOrganizationCustomer" , method = RequestMethod.POST)
-	public Result listPrivateOrganizationCustomer(CustomerListIn cli,Integer pageNo, Integer pageSize){
+	public Result listPrivateOrganizationCustomer(CustomerListIn cli ,Integer sort,Integer sortType,Integer pageNo, Integer pageSize){
 		Result res = new Result();
-		res.setData(customerService.listPrivateOrganizationCustomer(cli, pageNo, pageSize));
+		res.setData(customerService.listPrivateOrganizationCustomer(cli, sort, sortType, pageNo, pageSize));
 		return res;
 	}
 	

+ 1 - 1
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -68,7 +68,7 @@ public interface CustomerService {
 	 * @param pageNumber
 	 * @return
 	 */
-	Pagination<CustomerListOut> listPrivateOrganizationCustomer(CustomerListIn cli, Integer pageNo, Integer pageSize);
+	Pagination<CustomerListOut> listPrivateOrganizationCustomer(CustomerListIn cli,Integer sort,Integer sortType, Integer pageNo, Integer pageSize);
 	
 	/**
 	 * 公共单位客户列表查询

+ 5 - 3
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -151,12 +151,14 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<CustomerListOut> listPrivateOrganizationCustomer(CustomerListIn cli, Integer pageNo,Integer pageSize) {
+	public Pagination<CustomerListOut> listPrivateOrganizationCustomer(CustomerListIn cli,Integer sort,Integer sortType, Integer pageNo,Integer pageSize) {
 		cli.setType(AFTConstants.USER_TYPE_ORGANIZATION);
-		cli.setAid(TokenManager.getAdminId());
-//		cli.setAid("1");
+//		cli.setAid(TokenManager.getAdminId());
+		cli.setAid("1");
 		cli.setShareType(String.valueOf(AFTConstants.USER_SHARE_PRIVATE));
 		Map<String,Object> params = disposeParams(cli);
+		params.put("sort", sort);
+		params.put("sortType",sortType);
 		Pagination<CustomerListOut> list = (Pagination<CustomerListOut>) findPage("selectPrivateOrganizationCustomerList","selectPrivateOrganizationCustomerCount",params,pageNo,pageSize);
 		List<CustomerListOut> tmpList = (List<CustomerListOut>)list.getList();
 		setCustomerList(tmpList);