Browse Source

Accept Merge Request #174 测试 : (master -> test)

Merge Request: 测试
Created By: @albertshaw
Accepted By: @albertshaw
URL: https://coding.net/t/aft/p/AFT/git/merge/174
albertshaw 8 years ago
parent
commit
0d875219d9
26 changed files with 1699 additions and 172 deletions
  1. 26 8
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  2. 81 75
      src/main/java/com/goafanti/cognizance/bo/CognizanceDetailBo.java
  3. 38 36
      src/main/java/com/goafanti/cognizance/bo/CognizanceOrgInfoBo.java
  4. 24 9
      src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java
  5. 2 0
      src/main/java/com/goafanti/cognizance/service/OrgIntellectualPropertyService.java
  6. 1 0
      src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java
  7. 16 10
      src/main/java/com/goafanti/cognizance/service/impl/OrgIntellectualPropertyServiceImpl.java
  8. 45 1
      src/main/java/com/goafanti/common/controller/WebpageController.java
  9. 11 6
      src/main/java/com/goafanti/common/dao/OrgIntellectualPropertyMapper.java
  10. 1 1
      src/main/java/com/goafanti/common/mapper/DemandOrderMapper.xml
  11. 1 1
      src/main/java/com/goafanti/common/mapper/OrgCognizanceMapper.xml
  12. 9 0
      src/main/java/com/goafanti/common/mapper/OrgIntellectualPropertyMapper.xml
  13. 14 7
      src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml
  14. 23 9
      src/main/java/com/goafanti/common/mapper/PatentRegistrationMapper.xml
  15. 1 0
      src/main/java/com/goafanti/common/mapper/UserMapper.xml
  16. 1 1
      src/main/webapp/WEB-INF/views/common.html
  17. 413 1
      src/main/webapp/WEB-INF/views/portal/activity/activityIndex.html
  18. 187 2
      src/main/webapp/WEB-INF/views/portal/activity/details.html
  19. 1 1
      src/main/webapp/WEB-INF/views/portal/detail/demandDetail.html
  20. 1 0
      src/main/webapp/WEB-INF/views/portal/evaluation/index.html
  21. 1 1
      src/main/webapp/WEB-INF/views/portal/financial/financialIndex.html
  22. 243 2
      src/main/webapp/WEB-INF/views/portal/highTech/authentication.html
  23. 203 0
      src/main/webapp/WEB-INF/views/portal/news/newsDetails.html
  24. 354 1
      src/main/webapp/WEB-INF/views/portal/news/newsIndex.html
  25. 1 0
      src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html
  26. 1 0
      src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html

+ 26 - 8
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -489,9 +489,9 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到保存提交方式", "保存提交方式"));
 			return res;
 		}
-		
+
 		UserIdentity idd = userIdentityService.selectUserIdentityByUserId(userIdentity.getUid());
-		if (IdentityAuditStatus.COMMITTED.getCode().equals(idd.getAuditStatus())){
+		if (IdentityAuditStatus.COMMITTED.getCode().equals(idd.getAuditStatus())) {
 			res.getError().add(buildError("", "审核中,无法保存或提交!"));
 			return res;
 		}
@@ -597,9 +597,9 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "保存提交方式"));
 			return res;
 		}
-		
+
 		OrganizationIdentity idd = organizationIdentityService.selectOrgIdentityByUserId(orgIdentity.getUid());
-		if (IdentityAuditStatus.COMMITTED.getCode().equals(idd.getAuditStatus())){
+		if (IdentityAuditStatus.COMMITTED.getCode().equals(idd.getAuditStatus())) {
 			res.getError().add(buildError("", "审核中,无法保存或提交!"));
 			return res;
 		}
@@ -1017,6 +1017,11 @@ public class AdminApiController extends CertifyApiController {
 		if (!checkCertify(res, orgIntellectualProperty.getUid()).getError().isEmpty()) {
 			return res;
 		}
+
+		OrgIntellectualProperty p = orgIntellectualPropertyService.findByUidAndIntellectualPropertyNumber(
+				orgIntellectualProperty.getUid(), orgIntellectualProperty.getIntellectualPropertyNumber());
+		
+
 		if (!StringUtils.isBlank(authorizationDateFormattedDate)) {
 			try {
 				orgIntellectualProperty.setAuthorizationDate(
@@ -1028,12 +1033,20 @@ public class AdminApiController extends CertifyApiController {
 		BeanUtils.copyProperties(orgIntellectualProperty, oip);
 
 		if (StringUtils.isBlank(oip.getId())) {
+			if (null != p) {
+				res.getError().add(buildError("", "当前知识产权编号已录入,无法重复提交!"));
+				return res;
+			}
 			oip.setId(UUID.randomUUID().toString());
 			oip.setEvaluationCategory((oip.getCatagory() >= 2 && oip.getCatagory() <= 4) ? 1 : 0);
 			oip.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			oip.setType(IntellectualPropertyType.COMMON.getCode());
 			res.setData(orgIntellectualPropertyService.insert(oip));
 		} else {
+			if (null != p && !p.getId().equals(oip.getId())){
+				res.getError().add(buildError("", "当前知识产权编号已录入,无法重复提交!"));
+				return res;
+			}
 			oip.setEvaluationCategory(orgIntellectualProperty.getCatagory() <= 2 ? 1 : 0);
 			res.setData(orgIntellectualPropertyService.updateByPrimaryKeySelective(oip));
 		}
@@ -1515,12 +1528,13 @@ public class AdminApiController extends CertifyApiController {
 		OrgActivityCost oac = new OrgActivityCost();
 		BeanUtils.copyProperties(orgActivityCost, oac);
 
-		if (null != orgActivityCostService.selectOrgActivityCostByAidAndYear(oac.getAid(), oac.getYear())) {
-			res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目当前年份费用详情已录入!"));
-			return res;
-		}
+		OrgActivityCost ccc = orgActivityCostService.selectOrgActivityCostByAidAndYear(oac.getAid(), oac.getYear());
 
 		if (StringUtils.isBlank(oac.getId())) {
+			if (null != ccc) {
+				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目当前年份费用详情已录入!"));
+				return res;
+			}
 			OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(oac.getAid());
 			if (null != ac) {
 				Calendar c = Calendar.getInstance();
@@ -1543,6 +1557,10 @@ public class AdminApiController extends CertifyApiController {
 				return res;
 			}
 		} else {
+			if (null != ccc && !ccc.getId().equals(oac.getId())) {
+				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目当前年份费用详情已录入!"));
+				return res;
+			}
 			orgActivityCostService.updateByPrimaryKeySelective(oac);
 		}
 		return res;

+ 81 - 75
src/main/java/com/goafanti/cognizance/bo/CognizanceDetailBo.java

@@ -9,149 +9,162 @@ import com.fasterxml.jackson.annotation.JsonFormat.Shape;
  * 高企认定明细
  */
 public class CognizanceDetailBo {
-	private String uid;
-	
-	private String cid;
-	
+	private String		uid;
+
+	private String		cid;
+
 	/**
 	 * 公司名称
 	 */
-	private String unitName;
-	
+	private String		unitName;
+
 	/**
 	 * 公司组织机构代码
 	 */
-	private String orgCode;
-	
+	private String		orgCode;
+
 	/**
 	 * 公司地址
 	 */
-	private String postalAddress;
-	
+	private String		postalAddress;
+
 	/**
 	 * 联系人
 	 */
-	private String contacts;
-	
+	private String		contacts;
+
 	/**
 	 * 技术领域1st
 	 */
-    private Integer technicalField1;
-	
-    /**
-     * 技术领域2nd
-     */
-    private Integer technicalField2;
-    
-    /**
-     * 技术领域3rd
-     */
-	private Integer technicalField3;
-	
+	private Integer		technicalField1;
+
+	/**
+	 * 技术领域2nd
+	 */
+	private Integer		technicalField2;
+
+	/**
+	 * 技术领域3rd
+	 */
+	private Integer		technicalField3;
+
 	/**
 	 * 一类知识产权数量
 	 */
-	private Integer firstCatagory;
-	
+	private Integer		firstCatagory;
+
 	/**
 	 * 二类知识产权数量
 	 */
-	private Integer secondCatagory;
-	
+	private Integer		secondCatagory;
+
 	/**
 	 * 职工总数
 	 */
-	private Integer firmTotal;
-	
+	private Integer		firmTotal;
+
 	/**
 	 * 科技人员总数
 	 */
-	private Integer techTotal;
-	
+	private Integer		techTotal;
+
 	/**
 	 * 第一年所有者权益(净资产)
 	 */
-	private BigDecimal netAsset1;
-	
+	private BigDecimal	netAsset1;
+
 	/**
 	 * 第一年销售收入
 	 */
-	private BigDecimal salesRevenue1;
-	
+	private BigDecimal	salesRevenue1;
+
 	/**
 	 * 第一年利润总额
 	 */
-	private BigDecimal grossProfit1;
-	
+	private BigDecimal	grossProfit1;
+
 	/**
 	 * 第二年所有者权益(净资产)
 	 */
-	private BigDecimal netAsset2;
-	
+	private BigDecimal	netAsset2;
+
 	/**
 	 * 第二年销售收入
 	 */
-	private BigDecimal salesRevenue2;
-	
+	private BigDecimal	salesRevenue2;
+
 	/**
 	 * 第二年利润总额
 	 */
-	private BigDecimal grossProfit2;
-	
+	private BigDecimal	grossProfit2;
+
 	/**
 	 * 第三年所有者权益(净资产)
 	 */
-	private BigDecimal netAsset3;
-	
+	private BigDecimal	netAsset3;
+
 	/**
 	 * 第三年销售收入
 	 */
-	private BigDecimal salesRevenue3;
-	
+	private BigDecimal	salesRevenue3;
+
 	/**
 	 * 第三年利润总额
 	 */
-	private BigDecimal grossProfit3;
-	
+	private BigDecimal	grossProfit3;
+
 	/**
 	 * 近三年研发费用总额
 	 */
-	private BigDecimal researchCost;
-	
+	private BigDecimal	researchCost;
+
 	/**
 	 * 在中国境内研发费用
 	 */
-	private BigDecimal territory;
-	
+	private BigDecimal	territory;
+
 	/**
 	 * 基础研究投入费用
 	 */
-	private BigDecimal basicResearchCost;
-	
+	private BigDecimal	basicResearchCost;
+
 	/**
 	 * 近一年企业总收入
 	 */
-	private BigDecimal totalRevenue;
-	
+	private BigDecimal	totalRevenue;
+
 	/**
 	 * 近一年高新技术产品(服务)收入
 	 */
-	private BigDecimal lastYearRevenue;
-	
+	private BigDecimal	lastYearRevenue;
+
 	/**
 	 * 申请认定前一年内是否发生过重大安全、重大质量或严重环境违法行为
 	 */
-	private Integer accident;
-	
+	private Integer		accident;
+
 	/**
 	 * 是否为大额订单
 	 */
-	private Integer largeOrder;
-	
+	private Integer		largeOrder;
+
 	/**
 	 * 年份
 	 */
-	private Integer year;
+	private Integer		year;
+	
+	/**
+	 * 证书编号
+	 */
+	private String		certificateNumber;
+	
+	public String getCertificateNumber() {
+		return certificateNumber;
+	}
+
+	public void setCertificateNumber(String certificateNumber) {
+		this.certificateNumber = certificateNumber;
+	}
 
 	public String getUid() {
 		return uid;
@@ -193,8 +206,6 @@ public class CognizanceDetailBo {
 		this.postalAddress = postalAddress;
 	}
 
-	
-
 	public String getContacts() {
 		return contacts;
 	}
@@ -211,7 +222,7 @@ public class CognizanceDetailBo {
 	public void setTechnicalField1(Integer technicalField1) {
 		this.technicalField1 = technicalField1;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getTechnicalField2() {
 		return technicalField2;
@@ -262,7 +273,6 @@ public class CognizanceDetailBo {
 		this.techTotal = techTotal;
 	}
 
-	
 	public BigDecimal getNetAsset1() {
 		return netAsset1;
 	}
@@ -382,7 +392,7 @@ public class CognizanceDetailBo {
 	public void setAccident(Integer accident) {
 		this.accident = accident;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getLargeOrder() {
 		return largeOrder;
@@ -399,9 +409,5 @@ public class CognizanceDetailBo {
 	public void setYear(Integer year) {
 		this.year = year;
 	}
-	
-	
-	
-	
-	
+
 }

+ 38 - 36
src/main/java/com/goafanti/cognizance/bo/CognizanceOrgInfoBo.java

@@ -6,32 +6,33 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 
 public class CognizanceOrgInfoBo {
-	private String uid;
-	
-	private String cid;
-	
-	private String unitName;
-	
-	private String orgCode;
-	
-	private String postalAddress;
-	
-	private Integer contacts;
-	
-	private Integer technicalField1;
-	
-	private Integer technicalField2;
-	
-	private Integer technicalField3;
-	
-	private BigDecimal basicResearchCost;
-	
-	private Integer largeOrder;
-
-	private Integer accient;
-	
-	private Integer year;
-	
+	private String		uid;
+
+	private String		cid;
+
+	private String		unitName;
+
+	private String		orgCode;
+
+	private String		postalAddress;
+
+	private Integer		contacts;
+
+	private Integer		technicalField1;
+
+	private Integer		technicalField2;
+
+	private Integer		technicalField3;
+
+	private BigDecimal	basicResearchCost;
+
+	private Integer		largeOrder;
+
+	private Integer		accient;
+
+	private Integer		year;
+
+	private String		certificateNumber;
 
 	public String getUid() {
 		return uid;
@@ -82,7 +83,6 @@ public class CognizanceOrgInfoBo {
 		this.contacts = contacts;
 	}
 
-
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getTechnicalField1() {
 		return technicalField1;
@@ -91,7 +91,7 @@ public class CognizanceOrgInfoBo {
 	public void setTechnicalField1(Integer technicalField1) {
 		this.technicalField1 = technicalField1;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getTechnicalField2() {
 		return technicalField2;
@@ -100,7 +100,7 @@ public class CognizanceOrgInfoBo {
 	public void setTechnicalField2(Integer technicalField2) {
 		this.technicalField2 = technicalField2;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getTechnicalField3() {
 		return technicalField3;
@@ -110,7 +110,6 @@ public class CognizanceOrgInfoBo {
 		this.technicalField3 = technicalField3;
 	}
 
-
 	public BigDecimal getBasicResearchCost() {
 		return basicResearchCost;
 	}
@@ -142,10 +141,13 @@ public class CognizanceOrgInfoBo {
 	public void setYear(Integer year) {
 		this.year = year;
 	}
-	
-	
-	
-	
-	
-	
+
+	public String getCertificateNumber() {
+		return certificateNumber;
+	}
+
+	public void setCertificateNumber(String certificateNumber) {
+		this.certificateNumber = certificateNumber;
+	}
+
 }

+ 24 - 9
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -1427,10 +1427,10 @@ public class CognizanceApiController extends CertifyApiController {
 
 		OrgActivityCost oac = new OrgActivityCost();
 		BeanUtils.copyProperties(orgActivityCost, oac);
-
+		OrgActivityCost ccc = orgActivityCostService.selectOrgActivityCostByUidAndAid(oac.getAid(),
+				TokenManager.getUserId());
 		if (StringUtils.isBlank(oac.getId())) {
-			if (null != orgActivityCostService.selectOrgActivityCostByUidAndAid(oac.getAid(),
-					TokenManager.getUserId())) {
+			if (null != ccc) {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目费用详情已录入!"));
 				return res;
 			}
@@ -1443,6 +1443,10 @@ public class CognizanceApiController extends CertifyApiController {
 			oac.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			orgActivityCostService.insert(oac);
 		} else {
+			if (null != ccc && !ccc.getId().equals(oac.getId())){
+				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目费用详情已录入!"));
+				return res;
+			}
 			orgActivityCostService.updateByPrimaryKeySelective(oac);
 		}
 		return res;
@@ -1602,15 +1606,18 @@ public class CognizanceApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkUserLogin(res)) {
-			return res;
-		}
-
 		User curUser = TokenManager.getUserToken();
 		if (!checkCertify(res, curUser)) {
 			return res;
 		}
-
+		
+		if (StringUtils.isBlank(orgIntellectualProperty.getIntellectualPropertyNumber())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "知识产权编号", "知识产权编号"));
+			return res;
+		}
+		
+		OrgIntellectualProperty p = orgIntellectualPropertyService.findByUidAndIntellectualPropertyNumber(TokenManager.getUserId(), orgIntellectualProperty.getIntellectualPropertyNumber());
+		
 		if (!StringUtils.isBlank(authorizationDateFormattedDate)) {
 			try {
 				orgIntellectualProperty.setAuthorizationDate(
@@ -1622,6 +1629,10 @@ public class CognizanceApiController extends CertifyApiController {
 		BeanUtils.copyProperties(orgIntellectualProperty, oip);
 
 		if (StringUtils.isBlank(oip.getId())) {
+			if (null != p){
+				res.getError().add(buildError("", "当前知识产权编号已录入,无法重复提交!"));
+				return res;
+			}
 			oip.setId(UUID.randomUUID().toString());
 			oip.setUid(TokenManager.getUserId());
 			oip.setEvaluationCategory((oip.getCatagory() >= 2 && oip.getCatagory() <= 4) ? 1 : 0);
@@ -1629,6 +1640,10 @@ public class CognizanceApiController extends CertifyApiController {
 			oip.setType(IntellectualPropertyType.COMMON.getCode());
 			res.setData(orgIntellectualPropertyService.insert(oip));
 		} else {
+			if (null != p && !p.getId().equals(oip.getId())){
+				res.getError().add(buildError("", "当前知识产权编号已录入,无法重复提交!"));
+				return res;
+			}
 			oip.setEvaluationCategory(oip.getCatagory() <= 2 ? 1 : 0);
 			res.setData(orgIntellectualPropertyService.updateByPrimaryKeySelective(oip));
 		}
@@ -1723,7 +1738,7 @@ public class CognizanceApiController extends CertifyApiController {
 		if (StringUtils.isBlank(otp.getId())) {
 			OrgTechProduct product = orgTechProductService.findBySerialNumberAndUid(otp.getSerialNumber(),
 					TokenManager.getUserId());
-			if (null != product){
+			if (null != product) {
 				res.getError().add(buildError("", "产品编号重复,无法保存!"));
 				return res;
 			}

+ 2 - 0
src/main/java/com/goafanti/cognizance/service/OrgIntellectualPropertyService.java

@@ -31,4 +31,6 @@ public interface OrgIntellectualPropertyService {
 
 	List<OrgIntellectualProperty> selectIntellectualPropertyList(Integer year, String uid);
 
+	OrgIntellectualProperty findByUidAndIntellectualPropertyNumber(String userId, String intellectualPropertyNumber);
+
 }

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

@@ -137,6 +137,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 			cog.setAccident(null == orgInfo.getAccient() ? 0 : orgInfo.getAccient());
 			cog.setLargeOrder(null == orgInfo.getLargeOrder() ? 0 : orgInfo.getLargeOrder());
 			cog.setYear(orgInfo.getYear());
+			cog.setCertificateNumber(orgInfo.getCertificateNumber());
 		}
 
 		CognizanceResearchCostBo researchCost = orgCognizanceMapper.selectCognizanceResearchCostBoByUidAndYear(year,

+ 16 - 10
src/main/java/com/goafanti/cognizance/service/impl/OrgIntellectualPropertyServiceImpl.java

@@ -39,29 +39,29 @@ public class OrgIntellectualPropertyServiceImpl extends BaseMybatisDao<OrgIntell
 		Map<String, Object> params = new HashMap<>();
 		Date sDate = null;
 		Date eDate = null;
-		if (!StringUtils.isBlank(uid)){
+		if (!StringUtils.isBlank(uid)) {
 			params.put("uid", uid);
 		}
-		
-		if (!StringUtils.isBlank(startDate)){
+
+		if (!StringUtils.isBlank(startDate)) {
 			try {
 				sDate = DateUtils.parseDate(startDate, AFTConstants.YYYYMMDD);
 			} catch (ParseException e) {
 			}
 		}
-		
-		if (!StringUtils.isBlank(endDate)){
+
+		if (!StringUtils.isBlank(endDate)) {
 			try {
-				eDate = DateUtils.addDays(DateUtils.parseDate(endDate, AFTConstants.YYYYMMDD),1);
+				eDate = DateUtils.addDays(DateUtils.parseDate(endDate, AFTConstants.YYYYMMDD), 1);
 			} catch (ParseException e) {
 			}
 		}
-		
-		if (null != sDate){
+
+		if (null != sDate) {
 			params.put("sDate", sDate);
 		}
-		
-		if (null != eDate){
+
+		if (null != eDate) {
 			params.put("eDate", eDate);
 		}
 
@@ -134,4 +134,10 @@ public class OrgIntellectualPropertyServiceImpl extends BaseMybatisDao<OrgIntell
 		return orgIntellectualPropertyMapper.selectIntellectualPropertyList(year, uid);
 	}
 
+	@Override
+	public OrgIntellectualProperty findByUidAndIntellectualPropertyNumber(String uid,
+			String intellectualPropertyNumber) {
+		return orgIntellectualPropertyMapper.findByUidAndIntellectualPropertyNumber(uid, intellectualPropertyNumber);
+	}
+
 }

+ 45 - 1
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -380,9 +380,53 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 	
+	/**
+	 * 评估页
+	 */
+	@RequestMapping(value = "/portal/evaluation/index", method = RequestMethod.GET)
+	public ModelAndView evaluation(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/portal/evaluation/index");
+		return modelview;
+	}
 	
-
+	/**
+	 * 策源地
+	 * @param request
+	 * @param modelview
+	 * @return
+	 */
+	@RequestMapping(value = "/portal/news/newsIndex", method = RequestMethod.GET)
+	public ModelAndView portalNewsNewsIndex(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/portal/news/newsIndex");
+		return modelview;
+	}
 	
+	/**
+	 * 服务汇
+	 */
+	@RequestMapping(value = "/portal/service/serviceIndex", method = RequestMethod.GET)
+	public ModelAndView portalServiceServiceIndex(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/portal/service/serviceIndex");
+		return modelview;
+	}
+	
+	/**
+	 * 新闻详情
+	 */
+	@RequestMapping(value = "/portal/news/newsDetails", method = RequestMethod.GET)
+	public ModelAndView portalNewsNewsDetails(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/portal/news/newsDetails");
+		return modelview;
+	}
+	
+	/**
+	 * 技术交易 
+	 */
+	@RequestMapping(value = "/portal/technologyTrading/index", method = RequestMethod.GET)
+	public ModelAndView portalTechnologyTradingIndex(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/portal/technologyTrading/index");
+		return modelview;
+	}
 
 	private ModelAndView userLogin(HttpServletRequest request, ModelAndView modelview, String next) {
 		String key = TokenManager.getUserId();

+ 11 - 6
src/main/java/com/goafanti/common/dao/OrgIntellectualPropertyMapper.java

@@ -2,22 +2,24 @@ package com.goafanti.common.dao;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.goafanti.cognizance.bo.AnnualReportPropertyRightBo;
 import com.goafanti.cognizance.bo.OrgIntellectualPropertyDetailBo;
 import com.goafanti.common.model.OrgIntellectualProperty;
 
 public interface OrgIntellectualPropertyMapper {
-    int deleteByPrimaryKey(String id);
+	int deleteByPrimaryKey(String id);
 
-    int insert(OrgIntellectualProperty record);
+	int insert(OrgIntellectualProperty record);
 
-    int insertSelective(OrgIntellectualProperty record);
+	int insertSelective(OrgIntellectualProperty record);
 
-    OrgIntellectualProperty selectByPrimaryKey(String id);
+	OrgIntellectualProperty selectByPrimaryKey(String id);
 
-    int updateByPrimaryKeySelective(OrgIntellectualProperty record);
+	int updateByPrimaryKeySelective(OrgIntellectualProperty record);
 
-    int updateByPrimaryKey(OrgIntellectualProperty record);
+	int updateByPrimaryKey(OrgIntellectualProperty record);
 
 	int batchDeleteByPrimaryKey(List<String> id);
 
@@ -32,4 +34,7 @@ public interface OrgIntellectualPropertyMapper {
 	AnnualReportPropertyRightBo selectIntellectualPropertyCount(Integer year, String uid);
 
 	Integer findIntellectualPropertyNum(String uid);
+
+	OrgIntellectualProperty findByUidAndIntellectualPropertyNumber(@Param("uid") String uid,
+			@Param("intellectualPropertyNumber") String intellectualPropertyNumber);
 }

+ 1 - 1
src/main/java/com/goafanti/common/mapper/DemandOrderMapper.xml

@@ -310,7 +310,7 @@
   	<if test="uid != null">
   		and d.uid = #{uid,jdbcType=VARCHAR}
   	</if>
-  	<if test="username != null">
+  	<if test="unitName != null">
   		and oi.unit_name = #{unitName,jdbcType=VARCHAR}
   	</if>
   	order by do.serial_number desc

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

@@ -390,7 +390,7 @@
   <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.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}

+ 9 - 0
src/main/java/com/goafanti/common/mapper/OrgIntellectualPropertyMapper.xml

@@ -388,4 +388,13 @@
   		deleted_sign = 0
   	and uid = #{uid,jdbcType=VARCHAR}
   </select>
+  
+   <select id="findByUidAndIntellectualPropertyNumber" resultMap="BaseResultMap" >
+    select 
+    <include refid="Base_Column_List" />
+    from org_intellectual_property
+    where uid = #{uid,jdbcType=VARCHAR}
+    and intellectual_Property_number = #{intellectualPropertyNumber,jdbcType=VARCHAR}
+    and deleted_sign = 0
+  </select>
 </mapper>

+ 14 - 7
src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml

@@ -815,13 +815,21 @@
 
 	<select id="findNoticeOfCorrectionListByPage" parameterType="String"
 		resultType="com.goafanti.patent.bo.PatentNoticeOfCorrectionBo">
-		select p.uid as uid ,p.id as pid , o.id as oid , p.serial_number as
-		serialNumber , p.patent_number as patentNumber ,
-		p.patent_name as patentName , p.office ,
-		o.location_province as locationProvince,
-		o.unit_name as unitName , p.patent_catagory as
+	 select
+		p.uid as uid ,
+		p.id as pid , 
+		o.id as oid , 
+		p.serial_number as serialNumber , 
+		p.patent_number as patentNumber ,
+		p.patent_name as patentName , 
+		p.office ,
+		o.licence_province as locationProvince,
+		o.unit_name as unitName , 
+		p.patent_catagory as
 		patentCatagory ,
-		p.patent_state as patentState , a.name as author , p.record_time as
+		p.patent_state as patentState , 
+		a.name as author , 
+		p.record_time as
 		recordTime
 		FROM patent_info p
 		LEFT JOIN organization_identity o ON o.uid = p.uid
@@ -831,7 +839,6 @@
 		</if>
 		where p.patent_state in
 		(6,8) and p.deleted_sign = 0
-		
 		<if test="principal != null">
 			and l.principal = #{principal,jdbcType=VARCHAR}
 		</if>

+ 23 - 9
src/main/java/com/goafanti/common/mapper/PatentRegistrationMapper.xml

@@ -204,15 +204,29 @@
   </update>
   
   <select id="findRecieveSendList" resultType="com.goafanti.patent.bo.PatentRecieveSendBo">
-  select p.id as pid ,p.uid as uid, o.id as oid, r.id as rid, p.serial_number as serialNumber ,p.patent_number as patentNumber ,
-         o.location_province as locationProvince , o.unit_name as unitName ,
-         p.patent_catagory as patentCatagory , p.patent_name as patentName,
- 	     r.acceptance_receive_time as acceptanceReceiveTime , r.acceptance_issue_time as acceptanceIssueTime, 
-  	     r.acceptance_tracking_number as acceptanceTrackingNumber , r.acceptance_express_company as acceptanceExpressCompany,
-         r.authorization_receive_time as authorizationReceiveTime , r.authorization_issue_time as authorizationIssueTime, 
-         r.authorization_tracking_number as authorizationTrackingNumber , r.authorization_express_company as authorizationExpressCompany,
-         r.certificate_recieve_time as certificateRecieveTime, r.certificate_issue_time as certificateIssueTime, 
-         r.certificate_tracking_number as certificateTrackingNumber, r.certificate_express_company as certificateExpressCompany
+  	select 
+  		p.id as pid ,
+  		p.uid as uid, 
+  		o.id as oid, 
+  		r.id as rid, 
+  		p.serial_number as serialNumber ,
+  		p.patent_number as patentNumber ,
+        o.licence_province as locationProvince , 
+        o.unit_name as unitName ,
+        p.patent_catagory as patentCatagory , 
+        p.patent_name as patentName,
+ 	    r.acceptance_receive_time as acceptanceReceiveTime , 
+ 	    r.acceptance_issue_time as acceptanceIssueTime, 
+  	    r.acceptance_tracking_number as acceptanceTrackingNumber , 
+  	    r.acceptance_express_company as acceptanceExpressCompany,
+        r.authorization_receive_time as authorizationReceiveTime , 
+        r.authorization_issue_time as authorizationIssueTime, 
+        r.authorization_tracking_number as authorizationTrackingNumber , 
+        r.authorization_express_company as authorizationExpressCompany,
+        r.certificate_recieve_time as certificateRecieveTime, 
+        r.certificate_issue_time as certificateIssueTime, 
+        r.certificate_tracking_number as certificateTrackingNumber, 
+        r.certificate_express_company as certificateExpressCompany
 		from patent_info p 
 		LEFT  JOIN patent_registration r  on p.id = r.pid
 		LEFT JOIN organization_identity o on o.uid = p.uid

+ 1 - 0
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -361,6 +361,7 @@
 	LEFT JOIN user_identity i on u.id = i.uid
    
     where u.aid = #{aid,jdbcType=VARCHAR}
+    order by u.number desc
   </select>
   
   <select id="findUserByNameAndMobile" resultType="java.lang.String">

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/common.html


File diff suppressed because it is too large
+ 413 - 1
src/main/webapp/WEB-INF/views/portal/activity/activityIndex.html


File diff suppressed because it is too large
+ 187 - 2
src/main/webapp/WEB-INF/views/portal/activity/details.html


+ 1 - 1
src/main/webapp/WEB-INF/views/portal/detail/demandDetail.html

@@ -32,7 +32,7 @@
 			</div>
 			<div class="col-md-5">
 				<ul class="nav_content">
-					<li><a href="/protal/search/demand.html">技术交易</a></li>
+					<li><a th:href="${basePath + '/portal/search/demand.html'}">技术交易</a></li>
 					<li class="active"><a href="#">需求</a></li>
 				</ul>
 			</div>

File diff suppressed because it is too large
+ 1 - 0
src/main/webapp/WEB-INF/views/portal/evaluation/index.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/financial/financialIndex.html


File diff suppressed because it is too large
+ 243 - 2
src/main/webapp/WEB-INF/views/portal/highTech/authentication.html


File diff suppressed because it is too large
+ 203 - 0
src/main/webapp/WEB-INF/views/portal/news/newsDetails.html


File diff suppressed because it is too large
+ 354 - 1
src/main/webapp/WEB-INF/views/portal/news/newsIndex.html


File diff suppressed because it is too large
+ 1 - 0
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html


File diff suppressed because it is too large
+ 1 - 0
src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html