|
|
@@ -1,34 +1,28 @@
|
|
|
package com.goafanti.business.service.impl;
|
|
|
|
|
|
-import java.math.BigDecimal;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.UUID;
|
|
|
-
|
|
|
-import com.goafanti.order.enums.ProjectType;
|
|
|
-import org.springframework.beans.BeanUtils;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
-
|
|
|
import com.goafanti.app.bo.ProjectBo;
|
|
|
import com.goafanti.app.bo.ProjectDetailBo;
|
|
|
import com.goafanti.business.bo.BusinessProjectBo;
|
|
|
import com.goafanti.business.bo.ProjectSizeBo;
|
|
|
import com.goafanti.business.service.BusinessProjectService;
|
|
|
-import com.goafanti.common.dao.BusinessProjectMapper;
|
|
|
import com.goafanti.common.dao.BusinessCategoryMapper;
|
|
|
-import com.goafanti.common.dao.ProjectInterestMapper;
|
|
|
+import com.goafanti.common.dao.BusinessProjectMapper;
|
|
|
import com.goafanti.common.dao.BusinessProjectModelMapper;
|
|
|
-import com.goafanti.common.model.BusinessProject;
|
|
|
+import com.goafanti.common.dao.ProjectInterestMapper;
|
|
|
import com.goafanti.common.model.BusinessCategory;
|
|
|
+import com.goafanti.common.model.BusinessProject;
|
|
|
import com.goafanti.common.model.BusinessProjectModel;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
+import com.goafanti.order.enums.ProjectType;
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.stereotype.Service;
|
|
|
+
|
|
|
+import java.math.BigDecimal;
|
|
|
+import java.util.*;
|
|
|
|
|
|
@Service
|
|
|
public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMapper> implements BusinessProjectService {
|
|
|
@@ -68,16 +62,16 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<BusinessProjectBo> listProject(String bname, String cid, String country,String province,String city,String district, String activityFlag,
|
|
|
- String status,Integer type, Integer pNo, Integer pSize) {
|
|
|
+ String status,Integer type,Integer restrictStatus, Integer pNo, Integer pSize) {
|
|
|
if (pNo == null || pNo < 0)pNo = 1;
|
|
|
if (pSize == null || pSize < 0 )pSize = 10;
|
|
|
Pagination<BusinessProjectBo> pt=(Pagination<BusinessProjectBo>)findPage("findProjectListByPage", "findProjectListCount",
|
|
|
disposeParams(bname, cid, country, province, city, district, activityFlag,
|
|
|
- status,type),pNo,pSize);
|
|
|
+ status,type,restrictStatus),pNo,pSize);
|
|
|
return pt;
|
|
|
}
|
|
|
private Map<String, Object> disposeParams(String bname, String cid, String country,String province,String city,String district, String activityFlag,
|
|
|
- String status,Integer type) {
|
|
|
+ String status,Integer type,Integer restrictStatus) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
if (StringUtils.isNotBlank(bname)) {
|
|
|
params.put("bname", bname);
|
|
|
@@ -106,6 +100,9 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
|
|
|
if (type!=null ) {
|
|
|
params.put("type", type);
|
|
|
}
|
|
|
+ if (restrictStatus!=null ) {
|
|
|
+ params.put("restrictStatus", restrictStatus);
|
|
|
+ }
|
|
|
return params;
|
|
|
}
|
|
|
@Override
|
|
|
@@ -255,6 +252,7 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
|
|
|
bp.setFirstPayment(s.getFirstPayment());
|
|
|
bp.setType(s.getType());
|
|
|
bp.setPatentTransfer(s.getPatentTransfer());
|
|
|
+ bp.setRestrictStatus(s.getRestrictStatus());
|
|
|
if (null!=(s.getStatus())) {
|
|
|
bp.setStatus(s.getStatus());
|
|
|
}
|