Antiloveg 8 years ago
parent
commit
c6ec7106d0
32 changed files with 190 additions and 100 deletions
  1. 4 3
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  2. 12 11
      src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java
  3. 1 1
      src/main/java/com/goafanti/cognizance/service/OrgActivityCostService.java
  4. 1 1
      src/main/java/com/goafanti/cognizance/service/OrgActivityService.java
  5. 1 1
      src/main/java/com/goafanti/cognizance/service/OrgAnnualReportService.java
  6. 1 1
      src/main/java/com/goafanti/cognizance/service/OrgCognizanceService.java
  7. 1 1
      src/main/java/com/goafanti/cognizance/service/OrgFinanceService.java
  8. 1 1
      src/main/java/com/goafanti/cognizance/service/OrgHonorDatumService.java
  9. 1 1
      src/main/java/com/goafanti/cognizance/service/OrgIntellectualPropertyService.java
  10. 1 1
      src/main/java/com/goafanti/cognizance/service/OrgRatepayService.java
  11. 1 1
      src/main/java/com/goafanti/cognizance/service/OrgStandardService.java
  12. 1 1
      src/main/java/com/goafanti/cognizance/service/OrgTechAchievementService.java
  13. 1 1
      src/main/java/com/goafanti/cognizance/service/OrgTechCenterDetailService.java
  14. 1 1
      src/main/java/com/goafanti/cognizance/service/OrgTechProductService.java
  15. 1 1
      src/main/java/com/goafanti/cognizance/service/impl/OrgActivityCostServiceImpl.java
  16. 1 1
      src/main/java/com/goafanti/cognizance/service/impl/OrgActivityServiceImpl.java
  17. 1 1
      src/main/java/com/goafanti/cognizance/service/impl/OrgAnnualReportServiceImpl.java
  18. 1 1
      src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java
  19. 1 1
      src/main/java/com/goafanti/cognizance/service/impl/OrgFinanceServiceImpl.java
  20. 1 1
      src/main/java/com/goafanti/cognizance/service/impl/OrgHonorDatumServiceImpl.java
  21. 1 1
      src/main/java/com/goafanti/cognizance/service/impl/OrgIntellectualPropertyServiceImpl.java
  22. 1 1
      src/main/java/com/goafanti/cognizance/service/impl/OrgRatepayServiceImpl.java
  23. 1 1
      src/main/java/com/goafanti/cognizance/service/impl/OrgStandardServiceImpl.java
  24. 1 1
      src/main/java/com/goafanti/cognizance/service/impl/OrgTechAchievementServiceImpl.java
  25. 3 1
      src/main/java/com/goafanti/cognizance/service/impl/OrgTechCenterDetailServiceImpl.java
  26. 1 1
      src/main/java/com/goafanti/cognizance/service/impl/OrgTechProductServiceImpl.java
  27. 7 12
      src/main/java/com/goafanti/common/mapper/OrgTechCenterDetailMapper.xml
  28. 16 40
      src/main/java/com/goafanti/user/controller/UserApiController.java
  29. 7 0
      src/main/java/com/goafanti/user/service/OrganizationIdentityService.java
  30. 5 0
      src/main/java/com/goafanti/user/service/UserIdentityService.java
  31. 73 10
      src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java
  32. 40 0
      src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

+ 4 - 3
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -211,7 +211,7 @@ public class AdminApiController extends BaseApiController {
 			userIdentity.setWrongCount(0);
 			res.setData(userIdentityService.insert(userIdentity));
 		} else {
-			res.setData(userIdentityService.updateByPrimaryKeySelective(userIdentity));
+			res.setData(userIdentityService.updateUserDetail(userIdentity));
 		}
 		return res;
 	}
@@ -283,7 +283,7 @@ public class AdminApiController extends BaseApiController {
 			orgIdentity.setListedType(0);
 			res.setData(organizationIdentityService.insert(orgIdentity));
 		} else {
-			res.setData(organizationIdentityService.updateByPrimaryKeySelective(orgIdentity));
+			res.setData(organizationIdentityService.updateOrgDetail(orgIdentity));
 		}
 		return res;
 	}
@@ -925,6 +925,7 @@ public class AdminApiController extends BaseApiController {
 		}
 		if (null != orgCognizanceService.selectCognizanceByUidAndYear(year, uid)) {
 			res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度高企认定已申请!"));
+			return res;
 		}
 		
 		String aid = userService.selectByPrimaryKey(uid).getAid();
@@ -1024,7 +1025,7 @@ public class AdminApiController extends BaseApiController {
 		for (String s : ids) {
 			id.add(s);
 		}
-		res.setData(orgCognizanceService.batchDeleteByPrimaryKey(id));
+		res.setData(orgCognizanceService.deleteByPrimaryKey(id));
 		return res;
 	}
 

+ 12 - 11
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -173,8 +173,8 @@ public class CognizanceApiController extends BaseApiController {
 			for (String s : ids) {
 				id.add(s);
 			}
-			orgActivityService.batchDeleteByPrimaryKey(id);
-			orgActivityCostService.batchDeleteByAid(id);
+			orgActivityService.deleteByPrimaryKey(id);
+			orgActivityCostService.deleteByAid(id);
 		return res;
 	}
 
@@ -321,7 +321,7 @@ public class CognizanceApiController extends BaseApiController {
 			for (String s : ids) {
 				id.add(s);
 			}
-			res.setData(orgStandardService.batchDeleteByPrimaryKey(id));
+			res.setData(orgStandardService.deleteByPrimaryKey(id));
 		return res;
 	}
 
@@ -395,7 +395,7 @@ public class CognizanceApiController extends BaseApiController {
 			for (String s : ids) {
 				id.add(s);
 			}
-			res.setData(orgIntellectualPropertyService.batchDeleteByPrimaryKey(id));
+			res.setData(orgIntellectualPropertyService.deleteByPrimaryKey(id));
 		return res;
 	}
 
@@ -465,7 +465,7 @@ public class CognizanceApiController extends BaseApiController {
 			for (String s : ids) {
 				id.add(s);
 			}
-			res.setData(orgTechProductService.batchDeleteByPrimaryKey(id));
+			res.setData(orgTechProductService.deleteByPrimaryKey(id));
 		return res;
 	}
 
@@ -530,7 +530,7 @@ public class CognizanceApiController extends BaseApiController {
 			for (String s : ids) {
 				id.add(s);
 			}
-			res.setData(orgRatepayService.batchDeleteByPrimaryKey(id));
+			res.setData(orgRatepayService.deleteByPrimaryKey(id));
 		return res;
 	}
 
@@ -598,7 +598,7 @@ public class CognizanceApiController extends BaseApiController {
 			for (String s : ids) {
 				id.add(s);
 			}
-			res.setData(orgFinanceService.batchDeleteByPrimaryKey(id));
+			res.setData(orgFinanceService.deleteByPrimaryKey(id));
 		return res;
 	}
 
@@ -693,7 +693,7 @@ public class CognizanceApiController extends BaseApiController {
 			for (String s : ids) {
 				id.add(s);
 			}
-			res.setData(orgTechAchievementService.batchDeleteByPrimaryKey(id));
+			res.setData(orgTechAchievementService.deleteByPrimaryKey(id));
 		return res;
 	}
 
@@ -760,7 +760,7 @@ public class CognizanceApiController extends BaseApiController {
 			for (String s : ids) {
 				id.add(s);
 			}
-			res.setData(orgHonorDatumService.batchDeleteByPrimaryKey(id));
+			res.setData(orgHonorDatumService.deleteByPrimaryKey(id));
 		return res;
 	}
 
@@ -867,7 +867,7 @@ public class CognizanceApiController extends BaseApiController {
 		for (String s : ids) {
 			id.add(s);
 		}
-		res.setData(orgTechCenterDetailService.batchDeleteByPrimaryKey(id));
+		res.setData(orgTechCenterDetailService.deleteByPrimaryKey(id));
 		return res;
 	}
 
@@ -921,6 +921,7 @@ public class CognizanceApiController extends BaseApiController {
 		if (res.getError().isEmpty()) {
 			if (null != orgCognizanceService.selectCognizanceByUidAndYear(year, TokenManager.getUserId())){
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度高企认定已申请!"));
+				return res;
 			}
 			String aid = TokenManager.getToken().getAid();
 			orgCognizanceService.insertCognizance(contacts, comment, year,  state, aid, TokenManager.getUserId());
@@ -1064,7 +1065,7 @@ public class CognizanceApiController extends BaseApiController {
 		for (String s : ids) {
 			id.add(s);
 		}
-		res.setData(orgAnnualReportService.batchDeleteByPrimaryKey(id));
+		res.setData(orgAnnualReportService.deleteByPrimaryKey(id));
 		return res;
 	}
 

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

@@ -19,7 +19,7 @@ public interface OrgActivityCostService {
 
 	OrgActivityCost selectOrgActivityCostByAid(String id);
 
-	int batchDeleteByAid(List<String> id);
+	int deleteByAid(List<String> id);
 
 	OrgActivityCost selectOrgActivityCostByUidAndAid(String aid, String userId);
 

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

@@ -16,7 +16,7 @@ public interface OrgActivityService {
 
 	int updateByPrimaryKeySelective(OrgActivity orgActivity);
 
-	int batchDeleteByPrimaryKey(List<String> id);
+	int deleteByPrimaryKey(List<String> id);
 
 	OrgActivity selectOrgActivityByPrimaryKey(String aid);
 

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

@@ -13,7 +13,7 @@ public interface OrgAnnualReportService {
 
 	Pagination<OrgAnnualReport> listOrgAnnualReport(Integer year, Integer state, Integer pNo, Integer pSize, String userId);
 
-	int batchDeleteByPrimaryKey(List<String> id);
+	int deleteByPrimaryKey(List<String> id);
 
 	OrgAnnualReport insert(OrgAnnualReport orgAnnualReport);
 

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

@@ -34,7 +34,7 @@ public interface OrgCognizanceService {
 
 	OrgCognizance selectCognizanceByUidAndYear(Integer year, String uid);
 
-	int batchDeleteByPrimaryKey(List<String> id);
+	int deleteByPrimaryKey(List<String> id);
 
 	CognizanceDetailBo selectCognizanceDetailBo(String uid, String cid, Integer year);
 

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

@@ -14,7 +14,7 @@ public interface OrgFinanceService {
 
 	Pagination<OrgFinance> listFinance(Integer year, Integer pNo, Integer pSize, String userId);
 
-	int batchDeleteByPrimaryKey(List<String> id);
+	int deleteByPrimaryKey(List<String> id);
 
 	OrgFinance selectFinanceByUidAndYear(String uid, Integer year);
 

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

@@ -13,6 +13,6 @@ public interface OrgHonorDatumService {
 
 	int updateByPrimaryKeySelective(OrgHonorDatum honor);
 
-	int batchDeleteByPrimaryKey(List<String> id);
+	int deleteByPrimaryKey(List<String> id);
 
 }

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

@@ -13,7 +13,7 @@ public interface OrgIntellectualPropertyService {
 
 	int delete(String id);
 
-	int batchDeleteByPrimaryKey(List<String> id);
+	int deleteByPrimaryKey(List<String> id);
 
 	int updateByPrimaryKeySelective(OrgIntellectualProperty orgIntellectualProperty);
 

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

@@ -14,7 +14,7 @@ public interface OrgRatepayService {
 
 	Pagination<OrgRatepay> listOrgRatepay(Integer year, Integer pNo, Integer pSize, String userId);
 
-	int batchDeleteByPrimaryKey(List<String> id);
+	int deleteByPrimaryKey(List<String> id);
 
 	OrgRatepay selectRatepayByUidAndYear(String userId, Integer year);
 

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

@@ -16,6 +16,6 @@ public interface OrgStandardService {
 
 	int delete(String id);
 
-	int batchDeleteByPrimaryKey(List<String> id);
+	int deleteByPrimaryKey(List<String> id);
 
 }

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

@@ -13,6 +13,6 @@ public interface OrgTechAchievementService {
 
 	int updateByPrimaryKeySelective(OrgTechAchievement achievement);
 
-	int batchDeleteByPrimaryKey(List<String> id);
+	int deleteByPrimaryKey(List<String> id);
 
 }

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

@@ -13,6 +13,6 @@ public interface OrgTechCenterDetailService {
 
 	int updateByPrimaryKeySelective(OrgTechCenterDetail orgTechCenterDetail);
 
-	int batchDeleteByPrimaryKey(List<String> id);
+	int deleteByPrimaryKey(List<String> id);
 
 }

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

@@ -13,6 +13,6 @@ public interface OrgTechProductService {
 
 	int updateByPrimaryKeySelective(OrgTechProduct orgTechProduct);
 
-	int batchDeleteByPrimaryKey(List<String> id);
+	int deleteByPrimaryKey(List<String> id);
 
 }

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

@@ -88,7 +88,7 @@ public class OrgActivityCostServiceImpl extends BaseMybatisDao<OrgActivityCostMa
 
 
 	@Override
-	public int batchDeleteByAid(List<String> aid) {
+	public int deleteByAid(List<String> aid) {
 		return orgActivityCostMapper.batchDeleteByAid(aid);
 	}
 

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

@@ -81,7 +81,7 @@ public class OrgActivityServiceImpl extends BaseMybatisDao<OrgActivityMapper> im
 	}
 
 	@Override
-	public int batchDeleteByPrimaryKey(List<String> id) {
+	public int deleteByPrimaryKey(List<String> id) {
 		return orgActivityMapper.batchDeleteByPrimaryKey(id);
 	}
 

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

@@ -55,7 +55,7 @@ public class OrgAnnualReportServiceImpl extends BaseMybatisDao<OrgAnnualReportMa
 	}
 
 	@Override
-	public int batchDeleteByPrimaryKey(List<String> id) {
+	public int deleteByPrimaryKey(List<String> id) {
 		return orgAnnualReportMapper.batchDeleteByPrimaryKey(id);
 	}
 

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

@@ -156,7 +156,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 	}
 
 	@Override
-	public int batchDeleteByPrimaryKey(List<String> id) {
+	public int deleteByPrimaryKey(List<String> id) {
 		return orgCognizanceMapper.batchDeleteByPrimaryKey(id);
 	}
 

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

@@ -55,7 +55,7 @@ public class OrgFinanceServiceImpl  extends BaseMybatisDao<OrgFinanceMapper> imp
 	}
 
 	@Override
-	public int batchDeleteByPrimaryKey(List<String> id) {
+	public int deleteByPrimaryKey(List<String> id) {
 		return orgFinanceMapper.batchDeleteByPrimaryKey(id);
 	}
 

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

@@ -50,7 +50,7 @@ public class OrgHonorDatumServiceImpl extends BaseMybatisDao<OrgHonorDatumMapper
 	}
 
 	@Override
-	public int batchDeleteByPrimaryKey(List<String> id) {
+	public int deleteByPrimaryKey(List<String> id) {
 		return orgHonorDatumMapper.batchDeleteByPrimaryKey(id);
 	}
 }

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

@@ -52,7 +52,7 @@ public class OrgIntellectualPropertyServiceImpl extends BaseMybatisDao<OrgIntell
 	}
 
 	@Override
-	public int batchDeleteByPrimaryKey(List<String> id) {
+	public int deleteByPrimaryKey(List<String> id) {
 		return orgIntellectualPropertyMapper.batchDeleteByPrimaryKey(id);
 	}
 

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

@@ -55,7 +55,7 @@ public class OrgRatepayServiceImpl extends BaseMybatisDao<OrgRatepayMapper> impl
 	}
 
 	@Override
-	public int batchDeleteByPrimaryKey(List<String> id) {
+	public int deleteByPrimaryKey(List<String> id) {
 		return orgRatepayMapper.batchDeleteByPrimaryKey(id);
 	}
 

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

@@ -73,7 +73,7 @@ public class OrgStandardServiceImpl extends BaseMybatisDao<OrgStandardMapper> im
 	}
 
 	@Override
-	public int batchDeleteByPrimaryKey(List<String> id) {
+	public int deleteByPrimaryKey(List<String> id) {
 		// TODO Auto-generated method stub
 		return orgStandardMapper.batchDeleteByPrimaryKey(id);
 	}

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

@@ -50,7 +50,7 @@ public class OrgTechAchievementServiceImpl extends BaseMybatisDao<OrgTechAchieve
 	}
 
 	@Override
-	public int batchDeleteByPrimaryKey(List<String> id) {
+	public int deleteByPrimaryKey(List<String> id) {
 		return orgTechAchievementMapper.batchDeleteByPrimaryKey(id);
 	}
 }

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

@@ -25,6 +25,8 @@ public class OrgTechCenterDetailServiceImpl extends BaseMybatisDao<OrgTechCenter
 		
 		if (!StringUtils.isBlank(cid)){
 			params.put("cid", cid);
+		} else {
+			params.put("cid", "-1");
 		}
 
 		if (pageNo == null || pageNo < 0) {
@@ -50,7 +52,7 @@ public class OrgTechCenterDetailServiceImpl extends BaseMybatisDao<OrgTechCenter
 	}
 
 	@Override
-	public int batchDeleteByPrimaryKey(List<String> id) {
+	public int deleteByPrimaryKey(List<String> id) {
 		return orgTechCenterDetailMapper.batchDeleteByPrimaryKey(id);
 	}
 }

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

@@ -53,7 +53,7 @@ public class OrgTechProductServiceImpl extends BaseMybatisDao<OrgTechProductMapp
 	}
 
 	@Override
-	public int batchDeleteByPrimaryKey(List<String> id) {
+	public int deleteByPrimaryKey(List<String> id) {
 		return orgTechProductMapper.batchDeleteByPrimaryKey(id);
 	}
 }

+ 7 - 12
src/main/java/com/goafanti/common/mapper/OrgTechCenterDetailMapper.xml

@@ -128,13 +128,11 @@
   
    <select id="findOrgTechCenterDetailListByPage" parameterType="java.lang.String" resultMap="BaseResultMap">
   	 select 
-    <include refid="Base_Column_List" />
-    from org_tech_center_detail
-    where deleted_sign = 0
-    <if test="uid != null">
-	    and  cid = #{cid,jdbcType=VARCHAR}
-	</if>
-	order by project_time desc
+     d.id, d.cid, d.project_time , d.project_name , d.term_time,
+      d.institution, d.protocol_url , d.deleted_sign
+    from org_tech_center_detail d 
+    where d.deleted_sign = 0 and d.cid = #{cid,jdbcType=VARCHAR}
+	order by d.project_time desc
     <if test="page_sql != null">
     	${page_sql}
     </if>
@@ -142,11 +140,8 @@
   
   <select id="findOrgTechCenterDetailCount" resultType="java.lang.Integer" parameterType="String">
    	select count(1) 
-	    from org_tech_center_detail
-    where deleted_sign = 0
-	    <if test="cid != null">
-		    and  cid = #{cid,jdbcType=VARCHAR}
-		</if>
+	   from org_tech_center_detail d 
+    where d.deleted_sign = 0 and d.cid = #{cid,jdbcType=VARCHAR}
   </select>
   
   <update id="batchDeleteByPrimaryKey" parameterType="java.util.List">

+ 16 - 40
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
+import com.goafanti.cognizance.service.OrgRatepayService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
@@ -90,6 +91,8 @@ public class UserApiController extends BaseApiController {
 	private OrgHumanResourceService			orgHumanResourceService;
 	@Resource
 	private TechWebsiteService  techWebsiteService;
+	@Resource
+	private OrgRatepayService  orgRatepayService;
 
 	/**
 	 * 修改密码
@@ -745,15 +748,15 @@ public class UserApiController extends BaseApiController {
 			if (0 != (u.getAmountMoney().compareTo(userIdentity.getAmountMoney()))) {
 				int t = 3 - u.getWrongCount() - 1;
 				u.setWrongCount(u.getWrongCount() + 1);
-				userIdentityService.updateByPrimaryKeySelective(u);
+				
 				if (0 == t) {
 					u.setAuditStatus(4);
 					u.setProcess(5);
-					userIdentityService.updateByPrimaryKeySelective(u);
 					res.getError().add(buildError("", "2"));// 输入错误金额次数过多
 				} else {
 					res.getError().add(buildError("", "输入打款金额错误,您还有" + t + "次机会"));
 				}
+				userIdentityService.updateByPrimaryKeySelective(u);
 				return res;
 			}
 			userIdentity.setAuditStatus(5);
@@ -780,19 +783,22 @@ public class UserApiController extends BaseApiController {
 	@RequestMapping(value = "/orgNextPro", method = RequestMethod.POST)
 	public Result orgNextProcess(OrganizationIdentity orgIdentity, String listedDateFormattedDate, String verificationCode) throws ParseException {
 		Result res = new Result();
-		if (!StringUtils.isBlank(listedDateFormattedDate)){
-			orgIdentity.setListedDate(DateUtils.parseDate(listedDateFormattedDate, "yyyy-MM-dd"));
-		}
 		if (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, "yyyy-MM-dd"));
+			}
+			/*res.setData(organizationIdentityService.saveLastYearTaxReprotUrl(orgIdentity, TokenManager.getUserId()));
+			return res;*/
 		}
 		if (3 == orgIdentity.getProcess()) {
 			OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId());
 			o.setAuditStatus(1);
 			organizationIdentityService.updateByPrimaryKeySelective(o);
+			return res;
 		}
 		if (5 == orgIdentity.getProcess()) {
 			OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId());
@@ -812,15 +818,14 @@ public class UserApiController extends BaseApiController {
 			if (0 != (o.getValidationAmount().compareTo(orgIdentity.getValidationAmount()))) {
 				int t = 3 - o.getWrongCount() - 1;
 				o.setWrongCount(o.getWrongCount() + 1);
-				organizationIdentityService.updateByPrimaryKeySelective(o);
 				if (0 == t) {
 					o.setAuditStatus(4);
-					o.setProcess(5);
-					organizationIdentityService.updateByPrimaryKeySelective(o);
+					o.setProcess(6);
 					res.getError().add(buildError("", "2"));// 输入错误金额次数过多
 				} else {
 					res.getError().add(buildError("", "输入打款金额错误,您还有" + t + "次机会"));
 				}
+				organizationIdentityService.updateByPrimaryKeySelective(o);
 				return res;
 			}
 			orgIdentity.setAuditStatus(5);
@@ -904,42 +909,13 @@ public class UserApiController extends BaseApiController {
 
 	// orgProcess
 	private Result dealOrgProcess(Result res, OrganizationIdentity o, String uid) {
-		OrganizationIdentity org = organizationIdentityService.selectOrgIdentityByUserId(uid);
-		if (null == org) {
-			o.setId(UUID.randomUUID().toString());
-			o.setUid(uid);
-			res.setData(organizationIdentityService.insert(o));
-		} else {
-			o.setId(org.getId());
-			res.setData(organizationIdentityService.updateByPrimaryKeySelective(o));
-			if (null != o.getAuditStatus() && 5 == o.getAuditStatus()){
-				User u = new User();
-				u.setId(TokenManager.getUserId());
-				u.setLvl(1);;
-				userService.updateByPrimaryKeySelective(u);
-			}
-		}
+		res.setData(organizationIdentityService.saveOrgIndentityProcess(res, o, uid));
 		return res;
 	}
 
 	// userProcess
-	private Result dealUserProcess(Result res, UserIdentity userIdentity, String uid) {
-		UserIdentity identity = userIdentityService.selectUserIdentityByUserId(uid);
-		if (null == identity) {
-			userIdentity.setId(UUID.randomUUID().toString());
-			userIdentity.setUid(uid);
-			userIdentity.setWrongCount(0);
-			res.setData(userIdentityService.insert(userIdentity));
-		} else {
-			userIdentity.setId(identity.getId());
-			res.setData(userIdentityService.updateByPrimaryKeySelective(userIdentity));
-			if (5 == userIdentity.getAuditStatus()){
-				User u = new User();
-				u.setId(userIdentityService.selectUserIdentityByUserId(TokenManager.getUserId()).getUid());
-				u.setLvl(1);
-				userService.updateByPrimaryKeySelective(u);
-			}
-		}
+	private Result dealUserProcess(Result res, UserIdentity u, String uid) {
+		res.setData(userIdentityService.saveUserIdentityProcess(res, u, uid));
 		return res;
 	}
 

+ 7 - 0
src/main/java/com/goafanti/user/service/OrganizationIdentityService.java

@@ -3,6 +3,7 @@ package com.goafanti.user.service;
 import java.util.List;
 import java.util.Map;
 
+import com.goafanti.common.bo.Result;
 import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.user.bo.OrgIdentityBo;
 
@@ -23,6 +24,12 @@ public interface OrganizationIdentityService {
 	Map<String, String> selectContactsByUserId(String uid);
 
 
+
+	int saveOrgIndentityProcess(Result res, OrganizationIdentity o, String uid);
+
+	int updateOrgDetail(OrganizationIdentity orgIdentity);
+
+
 	
 
 }

+ 5 - 0
src/main/java/com/goafanti/user/service/UserIdentityService.java

@@ -1,5 +1,6 @@
 package com.goafanti.user.service;
 
+import com.goafanti.common.bo.Result;
 import com.goafanti.common.model.UserIdentity;
 import com.goafanti.user.bo.UserIdentityBo;
 
@@ -15,5 +16,9 @@ public interface UserIdentityService {
 
 	int updateByPrimaryKey(UserIdentity u);
 
+	int  saveUserIdentityProcess(Result res, UserIdentity u, String uid);
+
+	int updateUserDetail(UserIdentity userIdentity);
+
 
 }

+ 73 - 10
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -1,25 +1,36 @@
 package com.goafanti.user.service.impl;
 
-
+import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.dao.OrgRatepayMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
+import com.goafanti.common.dao.UserMapper;
+import com.goafanti.common.model.OrgRatepay;
 import com.goafanti.common.model.OrganizationIdentity;
+import com.goafanti.common.model.User;
 import com.goafanti.core.mybatis.BaseMybatisDao;
-import com.goafanti.user.bo.OrgIdentityBo;	
+import com.goafanti.user.bo.OrgIdentityBo;
 import com.goafanti.user.service.OrganizationIdentityService;
 
 @Service
-public class OrganizationIdentityServiceImpl extends BaseMybatisDao<OrganizationIdentityMapper> implements OrganizationIdentityService{
-    @Autowired
-    OrganizationIdentityMapper organizationIdentityMapper;
-    
+public class OrganizationIdentityServiceImpl extends BaseMybatisDao<OrganizationIdentityMapper>
+		implements OrganizationIdentityService {
+	@Autowired
+	OrganizationIdentityMapper	organizationIdentityMapper;
+	@Autowired
+	OrgRatepayMapper			orgRatepayMapper;
+	@Autowired
+	UserMapper					userMapper;
+
 	@Override
 	public OrganizationIdentity insert(OrganizationIdentity organizationIdentity) {
 		organizationIdentityMapper.insert(organizationIdentity);
@@ -55,15 +66,15 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 	public Map<String, String> selectContactsByUserId(String uid) {
 		OrganizationIdentity i = organizationIdentityMapper.selectOrgIdentityByUserId(uid);
 		Map<String, String> map = new TreeMap<String, String>();
-		if (null != i){
+		if (null != i) {
 			if (!StringUtils.isBlank(i.getFirstContacts()) && !StringUtils.isBlank(i.getFirstMobile())) {
 				map.put("1", i.getFirstContacts() + "  " + i.getFirstMobile());
 			}
-	
+
 			if (!StringUtils.isBlank(i.getSecondContacts()) && !StringUtils.isBlank(i.getSecondMobile())) {
 				map.put("2", i.getSecondContacts() + "  " + i.getSecondMobile());
 			}
-	
+
 			if (!StringUtils.isBlank(i.getThirdContacts()) && !StringUtils.isBlank(i.getThirdMobile())) {
 				map.put("3", i.getThirdContacts() + "  " + i.getThirdMobile());
 			}
@@ -71,6 +82,58 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 		return map;
 	}
 
-		
+	@Override
+	public int saveOrgIndentityProcess(Result res, OrganizationIdentity o, String uid) {
+		OrganizationIdentity org = organizationIdentityMapper.selectOrgIdentityByUserId(uid);
+		if (null == org) {
+			o.setId(UUID.randomUUID().toString());
+			o.setUid(uid);
+			return organizationIdentityMapper.insert(o);
+		} else {
+			o.setId(org.getId());
+			if (null != o.getAuditStatus() && 5 == o.getAuditStatus()) {
+				User u = new User();
+				u.setId(uid);
+				u.setLvl(1);
+				;
+				userMapper.updateByPrimaryKeySelective(u);
+				Calendar cal = Calendar.getInstance();
+				if (null != o.getLastYearTaxReportUrl()
+						&& null == orgRatepayMapper.selectRatepayByUidAndYear(uid, Calendar.YEAR - 1)) {
+					OrgRatepay r = new OrgRatepay();
+					r.setId(UUID.randomUUID().toString());
+					r.setUid(uid);
+					r.setYear(cal.get(Calendar.YEAR) - 1);
+					r.setDeletedSign(0);
+					r.setTaxReturnUrl(o.getLastYearTaxReportUrl());
+					orgRatepayMapper.insert(r);
+				}
+			}
+			return organizationIdentityMapper.updateByPrimaryKeySelective(o);
+		}
+	}
+
+	@Override
+	public int updateOrgDetail(OrganizationIdentity orgIdentity) {
+		if (null != orgIdentity.getAuditStatus() && 5 == orgIdentity.getAuditStatus() && !StringUtils.isBlank(orgIdentity.getUid())) {
+			User u = new User();
+			u.setId(orgIdentity.getUid());
+			u.setLvl(1);
+			userMapper.updateByPrimaryKeySelective(u);
+
+			Calendar cal = Calendar.getInstance();
+			if (null != orgIdentity.getLastYearTaxReportUrl()
+					&& null == orgRatepayMapper.selectRatepayByUidAndYear(orgIdentity.getUid(), Calendar.YEAR - 1)) {
+				OrgRatepay r = new OrgRatepay();
+				r.setId(UUID.randomUUID().toString());
+				r.setUid(orgIdentity.getUid());
+				r.setYear(cal.get(Calendar.YEAR) - 1);
+				r.setDeletedSign(0);
+				r.setTaxReturnUrl(orgIdentity.getLastYearTaxReportUrl());
+				orgRatepayMapper.insert(r);
+			}
+		}
+		return organizationIdentityMapper.updateByPrimaryKeySelective(orgIdentity);
+	}
 
 }

+ 40 - 0
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -1,9 +1,15 @@
 package com.goafanti.user.service.impl;
 
+import java.util.UUID;
+
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.common.bo.Result;
 import com.goafanti.common.dao.UserIdentityMapper;
+import com.goafanti.common.dao.UserMapper;
+import com.goafanti.common.model.User;
 import com.goafanti.common.model.UserIdentity;
 import com.goafanti.user.bo.UserIdentityBo;
 import com.goafanti.user.service.UserIdentityService;
@@ -12,6 +18,9 @@ import com.goafanti.user.service.UserIdentityService;
 public class UserIdentityServiceImpl implements UserIdentityService{
 	@Autowired
 	UserIdentityMapper userIdentityMapper;
+	@Autowired
+	UserMapper userMapper;
+	
 	@Override
 	public UserIdentity selectUserIdentityByUserId(String uid) {
 		return userIdentityMapper.selectUserIdentityByUserId(uid);
@@ -38,4 +47,35 @@ public class UserIdentityServiceImpl implements UserIdentityService{
 		return userIdentityMapper.updateByPrimaryKey(u);
 	}
 
+	@Override
+	public int saveUserIdentityProcess(Result res, UserIdentity userIdentity, String uid) {
+		UserIdentity identity = userIdentityMapper.selectUserIdentityByUserId(uid);
+		if (null == identity) {
+			userIdentity.setId(UUID.randomUUID().toString());
+			userIdentity.setUid(uid);
+			userIdentity.setWrongCount(0);
+			return userIdentityMapper.insert(userIdentity);
+		} else {
+			userIdentity.setId(identity.getId());
+			if (5 == userIdentity.getAuditStatus()){
+				User u = new User();
+				u.setId(userIdentity.getUid());
+				u.setLvl(1);
+				userMapper.updateByPrimaryKeySelective(u);
+			}
+			return userIdentityMapper.updateByPrimaryKeySelective(userIdentity);
+		}
+	}
+
+	@Override
+	public int updateUserDetail(UserIdentity u) {
+		if (null != u.getAuditStatus() && 5 == u.getAuditStatus() && !StringUtils.isBlank(u.getUid())){
+			User user = new User();
+			user.setId(u.getUid());
+			user.setLvl(1);
+			userMapper.updateByPrimaryKeySelective(user);
+		} 
+		return userIdentityMapper.updateByPrimaryKeySelective(u);
+	}
+
 }