Antiloveg 8 years ago
parent
commit
28fd6c0ea7

+ 0 - 4
src/main/java/com/goafanti/admin/bo/InputAdmin.java

@@ -1,6 +1,5 @@
 package com.goafanti.admin.bo;
 
-import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 
 import com.goafanti.common.constant.ErrorConstants;
@@ -10,7 +9,6 @@ public class InputAdmin {
 	private String	id;
 
 	@Size(min = 0, max = 11, message = "{" + ErrorConstants.MOBILE_SIZE_ERROR + "}")
-	@Pattern(regexp = "^([1-9])\\d{10}$", message = "{" + ErrorConstants.MOBILE_PATTERN_ERROR + "}")
 	private String	mobile;
 
 	@Size(min = 0, max = 6, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
@@ -20,8 +18,6 @@ public class InputAdmin {
 	private String	password;
 
 	@Size(min = 0, max = 255, message = "{" + ErrorConstants.EMAIL_SIZE_ERROR + "}")
-	@Pattern(regexp = "^([a-z0-9A-Z]+[_|\\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z]{2,}$", message = "{"
-			+ ErrorConstants.EMAIL_PATTERN_ERROR + "}")
 	private String	email;
 
 	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")

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

@@ -1587,7 +1587,8 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "研发活动id"));
 			return res;
 		}
-		res.setData(orgActivityService.selectDetailById(id));
+		Calendar a =Calendar.getInstance();
+		res.setData(orgActivityService.selectDetailByIdAndYear(id, a.get(Calendar.YEAR)-1));
 		return res;
 		
 	}

+ 20 - 21
src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java

@@ -281,7 +281,7 @@ public class AdminPatentApiController extends CertifyApiController {
 	}
 
 	/**
-	 * 专利相关材料上传
+	 * 专利相关材料上传(专利稿件,授权通知书,专利证书)
 	 * 
 	 * @param req
 	 * @param uid
@@ -319,8 +319,7 @@ public class AdminPatentApiController extends CertifyApiController {
 		}
 
 		AttachmentType attachmentType = AttachmentType.getField(sign);
-		if (attachmentType == AttachmentType.PATENT_PRORY_STATEMENT || attachmentType == AttachmentType.PATENT_WRITING
-				|| attachmentType == AttachmentType.AUTHORIZATION_NOTICE
+		if (attachmentType == AttachmentType.PATENT_WRITING || attachmentType == AttachmentType.AUTHORIZATION_NOTICE
 				|| attachmentType == AttachmentType.PATENT_CERTIFICATE) {
 			res.setData(handleFiles(res, "/patent/", true, req, sign, uid));
 		} else {
@@ -695,13 +694,13 @@ public class AdminPatentApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "专利记录ID", "专利记录ID"));
 			return res;
 		}
-		
+
 		PatentInfo p = patentInfoService.selectByPrimaryKey(pid);
-		if (null == p){
+		if (null == p) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
 			return res;
 		}
-		
+
 		if (PatentInfoStatus.CALLBACK.getCode() == p.getPatentState()) {
 			res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前申请已退单,无法修改!"));
 			return res;
@@ -711,7 +710,7 @@ public class AdminPatentApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前申请已结款,无法修改!"));
 			return res;
 		}
-		
+
 		patentRegistrationService.updateByPrimaryKey(regBo2Reg(rid, pid, patentRegistrationBo));
 		return res;
 	}
@@ -752,7 +751,7 @@ public class AdminPatentApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "专利记录ID", "专利记录ID"));
 			return res;
 		}
-		
+
 		PatentCost cost = patentCostService.selectByPrimaryKey(cid);
 		if (null == cost) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
@@ -770,7 +769,7 @@ public class AdminPatentApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前申请已退单,无法修改!"));
 			return res;
 		}
-		
+
 		if (PatentInfoStatus.SETTLEMENT.getCode() == info.getPatentState()) {
 			res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前申请已结款,无法修改!"));
 			return res;
@@ -1063,32 +1062,32 @@ public class AdminPatentApiController extends CertifyApiController {
 		patentRegistration.setAcceptanceExpressCompany(patentRegistrationBo.getAcceptanceExpressCompany());
 		try {
 			if (!StringUtils.isBlank(patentRegistrationBo.getAcceptanceIssueTime())) {
-				patentRegistration.setAcceptanceIssueTime(DateUtils
-						.parseDate(patentRegistrationBo.getAcceptanceIssueTime(), AFTConstants.YYYYMMDD));
+				patentRegistration.setAcceptanceIssueTime(
+						DateUtils.parseDate(patentRegistrationBo.getAcceptanceIssueTime(), AFTConstants.YYYYMMDD));
 			}
 			if (!StringUtils.isBlank(patentRegistrationBo.getAcceptanceReceiveTime())) {
-				patentRegistration.setAcceptanceReceiveTime(DateUtils
-						.parseDate(patentRegistrationBo.getAcceptanceReceiveTime(), AFTConstants.YYYYMMDD));
+				patentRegistration.setAcceptanceReceiveTime(
+						DateUtils.parseDate(patentRegistrationBo.getAcceptanceReceiveTime(), AFTConstants.YYYYMMDD));
 			}
 			patentRegistration.setAcceptanceTrackingNumber(patentRegistrationBo.getAcceptanceTrackingNumber());
 			patentRegistration.setAuthorizationExpressCompany(patentRegistrationBo.getAuthorizationExpressCompany());
 			if (!StringUtils.isBlank(patentRegistrationBo.getAuthorizationIssueTime())) {
-				patentRegistration.setAuthorizationIssueTime(DateUtils
-						.parseDate(patentRegistrationBo.getAuthorizationIssueTime(), AFTConstants.YYYYMMDD));
+				patentRegistration.setAuthorizationIssueTime(
+						DateUtils.parseDate(patentRegistrationBo.getAuthorizationIssueTime(), AFTConstants.YYYYMMDD));
 			}
 			if (!StringUtils.isBlank(patentRegistrationBo.getAuthorizationReceiveTime())) {
-				patentRegistration.setAuthorizationReceiveTime(DateUtils
-						.parseDate(patentRegistrationBo.getAuthorizationReceiveTime(), AFTConstants.YYYYMMDD));
+				patentRegistration.setAuthorizationReceiveTime(
+						DateUtils.parseDate(patentRegistrationBo.getAuthorizationReceiveTime(), AFTConstants.YYYYMMDD));
 			}
 			patentRegistration.setAuthorizationTrackingNumber(patentRegistrationBo.getAuthorizationTrackingNumber());
 			patentRegistration.setCertificateExpressCompany(patentRegistrationBo.getCertificateExpressCompany());
 			if (!StringUtils.isBlank(patentRegistrationBo.getCertificateIssueTime())) {
-				patentRegistration.setCertificateIssueTime(DateUtils
-						.parseDate(patentRegistrationBo.getCertificateIssueTime(), AFTConstants.YYYYMMDD));
+				patentRegistration.setCertificateIssueTime(
+						DateUtils.parseDate(patentRegistrationBo.getCertificateIssueTime(), AFTConstants.YYYYMMDD));
 			}
 			if (!StringUtils.isBlank(patentRegistrationBo.getCertificateRecieveTime())) {
-				patentRegistration.setCertificateRecieveTime(DateUtils
-						.parseDate(patentRegistrationBo.getCertificateRecieveTime(), AFTConstants.YYYYMMDD));
+				patentRegistration.setCertificateRecieveTime(
+						DateUtils.parseDate(patentRegistrationBo.getCertificateRecieveTime(), AFTConstants.YYYYMMDD));
 			}
 		} catch (ParseException e) {
 		}

+ 9 - 9
src/main/java/com/goafanti/cognizance/bo/InputOrgActivityCost.java

@@ -28,39 +28,39 @@ public class InputOrgActivityCost {
 	private String		activityNumber;
 
 	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	internalLaborCost;
 
 	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	internalDirectCost;
 
 	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	internalDepreciationCost;
 
 	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	internalAmortizationCost;
 
 	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	internalDesignCost;
 
 	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	internalEquipmentCost;
 
 	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	internalOtherCost;
 
 	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	externalTotalCost;
 
 	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	externalAbroadCost;
 
 	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")

+ 48 - 0
src/main/java/com/goafanti/cognizance/bo/OrgActivityDetailCostBo.java

@@ -0,0 +1,48 @@
+package com.goafanti.cognizance.bo;
+
+import java.math.BigDecimal;
+
+public class OrgActivityDetailCostBo {
+	private String id;
+	
+	private BigDecimal firstYearCost;
+	
+	private BigDecimal secondYearCost;
+	
+	private BigDecimal thirdYearCost;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public BigDecimal getFirstYearCost() {
+		return firstYearCost;
+	}
+
+	public void setFirstYearCost(BigDecimal firstYearCost) {
+		this.firstYearCost = firstYearCost;
+	}
+
+	public BigDecimal getSecondYearCost() {
+		return secondYearCost;
+	}
+
+	public void setSecondYearCost(BigDecimal secondYearCost) {
+		this.secondYearCost = secondYearCost;
+	}
+
+	public BigDecimal getThirdYearCost() {
+		return thirdYearCost;
+	}
+
+	public void setThirdYearCost(BigDecimal thirdYearCost) {
+		this.thirdYearCost = thirdYearCost;
+	}
+	
+	
+
+}

+ 1 - 2
src/main/java/com/goafanti/cognizance/service/OrgActivityService.java

@@ -24,7 +24,6 @@ public interface OrgActivityService {
 
 	void updateOrgActivity(OrgActivity orgActivity);
 
-	OrgActivity selectDetailById(String id);
-
+	OrgActivity selectDetailByIdAndYear(String id, int year);
 
 }

+ 11 - 2
src/main/java/com/goafanti/cognizance/service/impl/OrgActivityServiceImpl.java

@@ -1,5 +1,6 @@
 package com.goafanti.cognizance.service.impl;
 
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.Date;
 import java.util.HashMap;
@@ -11,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.cognizance.bo.ActivityNumberBo;
+import com.goafanti.cognizance.bo.OrgActivityDetailCostBo;
 import com.goafanti.cognizance.service.OrgActivityService;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.OrgActivityCostMapper;
@@ -122,7 +124,14 @@ public class OrgActivityServiceImpl extends BaseMybatisDao<OrgActivityMapper> im
 	}
 
 	@Override
-	public OrgActivity selectDetailById(String id) {
-		return orgActivityCostMapper.selectDetailById(id);
+	public OrgActivity selectDetailByIdAndYear(String id, int year) {
+		OrgActivityDetailCostBo oadcb = orgActivityCostMapper.selectDetailCostByIdAndYear(id, year);
+		OrgActivity oa = orgActivityMapper.selectByPrimaryKey(id);
+		if (null != oadcb){
+			oa.setFirstYearExpenditure(null == oadcb.getFirstYearCost() ? new BigDecimal(0) : oadcb.getFirstYearCost());
+			oa.setSecondYearExpenditure(null == oadcb.getSecondYearCost() ? new BigDecimal(0) : oadcb.getSecondYearCost());
+			oa.setThirdYearExpenditure(null == oadcb.getThirdYearCost() ? new BigDecimal(0) : oadcb.getThirdYearCost());
+		}
+		return oa;
 	}
 }

+ 3 - 2
src/main/java/com/goafanti/common/dao/OrgActivityCostMapper.java

@@ -2,7 +2,7 @@ package com.goafanti.common.dao;
 
 import java.util.List;
 
-import com.goafanti.common.model.OrgActivity;
+import com.goafanti.cognizance.bo.OrgActivityDetailCostBo;
 import com.goafanti.common.model.OrgActivityCost;
 
 public interface OrgActivityCostMapper {
@@ -28,5 +28,6 @@ public interface OrgActivityCostMapper {
 
 	OrgActivityCost selectOrgActivityCostByAidAndYear(String aid, Integer year);
 
-	OrgActivity selectDetailById(String id);
+
+	OrgActivityDetailCostBo selectDetailCostByIdAndYear(String id, int year);
 }

+ 15 - 0
src/main/java/com/goafanti/common/mapper/OrgActivityCostMapper.xml

@@ -371,4 +371,19 @@
     from org_activity_cost
     where aid = #{0} and year = #{1} and deleted_sign = 0
   </select>
+  
+  <select id="selectDetailCostByIdAndYear" resultType="com.goafanti.cognizance.bo.OrgActivityDetailCostBo">
+  	select oa.id,
+	(oac1.internal_labor_cost + oac1.internal_direct_cost + oac1.internal_depreciation_cost + oac1.internal_amortization_cost 
+	+ oac1.internal_design_cost + oac1.internal_equipment_cost + oac1.internal_other_cost + oac1.external_total_cost) as firstYearCost,
+  (oac2.internal_labor_cost + oac2.internal_direct_cost + oac2.internal_depreciation_cost + oac2.internal_amortization_cost 
+	+ oac2.internal_design_cost + oac2.internal_equipment_cost + oac2.internal_other_cost + oac2.external_total_cost) as secondYearCost,
+  (oac3.internal_labor_cost + oac3.internal_direct_cost + oac3.internal_depreciation_cost + oac3.internal_amortization_cost 
+	+ oac3.internal_design_cost + oac3.internal_equipment_cost + oac3.internal_other_cost + oac3.external_total_cost) as thirdYearCost
+	from org_activity oa 
+	LEFT JOIN org_activity_cost oac1 on oa.id = oac1.aid and oac1.year = #{1} and oa.deleted_sign = 0 and oac1.deleted_sign = 0
+	LEFT JOIN org_activity_cost oac2 on oa.id = oac2.aid and oac2.year = #{1}-1 and oa.deleted_sign = 0 and oac2.deleted_sign = 0
+	LEFT JOIN org_activity_cost oac3 on oa.id = oac3.aid and oac3.year = #{1}-2 and oa.deleted_sign = 0 and oac3.deleted_sign = 0
+   where oa.id = #{0}
+  </select>
 </mapper>

+ 0 - 6
src/main/java/com/goafanti/common/model/User.java

@@ -2,11 +2,8 @@ package com.goafanti.common.model;
 
 import java.util.Date;
 
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.goafanti.common.constant.ErrorConstants;
 
 
 
@@ -21,9 +18,6 @@ public class User extends BaseModel implements AftUser{
     /**
     * 用户注册手机号,作为登录依据
     */
-    @Size(min = 0, max = 11, message = "{" + ErrorConstants.MOBILE_SIZE_ERROR + "}")
-	@Pattern(regexp = "^[0-9]*[1-9][0-9]*$", message = "{"
-			+ ErrorConstants.MOBILE_PATTERN_ERROR + "}")
     private String mobile;
 
     /**

+ 1 - 1
src/main/java/com/goafanti/techproject/bo/InputTechProject.java

@@ -42,7 +42,7 @@ public class InputTechProject {
 	private Integer		projectMode;
 
 	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = (long) 0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	projectApproval;
 
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")

+ 0 - 4
src/main/java/com/goafanti/user/bo/InputOrgBasicInfo.java

@@ -5,7 +5,6 @@ import java.util.Date;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 
 import com.goafanti.common.constant.ErrorConstants;
@@ -66,7 +65,6 @@ public class InputOrgBasicInfo {
 	 * 联系人手机
 	 */
 	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	@Pattern(regexp = "^([1-9])\\d{10}$", message = "{" + ErrorConstants.MOBILE_PATTERN_ERROR + "}")
 	private String		contactMobile;
 
 	/**
@@ -97,8 +95,6 @@ public class InputOrgBasicInfo {
 	 * 法人Email
 	 */
 	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	@Pattern(regexp = "^([a-z0-9A-Z]+[_|\\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z]{2,}$", message = "{"
-			+ ErrorConstants.EMAIL_PATTERN_ERROR + "}")
 	private String		legalPersonEmail;
 
 	/**

+ 0 - 2
src/main/java/com/goafanti/user/bo/InputOrgPro.java

@@ -2,7 +2,6 @@ package com.goafanti.user.bo;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 
 import com.goafanti.common.constant.ErrorConstants;
@@ -30,7 +29,6 @@ public class InputOrgPro {
 	private String	locationArea;
 
 	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	@Pattern(regexp = "^([1-9])\\d{11}$", message = "{" + ErrorConstants.PARAM_PATTERN_ERROR + "}")
 	private String	unitSize;
 
 	@Size(min = 0, max = 1000, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")

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

@@ -79,7 +79,7 @@ public class InputOrganizationIdentity {
 	private String		bankCardNumber;
 
 	@Max(value = (long)99.9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = (long)0.0000, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	validationAmount;
 
 	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")

+ 0 - 2
src/main/java/com/goafanti/user/bo/InputUser.java

@@ -2,7 +2,6 @@ package com.goafanti.user.bo;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 
 import com.goafanti.common.constant.ErrorConstants;
@@ -10,7 +9,6 @@ import com.goafanti.common.constant.ErrorConstants;
 public class InputUser {
 	
 	@Size(min = 0, max = 11, message = "{" + ErrorConstants.MOBILE_SIZE_ERROR + "}")
-	@Pattern(regexp = "^([1-9])\\d{10}$", message = "{" + ErrorConstants.MOBILE_PATTERN_ERROR + "}")
 	private String mobile;
 	
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")

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

@@ -7,6 +7,7 @@ import com.goafanti.common.constant.ErrorConstants;
 public class InputUserCareer {
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	id;
+	
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	uid;
 

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

@@ -64,7 +64,7 @@ public class InputUserIdentity {
 
 
 	@Max(value = (long)99.9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = (long)0.0000, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	amountMoney;