|
|
@@ -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 {
|