albertshaw 8 anni fa
parent
commit
f578f316de

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

@@ -652,6 +652,9 @@ public class AdminApiController extends CertifyApiController {
 
 		OrganizationIdentity oi = new OrganizationIdentity();
 		BeanUtils.copyProperties(orgIdentity, oi);
+		if (orgIdentity.getRegisteredCapital() != null) {
+			oi.setRegisteredCapital(new BigDecimal(orgIdentity.getRegisteredCapital()));
+		}
 		if (CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
 			User u = userService.selectByPrimaryKey(oi.getUid());
 			if (!UserLevel.GENERAL.getCode().equals(u.getLvl())) {
@@ -857,8 +860,8 @@ public class AdminApiController extends CertifyApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(orgStandardService.listOrgStandard(year, standardName, standardNumber, standardLevel, participateWay, pNo,
-				pSize, uid));
+		res.setData(orgStandardService.listOrgStandard(year, standardName, standardNumber, standardLevel,
+				participateWay, pNo, pSize, uid));
 		return res;
 	}
 
@@ -1045,8 +1048,8 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
-		
-		if (null == orgIntellectualProperty.getCatagory()){
+
+		if (null == orgIntellectualProperty.getCatagory()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到类别", "类别"));
 			return res;
 		}
@@ -2694,10 +2697,11 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
-		/*if (year - oc.getYear() != 0) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "高企ID及年份"));
-			return res;
-		}*/
+		/*
+		 * if (year - oc.getYear() != 0) {
+		 * res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "",
+		 * "高企ID及年份")); return res; }
+		 */
 
 		res.setData(handleCognizanceDetail(uid, cid, year));
 		return res;

+ 4 - 1
src/main/java/com/goafanti/admin/controller/AdminUserCertifyApiController.java

@@ -1,5 +1,6 @@
 package com.goafanti.admin.controller;
 
+import java.math.BigDecimal;
 import java.util.Calendar;
 
 import javax.annotation.Resource;
@@ -224,7 +225,9 @@ public class AdminUserCertifyApiController extends CertifyApiController {
 
 		OrganizationIdentity oi = new OrganizationIdentity();
 		BeanUtils.copyProperties(orgIdentity, oi);
-
+		if (orgIdentity.getRegisteredCapital() != null) {
+			oi.setRegisteredCapital(new BigDecimal(orgIdentity.getRegisteredCapital()));
+		}
 		if (IdentityAuditStatus.UNCOMMITTED.getCode().equals(oi.getAuditStatus())) {
 			oi.setProcess(IdentityProcess.UNCOMMITTED.getCode());
 		} else if (IdentityAuditStatus.COMMITTED.getCode().equals(oi.getAuditStatus())

+ 2 - 0
src/main/java/com/goafanti/common/constant/ErrorConstants.java

@@ -3,6 +3,8 @@ package com.goafanti.common.constant;
 public class ErrorConstants {
 
 	public static final String	NON_LOGIN							= "NON_LOGIN";
+	
+	public static final String	NO_CERTIFY							= "NO_CERTIFY";
 
 	public static final String	VCODE_ERROR							= "VCODE_ERROR";
 

+ 9 - 5
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -1,5 +1,6 @@
 package com.goafanti.common.controller;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
 
@@ -105,7 +106,7 @@ public class PortalController extends BaseController {
 						industryCategory += (a ? s.getIndustryCategoryAS() : "") + (a && b ? DELIMITER : "")
 								+ (b ? s.getIndustryCategoryBS() : "");
 						s.setIndustryCategory(industryCategory);
-						if (null != s.getBudgetCost()) {
+						if (null != s.getBudgetCost() || s.getBudgetCost().compareTo(BigDecimal.ZERO) > 0) {
 							s.setBudgetCostS(s.getBudgetCost() + UNIT);
 						} else {
 							s.setBudgetCostS(PRICE_NEGOTIABLE);
@@ -177,7 +178,7 @@ public class PortalController extends BaseController {
 								|| AchievementBargainingMode.NEGOTIABLE.getCode().equals(bo.getBargainingMode())) {
 							bo.setTransferPriceS(PRICE_NEGOTIABLE);
 						} else {
-							if (null != bo.getTransferPrice()) {
+							if (null != bo.getTransferPrice() && bo.getTransferPrice().compareTo(BigDecimal.ZERO) > 0) {
 								bo.setTransferPriceS(bo.getTransferPrice() + UNIT);
 							} else {
 								bo.setTransferPriceS(PRICE_NEGOTIABLE);
@@ -186,12 +187,15 @@ public class PortalController extends BaseController {
 						String ulocation = "";
 						String uprovince = bo.getUprovince();
 						String ucity = bo.getUcity();
-						ulocation += (StringUtils.isBlank(uprovince) ? "" : uprovince) + (StringUtils.isBlank(ucity) ? "" : ucity);
+						ulocation += (StringUtils.isBlank(uprovince) ? "" : uprovince)
+								+ (StringUtils.isBlank(ucity) ? "" : ucity);
 						String olocation = "";
 						String oprovince = bo.getOprovince();
 						String ocity = bo.getOcity();
-						olocation += (StringUtils.isBlank(oprovince) ? "" : oprovince) + (StringUtils.isBlank(ocity) ? "" : ocity);
-						bo.setLocation(StringUtils.isNotBlank(ulocation) ? ulocation : (StringUtils.isNotBlank(olocation) ? olocation : ""));
+						olocation += (StringUtils.isBlank(oprovince) ? "" : oprovince)
+								+ (StringUtils.isBlank(ocity) ? "" : ocity);
+						bo.setLocation(StringUtils.isNotBlank(ulocation) ? ulocation
+								: (StringUtils.isNotBlank(olocation) ? olocation : ""));
 					}
 				}
 				mv.addObject("similarList", similarList);

+ 5 - 0
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -785,6 +785,7 @@
   	where a.deleted_sign = 0 and a.owner_type = 1
   	<if test="ownerName != null">
   		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
+  		and  a.owner_id is null
   	</if>
   	<if test="unitName != null">
   		and  oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
@@ -832,9 +833,13 @@
   	select 
   		count(1)
   	from achievement a
+  	<if test="unitName != null">
+  	LEFT JOIN organization_identity oi on a.owner_id = oi.uid
+  	</if>
   	where a.deleted_sign = 0 and a.owner_type = 1
   	<if test="ownerName != null">
   		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
+  		and  a.owner_id is null
   	</if>
   	<if test="unitName != null">
   		and  oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')

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

@@ -206,7 +206,7 @@
   <delete id="batchDeleteByPrimaryKey" parameterType="java.util.List">
   	delete
   		from activity_user
-  	where id in
+  	where aid in
   	<foreach item="item" index="index" collection="list" open="("
 			separator="," close=")">
 			#{item}

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

@@ -770,7 +770,8 @@
   		d.fixed_scheme as fixedScheme, d.cost_escrow as costEscrow, d.employer_id as employerId,
   		info.postal_address as address, u.email as mailbox,  u.mobile as mobile, d.audit_status as auditStatus,
   		d.employer_address as employerAddress, d.employer_contacts_mobile as employerContactsMobile,
-  		d.employer_contacts_mailbox as employerContactsMailbox, d.employer_name as employerName
+  		d.employer_contacts_mailbox as employerContactsMailbox, d.employer_name as employerName,
+  		d.tech_broker_id as techBrokerId,  u.mobile as contactsName
   	from demand d 
   	left join user_identity ui on ui.uid = d.employer_id
   	left join user_info info on info.uid = d.employer_id

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

@@ -244,10 +244,10 @@
   		do.intention_money as intentionMoney, do.contract_money as contractMoney, do.commission,
   		do.service_money as serviceMoney, d.name, d.serial_number as demandSerialNumber,
   		d.deleted_sign as deletedSign, d.audit_status as auditStatus,
-  		do.uid, ui.username
+  		do.uid, ui.nickname as username
   	from demand_order do
   	left join demand d on d.id = do.demand_id
-  	left join user_identity ui on ui.uid = do.uid
+  	left join user ui on ui.id = do.uid
   	where do.deleted_sign = 0 
   	and   d.deleted_sign = 0 
   	and   d.data_category = 0
@@ -261,7 +261,7 @@
   		and d.uid = #{uid,jdbcType=VARCHAR}
   	</if>
   	<if test="username != null">
-  		and ui.username = #{username,jdbcType=VARCHAR}
+  		and ui.nickname = #{username,jdbcType=VARCHAR}
   	</if>
   	order by do.serial_number desc
   	<if test="page_sql!=null">
@@ -274,7 +274,7 @@
   		count(1)
   	from demand_order do
   	left join demand d on d.id = do.demand_id
-  	left join user_identity ui on ui.uid = do.uid
+  	left join user ui on ui.id = do.uid
   	where do.deleted_sign = 0 
   	and   d.deleted_sign = 0 
   	and   d.data_category = 0
@@ -288,7 +288,7 @@
   		and d.uid = #{uid,jdbcType=VARCHAR}
   	</if>
   	<if test="username != null">
-  		and ui.username = #{username,jdbcType=VARCHAR}
+  		and ui.nickname = #{username,jdbcType=VARCHAR}
   	</if>
   </select>
   
@@ -300,10 +300,10 @@
   		do.intention_money as intentionMoney, do.contract_money as contractMoney, do.commission,
   		do.service_money as serviceMoney, d.name, d.serial_number as demandSerialNumber,
   		d.deleted_sign as deletedSign, d.audit_status as auditStatus,
-  		do.uid, oi.unit_name as unitName
+  		do.uid, oi.nickname as unitName
   	from demand_order do
   	left join demand d on d.id = do.demand_id
-  	left join organization_identity oi on oi.uid = do.uid
+  	left join user oi on u.id = do.uid
   	where do.deleted_sign = 0 
   	and   d.deleted_sign = 0 
   	and   d.data_category = 1
@@ -317,7 +317,7 @@
   		and d.uid = #{uid,jdbcType=VARCHAR}
   	</if>
   	<if test="unitName != null">
-  		and oi.unit_name = #{unitName,jdbcType=VARCHAR}
+  		and oi.nickname = #{unitName,jdbcType=VARCHAR}
   	</if>
   	order by do.serial_number desc
   	<if test="page_sql!=null">
@@ -330,7 +330,7 @@
   		count(1)
   	from demand_order do
   	left join demand d on d.id = do.demand_id
-  	left join organization_identity oi on oi.uid = do.uid
+  	left join user oi on oi.id = do.uid
   	where do.deleted_sign = 0 
   	and   d.deleted_sign = 0 
   	and   d.data_category = 1
@@ -344,7 +344,7 @@
   		and d.uid = #{uid,jdbcType=VARCHAR}
   	</if>
     <if test="unitName != null">
-  		and oi.unit_name = #{unitName,jdbcType=VARCHAR}
+  		and oi.nickname = #{unitName,jdbcType=VARCHAR}
   	</if>
   </select>
   

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

@@ -1048,7 +1048,7 @@
 	
 	<select id="selectAuditorOrgIdentityDetailByUserId"  resultType="com.goafanti.user.bo.AuditorOrgIdentityDetailBo">
 		select  
-			 u.aid, u.mid,
+			 u.aid, u.mid, u.lvl,
 			 oi.id, oi.uid,  oi.aft_username as aftUsername,  oi.unit_name as unitName,  oi.identity_type as identityType,
 			 oi.first_contacts as firstContacts,  oi.first_mobile as firstMobile,  oi.second_contacts as secondContacts,
 			 oi.second_mobile as secondMobile,  oi.third_contacts as thirdContacts,  oi.third_mobile as thirdMobile,

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

@@ -346,6 +346,7 @@
   	select 
   		u.aid, 
   		u.mid, 
+  		u.lvl,
   		ui.id, 
   		ui.uid, 
   		ui.username, 

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

@@ -783,7 +783,7 @@
 		u.lvl AS LEVEL,
 		ua.ability_label AS abilityLabel,
 		info.logo_url AS logoUrl,
-		info.company_introduction AS company_introduction,
+		info.company_introduction AS companyIntroduction,
 		info.publicity_picture_url AS publicityPictureUrl,
 		ot.search_area_category as field, 
 		interest.id as interestId

+ 8 - 8
src/main/java/com/goafanti/portal/controller/PortalOrderApiController.java

@@ -133,7 +133,7 @@ public class PortalOrderApiController extends CertifyApiController {
 	@RequestMapping(value = "/orderAchievement", method = RequestMethod.POST)
 	public Result orderAchievement(@Valid InputAchievementOrder order, BindingResult bindingResult) {
 		Result res = new Result();
-		if(TokenManager.getToken() instanceof Admin){
+		if (TokenManager.getUserToken() == null) {
 			res.getError().add(buildError(ErrorConstants.NON_LOGIN));
 			return res;
 		}
@@ -159,14 +159,14 @@ public class PortalOrderApiController extends CertifyApiController {
 		}
 
 		Achievement a = achievementService.selectByPrimaryKey(achievementId);
-	
+
 		if (null == a || !AchievementAuditStatus.AUDITED.getCode().equals(a.getAuditStatus())
 				|| !AchievementReleaseStatus.RELEASED.getCode().equals(a.getReleaseStatus())
 				|| !DeleteStatus.UNDELETE.getCode().equals(a.getDeletedSign())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "科技成果ID"));
 			return res;
 		}
-		if (TokenManager.getUserId().equals(a.getOwnerId())){
+		if (TokenManager.getUserId().equals(a.getOwnerId())) {
 			res.getError().add(buildError("", "无法购买本人发布科技成果!"));
 			return res;
 		}
@@ -260,7 +260,7 @@ public class PortalOrderApiController extends CertifyApiController {
 	@RequestMapping(value = "/orderDemand", method = RequestMethod.POST)
 	public Result orderDemand(@Valid InputDemandOrder inputDemandOrder, BindingResult bindingResult) {
 		Result res = new Result();
-		if(TokenManager.getToken() instanceof Admin){
+		if (TokenManager.getUserToken() == null) {
 			res.getError().add(buildError(ErrorConstants.NON_LOGIN));
 			return res;
 		}
@@ -276,9 +276,9 @@ public class PortalOrderApiController extends CertifyApiController {
 		}
 		List<DemandOrder> demandOrder = demandOrderService.selectDemandOrderByUidAndDemandId(TokenManager.getUserId(),
 				demandId);
-		if (!demandOrder.isEmpty()){
-			for (DemandOrder os : demandOrder){
-				if (!DemandOrderStatus.SHUTDOWN.getCode().equals(os.getStatus())){
+		if (!demandOrder.isEmpty()) {
+			for (DemandOrder os : demandOrder) {
+				if (!DemandOrderStatus.SHUTDOWN.getCode().equals(os.getStatus())) {
 					res.getError().add(buildError("", "当前科技需求已接单!"));
 					return res;
 				}
@@ -291,7 +291,7 @@ public class PortalOrderApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "科技需求ID"));
 			return res;
 		}
-		if (TokenManager.getUserId().equals(d.getEmployerId())){
+		if (TokenManager.getUserId().equals(d.getEmployerId())) {
 			res.getError().add(buildError("", "无法对本人发布科技需求接单!"));
 			return res;
 		}

+ 10 - 0
src/main/java/com/goafanti/user/bo/AuditorOrgIdentityDetailBo.java

@@ -5,6 +5,8 @@ public class AuditorOrgIdentityDetailBo extends OrgIdentityDetailBo {
 
 	private String	mid;
 	
+	private Integer lvl;
+	
 	private String ratepayId;
 
 	public String getAid() {
@@ -30,6 +32,14 @@ public class AuditorOrgIdentityDetailBo extends OrgIdentityDetailBo {
 	public void setRatepayId(String ratepayId) {
 		this.ratepayId = ratepayId;
 	}
+
+	public Integer getLvl() {
+		return lvl;
+	}
+
+	public void setLvl(Integer lvl) {
+		this.lvl = lvl;
+	}
 	
 	
 

+ 10 - 0
src/main/java/com/goafanti/user/bo/AuditorUserIdentityDetailBo.java

@@ -7,6 +7,8 @@ public class AuditorUserIdentityDetailBo extends UserIdentity {
 
 	private String	mid;
 
+	private Integer	lvl;
+
 	public String getAid() {
 		return aid;
 	}
@@ -23,4 +25,12 @@ public class AuditorUserIdentityDetailBo extends UserIdentity {
 		this.mid = mid;
 	}
 
+	public Integer getLvl() {
+		return lvl;
+	}
+
+	public void setLvl(Integer lvl) {
+		this.lvl = lvl;
+	}
+
 }

+ 54 - 52
src/main/resources/props/error.properties

@@ -1,92 +1,94 @@
-org.apache.shiro.authc.UnknownAccountException=\u8d26\u53f7\u6216\u5bc6\u7801\u4e0d\u5339\u914d\u3002
-org.apache.shiro.authc.IncorrectCredentialsException=\u8d26\u53f7\u6216\u5bc6\u7801\u4e0d\u5339\u914d\u3002
-org.apache.shiro.authc.LockedAccountException=\u8be5\u8d26\u53f7\u5df2\u51bb\u7ed3\uff0c\u8bf7\u8054\u7cfb\u7ba1\u7406\u5458\u3002
-org.apache.shiro.authc.DisabledAccountException=\u8be5\u8d26\u53f7\u5df2\u51bb\u7ed3\uff0c\u8bf7\u8054\u7cfb\u7ba1\u7406\u5458\u3002
-org.apache.shiro.authc.ExcessiveAttemptsException=\u5c1d\u8bd5\u6b21\u6570\u8fc7\u591a\uff0c\u8d26\u53f7\u6682\u65f6\u88ab\u9501\u5b9a\uff0c\u8bf7\u7a0d\u540e\u518d\u8bd5\u3002
-org.apache.shiro.session.ExpiredSessionException=\u767b\u5f55\u4fe1\u606f\u5df2\u8fc7\u671f\uff0c\u8bf7\u91cd\u65b0\u767b\u5f55\u3002
-org.springframework.dao.DataIntegrityViolationException=\u670d\u52a1\u5668\u6253\u4e86\u4e2a\u76f9\u513f\uff0c\u8bf7\u8054\u7cfb\u7ba1\u7406\u5458\u6216\u7a0d\u540e\u518d\u8bd5\u3002
-org.springframework.jdbc.BadSqlGrammarException=\u6570\u636e\u5f02\u5e38\uff0c\u8bf7\u8054\u7cfb\u7ba1\u7406\u5458\u6216\u7a0d\u540e\u518d\u8bd5\u3002
-java.text.ParseException=\u53c2\u6570\u683c\u5f0f\u9519\u8bef\uff0c\u8bf7\u6838\u5bf9\u8f93\u5165\u6570\u636e\u540e\u518d\u8bd5\u3002
-java.lang.IllegalArgumentException=\u53c2\u6570\u683c\u5f0f\u9519\u8bef\uff0c\u8bf7\u6838\u5bf9\u8f93\u5165\u6570\u636e\u540e\u518d\u8bd5\u3002
-com.alibaba.fastjson.JSONException=\u53c2\u6570\u683c\u5f0f\u9519\u8bef\uff0c\u8bf7\u6838\u5bf9\u8f93\u5165\u6570\u636e\u540e\u518d\u8bd5\u3002
+org.apache.shiro.authc.UnknownAccountException=\u8D26\u53F7\u6216\u5BC6\u7801\u4E0D\u5339\u914D\u3002
+org.apache.shiro.authc.IncorrectCredentialsException=\u8D26\u53F7\u6216\u5BC6\u7801\u4E0D\u5339\u914D\u3002
+org.apache.shiro.authc.LockedAccountException=\u8BE5\u8D26\u53F7\u5DF2\u51BB\u7ED3\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u3002
+org.apache.shiro.authc.DisabledAccountException=\u8BE5\u8D26\u53F7\u5DF2\u51BB\u7ED3\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u3002
+org.apache.shiro.authc.ExcessiveAttemptsException=\u5C1D\u8BD5\u6B21\u6570\u8FC7\u591A\uFF0C\u8D26\u53F7\u6682\u65F6\u88AB\u9501\u5B9A\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5\u3002
+org.apache.shiro.session.ExpiredSessionException=\u767B\u5F55\u4FE1\u606F\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55\u3002
+org.springframework.dao.DataIntegrityViolationException=\u670D\u52A1\u5668\u6253\u4E86\u4E2A\u76F9\u513F\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6216\u7A0D\u540E\u518D\u8BD5\u3002
+org.springframework.jdbc.BadSqlGrammarException=\u6570\u636E\u5F02\u5E38\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6216\u7A0D\u540E\u518D\u8BD5\u3002
+java.text.ParseException=\u53C2\u6570\u683C\u5F0F\u9519\u8BEF\uFF0C\u8BF7\u6838\u5BF9\u8F93\u5165\u6570\u636E\u540E\u518D\u8BD5\u3002
+java.lang.IllegalArgumentException=\u53C2\u6570\u683C\u5F0F\u9519\u8BEF\uFF0C\u8BF7\u6838\u5BF9\u8F93\u5165\u6570\u636E\u540E\u518D\u8BD5\u3002
+com.alibaba.fastjson.JSONException=\u53C2\u6570\u683C\u5F0F\u9519\u8BEF\uFF0C\u8BF7\u6838\u5BF9\u8F93\u5165\u6570\u636E\u540E\u518D\u8BD5\u3002
 
 
-NON_LOGIN=\u7528\u6237\u672a\u767b\u5f55\u3002
+NON_LOGIN=\u7528\u6237\u672A\u767B\u5F55\u3002
 
-VCODE_ERROR=\u56fe\u5f62\u9a8c\u8bc1\u7801\u8f93\u5165\u9519\u8bef\uff01
+VCODE_ERROR=\u56FE\u5F62\u9A8C\u8BC1\u7801\u8F93\u5165\u9519\u8BEF\uFF01
 
-NO_AUTH_ERROR=\u672a\u6388\u6743\u6216\u6388\u6743\u8fc7\u671f\u3002
+NO_AUTH_ERROR=\u672A\u6388\u6743\u6216\u6388\u6743\u8FC7\u671F\u3002
 
-PARAM_ERROR={0}\u53c2\u6570\u9519\u8bef
+NO_CERTIFY=\u8BA4\u8BC1\u7528\u6237\u624D\u80FD\u4F7F\u7528\u8BE5\u529F\u80FD
 
-PARAM_INTEGER_ERROR={0}\u53c2\u6570\u5fc5\u987b\u4e3a\u6570\u5b57\u3002
+PARAM_ERROR={0}\u53C2\u6570\u9519\u8BEF
 
-PARAM_EMPTY_ERROR={0}\u5fc5\u987b\u6307\u5b9a\u3002
+PARAM_INTEGER_ERROR={0}\u53C2\u6570\u5FC5\u987B\u4E3A\u6570\u5B57\u3002
 
-PARAM_SIZE_ERROR={0}\u53c2\u6570\u957f\u5ea6\u4e0d\u6b63\u786e\uff0c\u5fc5\u987b\u5728{min}\u548c{max}\u4e4b\u95f4\u3002
+PARAM_EMPTY_ERROR={0}\u5FC5\u987B\u6307\u5B9A\u3002
 
-PARAM_PATTERN_ERROR={0}\u53c2\u6570\u683c\u5f0f\u987b\u6b63\u786e\u6307\u5b9a{1}\u3002
+PARAM_SIZE_ERROR={0}\u53C2\u6570\u957F\u5EA6\u4E0D\u6B63\u786E\uFF0C\u5FC5\u987B\u5728{min}\u548C{max}\u4E4B\u95F4\u3002
 
-EMAIL_SIZE_ERROR=\u90ae\u7bb1\u5730\u5740\u957f\u5ea6\u9519\u8bef\uff01
+PARAM_PATTERN_ERROR={0}\u53C2\u6570\u683C\u5F0F\u987B\u6B63\u786E\u6307\u5B9A{1}\u3002
 
-EMAIL_PATTERN_ERROR=\u90ae\u7bb1\u5730\u5740\u683c\u5f0f\u9519\u8bef\uff01
+EMAIL_SIZE_ERROR=\u90AE\u7BB1\u5730\u5740\u957F\u5EA6\u9519\u8BEF\uFF01
 
-MOBILE_SIZE_ERROR=\u624b\u673a\u53f7\u957f\u5ea6\u9519\u8bef\uff01
+EMAIL_PATTERN_ERROR=\u90AE\u7BB1\u5730\u5740\u683C\u5F0F\u9519\u8BEF\uFF01
 
-MOBILE_PATTERN_ERROR=\u624b\u673a\u53f7\u683c\u5f0f\u9519\u8bef\uff01
+MOBILE_SIZE_ERROR=\u624B\u673A\u53F7\u957F\u5EA6\u9519\u8BEF\uFF01
 
-DUNPLICATE_KAY_ERROR={0}\u5df2\u88ab\u4ed6\u4eba\u6ce8\u518c\uff01
+MOBILE_PATTERN_ERROR=\u624B\u673A\u53F7\u683C\u5F0F\u9519\u8BEF\uFF01
 
-DATA_EMPTY_ERROR=\u5f53\u524d{0}\u6ca1\u6709\u6570\u636e\u3002
+DUNPLICATE_KAY_ERROR={0}\u5DF2\u88AB\u4ED6\u4EBA\u6CE8\u518C\uFF01
 
-PWD_NOT_MATCH_ERROR=\u539f\u5bc6\u7801\u8f93\u5165\u4e0d\u5339\u914d\u3002
+DATA_EMPTY_ERROR=\u5F53\u524D{0}\u6CA1\u6709\u6570\u636E\u3002
 
-MCODE_ERROR=\u624b\u673a\u9a8c\u8bc1\u7801\u9519\u8bef\uff01
+PWD_NOT_MATCH_ERROR=\u539F\u5BC6\u7801\u8F93\u5165\u4E0D\u5339\u914D\u3002
 
-NON_CERTIFIED=\u672a\u901a\u8fc7\u5b9e\u540d\u8ba4\u8bc1\uff0c\u65e0\u6cd5\u64cd\u4f5c\uff01
+MCODE_ERROR=\u624B\u673A\u9A8C\u8BC1\u7801\u9519\u8BEF\uFF01
 
-FILE_NON_EXISTENT=\u6587\u4ef6\u4e0d\u5b58\u5728\uff01
+NON_CERTIFIED=\u672A\u901A\u8FC7\u5B9E\u540D\u8BA4\u8BC1\uFF0C\u65E0\u6CD5\u64CD\u4F5C\uFF01
 
-RECORD_CALLBACK=\u5f53\u524d\u8bb0\u5f55\u5df2\u9000\u5355\uff0c\u65e0\u6cd5\u4fee\u6539\uff01
+FILE_NON_EXISTENT=\u6587\u4EF6\u4E0D\u5B58\u5728\uFF01
 
-RECORD_SETTLEMENT=\u5f53\u524d\u8bb0\u5f55\u5df2\u7ed3\u6b3e\uff0c\u65e0\u6cd5\u4fee\u6539\uff01
+RECORD_CALLBACK=\u5F53\u524D\u8BB0\u5F55\u5DF2\u9000\u5355\uFF0C\u65E0\u6CD5\u4FEE\u6539\uFF01
 
-RECORD_REJECT=\u5f53\u524d\u7533\u8bf7\u672a\u901a\u8fc7\uff0c\u65e0\u6cd5\u4fee\u6539\uff0c\u8bf7\u91cd\u65b0\u7533\u8bf7\uff01
+RECORD_SETTLEMENT=\u5F53\u524D\u8BB0\u5F55\u5DF2\u7ED3\u6B3E\uFF0C\u65E0\u6CD5\u4FEE\u6539\uFF01
 
-CONTRACT_PATENT_CREATED=\u5f53\u524d\u5408\u540c\u4e13\u5229\u7533\u8bf7\u5df2\u521b\u5efa,\u65e0\u6cd5\u91cd\u590d\u521b\u5efa\uff01
+RECORD_REJECT=\u5F53\u524D\u7533\u8BF7\u672A\u901A\u8FC7\uFF0C\u65E0\u6CD5\u4FEE\u6539\uFF0C\u8BF7\u91CD\u65B0\u7533\u8BF7\uFF01
 
-CONTRACT_COPYRIGHT_CREATED=\u5f53\u524d\u5408\u540c\u8f6f\u8457\u7533\u8bf7\u5df2\u521b\u5efa,\u65e0\u6cd5\u91cd\u590d\u521b\u5efa\uff01
+CONTRACT_PATENT_CREATED=\u5F53\u524D\u5408\u540C\u4E13\u5229\u7533\u8BF7\u5DF2\u521B\u5EFA,\u65E0\u6CD5\u91CD\u590D\u521B\u5EFA\uFF01
 
-CONTRACT_TECHPROJECT_CREATED=\u5f53\u524d\u5408\u540c\u79d1\u6280\u9879\u76ee\u7533\u8bf7\u5df2\u521b\u5efa,\u65e0\u6cd5\u91cd\u590d\u521b\u5efa\uff01
+CONTRACT_COPYRIGHT_CREATED=\u5F53\u524D\u5408\u540C\u8F6F\u8457\u7533\u8BF7\u5DF2\u521B\u5EFA,\u65E0\u6CD5\u91CD\u590D\u521B\u5EFA\uFF01
 
-CONTRACT_COGNIZANCE_CREATED=\u5f53\u524d\u5408\u540c\u9ad8\u4f01\u8ba4\u5b9a\u7533\u8bf7\u5df2\u521b\u5efa,\u65e0\u6cd5\u91cd\u590d\u521b\u5efa\uff01
+CONTRACT_TECHPROJECT_CREATED=\u5F53\u524D\u5408\u540C\u79D1\u6280\u9879\u76EE\u7533\u8BF7\u5DF2\u521B\u5EFA,\u65E0\u6CD5\u91CD\u590D\u521B\u5EFA\uFF01
 
-EVALUATE_ID=\u8bc4\u4f30\u62a5\u544a\u627e\u4e0d\u5230\uff01
-EVALUATE_STEP=\u9519\u8bef\u7684\u8bc4\u4f30\u6b65\u9aa4\uff01
-EVALUATE_PARAM=\u8bc4\u4f30\u53c2\u6570\u9519\u8bef\uff01
+CONTRACT_COGNIZANCE_CREATED=\u5F53\u524D\u5408\u540C\u9AD8\u4F01\u8BA4\u5B9A\u7533\u8BF7\u5DF2\u521B\u5EFA,\u65E0\u6CD5\u91CD\u590D\u521B\u5EFA\uFF01
 
-CONTRACT_YEAR_SECTION=\u5f53\u524d\u7533\u8bf7\u5e74\u4efd\u5df2\u4e0e\u5176\u4ed6\u5408\u540c\u7533\u8bf7\u5e74\u4efd\u91cd\u53e0\uff0c\u65e0\u6cd5\u63d0\u4ea4\u65b0\u7533\u8bf7\uff01
+EVALUATE_ID=\u8BC4\u4F30\u62A5\u544A\u627E\u4E0D\u5230\uFF01
+EVALUATE_STEP=\u9519\u8BEF\u7684\u8BC4\u4F30\u6B65\u9AA4\uFF01
+EVALUATE_PARAM=\u8BC4\u4F30\u53C2\u6570\u9519\u8BEF\uFF01
 
-VCODE_EMPTY_ERROR=\u56fe\u50cf\u9a8c\u8bc1\u7801\u4e0d\u80fd\u4e3a\u7a7a\uff01
+CONTRACT_YEAR_SECTION=\u5F53\u524D\u7533\u8BF7\u5E74\u4EFD\u5DF2\u4E0E\u5176\u4ED6\u5408\u540C\u7533\u8BF7\u5E74\u4EFD\u91CD\u53E0\uFF0C\u65E0\u6CD5\u63D0\u4EA4\u65B0\u7533\u8BF7\uFF01
 
-MCODE_FREQUENCY_ERROR=\u624b\u673a\u9a8c\u8bc1\u7801\u53d1\u9001\u9891\u7e41\uff01
+VCODE_EMPTY_ERROR=\u56FE\u50CF\u9A8C\u8BC1\u7801\u4E0D\u80FD\u4E3A\u7A7A\uFF01
 
-NON_REGISTER=\u8be5\u7528\u6237\u672a\u6ce8\u518c\uff01
+MCODE_FREQUENCY_ERROR=\u624B\u673A\u9A8C\u8BC1\u7801\u53D1\u9001\u9891\u7E41\uFF01
 
-MCODE_EMPTY_ERROR=\u624b\u673a\u9a8c\u8bc1\u7801\u4e0d\u80fd\u4e3a\u7a7a\uff01
+NON_REGISTER=\u8BE5\u7528\u6237\u672A\u6CE8\u518C\uFF01
 
-MCODE_OVERTIME_ERROR=\u624b\u673a\u9a8c\u8bc1\u7801\u8d85\u65f6\u5931\u6548\uff01
+MCODE_EMPTY_ERROR=\u624B\u673A\u9A8C\u8BC1\u7801\u4E0D\u80FD\u4E3A\u7A7A\uFF01
 
-RESET_CODE_ERROR=\u9875\u9762\u5931\u6548,\u8bf7\u91cd\u65b0\u83b7\u53d6\u9a8c\u8bc1\u7801\uff01
+MCODE_OVERTIME_ERROR=\u624B\u673A\u9A8C\u8BC1\u7801\u8D85\u65F6\u5931\u6548\uFF01
 
-RESET_CODE_OVERTIME=\u9875\u9762\u8d85\u65f6\u5931\u6548,\u8bf7\u91cd\u65b0\u83b7\u53d6\u9a8c\u8bc1\u7801\uff01
+RESET_CODE_ERROR=\u9875\u9762\u5931\u6548,\u8BF7\u91CD\u65B0\u83B7\u53D6\u9A8C\u8BC1\u7801\uFF01
 
-IDENTITY_PAY_OVER_TIME=\u8d85\u8fc7\u6253\u6b3e\u65e5\u671f5\u65e5\uff0c\u65e0\u6cd5\u63d0\u4ea4\u786e\u8ba4\uff01
+RESET_CODE_OVERTIME=\u9875\u9762\u8D85\u65F6\u5931\u6548,\u8BF7\u91CD\u65B0\u83B7\u53D6\u9A8C\u8BC1\u7801\uFF01
 
-OVER_MAX_WRONG_COUNT=\u8f93\u5165\u9519\u8bef\u91d1\u989d\u6b21\u6570\u8fc7\u591a\uff01
+IDENTITY_PAY_OVER_TIME=\u8D85\u8FC7\u6253\u6B3E\u65E5\u671F5\u65E5\uFF0C\u65E0\u6CD5\u63D0\u4EA4\u786E\u8BA4\uFF01
 
-WRONG_MONEY=\u8f93\u5165\u6253\u6b3e\u91d1\u989d\u9519\u8bef\uff0c\u60a8\u8fd8\u6709{0}\u6b21\u673a\u4f1a\uff01
+OVER_MAX_WRONG_COUNT=\u8F93\u5165\u9519\u8BEF\u91D1\u989D\u6B21\u6570\u8FC7\u591A\uFF01
 
-M_CODE_ERROR=\u624b\u673a\u9a8c\u8bc1\u7801\u83b7\u53d6\u5f02\u5e38\uff0c\u8bf7\u7a0d\u540e\u91cd\u8bd5\uff01
+WRONG_MONEY=\u8F93\u5165\u6253\u6B3E\u91D1\u989D\u9519\u8BEF\uFF0C\u60A8\u8FD8\u6709{0}\u6B21\u673A\u4F1A\uFF01
 
-MOBILE_SAME_ERROR=\u65b0\u624b\u673a\u53f7\u5fc5\u987b\u548c\u539f\u624b\u673a\u53f7\u4e0d\u540c\uff01
+M_CODE_ERROR=\u624B\u673A\u9A8C\u8BC1\u7801\u83B7\u53D6\u5F02\u5E38\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\uFF01
+
+MOBILE_SAME_ERROR=\u65B0\u624B\u673A\u53F7\u5FC5\u987B\u548C\u539F\u624B\u673A\u53F7\u4E0D\u540C\uFF01