Bläddra i källkod

Merge branch 'master' of https://git.coding.net/aft/AFT

wubb 8 år sedan
förälder
incheckning
77dab634fa

+ 9 - 0
src/main/java/com/goafanti/admin/controller/AdminBigShotApiController.java

@@ -0,0 +1,9 @@
+package com.goafanti.admin.controller;
+
+import com.goafanti.common.controller.BaseApiController;
+/**
+ * 大咖说首页
+ */
+public class AdminBigShotApiController extends BaseApiController{
+		
+}

+ 9 - 0
src/main/java/com/goafanti/admin/controller/AdminLectureApiController.java

@@ -0,0 +1,9 @@
+package com.goafanti.admin.controller;
+
+import com.goafanti.common.controller.BaseApiController;
+/**
+ * 科技讲堂
+ */
+public class AdminLectureApiController extends BaseApiController {
+
+}

+ 9 - 0
src/main/java/com/goafanti/admin/controller/AdminStarApiController.java

@@ -0,0 +1,9 @@
+package com.goafanti.admin.controller;
+
+import com.goafanti.common.controller.BaseApiController;
+/**
+ * 科技明星
+ */
+public class AdminStarApiController extends BaseApiController{
+
+}

+ 6 - 5
src/main/java/com/goafanti/cognizance/bo/CognizanceOrgInfoBo.java

@@ -28,7 +28,7 @@ public class CognizanceOrgInfoBo {
 
 	private Integer		largeOrder;
 
-	private Integer		accient;
+	private Integer		accident;
 
 	private Integer		year;
 
@@ -118,12 +118,13 @@ public class CognizanceOrgInfoBo {
 		this.basicResearchCost = basicResearchCost;
 	}
 
-	public Integer getAccient() {
-		return accient;
+
+	public Integer getAccident() {
+		return accident;
 	}
 
-	public void setAccient(Integer accient) {
-		this.accient = accient;
+	public void setAccident(Integer accident) {
+		this.accident = accident;
 	}
 
 	public Integer getLargeOrder() {

+ 1 - 1
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -135,7 +135,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 			cog.setTechnicalField3(null == orgInfo.getTechnicalField3() ? 0 : orgInfo.getTechnicalField3());
 			cog.setBasicResearchCost(
 					null == orgInfo.getBasicResearchCost() ? new BigDecimal(0) : orgInfo.getBasicResearchCost());
-			cog.setAccident(null == orgInfo.getAccient() ? 0 : orgInfo.getAccient());
+			cog.setAccident(null == orgInfo.getAccident() ? 0 : orgInfo.getAccident());
 			cog.setLargeOrder(null == orgInfo.getLargeOrder() ? 0 : orgInfo.getLargeOrder());
 			cog.setYear(orgInfo.getYear());
 			cog.setCertificateNumber(orgInfo.getCertificateNumber());

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

@@ -163,6 +163,11 @@ public class WebpageController extends BaseController {
 	public ModelAndView adminHome(HttpServletRequest request, ModelAndView modelview) {
 		return adminToLogin(request, modelview, "/admin/index");
 	}
+	
+	@RequestMapping(value = "/admin/idea", method = RequestMethod.GET)
+	public ModelAndView adminIdea(HttpServletRequest request, ModelAndView modelview) {
+		return adminToLogin(request, modelview, "/admin/idea");
+	}
 
 	@RequestMapping(value = "/portal/search/achievement", method = RequestMethod.GET)
 	public ModelAndView portalSearchAchievement(HttpServletRequest request, ModelAndView modelview) {

+ 15 - 3
src/main/java/com/goafanti/common/mapper/OrgCognizanceMapper.xml

@@ -388,9 +388,21 @@
 	
 	
   <select id="selectCognizanceOrgInfoBoByUidAndCid"  resultType="com.goafanti.cognizance.bo.CognizanceOrgInfoBo">
-		select u.id as uid, c.id as cid, o.unit_name as unitName, o.org_code as orgCode, o.postal_address as postalAddress, 
-			c.contacts, c.technical_field1 as technicalField1, c.technical_field2 as technicalField2, c.technical_field3 as technicalField3,
-			c.basic_research_cost as basicResearchCost, c.accident, c.large_order as largeOrder, c.year, c.certificate_number as certificateNumber
+		select 
+			u.id as uid, 
+			c.id as cid, 
+			o.unit_name as unitName, 
+			o.org_code as orgCode, 
+			o.postal_address as postalAddress, 
+			c.contacts, 
+			c.technical_field1 as technicalField1, 
+			c.technical_field2 as technicalField2, 
+			c.technical_field3 as technicalField3,
+			c.basic_research_cost as basicResearchCost, 
+			c.accident, 
+			c.large_order as largeOrder, 
+			c.year, 
+			c.certificate_number as certificateNumber
     	from  (select id from user where id = #{0}) u
 			LEFT JOIN organization_identity o on u.id = o.uid 
 			INNER JOIN org_cognizance c on c.uid = u.id  and c.deleted_sign = 0 and c.id = #{1}

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

@@ -1039,7 +1039,7 @@
 	</select>
 	
 	
-	<select id="selectAuditorOrgIdentityDetailByUserId" parameterType="java.lang.String" resultType="com.goafanti.user.bo.AuditorOrgIdentityDetailBo">
+	<select id="selectAuditorOrgIdentityDetailByUserId"  resultType="com.goafanti.user.bo.AuditorOrgIdentityDetailBo">
 		select  
 			 u.aid, u.mid,
 			 oi.id, oi.uid,  oi.aft_username as aftUsername,  oi.unit_name as unitName,  oi.identity_type as identityType,
@@ -1056,7 +1056,7 @@
 		from user u 
 		LEFT JOIN organization_identity oi on oi.uid = u.id
 		LEFT JOIN org_ratepay ratepay on ratepay.uid = u.id and ratepay.year = #{year,jdbcType=INTEGER} and deleted_sign = 0
-		where uid = #{uid,jdbcType=VARCHAR}
+		where u.id = #{uid,jdbcType=VARCHAR}
 	</select>
 	
 	<select id="selectManagerUnitNames" resultType="com.goafanti.user.bo.OrgUnitNames"

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

@@ -117,6 +117,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (StringUtils.isNotBlank(employerName)){
 			params.put("employerName", employerName);
 		}
+		
+		if (StringUtils.isNotBlank(username)){
+			params.put("username", username);
+		}
 
 		return (Pagination<DemandManageListBo>) findPage("findManageUserDemandListByPage", "findManageUserDemandCount",
 				params, pNo, pSize);
@@ -156,6 +160,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (StringUtils.isNotBlank(employerName)){
 			params.put("employerName", employerName);
 		}
+		
+		if (StringUtils.isNotBlank(username)){
+			params.put("unitName", username);
+		}
 
 		return (Pagination<DemandManageListBo>) findPage("findManageOrgDemandListByPage", "findManageOrgDemandCount",
 				params, pNo, pSize);

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

@@ -43,9 +43,9 @@ public class OrganizationInfoServiceImpl implements OrganizationInfoService {
 	@Override
 	public int insertInfoAndPro(OrganizationInfo oi, OrganizationProperties op) {
 		OrganizationInfo o = organizationInfoMapper.selectOrgInfoByUserId(TokenManager.getUserId());
+		oi.setUid(TokenManager.getUserId());
 		if (null == o && StringUtils.isBlank(oi.getId())) {
 			oi.setId(UUID.randomUUID().toString());
-			oi.setUid(TokenManager.getUserId());
 			organizationInfoMapper.insert(oi);
 		} else if (null != o && StringUtils.isNotBlank(oi.getId())) {
 			organizationInfoMapper.updateByPrimaryKeySelective(oi);

+ 16 - 0
src/main/webapp/WEB-INF/views/admin/idea.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org">
+<head th:replace="common::header(~{::title},~{::link})">
+	<title>科技思想页</title>
+	<link th:href="${staticHost+'/admin/idea.css'}" rel="stylesheet">
+</head>
+<body>
+	<div id="root"></div>
+	
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${staticHost+'/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${staticHost+'/admin/idea.js'}"></script>
+	</div>
+</body>
+</html>