Antiloveg 8 年 前
コミット
8054a639a1

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

@@ -95,6 +95,7 @@ import com.goafanti.common.enums.ProprotionFields;
 import com.goafanti.common.enums.UserAbilityFields;
 import com.goafanti.common.enums.UserFields;
 import com.goafanti.common.enums.UserIdentityFields;
+import com.goafanti.common.enums.UserLevel;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.OrgActivity;
 import com.goafanti.common.model.OrgActivityCost;
@@ -610,7 +611,7 @@ public class AdminApiController extends CertifyApiController {
 		now.set(Calendar.MILLISECOND, 0);
 		u.setCreateTime(now.getTime());
 		u.setPassword(passwordUtil.getEncryptPwd(u));
-		u.setLvl(0);
+		u.setLvl(UserLevel.GENERAL.getCode());
 		u.setAid(TokenManager.getAdminId());
 		userService.insertRegister(u, "", inputUser.getUnitName());
 		return res;
@@ -1059,7 +1060,7 @@ public class AdminApiController extends CertifyApiController {
 
 		if (StringUtils.isBlank(os.getId())) {
 			os.setId(UUID.randomUUID().toString());
-			os.setDeletedSign(0);
+			os.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			Calendar now = Calendar.getInstance();
 			now.set(Calendar.MILLISECOND, 0);
 			os.setCreateTime(now.getTime());
@@ -1251,7 +1252,7 @@ public class AdminApiController extends CertifyApiController {
 		if (StringUtils.isBlank(oip.getId())) {
 			oip.setId(UUID.randomUUID().toString());
 			oip.setEvaluationCategory((oip.getCatagory() >= 2 && oip.getCatagory() <= 4) ? 1 : 0);
-			oip.setDeletedSign(0);
+			oip.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			oip.setType(IntellectualPropertyType.COMMON.getCode());
 			res.setData(orgIntellectualPropertyService.insert(oip));
 		} else {
@@ -1453,7 +1454,7 @@ public class AdminApiController extends CertifyApiController {
 
 		if (StringUtils.isBlank(otp.getId())) {
 			otp.setId(UUID.randomUUID().toString());
-			otp.setDeletedSign(0);
+			otp.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			Calendar now = Calendar.getInstance();
 			now.set(Calendar.MILLISECOND, 0);
 			otp.setCreateTime(now.getTime());
@@ -1637,7 +1638,7 @@ public class AdminApiController extends CertifyApiController {
 
 		OrgActivity oa = new OrgActivity();
 		BeanUtils.copyProperties(orgActivity, oa);
-		oa.setDeletedSign(0);
+		oa.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 		if (StringUtils.isBlank(oa.getId())) {
 			oa.setId(UUID.randomUUID().toString());
 			orgActivityService.insert(oa);
@@ -1823,7 +1824,7 @@ public class AdminApiController extends CertifyApiController {
 				oac.setStartDate(null == ac.getStartDate() ? null : ac.getStartDate());
 				oac.setEndDate(null == ac.getEndDate() ? null : ac.getEndDate());
 				oac.setId(UUID.randomUUID().toString());
-				oac.setDeletedSign(0);
+				oac.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 				orgActivityCostService.insert(oac);
 			} else {
 				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到研发活动", "研发活动ID"));
@@ -2023,7 +2024,7 @@ public class AdminApiController extends CertifyApiController {
 		if (StringUtils.isBlank(rate.getId())) {
 			if (null == orgRatepayService.selectRatepayByUidAndYear(rate.getUid(), rate.getYear())) {
 				rate.setId(UUID.randomUUID().toString());
-				rate.setDeletedSign(0);
+				rate.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 				orgRatepayService.insert(rate);
 			} else {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度纳税申报表已录入!"));
@@ -2209,7 +2210,7 @@ public class AdminApiController extends CertifyApiController {
 		if (StringUtils.isBlank(of.getId())) {
 			if (null == orgFinanceService.selectFinanceByUidAndYear(of.getUid(), of.getYear())) {
 				of.setId(UUID.randomUUID().toString());
-				of.setDeletedSign(0);
+				of.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 				orgFinanceService.insert(of);
 			} else {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度财务报表已录入!"));
@@ -2362,7 +2363,7 @@ public class AdminApiController extends CertifyApiController {
 
 		if (StringUtils.isBlank(ota.getId())) {
 			ota.setId(UUID.randomUUID().toString());
-			ota.setDeletedSign(0);
+			ota.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			orgTechAchievementService.insert(ota);
 		} else {
 			orgTechAchievementService.updateByPrimaryKeySelective(ota);
@@ -2516,7 +2517,7 @@ public class AdminApiController extends CertifyApiController {
 
 		if (StringUtils.isBlank(ohd.getId())) {
 			ohd.setId(UUID.randomUUID().toString());
-			ohd.setDeletedSign(0);
+			ohd.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			orgHonorDatumService.insert(ohd);
 		} else {
 			orgHonorDatumService.updateByPrimaryKeySelective(ohd);
@@ -2654,7 +2655,7 @@ public class AdminApiController extends CertifyApiController {
 
 		if (StringUtils.isBlank(otc.getId())) {
 			otc.setId(UUID.randomUUID().toString());
-			otc.setDeletedSign(0);
+			otc.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			orgTechCenterService.insert(otc);
 		} else {
 			orgTechCenterService.updateByPrimaryKeySelective(otc);
@@ -2794,7 +2795,7 @@ public class AdminApiController extends CertifyApiController {
 
 		if (StringUtils.isBlank(otcd.getId())) {
 			otcd.setId(UUID.randomUUID().toString());
-			otcd.setDeletedSign(0);
+			otcd.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			orgTechCenterDetailService.insert(otcd);
 		} else {
 			orgTechCenterDetailService.updateByPrimaryKeySelective(otcd);
@@ -3333,7 +3334,7 @@ public class AdminApiController extends CertifyApiController {
 				now.set(Calendar.MILLISECOND, 0);
 				oar.setCreateTime(now.getTime());
 				oar.setLastUpdateTime(oar.getCreateTime());
-				oar.setDeletedSign(0);
+				oar.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 				orgAnnualReportService.insert(oar);
 			}
 		} else {

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

@@ -40,6 +40,7 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.enums.AttachmentType;
+import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.enums.PatentCostFields;
 import com.goafanti.common.enums.PatentInfoFields;
 import com.goafanti.common.enums.PatentInfoStatus;
@@ -548,7 +549,7 @@ public class AdminPatentApiController extends CertifyApiController {
 					f.setSign(sign);
 				}
 				f.setFilePath("/admin/" + fileName);
-				f.setDeleletedSign(0);
+				f.setDeleletedSign(DeleteStatus.UNDELETE.getCode());
 				aftFileService.insert(f);
 
 			}

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

@@ -62,6 +62,7 @@ import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.enums.AttachmentType;
 import com.goafanti.common.enums.CognizanceApplyFields;
+import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.enums.FinanceRatepayFields;
 import com.goafanti.common.enums.IntellectualPropertyType;
 import com.goafanti.common.enums.OrgActivityFields;
@@ -1358,7 +1359,7 @@ public class CognizanceApiController extends CertifyApiController {
 
 		OrgActivity oa = new OrgActivity();
 		BeanUtils.copyProperties(orgActivity, oa);
-		oa.setDeletedSign(0);
+		oa.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 
 		if (StringUtils.isBlank(oa.getId())) {
 			oa.setId(UUID.randomUUID().toString());
@@ -1444,7 +1445,7 @@ public class CognizanceApiController extends CertifyApiController {
 			oac.setEndDate(ac.getEndDate());
 			oac.setId(UUID.randomUUID().toString());
 			oac.setUid(TokenManager.getUserId());
-			oac.setDeletedSign(0);
+			oac.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			orgActivityCostService.insert(oac);
 		} else {
 			orgActivityCostService.updateByPrimaryKeySelective(oac);
@@ -1514,7 +1515,7 @@ public class CognizanceApiController extends CertifyApiController {
 		if (StringUtils.isBlank(os.getId())) {
 			os.setId(UUID.randomUUID().toString());
 			os.setUid(TokenManager.getUserId());
-			os.setDeletedSign(0);
+			os.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			Calendar now = Calendar.getInstance();
 			now.set(Calendar.MILLISECOND, 0);
 			os.setCreateTime(now.getTime());
@@ -1629,7 +1630,7 @@ public class CognizanceApiController extends CertifyApiController {
 			oip.setId(UUID.randomUUID().toString());
 			oip.setUid(TokenManager.getUserId());
 			oip.setEvaluationCategory((oip.getCatagory() >= 2 && oip.getCatagory() <= 4) ? 1 : 0);
-			oip.setDeletedSign(0);
+			oip.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			res.setData(orgIntellectualPropertyService.insert(oip));
 		} else {
 			oip.setEvaluationCategory(oip.getCatagory() <= 2 ? 1 : 0);
@@ -1724,7 +1725,7 @@ public class CognizanceApiController extends CertifyApiController {
 		if (StringUtils.isBlank(otp.getId())) {
 			otp.setId(UUID.randomUUID().toString());
 			otp.setUid(TokenManager.getUserId());
-			otp.setDeletedSign(0);
+			otp.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			Calendar now = Calendar.getInstance();
 			now.set(Calendar.MILLISECOND, 0);
 			otp.setCreateTime(now.getTime());
@@ -1795,7 +1796,7 @@ public class CognizanceApiController extends CertifyApiController {
 			if (null == orgRatepayService.selectRatepayByUidAndYear(TokenManager.getUserId(), rate.getYear())) {
 				rate.setId(UUID.randomUUID().toString());
 				rate.setUid(TokenManager.getUserId());
-				rate.setDeletedSign(0);
+				rate.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 				orgRatepayService.insert(rate);
 			} else {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度纳税申报表已录入!"));
@@ -1868,7 +1869,7 @@ public class CognizanceApiController extends CertifyApiController {
 			if (null == orgFinanceService.selectFinanceByUidAndYear(TokenManager.getUserId(), of.getYear())) {
 				of.setId(UUID.randomUUID().toString());
 				of.setUid(TokenManager.getUserId());
-				of.setDeletedSign(0);
+				of.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 				orgFinanceService.insert(of);
 			} else {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度财务报表已录入!"));
@@ -1976,7 +1977,7 @@ public class CognizanceApiController extends CertifyApiController {
 		if (StringUtils.isBlank(ota.getId())) {
 			ota.setId(UUID.randomUUID().toString());
 			ota.setUid(TokenManager.getUserId());
-			ota.setDeletedSign(0);
+			ota.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			orgTechAchievementService.insert(ota);
 		} else {
 			orgTechAchievementService.updateByPrimaryKeySelective(ota);
@@ -2053,7 +2054,7 @@ public class CognizanceApiController extends CertifyApiController {
 		if (StringUtils.isBlank(ohd.getId())) {
 			ohd.setId(UUID.randomUUID().toString());
 			ohd.setUid(TokenManager.getUserId());
-			ohd.setDeletedSign(0);
+			ohd.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			orgHonorDatumService.insert(ohd);
 		} else {
 			orgHonorDatumService.updateByPrimaryKeySelective(ohd);
@@ -2121,7 +2122,7 @@ public class CognizanceApiController extends CertifyApiController {
 		if (StringUtils.isBlank(otc.getId())) {
 			otc.setId(UUID.randomUUID().toString());
 			otc.setUid(TokenManager.getUserId());
-			otc.setDeletedSign(0);
+			otc.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			orgTechCenterService.insert(otc);
 		} else {
 			orgTechCenterService.updateByPrimaryKeySelective(otc);
@@ -2216,7 +2217,7 @@ public class CognizanceApiController extends CertifyApiController {
 
 		if (StringUtils.isBlank(otcd.getId())) {
 			otcd.setId(UUID.randomUUID().toString());
-			otcd.setDeletedSign(0);
+			otcd.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			orgTechCenterDetailService.insert(otcd);
 		} else {
 			orgTechCenterDetailService.updateByPrimaryKeySelective(otcd);
@@ -2543,7 +2544,7 @@ public class CognizanceApiController extends CertifyApiController {
 			now.set(Calendar.MILLISECOND, 0);
 			oar.setCreateTime(now.getTime());
 			oar.setLastUpdateTime(oar.getCreateTime());
-			oar.setDeletedSign(0);
+			oar.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			orgAnnualReportService.insert(oar);
 
 		} else {

+ 1 - 1
src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java

@@ -384,7 +384,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 				o.setId(UUID.randomUUID().toString());
 				o.setUid(p.getUid());
 				o.setPid(p.getId());
-				o.setDeletedSign(0);
+				o.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 				o.setIntellectualPropertyNumber(p.getPatentNumber());
 				o.setIntellectualPropertyName(p.getPatentName());
 				o.setCatagory(1);

+ 2 - 1
src/main/java/com/goafanti/techproject/service/impl/TechWebsiteServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.dao.TechWebsiteMapper;
+import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.model.TechWebsite;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -62,7 +63,7 @@ public class TechWebsiteServiceImpl extends BaseMybatisDao<TechWebsiteMapper> im
 	public int saveWebsite(TechWebsite t) {
 		if (StringUtils.isBlank(t.getId())) {
 			t.setId(UUID.randomUUID().toString());
-			t.setDeletedSign(0);
+			t.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			Calendar now = Calendar.getInstance();
 			now.set(Calendar.MILLISECOND, 0);
 			t.setCreateTime(now.getTime());

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

@@ -24,6 +24,7 @@ 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.DeleteStatus;
 import com.goafanti.common.enums.IdentityAuditStatus;
 import com.goafanti.common.enums.IdentityProcess;
 import com.goafanti.common.enums.OrgProFields;
@@ -34,6 +35,7 @@ import com.goafanti.common.enums.UserCareerFields;
 import com.goafanti.common.enums.UserEduFields;
 import com.goafanti.common.enums.UserIdentityFields;
 import com.goafanti.common.enums.UserInfoBoFields;
+import com.goafanti.common.enums.UserType;
 import com.goafanti.common.model.OrgHumanResource;
 import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.common.model.OrganizationInfo;
@@ -542,7 +544,7 @@ public class UserApiController extends BaseApiController {
 	public Result basic() {
 		Result res = new Result();
 		UidAndTypeBo ub = basicInfo(userService);
-		if (null != ub && ub.getType() == 0) {
+		if (null != ub && ub.getType() == UserType.PERSONAL.getCode()) {
 			UserIdentityBo u = userIdentityService.selectUserIdentityBoByUserId(ub.getUid());
 			res.setData(u);
 		} else {
@@ -561,7 +563,7 @@ public class UserApiController extends BaseApiController {
 	public Result member() {
 		Result res = new Result();
 		UidAndTypeBo ub = basicInfo(userService);
-		if (null != ub && ub.getType() == 0) {
+		if (null != ub && ub.getType() == UserType.PERSONAL.getCode()) {
 			UserInfoBo u = userInfoService.selectUserInfoBoByUserId(ub.getUid());
 			res.setData(u);
 		} else {
@@ -598,7 +600,7 @@ public class UserApiController extends BaseApiController {
 	public Result job() {
 		Result res = new Result();
 		UidAndTypeBo ub = basicInfo(userService);
-		if (null != ub && ub.getType() == 0) {
+		if (null != ub && ub.getType() == UserType.PERSONAL.getCode()) {
 			UserCareer u = userCareerService.selectUserCareerByUserId(ub.getUid());
 			res.setData(u);
 		} else {
@@ -665,7 +667,7 @@ public class UserApiController extends BaseApiController {
 			}
 			orgHumanResource.setId(UUID.randomUUID().toString());
 			orgHumanResource.setUid(TokenManager.getUserId());
-			orgHumanResource.setDeletedSign(0);
+			orgHumanResource.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			orgHumanResourceService.insert(orgHumanResource);
 		} else {
 			orgHumanResourceService.updateByPrimaryKeySelective(orgHumanResource);

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

@@ -156,7 +156,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 				r.setId(UUID.randomUUID().toString());
 				r.setUid(orgIdentity.getUid());
 				r.setYear(cal.get(Calendar.YEAR) - 1);
-				r.setDeletedSign(0);
+				r.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 				r.setTaxReturnUrl(orgIdentity.getLastYearTaxReportUrl());
 				orgRatepayMapper.insert(r);
 			} else {