Antiloveg преди 8 години
родител
ревизия
e533a2b8b5

+ 4 - 0
schema/permission.sql

@@ -394,6 +394,10 @@ values
 (UUID(), 'api/admin/userCertify/accountManager', '用户认证--获取客户经理下拉(审核员)'),
 (UUID(), 'api/admin/userCertify/technician', '用户认证--获取业务员(技术员)下拉(审核员)');
 
+insert into `permission`(`id`, `url`, `name`) 
+values
+(UUID(), 'api/admin/salesman', '获取营销员及营销经理下拉');
+
 
 
 

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

@@ -68,6 +68,7 @@ import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.enums.AdminFields;
 import com.goafanti.common.enums.AttachmentType;
+import com.goafanti.common.enums.CertifySubmitType;
 import com.goafanti.common.enums.CognizanceApplyFields;
 import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.enums.FinanceRatepayFields;
@@ -189,12 +190,12 @@ public class AdminApiController extends CertifyApiController {
 	private CopyrightInfoService			copyrightInfoService;
 	@Resource
 	private OrgCognizanceProportionService	orgCognizanceProportionService;
-	
+
 	/**
 	 * 获取营销员及营销经理下拉
 	 */
 	@RequestMapping(value = "/salesman", method = RequestMethod.GET)
-	public Result getSalesMan(){
+	public Result getSalesMan() {
 		Result res = new Result();
 		res.setData(adminService.selectSalesman());
 		return res;
@@ -671,7 +672,7 @@ public class AdminApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/updateUserDetail", method = RequestMethod.POST)
 	public Result updateUserDetail(@Valid InputUserIdentity userIdentity, BindingResult bindingResult,
-			String paymentDateFormattedDate) {
+			String paymentDateFormattedDate, String saveSign) {
 		Result res = new Result();
 
 		if (bindingResult.hasErrors()) {
@@ -685,6 +686,16 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
+		if (StringUtils.isBlank(saveSign)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到保存提交方式", "保存提交方式"));
+			return res;
+		}
+
+		if (!saveSign.equals(CertifySubmitType.SAVE.getCode()) && !saveSign.equals(CertifySubmitType.SUBMIT.getCode())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "保存提交方式"));
+			return res;
+		}
+
 		if (!StringUtils.isBlank(paymentDateFormattedDate)) {
 			try {
 				userIdentity.setPaymentDate(DateUtils.parseDate(paymentDateFormattedDate, AFTConstants.YYYYMMDD));
@@ -700,9 +711,9 @@ public class AdminApiController extends CertifyApiController {
 
 		if (StringUtils.isBlank(ui.getId())) {
 			ui.setId(UUID.randomUUID().toString());
-			res.setData(userIdentityService.insertByAdmin(ui, null, null));
+			res.setData(userIdentityService.insertByAdmin(ui, null, null, saveSign));
 		} else {
-			res.setData(userIdentityService.updateUserDetail(ui, null, null));
+			res.setData(userIdentityService.updateUserDetail(ui, null, null, saveSign));
 		}
 		return res;
 	}
@@ -753,7 +764,8 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(organizationIdentityService.selectOrgIdentityDetailByUserId(uid));
 		return res;
 	}
-
+	
+    
 	/**
 	 * 修改团体用户信息
 	 * 
@@ -763,7 +775,7 @@ public class AdminApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/updateOrgDetail", method = RequestMethod.POST)
 	public Result updateOrgDetail(@Valid InputOrganizationIdentity orgIdentity, BindingResult bindingResult,
-			String paymentDateFormattedDate) {
+			String paymentDateFormattedDate, String saveSign) {
 		Result res = new Result();
 
 		if (bindingResult.hasErrors()) {
@@ -776,6 +788,17 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
+
+		if (StringUtils.isBlank(saveSign)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到保存提交方式", "保存提交方式"));
+			return res;
+		}
+
+		if (!saveSign.equals(CertifySubmitType.SAVE.getCode()) && !saveSign.equals(CertifySubmitType.SUBMIT.getCode())){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "保存提交方式"));
+			return res;
+		}
+
 		if (!StringUtils.isBlank(paymentDateFormattedDate)) {
 			try {
 				orgIdentity.setPaymentDate(DateUtils.parseDate(paymentDateFormattedDate, AFTConstants.YYYYMMDD));
@@ -788,9 +811,9 @@ public class AdminApiController extends CertifyApiController {
 
 		if (StringUtils.isBlank(oi.getId())) {
 			oi.setId(UUID.randomUUID().toString());
-			res.setData(organizationIdentityService.insertByAdmin(oi, null, null));
+			res.setData(organizationIdentityService.insertByAdmin(oi, null, null, saveSign));
 		} else {
-			res.setData(organizationIdentityService.updateOrgDetail(oi, null, null));
+			res.setData(organizationIdentityService.updateOrgDetail(oi, null, null, saveSign));
 		}
 		return res;
 	}
@@ -2967,8 +2990,8 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
-		
-		if (StringUtils.isBlank(cog.getSalesman())){
+
+		if (StringUtils.isBlank(cog.getSalesman())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到营销员", "营销员"));
 			return res;
 		}
@@ -2985,24 +3008,24 @@ public class AdminApiController extends CertifyApiController {
 		LatelyCogRecord lcr = orgCognizanceService.selectLatelyRecord(cog.getUid());
 
 		if (null != lcr && null != lcr.getState() && OrgCognizanceStatus.FOSTER.getCode() == lcr.getState()) {
-			res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "", "高企培育中!无法提交新申请!"));
+			res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "高企培育中!无法提交新申请!", "高企培育中!无法提交新申请!"));
 			return res;
 		}
 
 		if (null != lcr && null != lcr.getState() && OrgCognizanceStatus.SETTLEMENT.getCode() != lcr.getState()
 				&& OrgCognizanceStatus.CALLBACK.getCode() != lcr.getState()) {
-			res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "", "高企申请中!无法提交新申请!"));
+			res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "高企申请中!无法提交新申请!", "高企申请中!无法提交新申请!"));
 			return res;
 		}
 
 		if (null != lcr && null != lcr.getState() && OrgCognizanceStatus.SETTLEMENT.getCode() == lcr.getState()) {
 			if (null == lcr.getIssuingDate()) {
-				res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "", "高企认定未过期!无法提交新申请!"));
+				res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "高企认定未过期!无法提交新申请!", "高企认定未过期!无法提交新申请!"));
 				return res;
 			}
 			try {
 				if (Boolean.FALSE == TimeUtils.checkCogExpire(lcr.getIssuingDate())) {
-					res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "", "高企认定未过期,无法提交新申请!"));
+					res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "高企认定未过期,无法提交新申请!", "高企认定未过期,无法提交新申请!"));
 					return res;
 				}
 			} catch (ParseException e) {

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

@@ -155,7 +155,7 @@ public class AdminUserCertifyApiController extends CertifyApiController {
 					|| IdentityAuditStatus.PASSED.getCode() == ui.getAuditStatus()) {
 				ui.setProcess(IdentityProcess.RESULTS.getCode());
 			}
-			res.setData(userIdentityService.insertByAdmin(ui, aid, mid));
+			res.setData(userIdentityService.insertByAdmin(ui, aid, mid, null));
 		} else {
 			ui.setAuditStatus(null == ui.getAuditStatus() ? 0 : ui.getAuditStatus());
 			if (IdentityAuditStatus.UNCOMMITTED.getCode() == ui.getAuditStatus()) {
@@ -169,7 +169,7 @@ public class AdminUserCertifyApiController extends CertifyApiController {
 					|| IdentityAuditStatus.PASSED.getCode() == ui.getAuditStatus()) {
 				ui.setProcess(IdentityProcess.RESULTS.getCode());
 			}
-			res.setData(userIdentityService.updateUserDetail(ui, aid, mid));
+			res.setData(userIdentityService.updateUserDetail(ui, aid, mid, null));
 		}
 		return res;
 	}
@@ -241,7 +241,7 @@ public class AdminUserCertifyApiController extends CertifyApiController {
 			}
 			oi.setListed(null == oi.getListed() ? 0 : oi.getListed());
 			oi.setListedType(null == oi.getListedType() ? 0 : oi.getListedType());
-			res.setData(organizationIdentityService.insertByAdmin(oi, aid, mid));
+			res.setData(organizationIdentityService.insertByAdmin(oi, aid, mid, null));
 		} else {
 			oi.setAuditStatus(null == oi.getAuditStatus() ? 0 : oi.getAuditStatus());
 			if (IdentityAuditStatus.UNCOMMITTED.getCode() == oi.getAuditStatus()) {
@@ -255,7 +255,7 @@ public class AdminUserCertifyApiController extends CertifyApiController {
 					|| IdentityAuditStatus.PASSED.getCode() == oi.getAuditStatus()) {
 				oi.setProcess(IdentityProcess.RESULTS.getCode());
 			}
-			res.setData(organizationIdentityService.updateOrgDetail(oi, aid, mid));
+			res.setData(organizationIdentityService.updateOrgDetail(oi, aid, mid, null));
 		}
 		return res;
 	}

+ 51 - 0
src/main/java/com/goafanti/common/enums/CertifySubmitType.java

@@ -0,0 +1,51 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum CertifySubmitType {
+	
+	SAVE("save", "保存"), 
+	SUBMIT("submit", "保存并提交"),
+	DEFAULT("other", "其他");
+
+	private CertifySubmitType(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<String, CertifySubmitType> status = new HashMap<String, CertifySubmitType>();
+
+	static {
+		for (CertifySubmitType value : CertifySubmitType.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+
+	public static CertifySubmitType getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return DEFAULT;
+	}
+
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+
+	private String	code;
+	private String	desc;
+
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

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

@@ -505,6 +505,6 @@
   <select id="selectLatelyRecord" resultType="com.goafanti.cognizance.bo.LatelyCogRecord" parameterType="java.lang.String" >
     select c.id, c.issuing_date as issuingDate, l.state, MAX(l.record_time) as recordTime
 		   from org_cognizance c LEFT JOIN org_cognizance_log l on 
-		   c.id = l.cid  where c.uid = #{uid,jdbcType=VARCHAR}
+		   c.id = l.cid  where c.uid = #{uid,jdbcType=VARCHAR} and c.deleted_sign = 0
   </select>
 </mapper>

+ 1 - 0
src/main/java/com/goafanti/copyright/service/impl/CopyrightInfoServiceImpl.java

@@ -294,6 +294,7 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
 		l.setOperator(salesman);
 		l.setPrincipal(TokenManager.getAdminId());
 		l.setStatus(CopyrightStatus.DELIVERD.getCode());
+		copyrightLogMapper.insertSelective(l);
 		createNotice(copyrightInfo, l);
 		return copyrightInfo;
 	}

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

@@ -159,6 +159,7 @@ public class InputOrganizationIdentity {
 
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		consultant;
+	
 
 	public String getId() {
 		return id;

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

@@ -32,7 +32,7 @@ public interface OrganizationIdentityService {
 
 	int saveOrgIndentityProcess(Result res, OrganizationIdentity o, String uid);
 
-	int updateOrgDetail(OrganizationIdentity orgIdentity, String aid, String mid);
+	int updateOrgDetail(OrganizationIdentity orgIdentity, String aid, String mid, String saveSign);
 
 	OrgBasicInfoBo selectBasicInfo(String uid, int year);
 
@@ -42,7 +42,7 @@ public interface OrganizationIdentityService {
 
 	AuditorOrgIdentityDetailBo selectAuditorOrgIdentityDetailByUserId(String uid);
 
-	OrganizationIdentity insertByAdmin(OrganizationIdentity oi, String aid, String mid);
+	OrganizationIdentity insertByAdmin(OrganizationIdentity oi, String aid, String mid, String saveSign);
 
 
 

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

@@ -19,9 +19,9 @@ public interface UserIdentityService {
 
 	int  saveUserIdentityProcess(Result res, UserIdentity u, String uid);
 
-	int updateUserDetail(UserIdentity userIdentity, String aid, String mid);
+	int updateUserDetail(UserIdentity userIdentity, String aid, String mid, String saveSign);
 
-	UserIdentity insertByAdmin(UserIdentity ui, String aid, String mid);
+	UserIdentity insertByAdmin(UserIdentity ui, String aid, String mid, String saveSign);
 
 	AuditorUserIdentityDetailBo selectAuditorUserIdentityByUserId(String uid);
 

+ 27 - 23
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -18,6 +18,7 @@ import com.goafanti.common.dao.OrgRatepayMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.dao.UserRoleMapper;
+import com.goafanti.common.enums.CertifySubmitType;
 import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.enums.IdentityAuditStatus;
 import com.goafanti.common.enums.NoticeReadStatus;
@@ -139,40 +140,41 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 	}
 
 	@Override
-	public int updateOrgDetail(OrganizationIdentity orgIdentity, String aid, String mid) {
+	public int updateOrgDetail(OrganizationIdentity orgIdentity, String aid, String mid, String saveSign) {
 		if (null != orgIdentity.getAuditStatus() && 5 == orgIdentity.getAuditStatus()
 				&& !StringUtils.isBlank(orgIdentity.getUid())) {
 			User u = new User();
 			u.setId(orgIdentity.getUid());
 			u.setLvl(UserLevel.CERTIFIED.getCode());
 			userMapper.updateByPrimaryKeySelective(u);
-
-			Calendar cal = Calendar.getInstance();
-			if (null != orgIdentity.getLastYearTaxReportUrl()) {
-				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(0);
-					r.setTaxReturnUrl(orgIdentity.getLastYearTaxReportUrl());
-					orgRatepayMapper.insert(r);
-				} else {
-					rate.setTaxReturnUrl(orgIdentity.getLastYearTaxReportUrl());
-					orgRatepayMapper.updateByPrimaryKeySelective(rate);
-				}
+		}
+		Calendar cal = Calendar.getInstance();
+		if (null != orgIdentity.getLastYearTaxReportUrl()) {
+			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(0);
+				r.setTaxReturnUrl(orgIdentity.getLastYearTaxReportUrl());
+				orgRatepayMapper.insert(r);
+			} else {
+				rate.setTaxReturnUrl(orgIdentity.getLastYearTaxReportUrl());
+				orgRatepayMapper.updateByPrimaryKeySelective(rate);
 			}
 		}
+
 		User user = userMapper.selectByPrimaryKey(orgIdentity.getUid());
-		if (!TokenManager.hasRole(AFTConstants.AUDITORADMIN) && !TokenManager.hasRole(AFTConstants.SUPERADMIN)){
+		if (!TokenManager.hasRole(AFTConstants.AUDITORADMIN) && !TokenManager.hasRole(AFTConstants.SUPERADMIN)
+				&& CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
 			user.setAid(TokenManager.getAdminId());
 			createAuditorNotice(user);
 		} else {
-			if (!StringUtils.isBlank(aid)){
+			if (!StringUtils.isBlank(aid)) {
 				user.setAid(aid);
 			}
-			if (!StringUtils.isBlank(mid)){
+			if (!StringUtils.isBlank(mid)) {
 				user.setMid(mid);
 			}
 			createNotice(user, orgIdentity.getAuditStatus());
@@ -219,10 +221,11 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 	}
 
 	@Override
-	public OrganizationIdentity insertByAdmin(OrganizationIdentity oi, String aid, String mid) {
+	public OrganizationIdentity insertByAdmin(OrganizationIdentity oi, String aid, String mid, String saveSign) {
 		organizationIdentityMapper.insert(oi);
 		User u = userMapper.selectByPrimaryKey(oi.getUid());
-		if (!TokenManager.hasRole(AFTConstants.AUDITORADMIN) && !TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
+		if (!TokenManager.hasRole(AFTConstants.AUDITORADMIN) && !TokenManager.hasRole(AFTConstants.SUPERADMIN)
+				&& CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
 			u.setAid(TokenManager.getAdminId());
 			userMapper.updateByPrimaryKeySelective(u);
 			createAuditorNotice(u);
@@ -278,7 +281,8 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 				}
 				n.setUid(u.getId());
 				n.setAid(s);
-				n.setContent(NoticeStatus.ORGANIZATIONCERTIFY.getDesc() + " " + IdentityAuditStatus.COMMITTED.getDesc());
+				n.setContent(
+						NoticeStatus.ORGANIZATIONCERTIFY.getDesc() + " " + IdentityAuditStatus.COMMITTED.getDesc());
 				n.setNoticeType(NoticeStatus.ORGANIZATIONCERTIFY.getCode());
 				noticeMapper.insert(n);
 			}

+ 7 - 4
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -14,6 +14,7 @@ import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.UserIdentityMapper;
 import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.dao.UserRoleMapper;
+import com.goafanti.common.enums.CertifySubmitType;
 import com.goafanti.common.enums.IdentityAuditStatus;
 import com.goafanti.common.enums.NoticeReadStatus;
 import com.goafanti.common.enums.NoticeStatus;
@@ -85,7 +86,7 @@ public class UserIdentityServiceImpl implements UserIdentityService {
 	}
 
 	@Override
-	public int updateUserDetail(UserIdentity u, String aid, String mid) {
+	public int updateUserDetail(UserIdentity u, String aid, String mid, String saveSign) {
 		if (null != u.getAuditStatus() && 5 == u.getAuditStatus() && !StringUtils.isBlank(u.getUid())) {
 			User user = new User();
 			user.setId(u.getUid());
@@ -93,7 +94,8 @@ public class UserIdentityServiceImpl implements UserIdentityService {
 			userMapper.updateByPrimaryKeySelective(user);
 		}
 		User user = userMapper.selectByPrimaryKey(u.getUid());
-		if (!TokenManager.hasRole(AFTConstants.AUDITORADMIN) && !TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
+		if (!TokenManager.hasRole(AFTConstants.AUDITORADMIN) && !TokenManager.hasRole(AFTConstants.SUPERADMIN)
+				&& CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
 			user.setAid(TokenManager.getAdminId());
 			createAuditorNotice(user);
 		} else {
@@ -110,10 +112,11 @@ public class UserIdentityServiceImpl implements UserIdentityService {
 	}
 
 	@Override
-	public UserIdentity insertByAdmin(UserIdentity ui, String aid, String mid) {
+	public UserIdentity insertByAdmin(UserIdentity ui, String aid, String mid, String saveSign) {
 		userIdentityMapper.insert(ui);
 		User u = userMapper.selectByPrimaryKey(ui.getUid());
-		if (!TokenManager.hasRole(AFTConstants.AUDITORADMIN) && !TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
+		if (!TokenManager.hasRole(AFTConstants.AUDITORADMIN) && !TokenManager.hasRole(AFTConstants.SUPERADMIN)
+				&& CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
 			u.setAid(TokenManager.getAdminId());
 			userMapper.updateByPrimaryKeySelective(u);
 			createAuditorNotice(u);