From 6fffaf7686067b5c56297a4dfb12c474455613ac Mon Sep 17 00:00:00 2001 From: wang Date: Thu, 29 Jan 2026 20:31:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goods/domain/entity/GoodsEntity.java | 7 +- .../goods/domain/form/GoodsAddForm.java | 7 +- .../goods/domain/form/GoodsImportForm.java | 2 +- .../goods/domain/vo/GoodsExcelVO.java | 2 +- .../business/goods/domain/vo/GoodsVO.java | 5 +- .../service/dao/ServiceApplicationsDao.java | 12 +++ .../entity/ServiceApplicationsEntity.java | 2 +- .../form/ServiceApplicationsAddForm.java | 19 +++- .../form/ServiceApplicationsUpdateForm.java | 14 ++- .../service/ServiceApplicationsService.java | 91 +++++++++++++++++-- .../src/main/resources/dev/application.yaml | 2 +- .../service/ServiceApplicationsMapper.xml | 86 ++++++++++++++++++ .../sa/base/common/code/UserErrorCode.java | 2 + .../sa/base/listener/Ip2RegionListener.java | 6 +- .../datamasking/SmartDataMaskingUtil.java | 20 ++-- .../DataTracerChangeContentService.java | 6 +- yun-base/src/main/resources/dev/yun-base.yaml | 22 ++--- 17 files changed, 255 insertions(+), 50 deletions(-) diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/entity/GoodsEntity.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/entity/GoodsEntity.java index 8ea568d..37d0a29 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/entity/GoodsEntity.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/entity/GoodsEntity.java @@ -34,12 +34,15 @@ public class GoodsEntity { */ private String goodsName; - /** * 商品价格 */ - private BigDecimal price; + private String price; + /** + * 成本计算类型：时间类型、字典、金额 + */ + private String timeType; /** * 上架状态 diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsAddForm.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsAddForm.java index 7317007..9eb4090 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsAddForm.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsAddForm.java @@ -28,14 +28,15 @@ public class GoodsAddForm { private String goodsName; @Schema(description = "商品价格") - @NotNull(message = "商品价格不能为空") - @DecimalMin(value = "0", message = "商品价格最低0") - private BigDecimal price; + private String price; @Schema(description = "上架状态") @NotNull(message = "上架状态不能为空") private Boolean shelvesFlag; + @Schema(description = "计算类型") + private String timeType; + @Schema(description = "备注|可选") private String remark; } diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsImportForm.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsImportForm.java index 4cbb4ca..1643c3a 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsImportForm.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsImportForm.java @@ -18,7 +18,7 @@ public class GoodsImportForm { private String goodsName; @ExcelProperty("商品价格") - private BigDecimal price; + private String price; @ExcelProperty("备注") private String remark; diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/vo/GoodsExcelVO.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/vo/GoodsExcelVO.java index 60d2277..93ab48c 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/vo/GoodsExcelVO.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/vo/GoodsExcelVO.java @@ -36,7 +36,7 @@ public class GoodsExcelVO { private String place; @ExcelProperty("商品价格") - private BigDecimal price; + private String price; @ExcelProperty("备注") private String remark; diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/vo/GoodsVO.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/vo/GoodsVO.java index 5f9ae5c..7dd291c 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/vo/GoodsVO.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/vo/GoodsVO.java @@ -24,7 +24,10 @@ public class GoodsVO { private Integer goodsStatus; @Schema(description = "商品价格") - private BigDecimal price; + private String price; + + @Schema(description = "计算类型") + private String timeType; @Schema(description = "上架状态") private Boolean shelvesFlag; diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/dao/ServiceApplicationsDao.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/dao/ServiceApplicationsDao.java index 3629eb1..d41c7ff 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/dao/ServiceApplicationsDao.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/dao/ServiceApplicationsDao.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.service.dao; +import java.math.BigDecimal; import java.util.List; import net.lab1024.sa.admin.module.service.domain.entity.ServiceApplicationsEntity; import net.lab1024.sa.admin.module.service.domain.form.*; @@ -123,4 +124,15 @@ public interface ServiceApplicationsDao extends BaseMapper getLawyerStatisticsByMonth(@Param("queryForm") ServiceLawyerQueryForm serviceLawyerQueryForm); + + /** + * 统计金额 + */ + BigDecimal getServiceApplicationsAmount(@Param("queryForm") ServiceLawyerQueryForm queryForm); + + List selectByRecordNo(@Param("recordNo") String recordNo); + + BigDecimal getServiceAmount(@Param("queryForm") LawyerStatisticsQueryForm queryForm); + + List selectByRecordNoNotMy(@Param("userId") Long userId, @Param("recordNo") String recordNo); } \ No newline at end of file diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/entity/ServiceApplicationsEntity.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/entity/ServiceApplicationsEntity.java index ffc7c47..fd502a7 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/entity/ServiceApplicationsEntity.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/entity/ServiceApplicationsEntity.java @@ -78,7 +78,7 @@ public class ServiceApplicationsEntity { private String serviceContent; /** - * 工作量换算得分 + * 工作量换算得分 -金额 */ private BigDecimal workloadScore; diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceApplicationsAddForm.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceApplicationsAddForm.java index c15781e..b6226da 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceApplicationsAddForm.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceApplicationsAddForm.java @@ -27,15 +27,15 @@ public class ServiceApplicationsAddForm { private Long firmId; @Schema(description = "服务开始时间", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "服务开始时间 不能为空") + //@NotNull(message = "服务开始时间 不能为空") private LocalDateTime serviceStart; @Schema(description = "服务结束时间", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "服务结束时间 不能为空") + //@NotNull(message = "服务结束时间 不能为空") private LocalDateTime serviceEnd; @Schema(description = "服务时长（小时）", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "服务时长（小时） 不能为空") + //@NotNull(message = "服务时长（小时） 不能为空") private Double serviceDuration; @Schema(description = "受益人数", requiredMode = Schema.RequiredMode.REQUIRED) @@ -76,4 +76,17 @@ public class ServiceApplicationsAddForm { * 职务id */ private Long positionId; + + /** + * 工作量换算得分 -金额 + */ + private BigDecimal workloadScore; + /** + * 备案编号 + */ + private String recordNo; + /** + * 申报服务类型 + */ + private String serviceType; } \ No newline at end of file diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceApplicationsUpdateForm.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceApplicationsUpdateForm.java index 3b9d5f4..38e2214 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceApplicationsUpdateForm.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceApplicationsUpdateForm.java @@ -6,6 +6,7 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import lombok.Data; +import java.math.BigDecimal; import java.time.LocalDateTime; /** @@ -79,5 +80,16 @@ public class ServiceApplicationsUpdateForm{ * 职务id */ private Long positionId; - + /** + * 工作量换算得分 -金额 + */ + private BigDecimal workloadScore; + /** + * 备案编号 + */ + private String recordNo; + /** + * 申报服务类型 + */ + private String serviceType; } \ No newline at end of file diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java index e6e2bfc..90fae42 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java @@ -226,10 +226,24 @@ public class ServiceApplicationsService { * 添加 */ public ResponseDTO add(ServiceApplicationsAddForm addForm) { + ServiceApplicationsEntity serviceApplicationsEntity = SmartBeanUtil.copy(addForm, ServiceApplicationsEntity.class); if(addForm.getApplicationId() == null) { + //新增的时候判断活动类型查询案号有没有存在 + if("TIME".equals(addForm.getServiceType())) { + List serviceApplicationsVOS = serviceApplicationsDao.selectByRecordNo(addForm.getRecordNo()); + if (!serviceApplicationsVOS.isEmpty()){ + throw new BusinessException(UserErrorCode.HAS_EXIST.getMsg()+serviceApplicationsVOS.get(0).getUserName()+UserErrorCode.HAS_EXIST1.getMsg()); + } + } serviceApplicationsDao.insert(serviceApplicationsEntity); }else { + //修改的时候判断活动类型查询案号别人有没有创建 + if("TIME".equals(addForm.getServiceType())) { + //当前登录人的ID + Long userId = AdminRequestUtil.getRequestUser().getEmployeeId(); + List applicationsVOS = serviceApplicationsDao.selectByRecordNoNotMy(userId,addForm.getRecordNo()); + } serviceApplicationsDao.updateById(serviceApplicationsEntity); } return ResponseDTO.ok(); @@ -240,6 +254,16 @@ public class ServiceApplicationsService { * */ public ResponseDTO update(ServiceApplicationsUpdateForm updateForm) { + //判断活动类型查询案号有没有存在 + if("TIME".equals(updateForm.getServiceType())) { + //当前登录人的ID + Long userId = AdminRequestUtil.getRequestUser().getEmployeeId(); + List serviceApplicationsEntity = serviceApplicationsDao.selectByRecordNoNotMy(userId, updateForm.getRecordNo()); + + if (!serviceApplicationsEntity.isEmpty()){ + throw new BusinessException(UserErrorCode.HAS_EXIST.getMsg()+serviceApplicationsEntity.get(0).getUserName()+UserErrorCode.HAS_EXIST1.getMsg()); + } + } ServiceApplicationsEntity serviceApplicationsEntity = SmartBeanUtil.copy(updateForm, ServiceApplicationsEntity.class); //serviceApplicationsEntity.setFirmAuditStatus(ReviewEnum.APPROVAL.getValue()); serviceApplicationsDao.updateById(serviceApplicationsEntity); @@ -250,12 +274,20 @@ public class ServiceApplicationsService { * 提交 * */ - public ResponseDTO submit(Long applicationId) { - if (null == applicationId){ + public ResponseDTO submit(ServiceApplicationsAddForm addForm) { + if (null == addForm.getApplicationId()){ return ResponseDTO.ok(); } + if("TIME".equals(addForm.getServiceType())) { + //当前登录人的ID + Long userId = AdminRequestUtil.getRequestUser().getEmployeeId(); + List serviceApplicationsEntity = serviceApplicationsDao.selectByRecordNoNotMy(userId, addForm.getRecordNo()); - ServiceApplicationsEntity serviceApplicationsEntity = serviceApplicationsDao.selectById(applicationId); + if (!serviceApplicationsEntity.isEmpty()){ + throw new BusinessException(UserErrorCode.HAS_EXIST.getMsg()+serviceApplicationsEntity.get(0).getUserName()+UserErrorCode.HAS_EXIST1.getMsg()); + } + } + ServiceApplicationsEntity serviceApplications = serviceApplicationsDao.selectById(addForm.getApplicationId()); // 检查当前用户角色是否为CEO /*RequestUser requestUser = AdminRequestUtil.getRequestUser(); @@ -272,10 +304,11 @@ public class ServiceApplicationsService { serviceApplicationsEntity.setAssociationAuditTime(LocalDateTime.now()); } }else {*/ - serviceApplicationsEntity.setFirmAuditStatus(ReviewEnum.APPROVAL.getValue()); - serviceApplicationsEntity.setReportTime(LocalDateTime.now()); + SmartBeanUtil.copyProperties(addForm, serviceApplications); + serviceApplications.setFirmAuditStatus(ReviewEnum.APPROVAL.getValue()); + serviceApplications.setReportTime(LocalDateTime.now()); //} - serviceApplicationsDao.updateById(serviceApplicationsEntity); + serviceApplicationsDao.updateById(serviceApplications); return ResponseDTO.ok(); } /** @@ -523,6 +556,13 @@ public class ServiceApplicationsService { } public ResponseDTO addSubmit(@Valid ServiceApplicationsAddForm addForm) { + //判断活动类型查询案号有没有存在 + if("TIME".equals(addForm.getServiceType())) { + List serviceApplicationsEntity = serviceApplicationsDao.selectByRecordNo(addForm.getRecordNo()); + if (!serviceApplicationsEntity.isEmpty()){ + throw new BusinessException(UserErrorCode.HAS_EXIST.getMsg()+serviceApplicationsEntity.get(0).getUserName()+UserErrorCode.HAS_EXIST1.getMsg()); + } + } ServiceApplicationsEntity serviceApplicationsEntity = SmartBeanUtil.copy(addForm, ServiceApplicationsEntity.class); serviceApplicationsEntity.setFirmAuditStatus(ReviewEnum.APPROVAL.getValue()); //serviceApplicationsEntity.setReportTime(LocalDateTime.now()); @@ -614,10 +654,19 @@ public class ServiceApplicationsService { List lawyerImportForms = serviceApplicationsDao.getLawyerStatisticsByMonth(serviceLawyerQueryForm); lawyerServiceVO.setQuarterlyServiceCost(BigDecimal.valueOf(Long.valueOf(dictItem.getRemark()) * lawyerImportForms.get(0).getQuarterlyServiceDuration())); lawyerServiceVO.setQuarterlyServiceDuration(lawyerImportForms.get(0).getQuarterlyServiceDuration()); + //查询amount类型的金额，然后添加到服务成本中 + queryForm.setUserId(lawyerServiceVO.getUserId()); + BigDecimal amount = serviceApplicationsDao.getServiceAmount(queryForm); + lawyerServiceVO.setQuarterlyServiceCost(lawyerServiceVO.getQuarterlyServiceCost().add(amount)); + }); }else { lawyerServiceVOList.forEach(lawyerServiceVO -> { lawyerServiceVO.setAnnualServiceCost(BigDecimal.valueOf(Long.valueOf(dictItem.getRemark()) * lawyerServiceVO.getAnnualServiceDuration())); + //查询amount类型的金额，然后添加到服务成本中 + queryForm.setUserId(lawyerServiceVO.getUserId()); + BigDecimal amount = serviceApplicationsDao.getServiceAmount(queryForm); + lawyerServiceVO.setAnnualServiceCost(lawyerServiceVO.getAnnualServiceCost().add(amount)); }); } lawyerStatisticsVO.setLawyerServiceVOList(lawyerServiceVOList); @@ -728,14 +777,16 @@ public class ServiceApplicationsService { if (dictItem == null){ return BigDecimal.valueOf(0L); } - + // 获取是否有amount类型的的案件数据，获取金额 + BigDecimal workloadScore = serviceApplicationsDao.getServiceApplicationsAmount(queryForm); //除1w if (time != null && time != 0L) { Long timeCost = time * Long.valueOf(dictItem.getRemark()); - //取两位小数 // 将long类型转换为BigDecimal BigDecimal bigDecimalDividend = BigDecimal.valueOf(timeCost); + // 将获取到的金额加到时间金额上 + bigDecimalDividend = workloadScore.add(bigDecimalDividend); BigDecimal bigDecimalDivisor = BigDecimal.valueOf(10000); // 执行除法运算 @@ -1009,6 +1060,10 @@ public class ServiceApplicationsService { if (!lawyerStatisticsVOPageResult.getList().isEmpty()) { for (LawyerStatisticsVO statisticsVO : lawyerStatisticsWithParamYear) { statisticsVO.setAnnualServiceCost(BigDecimal.valueOf(statisticsVO.getAnnualServiceDuration() * Long.valueOf(one.getRemark()))); + //统计金额 + queryForm.setUserId(statisticsVO.getUserId()); + BigDecimal amount = serviceApplicationsDao.getServiceAmount(queryForm); + statisticsVO.setAnnualServiceCost(statisticsVO.getAnnualServiceCost().add(amount)); } monthStatistics(queryForm, lawyerStatisticsVOPageResult.getList(),null); } @@ -1088,6 +1143,9 @@ public class ServiceApplicationsService { if (quarterStatisticsVO != null && quarterStatisticsVO.getQuarterlyServiceDuration() != null) { statisticsVO.setQuarterlyServiceDuration(quarterStatisticsVO.getQuarterlyServiceDuration()); statisticsVO.setQuarterlyServiceCost(BigDecimal.valueOf(quarterStatisticsVO.getQuarterlyServiceDuration() * Long.valueOf(one.getRemark()))); + //统计金额 + BigDecimal amount = serviceApplicationsDao.getServiceAmount(queryForm); + statisticsVO.setQuarterlyServiceCost(statisticsVO.getQuarterlyServiceCost().add(amount)); } } }else if (lawyerStatisticsWithParamYear != null) { @@ -1115,7 +1173,9 @@ public class ServiceApplicationsService { if (quarterStatisticsVO != null && quarterStatisticsVO.getQuarterlyServiceDuration() != null) { statisticsVO.setQuarterlyServiceDuration(quarterStatisticsVO.getQuarterlyServiceDuration()); statisticsVO.setQuarterlyServiceCost(BigDecimal.valueOf(quarterStatisticsVO.getQuarterlyServiceDuration() * Long.valueOf(one.getRemark()))); - + //统计金额 + BigDecimal amount = serviceApplicationsDao.getServiceAmount(queryForm); + statisticsVO.setQuarterlyServiceCost(statisticsVO.getQuarterlyServiceCost().add(amount)); } } } @@ -1145,6 +1205,8 @@ public class ServiceApplicationsService { queryForm.setUserId(statisticsVO.getUserId()); //计算年度累计服务成本 statisticsVO.setAnnualServiceCost(BigDecimal.valueOf(statisticsVO.getAnnualServiceDuration() * Long.valueOf(dictItem.getRemark()))); + //查询amount类型的金额，然后添加到服务成本中 + BigDecimal amount = serviceApplicationsDao.getServiceAmount(queryForm); //季度服务时间范围 LawyerStatisticsVO quarterStatisticsVO = serviceApplicationsDao.getdepartmentMothStatistic(queryForm); if (quarterStatisticsVO != null && quarterStatisticsVO.getQuarterlyServiceDuration() != null) { @@ -1152,6 +1214,11 @@ public class ServiceApplicationsService { //计算季度累计服务成本 statisticsVO.setQuarterlyServiceCost(BigDecimal.valueOf(quarterStatisticsVO.getQuarterlyServiceDuration() * Long.valueOf(dictItem.getRemark()))); } + if (queryForm.getQuarter() == null) { + statisticsVO.setAnnualServiceCost(statisticsVO.getAnnualServiceCost().add(amount)); + }else { + statisticsVO.setQuarterlyServiceCost(statisticsVO.getQuarterlyServiceCost().add(amount)); + } } }else if (lawyerStatisticsWithParamYear != null) { for (ServiceDepartmentImportForm statisticsVO : lawyerStatisticsWithParamYear) { @@ -1175,6 +1242,7 @@ public class ServiceApplicationsService { queryForm.setFirmId(statisticsVO.getFirmId()); //计算年度累计服务成本 statisticsVO.setAnnualServiceCost(BigDecimal.valueOf(statisticsVO.getAnnualServiceDuration() * Long.valueOf(dictItem.getRemark()))); + BigDecimal amount = serviceApplicationsDao.getServiceAmount(queryForm); //季度服务时间范围 LawyerStatisticsVO quarterStatisticsVO = serviceApplicationsDao.getdepartmentMothStatistic(queryForm); if (quarterStatisticsVO != null && quarterStatisticsVO.getQuarterlyServiceDuration() != null) { @@ -1182,6 +1250,11 @@ public class ServiceApplicationsService { //计算季度累计服务成本 statisticsVO.setQuarterlyServiceCost(BigDecimal.valueOf(quarterStatisticsVO.getQuarterlyServiceDuration() * Long.valueOf(dictItem.getRemark()))); } + if (queryForm.getQuarter() == null) { + statisticsVO.setAnnualServiceCost(statisticsVO.getAnnualServiceCost().add(amount)); + }else { + statisticsVO.setQuarterlyServiceCost(statisticsVO.getQuarterlyServiceCost().add(amount)); + } } } } diff --git a/yun-admin/src/main/resources/dev/application.yaml b/yun-admin/src/main/resources/dev/application.yaml index 6ba9901..2ed69b9 100644 --- a/yun-admin/src/main/resources/dev/application.yaml +++ b/yun-admin/src/main/resources/dev/application.yaml @@ -8,7 +8,7 @@ # 项目配置: 名称、日志目录 project: name: yun-admin - log-directory: ${localPath:/home}/logs/smart_admin_v3/${project.name}/${spring.profiles.active} + log-directory: ${localPath:/Users/wang}/logs/smart_admin_v3/${project.name}/${spring.profiles.active} # 项目端口和url根路径 server: diff --git a/yun-admin/src/main/resources/mapper/service/ServiceApplicationsMapper.xml b/yun-admin/src/main/resources/mapper/service/ServiceApplicationsMapper.xml index 5cb9f02..cb56da2 100644 --- a/yun-admin/src/main/resources/mapper/service/ServiceApplicationsMapper.xml +++ b/yun-admin/src/main/resources/mapper/service/ServiceApplicationsMapper.xml @@ -476,4 +476,90 @@ + + + + \ No newline at end of file diff --git a/yun-base/src/main/java/net/lab1024/sa/base/common/code/UserErrorCode.java b/yun-base/src/main/java/net/lab1024/sa/base/common/code/UserErrorCode.java index 85c6866..5b3fd43 100644 --- a/yun-base/src/main/java/net/lab1024/sa/base/common/code/UserErrorCode.java +++ b/yun-base/src/main/java/net/lab1024/sa/base/common/code/UserErrorCode.java @@ -39,6 +39,8 @@ public enum UserErrorCode implements ErrorCode { FORM_REPEAT_SUBMIT_PENALTY(30013, "有处罚记录，无法申请证明开具"), + HAS_EXIST(30014, "本案仅限一人申报，已由"), + HAS_EXIST1(30015, "律师申报"), LOGIN_ACTIVE_TIMEOUT(30012, "长时间未操作系统，需要重新登录"); private final int code; diff --git a/yun-base/src/main/java/net/lab1024/sa/base/listener/Ip2RegionListener.java b/yun-base/src/main/java/net/lab1024/sa/base/listener/Ip2RegionListener.java index 0055d15..318864b 100644 --- a/yun-base/src/main/java/net/lab1024/sa/base/listener/Ip2RegionListener.java +++ b/yun-base/src/main/java/net/lab1024/sa/base/listener/Ip2RegionListener.java @@ -22,7 +22,7 @@ import java.io.IOException; * @Email lab1024@163.com * @Copyright 1024创新实验室 */ -@Order(value = LoggingApplicationListener.DEFAULT_ORDER) +//@Order(value = LoggingApplicationListener.DEFAULT_ORDER) @Slf4j public class Ip2RegionListener implements ApplicationListener { @@ -54,7 +54,7 @@ public class Ip2RegionListener implements ApplicationListener