|
|
@@ -8,7 +8,14 @@ import com.uas.platform.b2c.core.support.SystemSession;
|
|
|
import com.uas.platform.b2c.core.utils.UuidUtils;
|
|
|
import com.uas.platform.b2c.prod.store.dao.StoreApplyDao;
|
|
|
import com.uas.platform.b2c.prod.store.dao.StoreBrandInfoDao;
|
|
|
-import com.uas.platform.b2c.prod.store.model.*;
|
|
|
+import com.uas.platform.b2c.prod.store.model.EnterpriseSimple;
|
|
|
+import com.uas.platform.b2c.prod.store.model.Qualification;
|
|
|
+import com.uas.platform.b2c.prod.store.model.QualificationType;
|
|
|
+import com.uas.platform.b2c.prod.store.model.StoreApply;
|
|
|
+import com.uas.platform.b2c.prod.store.model.StoreBrandInfo;
|
|
|
+import com.uas.platform.b2c.prod.store.model.StoreIn;
|
|
|
+import com.uas.platform.b2c.prod.store.model.StoreInfoAndProdExport;
|
|
|
+import com.uas.platform.b2c.prod.store.model.StoreType;
|
|
|
import com.uas.platform.b2c.prod.store.service.StoreApplyService;
|
|
|
import com.uas.platform.b2c.prod.store.service.StoreInService;
|
|
|
import com.uas.platform.b2c.trade.support.CodeType;
|
|
|
@@ -19,10 +26,8 @@ import com.uas.platform.core.persistence.criteria.CriterionExpression;
|
|
|
import com.uas.platform.core.persistence.criteria.LogicalExpression;
|
|
|
import com.uas.platform.core.persistence.criteria.SimpleExpression;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.core.convert.converter.Converter;
|
|
|
import org.springframework.data.domain.Page;
|
|
|
import org.springframework.data.domain.Pageable;
|
|
|
-import org.springframework.data.domain.Sort;
|
|
|
import org.springframework.data.jpa.domain.Specification;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
@@ -334,26 +339,26 @@ public class StoreApplyServiceImpl implements StoreApplyService {
|
|
|
+ "a.apply_store_enuu enuu,a.apply_auth_time agreeTime, a.apply_auth_person_name agreeName, "
|
|
|
+ "ifnull(p.count, 0) count from `store$apply` a left join (select pr_enuu, count(1) count from products");
|
|
|
if (!StringUtils.isEmpty(startTime)) {
|
|
|
- sql.append(" where date(pr_create_time) >= '" + new java.sql.Date(startTime.getTime()) + "'");
|
|
|
+ sql.append(" where pr_create_time >= '" + new java.sql.Date(startTime.getTime()) + "'");
|
|
|
}
|
|
|
if (!StringUtils.isEmpty(endTime) && !StringUtils.isEmpty(startTime)) {
|
|
|
- sql.append(" and date(pr_create_time) <= '" + new java.sql.Date(endTime.getTime()) + "' ");
|
|
|
+ sql.append(" and pr_create_time <= '" + new java.sql.Date(endTime.getTime()) + "' ");
|
|
|
}
|
|
|
if (!StringUtils.isEmpty(endTime) && StringUtils.isEmpty(startTime)) {
|
|
|
- sql.append(" where date(pr_create_time) <= '" + new java.sql.Date(endTime.getTime()) + "' ");
|
|
|
+ sql.append(" where pr_create_time <= '" + new java.sql.Date(endTime.getTime()) + "' ");
|
|
|
}
|
|
|
sql.append(" group by pr_enuu) p on p.pr_enuu = a.apply_store_enuu where a.apply_status='PASS' and count > 0 "
|
|
|
+ "order by a.apply_create_time limit " + (pageable.getPageNumber() - 1) * pageable.getPageSize() + ","
|
|
|
+ pageable.getPageSize());
|
|
|
StringBuilder totalSql = new StringBuilder("select count(1) from `store$apply` a left join (select pr_enuu, count(1) count from products ");
|
|
|
if (!StringUtils.isEmpty(startTime)) {
|
|
|
- totalSql.append(" where date(pr_create_time) >= '" + new java.sql.Date(startTime.getTime()) + "'");
|
|
|
+ totalSql.append(" where pr_create_time >= '" + new java.sql.Date(startTime.getTime()) + "'");
|
|
|
}
|
|
|
if (!StringUtils.isEmpty(endTime) && !StringUtils.isEmpty(startTime)) {
|
|
|
- totalSql.append(" and date(pr_create_time) <= '" + new java.sql.Date(endTime.getTime()) + "' ");
|
|
|
+ totalSql.append(" and pr_create_time <= '" + new java.sql.Date(endTime.getTime()) + "' ");
|
|
|
}
|
|
|
if (!StringUtils.isEmpty(endTime) && StringUtils.isEmpty(startTime)) {
|
|
|
- totalSql.append(" where date(pr_create_time) <= '" + new java.sql.Date(endTime.getTime()) + "' ");
|
|
|
+ totalSql.append(" where pr_create_time <= '" + new java.sql.Date(endTime.getTime()) + "' ");
|
|
|
}
|
|
|
totalSql.append(" group by pr_enuu) p on p.pr_enuu = a.apply_store_enuu where a.apply_status='PASS' and count > 0 ");
|
|
|
Integer total = commonDao.queryForObject(totalSql.toString(), Integer.class);
|
|
|
@@ -367,13 +372,13 @@ public class StoreApplyServiceImpl implements StoreApplyService {
|
|
|
+ "a.apply_store_enuu enuu,a.apply_auth_time agreeTime, a.apply_auth_person_name agreeName, "
|
|
|
+ "ifnull(p.count, 0) count from `store$apply` a left join (select pr_enuu, count(1) count from products");
|
|
|
if (!StringUtils.isEmpty(startTime)) {
|
|
|
- sql.append(" where date(pr_create_time) >= '" + new java.sql.Date(startTime.getTime()) + "'");
|
|
|
+ sql.append(" where pr_create_time >= '" + new java.sql.Date(startTime.getTime()) + "'");
|
|
|
}
|
|
|
if (!StringUtils.isEmpty(endTime) && !StringUtils.isEmpty(startTime)) {
|
|
|
- sql.append(" and date(pr_create_time) <= '" + new java.sql.Date(endTime.getTime()) + "' ");
|
|
|
+ sql.append(" and pr_create_time <= '" + new java.sql.Date(endTime.getTime()) + "' ");
|
|
|
}
|
|
|
if (!StringUtils.isEmpty(endTime) && StringUtils.isEmpty(startTime)) {
|
|
|
- sql.append(" where date(pr_create_time) <= '" + new java.sql.Date(endTime.getTime()) + "' ");
|
|
|
+ sql.append(" where pr_create_time <= '" + new java.sql.Date(endTime.getTime()) + "' ");
|
|
|
}
|
|
|
sql.append(" group by pr_enuu) p on p.pr_enuu = a.apply_store_enuu where a.apply_status='PASS' and count > 0 "
|
|
|
+ "order by a.apply_create_time ");
|