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

服务商页面开发

anderx 7 éve%!(EXTRA string=óta)
szülő
commit
701dc5415a

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

@@ -89,7 +89,7 @@ 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);

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

@@ -47,7 +47,7 @@ import com.goafanti.user.service.UserIdentityService;
 import com.goafanti.user.service.UserService;
 
 @Controller
-@RequestMapping(value = "/api/admin")
+@RequestMapping(value = "/open/api/admin")
 public class AdminApiController extends CertifyApiController {
 	@Resource
 	private UserService						userService;
@@ -416,6 +416,17 @@ 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())||null==identity.getAuditStatus()) {
+				res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","撤销"));
+				return res;
+			}
+			res.setData(userIdentityService.updateAuditing(identity));
+			return res;
+		}
 	
 	//获得注册用户信息
 	@RequestMapping(value="/user/info", method = RequestMethod.GET)

+ 2 - 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);

+ 6 - 5
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -1208,15 +1208,16 @@ 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(","));

+ 1 - 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;
 		}

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

@@ -605,7 +605,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

+ 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" class="container">
+    	<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>