Forráskód Böngészése

Merge remote-tracking branch 'origin/test'

Conflicts:
	src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
	src/main/webapp/WEB-INF/views/portal/continueHigh.html
	src/main/webapp/WEB-INF/views/portal/militaryProject.html
	src/main/webapp/WEB-INF/views/portal/practicalPatent.html
	src/main/webapp/WEB-INF/views/portal/service/patenteDetails.html
	src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html
limin 7 éve%!(EXTRA string=óta)
szülő
commit
66721ff785
20 módosított fájl, 313 hozzáadás és 43 törlés
  1. 15 1
      src/main/java/com/goafanti/achievement/controller/AdminAchievementApiController.java
  2. 13 8
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  3. 12 0
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  4. 15 2
      src/main/java/com/goafanti/business/controller/AdminJtBusinessController.java
  5. 0 1
      src/main/java/com/goafanti/business/service/impl/JtBusinessServiceImpl.java
  6. 7 0
      src/main/java/com/goafanti/common/controller/PortalController.java
  7. 23 0
      src/main/java/com/goafanti/common/controller/PublicController.java
  8. 29 9
      src/main/java/com/goafanti/common/controller/WebpageController.java
  9. 2 3
      src/main/java/com/goafanti/common/mapper/JtBusinessProjectMapper.xml
  10. 20 1
      src/main/java/com/goafanti/demand/controller/AdminDemandApiController.java
  11. 2 2
      src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java
  12. 1 0
      src/main/java/com/goafanti/user/bo/InputOrganizationIdentity.java
  13. 54 10
      src/main/java/com/goafanti/user/controller/UserApiController.java
  14. 1 1
      src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java
  15. 1 1
      src/main/resources/props/config_local.properties
  16. 1 1
      src/main/webapp/WEB-INF/views/portal/continueHigh.html
  17. 114 0
      src/main/webapp/WEB-INF/views/portal/facilitator.html
  18. 1 1
      src/main/webapp/WEB-INF/views/portal/militaryProject.html
  19. 1 1
      src/main/webapp/WEB-INF/views/portal/practicalPatent.html
  20. 1 1
      src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html

+ 15 - 1
src/main/java/com/goafanti/achievement/controller/AdminAchievementApiController.java

@@ -23,6 +23,7 @@ import com.goafanti.common.enums.AchievementAuditStatus;
 import com.goafanti.common.enums.AttachmentType;
 import com.goafanti.common.model.Achievement;
 import com.goafanti.common.model.AchievementPublish;
+import com.goafanti.common.model.UserIdentity;
 import com.goafanti.common.service.BranchInformationService;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.portal.bo.AchievementResultObject;
@@ -89,12 +90,25 @@ public class AdminAchievementApiController extends CertifyApiController {
     	if(achievementResultObject==null) {
     		result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"未找到成果","成果Id"));return result;
     	}
-    	if(achievementResultObject.getAuditStatus()!= AchievementAuditStatus.SUBMIT.getCode()) {
+    	if(achievementResultObject.getAuditStatus()!= AchievementAuditStatus.SUBMIT.getCode()||achievementResultObject.getAuditStatus()!= AchievementAuditStatus.AUDITED.getCode()) {
     		result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"未找到成果","当前状态不可审核"));return result;
     	}
     	achievementService.updateAuditAchievement( id,auditResult,auditInfo);
     	return result; 
     }
+    
+  //撤销成果
+  		@RequestMapping(value="/annul", method = RequestMethod.POST)
+  		public Result annul(String id){
+  			Result res = new Result();
+  			if (StringUtils.isBlank(id)) {
+  				res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","撤销"));
+  				return res;
+  			}
+  			achievementService.updateAuditAchievement( id,0,null);
+  			res.setData(1);
+  			return res;
+  		}
 	@RequestMapping(value = "/achievementDetail",method=RequestMethod.GET)
 	private Result Detail(String id) {
 		Result result=new Result();

+ 13 - 8
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -789,15 +789,11 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		int auditStatus=AchievementAuditStatus.AUDITED.getCode().intValue();
 		if(auditResult.intValue() == 0) {
 			auditStatus=AchievementAuditStatus.UNAUDITED.getCode().intValue();
+			if(collectFlag)jtCollectSearchMapper.deleteByrowId(id);
 		}
-		else auditStatus=AchievementAuditStatus.AUDITED.getCode().intValue();
-		Achievement achievement=new Achievement();
-		achievement.setId(id);
-		achievement.setAuditStatus(auditStatus);
-		achievement.setAuditInfo(auditInfo);
-		achievement.setReleaseDate(new Date());
-		achievementMapper.updateByPrimaryKeySelective(achievement);
-		if(collectFlag){
+		else {
+			auditStatus=AchievementAuditStatus.AUDITED.getCode().intValue();
+			if(collectFlag){
 			Achievement a=achievementMapper.selectByPrimaryKey(id);
 			JtCollectSearch r=new JtCollectSearch();
 			r.setFromTable(collectType.ACHIEVEMENT.getDesc());
@@ -811,6 +807,15 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			r.setSummary(sum);
 			jtCollectSearchMapper.insertSelective(r);
 		}
+		}
+		
+		Achievement achievement=new Achievement();
+		achievement.setId(id);
+		achievement.setAuditStatus(auditStatus);
+		achievement.setAuditInfo(auditInfo);
+		achievement.setReleaseDate(new Date());
+		achievementMapper.updateByPrimaryKeySelective(achievement);
+		
 		return auditStatus;
 	}
 

+ 12 - 0
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -416,6 +416,18 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(userIdentityService.updateAuditing(identity));
 		return res;
 	}
+	//管理员打回专家顾问
+		@RequestMapping(value="/annul", method = RequestMethod.POST)
+		public Result annul(UserIdentity identity){
+			Result res = new Result();
+			if (StringUtils.isBlank(identity.getId())) {
+				res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","撤销"));
+				return res;
+			}
+			identity.setAuditStatus(3);
+			res.setData(userIdentityService.updateAuditing(identity));
+			return res;
+		}
 	
 	//获得注册用户信息
 	@RequestMapping(value="/user/info", method = RequestMethod.GET)

+ 15 - 2
src/main/java/com/goafanti/business/controller/AdminJtBusinessController.java

@@ -259,9 +259,9 @@ public class AdminJtBusinessController extends CertifyApiController{
     	if(jtBusinessProject==null) {
     		result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"未找到服务","服务Id"));return result;
     	}
-    	if(jtBusinessProject.getAuditStatus()!= ProjectAuditStatus.SUBMIT.getCode()) {
+    	/*if(jtBusinessProject.getAuditStatus()!= ProjectAuditStatus.SUBMIT.getCode()) {
     		result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"未找到服务","当前状态不可审核"));return result;
-    	}
+    	}*/
     	if(auditResult.intValue() == 0){
     		jtBusinessProject.setAuditStatus(ProjectAuditStatus.AUDITED.getCode());
     		jtBusinessService.addJtCollectSearch(jtBusinessProject);
@@ -272,6 +272,19 @@ public class AdminJtBusinessController extends CertifyApiController{
     	return result; 
 	}
 	
+	@RequestMapping(value="/project/annul" ,method=RequestMethod.POST)
+    private Result projectAnnul(JtBusinessProject jtBusinessProject) {
+    	Result result=new Result();
+    	if (StringUtils.isBlank(jtBusinessProject.getId())) {
+    		result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","撤销"));
+			return result;
+		}
+    	jtBusinessProject.setAuditStatus(3);
+    	jtBusinessService.updateJtCollectSearch(jtBusinessProject.getId());
+    	result.setData(jtBusinessService.updateProject(jtBusinessProject));
+    	return result; 
+	}
+	
 	/*
 	 * 新增标签
 	 * */

+ 0 - 1
src/main/java/com/goafanti/business/service/impl/JtBusinessServiceImpl.java

@@ -106,7 +106,6 @@ public class JtBusinessServiceImpl  extends BaseMybatisDao<JtBusinessProjectMapp
 			Integer pageNo,Integer privateProject,Integer auditStatus,Integer module,Integer isHot,Integer orderType,Integer orderSort,String ownerId) {
 		if(orderType==null)orderType=0;
 		if(orderSort==null)orderSort=0;
-		// TODO Auto-generated method stub
 		if (pageNo == null || pageNo < 0) {
 			pageNo = 1;
 		}

+ 7 - 0
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -9,11 +9,14 @@ import javax.servlet.http.HttpServletRequest;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.RedirectView;
 
 import com.goafanti.achievement.bo.AchievementPartnerListBo;
 import com.goafanti.achievement.service.AchievementService;
+import com.goafanti.business.service.JtBusinessService;
+import com.goafanti.common.bo.Result;
 import com.goafanti.common.enums.AchievementMaturity;
 import com.goafanti.common.model.UserInterest;
 import com.goafanti.common.service.DistrictGlossoryService;
@@ -50,6 +53,8 @@ public class PortalController extends BaseController {
 	OrderService	orderService;
 	@Resource
 	UserInterestService userInterestService;
+	@Resource
+	JtBusinessService	jtBusinessService;
 
 	@RequestMapping(value = "/index", method = RequestMethod.GET)
 	public ModelAndView index(HttpServletRequest request, ModelAndView modelview) {
@@ -146,4 +151,6 @@ public class PortalController extends BaseController {
 		return mv;
 
 	}
+	
+	
 	}

+ 23 - 0
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -5,6 +5,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.List;
 import java.util.UUID;
 
 import javax.annotation.Resource;
@@ -21,6 +22,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.goafanti.achievement.service.AchievementService;
+import com.goafanti.business.bo.JtBusinessProjectResult;
+import com.goafanti.business.service.JtBusinessService;
 import com.goafanti.comment.bo.CommentInput;
 import com.goafanti.comment.bo.CommentResult;
 import com.goafanti.comment.controller.UserCommentController;
@@ -38,6 +41,7 @@ import com.goafanti.common.utils.PasswordUtil;
 import com.goafanti.common.utils.PictureUtils;
 import com.goafanti.common.utils.TimeUtils;
 import com.goafanti.common.utils.VerifyCodeUtils;
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.demand.bo.DemandListBo;
 import com.goafanti.demand.service.DemandService;
@@ -91,6 +95,9 @@ public class PublicController extends BaseController {
 	@Autowired
 	private DemandService demandService;
 	
+	@Autowired
+	private JtBusinessService jtBusinessService;
+	
 	@Value(value = "${patentTemplate}")
 	private String					patentTemplate		= null;
 
@@ -742,5 +749,21 @@ public class PublicController extends BaseController {
 		return result;
 		
 	}
+	/**
+	 * 服务商项目列表
+	 */
+	@SuppressWarnings("unchecked")
+	@RequestMapping(value = "/user/projectList", method = RequestMethod.GET)
+	@ResponseBody
+	public Result userProjectList(String uid, Integer pageSize, Integer pageNo) {
+		Result res = new Result();
+		Pagination<JtBusinessProjectResult> pagination=jtBusinessService.getProjects(null,null, null, null, pageSize, pageNo, 0, 2, null, null, 0, 0, uid);
+		List<JtBusinessProjectResult> list=(List<JtBusinessProjectResult>) pagination.getList();
+		for (JtBusinessProjectResult j : list) {
+			j.setIntroduce(j.getIntroduce().replaceAll("\\<.*?>", ""));
+		}
+		res.setData(pagination);
+		return res;
+	}
 	
 }

+ 29 - 9
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -266,19 +266,37 @@ public class WebpageController extends BaseController {
 	}
 
 	@RequestMapping(value = "/portal/continueHigh", method = RequestMethod.GET)
-	public ModelAndView portalContinueHigh(HttpServletRequest request, ModelAndView modelview) {
+	public ModelAndView portalContinueHigh(HttpServletRequest request, ModelAndView modelview) {
+		JtBusinessCategory bc1=jtBusinessService.getBusinessCategoryByLayerAndName(2, "高企诊断");
+		JtBusinessCategory bc2=jtBusinessService.getBusinessCategoryByLayerAndName(2, "高企认定");
+		JtBusinessCategory bc3=jtBusinessService.getBusinessCategoryByLayerAndName(2, "高企培育");
+		modelview.addObject("gqc1", bc1);
+		modelview.addObject("gqc2", bc2);
+		modelview.addObject("gqc3", bc3);
 		modelview.setViewName("/portal/continueHigh");
 		return modelview;
 	}
 
 	@RequestMapping(value = "/portal/militaryProject", method = RequestMethod.GET)
-	public ModelAndView portalMilitaryProject(HttpServletRequest request, ModelAndView modelview) {
+	public ModelAndView portalMilitaryProject(HttpServletRequest request, ModelAndView modelview) {
+		JtBusinessCategory bc1=jtBusinessService.getBusinessCategoryByLayerAndName(2, "武器装备科研生产保密资格认证");
+		JtBusinessCategory bc2=jtBusinessService.getBusinessCategoryByLayerAndName(2, "武器装备科研生产许可证认证");
+		JtBusinessCategory bc3=jtBusinessService.getBusinessCategoryByLayerAndName(2, "装备承制单位资格认证");
+		modelview.addObject("gqc1", bc1);
+		modelview.addObject("gqc2", bc2);
+		modelview.addObject("gqc3", bc3);
 		modelview.setViewName("/portal/militaryProject");
 		return modelview;
 	}
 
 	@RequestMapping(value = "/portal/practicalPatent", method = RequestMethod.GET)
-	public ModelAndView portalPracticalPatent(HttpServletRequest request, ModelAndView modelview) {
+	public ModelAndView portalPracticalPatent(HttpServletRequest request, ModelAndView modelview) {
+		JtBusinessCategory bc1=jtBusinessService.getBusinessCategoryByLayerAndName(2, "发明专利");
+		JtBusinessCategory bc2=jtBusinessService.getBusinessCategoryByLayerAndName(2, "商标注册");
+		JtBusinessCategory bc3=jtBusinessService.getBusinessCategoryByLayerAndName(2, "软著申请");
+		modelview.addObject("gqc1", bc1);
+		modelview.addObject("gqc2", bc2);
+		modelview.addObject("gqc3", bc3);
 		modelview.setViewName("/portal/practicalPatent");
 		return modelview;
 	}
@@ -1190,21 +1208,22 @@ public class WebpageController extends BaseController {
 		return modelAndView;
 	}
 
-	@SuppressWarnings("unchecked")
-	@RequestMapping(value = "/portal/companyProfile")
+	
+
+	@RequestMapping(value = "/portal/facilitatorDetails")
 	public ModelAndView companyProfile(HttpServletRequest request, ModelAndView modelAndView, String uid) {
-		modelAndView.setViewName("/portal/companyProfile");
+		modelAndView.setViewName("/portal/facilitator");
+		
 		OrgIdentityBo org = organizationIdentityService.selectOrgIdentityBoByUserId(uid);
 		modelAndView.addObject("org", org);
-		List<JtBusinessProjectResult> projectResults = (List<JtBusinessProjectResult>) jtBusinessService
+		/*List<JtBusinessProjectResult> projectResults = (List<JtBusinessProjectResult>) jtBusinessService
 				.getProjects(null,null, null, null, 12, 1, 0, 2, null, null, 0, 0, uid).getList();
-		modelAndView.addObject("jtProjects", projectResults);
+		modelAndView.addObject("jtProjects", projectResults);*/
 		String honor = org.getHonorPicture();
 		if (honor != null && honor.contains(".")) {
 			List<String> honorPictures = Arrays.asList(honor.split(","));
 			if (honorPictures.size() > 0)
 				modelAndView.addObject("honors", honorPictures);
-
 		}
 		return modelAndView;
 	}
@@ -1461,4 +1480,5 @@ public class WebpageController extends BaseController {
 		return res;
 	} 
 	
+	
 }

+ 2 - 3
src/main/java/com/goafanti/common/mapper/JtBusinessProjectMapper.xml

@@ -655,17 +655,16 @@
 	  ifnull(dct.dealCount,0) as dealCount,
 	  ifnull(x.count,0) as interestCount,
 	  u.nickname as companyName,u.id as companyId,
+	  jtbc1.module,
 	  u.`type` as type
   from jt_business_project jtbp
   left join user u on u.id=jtbp.owner_id
   left join (select project_id as id,count(*) as count from project_interest group by project_id)x on jtbp.id=x.id
   left join (select sum(commodity_quantity) as dealCount ,commodity_id from jt_order_detail group by commodity_id) dct on jtbp.id=dct.commodity_id
+  left join jt_business_category jtbc1 on jtbc1.id = jtbp.category_id
   <if test="topId!=null">
   left join jt_business_category jtbc on jtbc.super_id =#{topId,jdbcType=VARCHAR}
   </if>
-  <if test="module!=null">
-  left join jt_business_category jtbc1 on jtbc1.id = jtbp.category_id
-  </if>
   <if test="tag != null">
   left join jt_business_project_tag x on x.project_id=jtbp.id
   left join jt_tag y on x.tag_id=y.id

+ 20 - 1
src/main/java/com/goafanti/demand/controller/AdminDemandApiController.java

@@ -153,7 +153,7 @@ public class AdminDemandApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "需求ID"));
 			return res;
 		}
-		if(d.getAuditStatus() != DemandAuditStatus.INAUDIT.getCode()){
+		if(d.getAuditStatus() != DemandAuditStatus.INAUDIT.getCode()||d.getAuditStatus() != DemandAuditStatus.AUDITED.getCode()){
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "需求未达审核条件"));
 			return res;
 		}
@@ -172,6 +172,25 @@ public class AdminDemandApiController extends CertifyApiController {
 		return res;
 	}
 	
+
+	/**
+	 * 撤销需求
+	 * @param id
+	 * @param auditResult
+	 * @return
+	 */
+	
+	@RequestMapping(value = "/annul", method = RequestMethod.POST)
+	public Result annul(Demand d){
+		Result res = new Result();
+		if (StringUtils.isBlank(d.getId())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","撤销"));
+			return res;
+		}
+		d.setAuditStatus(3);
+		res.setData(demandService.updateByPrimaryKeySelective(d));
+		return res;
+	}
 	/**
 	 * 需求管理--获取个人用户下拉
 	 */

+ 2 - 2
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -610,7 +610,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 				r.setSummary(sum);
 				jtCollectSearchMapper.insertSelective(r);				
 			}
-			if (d.getAuditStatus()==4) {
+			if (d.getAuditStatus()==4||d.getAuditStatus()==3) {
 				if(collectFlag)jtCollectSearchMapper.deleteByrowId(d.getId());
 			}
 		}
@@ -976,4 +976,4 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	}
 	
 	
-	}
+	}

+ 1 - 0
src/main/java/com/goafanti/user/bo/InputOrganizationIdentity.java

@@ -167,6 +167,7 @@ public class InputOrganizationIdentity {
 	
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	
 	private Integer highTechZone;
 	
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")

+ 54 - 10
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -14,8 +14,10 @@ import org.springframework.util.Assert;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.goafanti.business.service.JtBusinessService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
@@ -85,6 +87,9 @@ public class UserApiController extends BaseApiController {
 	private UserContactService 				userContactService;
 	@Autowired
 	private EasemobUtils					easemobUtils;
+	
+	@Resource
+	private JtBusinessService	jtBusinessService;
 
 	private static final Integer			STEP_ONE			= 1;
 
@@ -515,18 +520,11 @@ public class UserApiController extends BaseApiController {
 					UserIdentityFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-		if(StringUtils.isBlank(organizationIdentity.getUid())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "用户ID"));
+		res=validation(organizationIdentity, res);
+		if (!res.getError().isEmpty()) {
 			return res;
 		}
-		if(organizationIdentity.getAuthentication() == UserAuthentication.AUTHENTICATION.getCode()
-				&& organizationIdentity.getType() == UserType.PERSONAL.getCode()){
-			res.getError().add(buildError(null, "", "用户已经个人认证"));
-			return res;
-		}else if(organizationIdentity.getAuthentication() == UserAuthentication.UN_AUTHENTICATION.getCode()){
-			organizationIdentity.setType(UserType.ORGANIZATION.getCode());
-			organizationIdentity.setAuthentication(UserAuthentication.AUTHENTICATION.getCode());
-		}
+		
 		if (res.getError().isEmpty()) {
 			OrganizationIdentity oi = new OrganizationIdentity();
 			User user = new User();
@@ -547,6 +545,50 @@ public class UserApiController extends BaseApiController {
 		res.setData(organizationIdentity);
 		return res;
 	}
+
+	private Result validation(InputOrganizationIdentity organizationIdentity, Result res) {
+		if(StringUtils.isBlank(organizationIdentity.getUid())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "用户ID"));
+			return res;
+		}
+		if(StringUtils.isBlank(organizationIdentity.getQq())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "QQ"));
+			return res;
+		}
+		if(StringUtils.isBlank(organizationIdentity.getIdentifyName())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "单位名称"));			
+			return res;
+		}
+		if(StringUtils.isBlank(organizationIdentity.getCompanyLogoUrl())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "LOGO"));			
+			return res;
+		}
+		if(StringUtils.isBlank(organizationIdentity.getBusinessScope())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "业务范围"));			
+			return res;
+		}
+		if(StringUtils.isBlank(organizationIdentity.getIntroduction())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "单位简介"));			
+			return res;
+		}
+		if(StringUtils.isBlank(organizationIdentity.getHonorPicture())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "荣誉资质"));			
+			return res;
+		}
+		if(null==organizationIdentity.getLicenceProvince()||null==organizationIdentity.getLicenceCity()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "地区"));
+			return res;
+		}
+		if(organizationIdentity.getAuthentication() == UserAuthentication.AUTHENTICATION.getCode()
+				&& organizationIdentity.getType() == UserType.PERSONAL.getCode()){
+			res.getError().add(buildError(null, "", "用户已经个人认证"));
+			return res;
+		}else if(organizationIdentity.getAuthentication() == UserAuthentication.UN_AUTHENTICATION.getCode()){
+			organizationIdentity.setType(UserType.ORGANIZATION.getCode());
+			organizationIdentity.setAuthentication(UserAuthentication.AUTHENTICATION.getCode());
+		}
+		return res;
+	}
 	
 	/**
 	 * 个人资料/团体会员资料
@@ -914,4 +956,6 @@ public class UserApiController extends BaseApiController {
 		return res;
 	}
 	
+	
+
 }

+ 1 - 1
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -610,7 +610,7 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 				jtCollectSearchMapper.insertSelective(r);
 			}
 		
-		if (identity.getAuditStatus()==4) {
+		if (identity.getAuditStatus()==4||identity.getAuditStatus()==3) {
 			if(collectFlag)jtCollectSearchMapper.deleteByrowId(u.getUid());
 			}
 		}

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -57,7 +57,7 @@ template.cacheable=false
 
 static.host=//sclient.jishutao.com:8088/client/1.0.0
 
-portal.host=//sportal.jishutao.com:80/portal/1.0.0
+portal.host=//sportal.jishutao.com:80/portal/1.0.1
 
 avatar.host=//sclient.jishutao.com
 avatar.upload.host=//sclient.jishutao.com/upload

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/continueHigh.html


+ 114 - 0
src/main/webapp/WEB-INF/views/portal/facilitator.html

@@ -0,0 +1,114 @@
+<!DOCTYPE html>
+<html  xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org"
+	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+
+<head th:replace="common::header(~{::title},~{::link})">
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>服务商主页</title>
+    <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
+	<link th:href="${portalHost+'/facilitator.css'}" rel="stylesheet"> 
+</head>
+<body>
+    <div th:replace="common::nav('','index')"></div>
+    <!--主体部分-->
+    <div id="facili" >
+    	<div class="facImg">
+    		<div>
+    			<div><img th:src="${org.companyLogoUrl}==null or ${org.companyLogoUrl}==''?${portalHost+'/img/fac/fea1.png'}:${avatarUploadHost+org.companyLogoUrl}" alt=""></div>
+    		</div>
+    		<div>
+    			<h3 th:text="${org.identifyName}">湖南阿凡提有限公司</h3>
+    		</div>
+    	</div>
+    	<div class="facTab">
+    		<span class="facActive">首页</span>
+    		<span>所有项目</span>
+    	</div>
+    	<div class="facFirst">
+    		<div class="jianjie">
+    			<h4>公司简介</h4>
+    			  <p th:text="(${org.introduction}==null or ${org.introduction}=='')?'暂无':${org.introduction}"></p>
+    		</div>
+    		<div class="jianjie">
+    			<h4>业务范围</h4>
+    			<p th:text="(${org.businessScope}==null or${org.businessScope}=='')?'暂无':${org.businessScope}"></p>
+    		</div>
+    		<div class="RecommendTitle">
+	            <h2>荣誉资质</h2>
+	            <span></span>
+	        </div>
+    		<div class="rongyuCont" >
+    			<div th:each="pic:${honors}">
+    				<img  th:src="(${pic}==null or ${pic}=='')?${portalHost+'/img/fac/fea2.png'}:${avatarUploadHost+pic}" alt="" >
+    			</div>
+    			
+    		</div>
+    		<div class="RecommendTitle">
+	            <h2>联系我们</h2>
+	            <span></span>
+	        </div>
+	        <ol class="contantUs">
+	            <li>
+	                <span class="glyphicon glyphicon-earphone"></span>
+	                <div>
+	                    <p>联系方式<span class="pho" th:text="(${org.fixedTel}==null or ${org.fixedTel}=='')?'暂无':${org.fixedTel}"></span></p>
+	                    <p>QQ号码<span class="pho" th:text="(${org.qq}==null or ${org.qq}=='')?'暂无':${org.qq}"></span></p>
+	                </div>
+	            </li>
+	            <li>
+	                <span class="glyphicon glyphicon-envelope"></span>
+	                <div>
+	                    <p>公司邮箱</span></p>
+	                    <p><span th:text="(${org.email}==null or ${org.email}=='')?'暂无':${org.email}">3846252890@qq.com</span> </p>
+	                </div>
+	            </li>
+	            <li>
+	                <span class="glyphicon glyphicon-map-marker"></span>
+	                <div>
+	                    <p>公司地址</span></p>
+	                    <p><span th:text="(${org.postalAddress}==null or ${org.postalAddress}=='')?'暂无':${org.postalAddress}">湖南省长沙市营盘东路</span> </p>
+	                </div>
+	            </li>
+	        </ol>
+    	</div>
+    	<div id="facAll">
+    		<div class="facAll">
+    			
+    		</div>
+    		<div class="pagination_box">
+	            <nav aria-label="Page navigation" class="clearfix">
+	                <ul class="pagination">
+	                    <li class="pagePre">
+	                        <a href="#" aria-label="Previous">
+	                            <span aria-hidden="true">&laquo;</span>
+	                        </a>
+	                    </li>
+	                    <li class="pageNumber"><a href="#" value="1">1</a></li>
+	                    <li class="pageNext">
+	                        <a href="#" aria-label="Next">
+	                            <span aria-hidden="true">&raquo;</span>
+	                        </a>
+	                    </li>
+	                </ul>
+	                <div class="inp">
+	                    <input type="text" class=""><button class="btn btn-default">跳转</button>
+	                </div>
+	                <span class="totalCount">共0条数据</span>
+	            </nav>
+	        </div>
+    	</div>
+    </div>
+    <footer>
+      <div th:replace="common::copyright"></div>
+		<div th:replace="common::login"></div>
+    </footer>
+     <div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost+'/facilitator.js'}"></script>
+	</div>
+</body>
+<!-- <script language="javascript" src="https://put.zoosnet.net/JS/LsJS.aspx?siteid=PUT70876498&float=1&lng=cn"></script> -->
+</html>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/militaryProject.html


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/practicalPatent.html


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html