diff --git a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/GlobalConstants.java b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/GlobalConstants.java index 35ffb67e..80fddfca 100644 --- a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/GlobalConstants.java +++ b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/GlobalConstants.java @@ -290,6 +290,10 @@ public class GlobalConstants { * 整数 26 */ public static final int INT_26 = 26; + /** + * 整数 41 + */ + public static final int INT_41 = 41; /** * 整数 51 */ @@ -378,6 +382,22 @@ public class GlobalConstants { * 整数 97 */ public static final int INT_97 = 97; + /** + * 整数 98 + */ + public static final int INT_98 = 98; + /** + * 整数 99 + */ + public static final int INT_99 = 99; + /** + * 整数 100 + */ + public static final int INT_100 = 100; + /** + * 整数 1000 + */ + public static final int INT_1000 = 1000; /** * 整数 255 */ diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java index e07b8ea8..cd75b452 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java @@ -3,13 +3,13 @@ package com.bonus.sgzb.app.controller; import cn.hutool.core.collection.CollUtil; import com.bonus.sgzb.app.domain.BackApplyInfo; import com.bonus.sgzb.app.domain.BmAgreementInfo; -import com.bonus.sgzb.app.domain.GlobalConstants; import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.app.service.BackApplyService; import com.bonus.sgzb.app.service.LeaseApplyDetailsService; import com.bonus.sgzb.app.service.LeaseApplyInfoService; import com.bonus.sgzb.app.service.TmTaskService; import com.bonus.sgzb.common.core.utils.DateUtils; +import com.bonus.sgzb.common.core.utils.GlobalConstants; import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; @@ -237,9 +237,9 @@ public class BackApplyController extends BaseController { String format = dateFormat.format(nowDate); int taskNum = tmTaskService.selectTaskNumByMonth(nowDate, 36) + 1; String code = ""; - if (taskNum > GlobalConstants.NINE && taskNum < GlobalConstants.ONE_HUNDRED) { + if (taskNum > GlobalConstants.INT_9 && taskNum < GlobalConstants.INT_100) { code = "T" + format + "-00" + taskNum; - } else if (taskNum > GlobalConstants.NINETY_NINE && taskNum < GlobalConstants.ONE_THOUSAND) { + } else if (taskNum > GlobalConstants.INT_99 && taskNum < GlobalConstants.INT_1000) { code = "T" + format + "-0" + taskNum; } else { code = "T" + format + "-000" + taskNum; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/GlobalConstants.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/GlobalConstants.java deleted file mode 100644 index 83ab6322..00000000 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/GlobalConstants.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.bonus.sgzb.app.domain; - -public class GlobalConstants { - /** 9 */ - public static final int NINE=9; - /** 100 */ - public static final int ONE_HUNDRED=100; - /** 1000 */ - public static final int ONE_THOUSAND=1000; - /** 99 */ - public static final int NINETY_NINE=99; - /** 41 */ - public static final int FORTY_ONE=41; -} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java index 025839c8..c8f68fb1 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java @@ -1,10 +1,10 @@ package com.bonus.sgzb.app.service.impl; import com.bonus.sgzb.app.domain.BackApplyInfo; -import com.bonus.sgzb.app.domain.GlobalConstants; import com.bonus.sgzb.app.mapper.BackReceiveMapper; import com.bonus.sgzb.app.service.BackReceiveService; import com.bonus.sgzb.common.core.utils.DateUtils; +import com.bonus.sgzb.common.core.utils.GlobalConstants; import com.bonus.sgzb.common.core.utils.StringHelper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -210,7 +210,7 @@ public class BackReceiveServiceImpl implements BackReceiveService { BackApplyInfo applyInfo = new BackApplyInfo(); applyInfo.setTaskType(taskType); String taskStatus=""; - if(GlobalConstants.FORTY_ONE == taskType){ + if(GlobalConstants.INT_41 == taskType){ taskStatus = "43"; } if(57 == taskType){ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java index bab9b244..6937c81d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java @@ -1,11 +1,7 @@ package com.bonus.sgzb.material.controller; -import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; - -import cn.hutool.core.bean.BeanUtil; -import com.bonus.sgzb.material.domain.BmNoticeInfo; import com.bonus.sgzb.material.domain.PurchaseInput; import com.bonus.sgzb.material.service.IPurchaseCheckInfoService; import com.bonus.sgzb.material.domain.PurchaseCheckInfo; @@ -16,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; -import com.bonus.sgzb.common.security.annotation.RequiresPermissions; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.utils.poi.ExcelUtil;