Antiloveg 8 years ago
parent
commit
e83aa5dcdb

+ 6 - 6
schema/permission.sql

@@ -164,7 +164,7 @@ values
 (UUID(), 'CognizanceStatus10', '高企认定流转状态--已到期'), 
 (UUID(), 'CognizanceStatus11', '高企认定流转状态--培育中'), 
 (UUID(), 'CognizanceStatus12', '高企认定流转状态--已结款'), 
-(UUID(), 'CognizanceStatus13', '高企认定流转状态--撤销');
+(UUID(), 'CognizanceStatus13', '高企认定流转状态--退单');
 
 insert into `permission`(`id`, `url`, `name`) 
 values
@@ -208,7 +208,7 @@ values
 (UUID(), 'CopyrightStatus7', '软著申请管理--驳回'),
 (UUID(), 'CopyrightStatus8', '软著申请管理--已下证'), 
 (UUID(), 'CopyrightStatus9', '软著申请管理--已结款'),
-(UUID(), 'CopyrightStatus10', '软著申请管理--撤销');
+(UUID(), 'CopyrightStatus10', '软著申请管理--退单');
 
 insert into `permission`(`id`, `url`, `name`) 
 values
@@ -262,7 +262,7 @@ values
 (UUID(), 'PatentInfoStatus11', '专利申请管理--驳回'),
 (UUID(), 'PatentInfoStatus12', '专利申请管理--发证'),
 (UUID(), 'PatentInfoStatus13', '专利申请管理--已结款'),
-(UUID(), 'PatentInfoStatus14', '专利申请管理--撤销');
+(UUID(), 'PatentInfoStatus14', '专利申请管理--退单');
 
 
 insert into `permission`(`id`, `url`, `name`) 
@@ -276,6 +276,8 @@ values
 (UUID(), 'api/admin/techproject/getDepartment', '科技项目申报管理--获取科技部门'),
 (UUID(), 'api/admin/techproject/deleteTechProject', '科技项目申报管理--删除科技项目申报记录'),
 (UUID(), 'api/admin/techproject/getConsultant', '科技项目申报管理--咨询师下拉列表'),
+(UUID(), 'api/admin/techproject/upload', '科技项目申报管理--科技项目申报材料上传'),
+(UUID(), 'api/admin/techproject/download', '科技项目申报管理--下载科技项目材料'),
 (UUID(), 'api/admin/techproject/getPrincipal', '科技项目申报管理--负责人下拉');
 
 insert into `permission`(`id`, `url`, `name`) 
@@ -283,8 +285,6 @@ values
 (UUID(), 'api/admin/techproject/listTechWebsite', '科技单位网址管理--科技单位网址列表'),
 (UUID(), 'api/admin/techproject/disposeTechWebsite', '科技单位网址管理--科技单位网址新增及修改'),
 (UUID(), 'api/admin/techproject/techWebsiteDetail', '科技单位网址管理--网址管理详情'),
-(UUID(), 'api/admin/techproject/upload', '科技单位网址管理--科技项目申报材料上传'),
-(UUID(), 'api/admin/techproject/download', '科技单位网址管理--下载科技项目材料'),
 (UUID(), 'api/admin/techproject/deleteTechWebsite', '科技单位网址管理--删除科技网址记录');
 
 insert into `permission`(`id`, `url`, `name`) 
@@ -298,7 +298,7 @@ values
 (UUID(), 'TechProjectStatus6', '科技项目申报管理--审批通过'), 
 (UUID(), 'TechProjectStatus7', '科技项目申报管理--审批不通过'), 
 (UUID(), 'TechProjectStatus8', '科技项目申报管理--已结款'), 
-(UUID(), 'TechProjectStatus9', '科技项目申报管理--撤销');
+(UUID(), 'TechProjectStatus9', '科技项目申报管理--退单');
 
 
 

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

@@ -64,6 +64,8 @@ import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.enums.AdminFields;
 import com.goafanti.common.enums.AttachmentType;
 import com.goafanti.common.enums.CognizanceApplyFields;
+import com.goafanti.common.enums.IdentityAuditStatus;
+import com.goafanti.common.enums.IdentityProcess;
 import com.goafanti.common.enums.OrgActivityFields;
 import com.goafanti.common.enums.OrgAnnualReportFields;
 import com.goafanti.common.enums.OrgCognizanceFields;
@@ -164,28 +166,29 @@ public class AdminApiController extends CertifyApiController {
 	private AdminService					adminService;
 	@Resource
 	private OrgTechCenterDetailService		orgTechCenterDetailService;
-	
+
 	/**
 	 * 
 	 */
-	
+
 	@RequestMapping(value = "/role", method = RequestMethod.GET)
-	public Result getRole(String uid){
+	public Result getRole(String uid) {
 		Result res = new Result();
-		if (StringUtils.isBlank(uid)){
+		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "管理员ID"));
 			return res;
 		}
 		res.setData(adminService.selectRoleByPrimaryKey(uid));
 		return res;
 	}
-	
+
 	/**
 	 * 管理员"我的客户"列表
+	 * 
 	 * @return
 	 */
 	@RequestMapping(value = "/customer", method = RequestMethod.GET)
-	public Result getCustomer(){
+	public Result getCustomer() {
 		Result res = new Result();
 		res.setData(userService.selectUserByAid(TokenManager.getAdminId()));
 		return res;
@@ -464,7 +467,7 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/addNewUser", method = RequestMethod.POST)
 	public Result addNewUser(@Valid InputUser inputUser, BindingResult bindingResult) {
 		Result res = new Result();
-		
+
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
 					UserFields.getFieldDesc(bindingResult.getFieldError().getField())));
@@ -574,7 +577,7 @@ public class AdminApiController extends CertifyApiController {
 
 		if (!StringUtils.isBlank(paymentDateFormattedDate)) {
 			try {
-				userIdentity.setPaymentDate(DateUtils.parseDate(paymentDateFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
+				userIdentity.setPaymentDate(DateUtils.parseDate(paymentDateFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			}
 		}
@@ -584,10 +587,32 @@ public class AdminApiController extends CertifyApiController {
 
 		if (StringUtils.isBlank(ui.getId())) {
 			ui.setId(UUID.randomUUID().toString());
-			ui.setAuditStatus(null == userIdentity.getAuditStatus() ? 0 : userIdentity.getAuditStatus());
-			ui.setProcess(null == userIdentity.getProcess() ? 0 : userIdentity.getProcess());
+			ui.setAuditStatus(null == ui.getAuditStatus() ? 0 : ui.getAuditStatus());
+			if (IdentityAuditStatus.UNCOMMITTED.getCode() == ui.getAuditStatus()) {
+				ui.setProcess(IdentityProcess.UNCOMMITTED.getCode());
+			} else if (IdentityAuditStatus.COMMITTED.getCode() == ui.getAuditStatus()
+					|| IdentityAuditStatus.UNPAID.getCode() == ui.getAuditStatus()) {
+				ui.setProcess(IdentityProcess.COMMITTED.getCode());
+			} else if (IdentityAuditStatus.PAID.getCode() == ui.getAuditStatus()) {
+				ui.setProcess(IdentityProcess.FILLIN.getCode());
+			} else if (IdentityAuditStatus.NOTPASSED.getCode() == ui.getAuditStatus()
+					|| IdentityAuditStatus.PASSED.getCode() == ui.getAuditStatus()) {
+				ui.setProcess(IdentityProcess.RESULTS.getCode());
+			}
 			res.setData(userIdentityService.insert(ui));
 		} else {
+			ui.setAuditStatus(null == ui.getAuditStatus() ? 0 : ui.getAuditStatus());
+			if (IdentityAuditStatus.UNCOMMITTED.getCode() == ui.getAuditStatus()) {
+				ui.setProcess(IdentityProcess.UNCOMMITTED.getCode());
+			} else if (IdentityAuditStatus.COMMITTED.getCode() == ui.getAuditStatus()
+					|| IdentityAuditStatus.UNPAID.getCode() == ui.getAuditStatus()) {
+				ui.setProcess(IdentityProcess.COMMITTED.getCode());
+			} else if (IdentityAuditStatus.PAID.getCode() == ui.getAuditStatus()) {
+				ui.setProcess(IdentityProcess.FILLIN.getCode());
+			} else if (IdentityAuditStatus.NOTPASSED.getCode() == ui.getAuditStatus()
+					|| IdentityAuditStatus.PASSED.getCode() == ui.getAuditStatus()) {
+				ui.setProcess(IdentityProcess.RESULTS.getCode());
+			}
 			res.setData(userIdentityService.updateUserDetail(ui));
 		}
 		return res;
@@ -664,7 +689,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		if (!StringUtils.isBlank(paymentDateFormattedDate)) {
 			try {
-				orgIdentity.setPaymentDate(DateUtils.parseDate(paymentDateFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
+				orgIdentity.setPaymentDate(DateUtils.parseDate(paymentDateFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			}
 		}
@@ -676,11 +701,33 @@ public class AdminApiController extends CertifyApiController {
 			oi.setId(UUID.randomUUID().toString());
 			oi.setIdentityType(null == oi.getIdentityType() ? 0 : oi.getIdentityType());
 			oi.setAuditStatus(null == oi.getAuditStatus() ? 0 : oi.getAuditStatus());
-			oi.setProcess(null == oi.getProcess() ? 0 : oi.getProcess());
+			if (IdentityAuditStatus.UNCOMMITTED.getCode() == oi.getAuditStatus()) {
+				oi.setProcess(IdentityProcess.UNCOMMITTED.getCode());
+			} else if (IdentityAuditStatus.COMMITTED.getCode() == oi.getAuditStatus()
+					|| IdentityAuditStatus.UNPAID.getCode() == oi.getAuditStatus()) {
+				oi.setProcess(IdentityProcess.COMMITTED.getCode());
+			} else if (IdentityAuditStatus.PAID.getCode() == oi.getAuditStatus()) {
+				oi.setProcess(IdentityProcess.FILLIN.getCode());
+			} else if (IdentityAuditStatus.NOTPASSED.getCode() == oi.getAuditStatus()
+					|| IdentityAuditStatus.PASSED.getCode() == oi.getAuditStatus()) {
+				oi.setProcess(IdentityProcess.RESULTS.getCode());
+			}
 			oi.setListed(null == oi.getListed() ? 0 : oi.getListed());
 			oi.setListedType(null == oi.getListedType() ? 0 : oi.getListedType());
 			res.setData(organizationIdentityService.insert(oi));
 		} else {
+			oi.setAuditStatus(null == oi.getAuditStatus() ? 0 : oi.getAuditStatus());
+			if (IdentityAuditStatus.UNCOMMITTED.getCode() == oi.getAuditStatus()) {
+				oi.setProcess(IdentityProcess.UNCOMMITTED.getCode());
+			} else if (IdentityAuditStatus.COMMITTED.getCode() == oi.getAuditStatus()
+					|| IdentityAuditStatus.UNPAID.getCode() == oi.getAuditStatus()) {
+				oi.setProcess(IdentityProcess.COMMITTED.getCode());
+			} else if (IdentityAuditStatus.PAID.getCode() == oi.getAuditStatus()) {
+				oi.setProcess(IdentityProcess.FILLIN.getCode());
+			} else if (IdentityAuditStatus.NOTPASSED.getCode() == oi.getAuditStatus()
+					|| IdentityAuditStatus.PASSED.getCode() == oi.getAuditStatus()) {
+				oi.setProcess(IdentityProcess.RESULTS.getCode());
+			}
 			res.setData(organizationIdentityService.updateOrgDetail(oi));
 		}
 		return res;
@@ -1132,7 +1179,6 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(orgTechProductService.listTechProduct(pNo, pSize, uid));
 		return res;
 	}
-	
 
 	/**
 	 * 上年度高新技术产品(服务)情况(新增+修改)
@@ -2243,7 +2289,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		if (!StringUtils.isBlank(foundingTimeFormattedDate)) {
 			try {
-				orgTechCenter.setFoundingTime(DateUtils.parseDate(foundingTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
+				orgTechCenter.setFoundingTime(DateUtils.parseDate(foundingTimeFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			}
 		}
@@ -2535,13 +2581,14 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(orgCognizanceService.listCognizance(uid, unitName, locationProvince, pNo, pSize));
 		return res;
 	}
-	
+
 	/**
 	 * 高企认定咨询师下拉列表
+	 * 
 	 * @return
 	 */
 	@RequestMapping(value = "/getConsultant", method = RequestMethod.GET)
-	public Result getConsultant(){
+	public Result getConsultant() {
 		Result res = new Result();
 		List<Admin> list = adminService.selectCognizanceConsultant();
 		Map<String, String> map = new TreeMap<String, String>();
@@ -2551,7 +2598,7 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(map);
 		return res;
 	}
-	
+
 	/**
 	 * 高企负责人下拉
 	 * 
@@ -2691,25 +2738,24 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到", "高企认定"));
 			return res;
 		}
-		
+
 		OrgCognizance o = orgCognizanceService.selectByPrimaryKey(cog.getId());
-		
-		if (null == o){
+
+		if (null == o) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到", "高企认定"));
 			return res;
 		}
-		
-		if (OrgCognizanceStatus.CALLBACK.getCode() == o.getState()){
+
+		if (OrgCognizanceStatus.CALLBACK.getCode() == o.getState()) {
 			res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前记录已退单,无法修改!"));
 			return res;
 		}
-		
-		if (OrgCognizanceStatus.SETTLEMENT.getCode() == o.getState()){
+
+		if (OrgCognizanceStatus.SETTLEMENT.getCode() == o.getState()) {
 			res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前记录已结款,无法修改!"));
 			return res;
 		}
-		
-		
+
 		if (!checkCertify(res, cog.getUid()).getError().isEmpty()) {
 			return res;
 		}

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

@@ -1064,31 +1064,31 @@ public class AdminPatentApiController extends CertifyApiController {
 		try {
 			if (!StringUtils.isBlank(patentRegistrationBo.getAcceptanceIssueTime())) {
 				patentRegistration.setAcceptanceIssueTime(DateUtils
-						.parseDate(patentRegistrationBo.getAcceptanceIssueTime(), AFTConstants.YYYYMMDDHHMMSS));
+						.parseDate(patentRegistrationBo.getAcceptanceIssueTime(), AFTConstants.YYYYMMDD));
 			}
 			if (!StringUtils.isBlank(patentRegistrationBo.getAcceptanceReceiveTime())) {
 				patentRegistration.setAcceptanceReceiveTime(DateUtils
-						.parseDate(patentRegistrationBo.getAcceptanceReceiveTime(), AFTConstants.YYYYMMDDHHMMSS));
+						.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.YYYYMMDDHHMMSS));
+						.parseDate(patentRegistrationBo.getAuthorizationIssueTime(), AFTConstants.YYYYMMDD));
 			}
 			if (!StringUtils.isBlank(patentRegistrationBo.getAuthorizationReceiveTime())) {
 				patentRegistration.setAuthorizationReceiveTime(DateUtils
-						.parseDate(patentRegistrationBo.getAuthorizationReceiveTime(), AFTConstants.YYYYMMDDHHMMSS));
+						.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.YYYYMMDDHHMMSS));
+						.parseDate(patentRegistrationBo.getCertificateIssueTime(), AFTConstants.YYYYMMDD));
 			}
 			if (!StringUtils.isBlank(patentRegistrationBo.getCertificateRecieveTime())) {
 				patentRegistration.setCertificateRecieveTime(DateUtils
-						.parseDate(patentRegistrationBo.getCertificateRecieveTime(), AFTConstants.YYYYMMDDHHMMSS));
+						.parseDate(patentRegistrationBo.getCertificateRecieveTime(), AFTConstants.YYYYMMDD));
 			}
 		} catch (ParseException e) {
 		}

+ 60 - 0
src/main/java/com/goafanti/common/enums/IdentityAuditStatus.java

@@ -0,0 +1,60 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+public enum IdentityAuditStatus {
+	
+	UNCOMMITTED(0, "未提交审核"),
+	COMMITTED(1, "提交审核"),
+	UNPAID(2, "审核未打款"),
+	PAID(3, "审核已打款"),
+	NOTPASSED(4, "审核未通过"),
+	PASSED(5, "审核通过"),
+	OTHER(6, "其他");
+
+	private IdentityAuditStatus(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, IdentityAuditStatus> status = new HashMap<Integer, IdentityAuditStatus>();
+
+	static {
+		for (IdentityAuditStatus value : IdentityAuditStatus.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+
+	public static IdentityAuditStatus getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+
+	public static IdentityAuditStatus getStatus(String code) {
+		if (StringUtils.isNumeric(code)) {
+			return getStatus(Integer.parseInt(code));
+		}
+		return OTHER;
+	}
+
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+
+	private Integer	code;
+	private String	desc;
+
+	public Integer getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

+ 58 - 0
src/main/java/com/goafanti/common/enums/IdentityProcess.java

@@ -0,0 +1,58 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+public enum IdentityProcess {
+	
+	UNCOMMITTED(0, "填写认证信息"),
+	COMMITTED(3, "审核信息"),
+	FILLIN(4, "填写银行卡金额"),
+	RESULTS(5, "认证结果"),
+	OTHER(6, "其他");
+
+	private IdentityProcess(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, IdentityProcess> status = new HashMap<Integer, IdentityProcess>();
+
+	static {
+		for (IdentityProcess value : IdentityProcess.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+
+	public static IdentityProcess getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+
+	public static IdentityProcess getStatus(String code) {
+		if (StringUtils.isNumeric(code)) {
+			return getStatus(Integer.parseInt(code));
+		}
+		return OTHER;
+	}
+
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+
+	private Integer	code;
+	private String	desc;
+
+	public Integer getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

+ 1 - 1
src/main/java/com/goafanti/common/model/UserIdentity.java

@@ -296,7 +296,7 @@ public class UserIdentity {
 		if (this.paymentDate == null) {
 			 return null;
 		   } else {
-			 return DateFormatUtils.format(this.getPaymentDate(), AFTConstants.YYYYMMDDHHMMSS);
+			 return DateFormatUtils.format(this.getPaymentDate(), AFTConstants.YYYYMMDD);
 		   }
 	}
 		

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

@@ -77,6 +77,7 @@ public class OrgListBo {
 		this.aftUsername = aftUsername;
 	}
 
+	@JsonFormat(shape = Shape.STRING)
 	public Integer getAuditStatus() {
 		return auditStatus;
 	}
@@ -118,7 +119,7 @@ public class OrgListBo {
 		if (this.createTime == null) {
 			 return null;
 		   } else {
-			 return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
+			 return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
 		   }
 	}
 			

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

@@ -4,6 +4,8 @@ import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 
 
@@ -74,7 +76,8 @@ public class UserListBo {
 	public void setAftUsername(String aftUsername) {
 		this.aftUsername = aftUsername;
 	}
-
+	
+	@JsonFormat(shape = Shape.STRING)
 	public Integer getAuditStatus() {
 		return auditStatus;
 	}

+ 27 - 20
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -24,6 +24,8 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.enums.IdentityAuditStatus;
+import com.goafanti.common.enums.IdentityProcess;
 import com.goafanti.common.enums.OrgProFields;
 import com.goafanti.common.enums.OrganizationIdentityFields;
 import com.goafanti.common.enums.OrganizationTechFields;
@@ -737,30 +739,32 @@ public class UserApiController extends BaseApiController {
 	@RequestMapping(value = "/userNextPro", method = RequestMethod.POST)
 	public Result userNextProcess(UserIdentity userIdentity, String verificationCode) {
 		Result res = new Result();
-		if (1 == userIdentity.getProcess()) {
+		if ((IdentityProcess.UNCOMMITTED.getCode() + 1) == userIdentity.getProcess()) {
 			if (!TokenManager.getSession().getAttribute(VerifyCodeUtils.V_CODE).equals(verificationCode)) {
 				res.getError().add(buildError(ErrorConstants.VCODE_ERROR, "验证码错误"));
 				return res;
 			}
 		}
 
-		if (3 == userIdentity.getProcess()) {
+		if (IdentityProcess.COMMITTED.getCode() == userIdentity.getProcess()) {//3
 			UserIdentity u = userIdentityService.selectUserIdentityByUserId(TokenManager.getUserId());
-			u.setAuditStatus(1);
+			u.setProcess(IdentityProcess.COMMITTED.getCode());
+			u.setAuditStatus(IdentityAuditStatus.COMMITTED.getCode());
 			userIdentityService.updateByPrimaryKeySelective(u);
+			return res;
 		}
 
-		if (5 == userIdentity.getProcess()) {
+		if (IdentityProcess.RESULTS.getCode() == userIdentity.getProcess()) {
 			UserIdentity u = userIdentityService.selectUserIdentityByUserId(TokenManager.getUserId());
 			if ((System.currentTimeMillis() - u.getPaymentDate().getTime()) > 432000000) {
-				u.setAuditStatus(4);
+				u.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());//4
 				userIdentityService.updateByPrimaryKeySelective(u);
 				res.getError().add(buildError("", "1"));// 超过打款日期5日,无法提交确认
 				return res;
 			}
 			if (3 == u.getWrongCount()) {
-				u.setAuditStatus(4);
-				u.setProcess(5);
+				u.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());//4
+				u.setProcess(IdentityProcess.RESULTS.getCode());//5
 				userIdentityService.updateByPrimaryKeySelective(u);
 				res.getError().add(buildError("", "2"));// 输入错误金额次数过多
 				return res;
@@ -770,8 +774,8 @@ public class UserApiController extends BaseApiController {
 				u.setWrongCount(u.getWrongCount() + 1);
 
 				if (0 == t) {
-					u.setAuditStatus(4);
-					u.setProcess(5);
+					u.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());//4
+					u.setProcess(IdentityProcess.RESULTS.getCode());//5
 					res.getError().add(buildError("", "2"));// 输入错误金额次数过多
 				} else {
 					res.getError().add(buildError("", "输入打款金额错误,您还有" + t + "次机会"));
@@ -779,7 +783,8 @@ public class UserApiController extends BaseApiController {
 				userIdentityService.updateByPrimaryKeySelective(u);
 				return res;
 			}
-			userIdentity.setAuditStatus(5);
+			userIdentity.setAuditStatus(IdentityAuditStatus.PASSED.getCode());
+			userIdentity.setProcess(IdentityProcess.RESULTS.getCode());
 		}
 		return dealUserProcess(res, userIdentity, TokenManager.getUserId());
 	}
@@ -805,32 +810,33 @@ public class UserApiController extends BaseApiController {
 	public Result orgNextProcess(OrganizationIdentity orgIdentity, String listedDateFormattedDate,
 			String verificationCode) throws ParseException {
 		Result res = new Result();
-		if (1 == orgIdentity.getProcess()) {
+		if ((IdentityProcess.UNCOMMITTED.getCode() + 1) == orgIdentity.getProcess()) {
 			if (!TokenManager.getSession().getAttribute(VerifyCodeUtils.V_CODE).equals(verificationCode)) {
 				res.getError().add(buildError(ErrorConstants.VCODE_ERROR, "验证码错误"));
 				return res;
 			}
 			if (!StringUtils.isBlank(listedDateFormattedDate)) {
-				orgIdentity.setListedDate(DateUtils.parseDate(listedDateFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
+				orgIdentity.setListedDate(DateUtils.parseDate(listedDateFormattedDate, AFTConstants.YYYYMMDD));
 			}
 		}
-		if (3 == orgIdentity.getProcess()) {
+		if (IdentityProcess.COMMITTED.getCode() == orgIdentity.getProcess()) {
 			OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId());
-			o.setAuditStatus(1);
+			o.setAuditStatus(IdentityAuditStatus.COMMITTED.getCode());
+			o.setProcess(IdentityProcess.COMMITTED.getCode());
 			organizationIdentityService.updateByPrimaryKeySelective(o);
 			return res;
 		}
 		if (5 == orgIdentity.getProcess()) {
 			OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId());
 			if (System.currentTimeMillis() - o.getPaymentDate().getTime() > 432000000) {
-				o.setAuditStatus(4);
+				o.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());//4
 				organizationIdentityService.updateByPrimaryKeySelective(o);
 				res.getError().add(buildError("", "1"));// 超过打款日期5日,无法提交确认
 				return res;
 			}
 			if (3 == o.getWrongCount()) {
-				o.setAuditStatus(4);
-				o.setProcess(5);
+				o.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());//4
+				o.setProcess(IdentityProcess.RESULTS.getCode());//5
 				organizationIdentityService.updateByPrimaryKeySelective(o);
 				res.getError().add(buildError("", "2"));// 输入错误金额次数过多
 				return res;
@@ -839,8 +845,8 @@ public class UserApiController extends BaseApiController {
 				int t = 3 - o.getWrongCount() - 1;
 				o.setWrongCount(o.getWrongCount() + 1);
 				if (0 == t) {
-					o.setAuditStatus(4);
-					o.setProcess(6);
+					o.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());//4
+					o.setProcess(IdentityProcess.RESULTS.getCode());//5
 					res.getError().add(buildError("", "2"));// 输入错误金额次数过多
 				} else {
 					res.getError().add(buildError("", "输入打款金额错误,您还有" + t + "次机会"));
@@ -848,7 +854,8 @@ public class UserApiController extends BaseApiController {
 				organizationIdentityService.updateByPrimaryKeySelective(o);
 				return res;
 			}
-			orgIdentity.setAuditStatus(5);
+			orgIdentity.setAuditStatus(IdentityAuditStatus.PASSED.getCode());
+			orgIdentity.setProcess(IdentityProcess.RESULTS.getCode());
 		}
 		return dealOrgProcess(res, orgIdentity, TokenManager.getUserId());
 	}

+ 6 - 0
src/main/webapp/WEB-INF/views/header.jsp

@@ -77,6 +77,12 @@
 	<shiro:hasPermission name="customer">
 	window.showCustomer = true;
 	</shiro:hasPermission>
+	<shiro:hasPermission name="api/admin/userList">
+	window.showUserList = true;
+	</shiro:hasPermission>
+	<shiro:hasPermission name="api/admin/orgList">
+	window.showOrgList = true;
+	</shiro:hasPermission>
 	
 </script>
 <script type="text/javascript" src="${staticHost}/vendors.js"></script>