Antiloveg 8 years ago
parent
commit
9864d45012

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

@@ -1827,7 +1827,7 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/downloadRatepay", method = RequestMethod.GET)
 	public Result downloadRatepay(HttpServletResponse response, String sign, String id) {
 		Result res = new Result();
-		if (StringUtils.isEmpty(id)) {
+		if (StringUtils.isBlank(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "企业纳税申报id"));
 			return res;
 		}

+ 4 - 1
src/main/java/com/goafanti/common/dao/OrganizationIdentityMapper.java

@@ -10,6 +10,7 @@ import com.goafanti.user.bo.OrgBasicInfoBo;
 import com.goafanti.user.bo.OrgIdentityBo;
 import com.goafanti.user.bo.OrgIdentityDetailBo;
 import com.goafanti.user.bo.OrgUnitNames;
+import com.goafanti.user.bo.OrganizationIndentityUserBo;
 
 public interface OrganizationIdentityMapper {
     int deleteByPrimaryKey(String id);
@@ -34,7 +35,7 @@ public interface OrganizationIdentityMapper {
 
 	OrgIdentityDetailBo selectOrgIdentityDetailByUserId(String uid);
 
-	AuditorOrgIdentityDetailBo selectAuditorOrgIdentityDetailByUserId(String uid);
+	AuditorOrgIdentityDetailBo selectAuditorOrgIdentityDetailByUserId(@Param("uid")String uid, @Param("year")Integer year);
 
 	List<OrgUnitNames> selectManagerUnitNames(String aid);
 
@@ -42,4 +43,6 @@ public interface OrganizationIdentityMapper {
 
 	List<OrgUnitNames> selectAchievementOrgOwner(@Param("aid")String aid, @Param("name")String name);
 
+	OrganizationIndentityUserBo selectOrgIdentityUserBoByUserId(@Param("uid")String uid, @Param("year")Integer year);
+
 }

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

@@ -946,8 +946,9 @@
 
 	<select id="selectOrgIdentityBoByUserId" parameterType="java.lang.String"
 		resultType="com.goafanti.user.bo.OrgIdentityBo">
-		select t.id,t.uid,t.contacts,t.fixed_tel as fixedTel
-		,t.qq,t.postal_address
+		select 
+		t.id,t.uid,t.contacts,t.fixed_tel as fixedTel,
+		t.qq,t.postal_address
 		as postalAddress ,t.postcode,
 		t.first_contacts as
 		firstContacts, t.first_mobile as firstMobile,
@@ -1050,9 +1051,11 @@
 			 oi.org_code_url as orgCodeUrl,  oi.banks, bank_branch as bankBranch,  oi.bank_card_number as bankCardNumber,
 			 oi.location_province as locationProvince,  oi.location_city as locationCity,  oi.location_area as locationArea,
 			 oi.validation_amount as validationAmount,  oi.payment_date as paymentDate,  oi.audit_status as auditStatus,
-			 oi.last_year_tax_report_url as lastYearTaxReportUrl, oi.field, oi.registered_capital as registeredCapital
+			 oi.last_year_tax_report_url as lastYearTaxReportUrl, oi.field, oi.registered_capital as registeredCapital,
+			 ratepay.id as ratepayId
 		from user u 
 		LEFT JOIN organization_identity oi on oi.uid = u.id
+		LEFT JOIN org_ratepay ratepay on ratepay.uid = u.id and ratepay.year = #{year,jdbcType=INTEGER} and deleted_sign = 0
 		where uid = #{uid,jdbcType=VARCHAR}
 	</select>
 	

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

@@ -4,6 +4,8 @@ public class AuditorOrgIdentityDetailBo extends OrgIdentityDetailBo {
 	private String	aid;
 
 	private String	mid;
+	
+	private String ratepayId;
 
 	public String getAid() {
 		return aid;
@@ -21,4 +23,14 @@ public class AuditorOrgIdentityDetailBo extends OrgIdentityDetailBo {
 		this.mid = mid;
 	}
 
+	public String getRatepayId() {
+		return ratepayId;
+	}
+
+	public void setRatepayId(String ratepayId) {
+		this.ratepayId = ratepayId;
+	}
+	
+	
+
 }

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

@@ -4,7 +4,9 @@ import com.goafanti.common.model.OrganizationIdentity;
 
 public class OrgIdentityDetailAdmin extends OrganizationIdentity {
 	private String level;
-
+	
+	private String ratepayId;
+	
 	public String getLevel() {
 		return level;
 	}
@@ -13,4 +15,14 @@ public class OrgIdentityDetailAdmin extends OrganizationIdentity {
 		this.level = level;
 	}
 
+	public String getRatepayId() {
+		return ratepayId;
+	}
+
+	public void setRatepayId(String ratepayId) {
+		this.ratepayId = ratepayId;
+	}
+	
+	
+
 }

+ 17 - 0
src/main/java/com/goafanti/user/bo/OrganizationIndentityUserBo.java

@@ -0,0 +1,17 @@
+package com.goafanti.user.bo;
+
+import com.goafanti.common.model.OrganizationIdentity;
+
+public class OrganizationIndentityUserBo extends OrganizationIdentity{
+	private String ratepayId;
+
+	public String getRatepayId() {
+		return ratepayId;
+	}
+
+	public void setRatepayId(String ratepayId) {
+		this.ratepayId = ratepayId;
+	}
+	
+	
+}

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

@@ -741,7 +741,7 @@ public class UserApiController extends BaseApiController {
 	public Result orgProcess() {
 		Result res = new Result();
 		if (TokenManager.isLogin()) {
-			res.setData(organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId()));
+			res.setData(organizationIdentityService.selectOrgIdentityUserBoByUserId(TokenManager.getUserId()));
 		}
 		return res;
 	}

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

@@ -14,6 +14,7 @@ import com.goafanti.user.bo.OrgIdentityBo;
 import com.goafanti.user.bo.OrgIdentityDetailAdmin;
 import com.goafanti.user.bo.OrgIdentityDetailBo;
 import com.goafanti.user.bo.OrgUnitNames;
+import com.goafanti.user.bo.OrganizationIndentityUserBo;
 
 public interface OrganizationIdentityService {
 
@@ -51,5 +52,7 @@ public interface OrganizationIdentityService {
 	OrgIdentityDetailAdmin selectOrgIdentityDetailByUserIdAdmin(String uid);
 
 	void save(OrgIdentityBo orgIdentityBo);
+	
+	OrganizationIndentityUserBo selectOrgIdentityUserBoByUserId(String userId);
 
 }

+ 35 - 22
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -42,6 +42,7 @@ import com.goafanti.user.bo.OrgIdentityBo;
 import com.goafanti.user.bo.OrgIdentityDetailAdmin;
 import com.goafanti.user.bo.OrgIdentityDetailBo;
 import com.goafanti.user.bo.OrgUnitNames;
+import com.goafanti.user.bo.OrganizationIndentityUserBo;
 import com.goafanti.user.service.OrganizationIdentityService;
 
 @Service
@@ -71,6 +72,18 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 		return organizationIdentityMapper.selectOrgIdentityByUserId(userId);
 	}
 
+	public OrganizationIndentityUserBo selectOrgIdentityUserBoByUserId(String userId) {
+		OrganizationIdentity oi = organizationIdentityMapper.selectOrgIdentityByUserId(userId);
+		OrgRatepay ratepay = orgRatepayMapper.selectRatepayByUidAndYear(userId,
+				Calendar.getInstance().get(Calendar.YEAR - 1));
+		OrganizationIndentityUserBo bo = new OrganizationIndentityUserBo();
+		BeanUtils.copyProperties(oi, bo);
+		if (null != ratepay) {
+			bo.setRatepayId(ratepay.getId());
+		}
+		return null;
+	}
+
 	@Override
 	public int updateByPrimaryKeySelective(OrganizationIdentity organizationIdentity) {
 		return organizationIdentityMapper.updateByPrimaryKeySelective(organizationIdentity);
@@ -118,6 +131,9 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 	@Override
 	public int saveOrgIndentityProcess(Result res, OrganizationIdentity o, String uid) {
 		OrganizationIdentity org = organizationIdentityMapper.selectOrgIdentityByUserId(uid);
+		if (StringUtils.isNotBlank(o.getLastYearTaxReportUrl())) {
+			disposeRatePay(o, uid);
+		}
 		if (null == org) {
 			o.setId(UUID.randomUUID().toString());
 			o.setUid(uid);
@@ -127,7 +143,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 			if (null != o.getAuditStatus() && 5 == o.getAuditStatus()) {
 				User u = new User();
 				u.setId(uid);
-				u.setLvl(1);
+				u.setLvl(UserLevel.CERTIFIED.getCode());
 				userMapper.updateByPrimaryKeySelective(u);
 			}
 			return organizationIdentityMapper.updateByPrimaryKeySelective(o);
@@ -136,21 +152,8 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 
 	@Override
 	public int updateOrgDetail(OrganizationIdentity orgIdentity, String saveSign, Integer level) {
-		if (null != orgIdentity.getLastYearTaxReportUrl()) {
-			Calendar cal = Calendar.getInstance();
-			OrgRatepay rate = orgRatepayMapper.selectRatepayByUidAndYear(orgIdentity.getUid(), Calendar.YEAR - 1);
-			if (null == rate) {
-				OrgRatepay r = new OrgRatepay();
-				r.setId(UUID.randomUUID().toString());
-				r.setUid(orgIdentity.getUid());
-				r.setYear(cal.get(Calendar.YEAR) - 1);
-				r.setDeletedSign(DeleteStatus.UNDELETE.getCode());
-				r.setTaxReturnUrl(orgIdentity.getLastYearTaxReportUrl());
-				orgRatepayMapper.insert(r);
-			} else {
-				rate.setTaxReturnUrl(orgIdentity.getLastYearTaxReportUrl());
-				orgRatepayMapper.updateByPrimaryKeySelective(rate);
-			}
+		if (StringUtils.isNotBlank(orgIdentity.getLastYearTaxReportUrl())) {
+			disposeRatePay(orgIdentity, orgIdentity.getUid());
 		}
 		User user = userMapper.selectByPrimaryKey(orgIdentity.getUid());
 		user.setLvl(level);
@@ -178,7 +181,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 			user.setAid(aid);
 			user.setMid(mid);
 			userMapper.updateByPrimaryKeySelective(user);
-			disposeRatePay(oi, oi.getUid());
+			// disposeRatePay(oi, oi.getUid());
 			createNotice(user, oi.getAuditStatus());
 		}
 		return organizationIdentityMapper.updateByPrimaryKeySelective(oi);
@@ -217,7 +220,9 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 
 	@Override
 	public AuditorOrgIdentityDetailBo selectAuditorOrgIdentityDetailByUserId(String uid) {
-		return organizationIdentityMapper.selectAuditorOrgIdentityDetailByUserId(uid);
+
+		return organizationIdentityMapper.selectAuditorOrgIdentityDetailByUserId(uid,
+				Calendar.getInstance().get(Calendar.YEAR - 1));
 	}
 
 	@SuppressWarnings("unchecked")
@@ -342,13 +347,18 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 		OrgIdentityDetailAdmin bo = new OrgIdentityDetailAdmin();
 		BeanUtils.copyProperties(o, bo);
 		bo.setLevel(u.getLvl().toString());
+		Calendar now = Calendar.getInstance();
+		OrgRatepay ratepay = orgRatepayMapper.selectRatepayByUidAndYear(uid, now.get(Calendar.YEAR) - 1);
+		if (null != ratepay) {
+			bo.setRatepayId(ratepay.getId());
+		}
 		return bo;
 	}
 
 	private void disposeRatePay(OrganizationIdentity o, String uid) {
 		Calendar now = Calendar.getInstance();
-		if (null != o.getLastYearTaxReportUrl()
-				&& null == orgRatepayMapper.selectRatepayByUidAndYear(uid, now.get(Calendar.YEAR) - 1)) {
+		OrgRatepay ratepay = orgRatepayMapper.selectRatepayByUidAndYear(uid, now.get(Calendar.YEAR) - 1);
+		if (null == ratepay) {
 			OrgRatepay r = new OrgRatepay();
 			r.setId(UUID.randomUUID().toString());
 			r.setUid(uid);
@@ -356,6 +366,9 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 			r.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			r.setTaxReturnUrl(o.getLastYearTaxReportUrl());
 			orgRatepayMapper.insert(r);
+		} else {
+			ratepay.setTaxReturnUrl(o.getLastYearTaxReportUrl());
+			orgRatepayMapper.updateByPrimaryKeySelective(ratepay);
 		}
 	}
 
@@ -371,10 +384,10 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 			oi.setId(UUID.randomUUID().toString());
 			oi.setUid(TokenManager.getUserId());
 			organizationIdentityMapper.insert(oi);
-		} else if (null != o && StringUtils.isNotBlank(oi.getId())){
+		} else if (null != o && StringUtils.isNotBlank(oi.getId())) {
 			organizationIdentityMapper.updateByPrimaryKeySelective(oi);
 		}
-		
+
 	}
 
 }