diff --git a/ng/3/nginx.conf b/ng/3/nginx.conf index 90698a02..5b42620a 100644 --- a/ng/3/nginx.conf +++ b/ng/3/nginx.conf @@ -19,6 +19,7 @@ http { default_type application/octet-stream; add_header X-Frame-Options SAMEORIGIN; server_tokens off; + client_max_body_size 50M; # 定义后端集群 upstream java_cluster { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java index f7b70e1f..762de972 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java @@ -49,8 +49,8 @@ public class AppEntLawEnforcementCaseController extends BaseController { */ @ApiResponse(description = "企业端-执法案件信息详情") @GetMapping("/lawCasedetail") - public AppLawEnforcementCaseVo lawCasedetail(AppLawEnforcementCaseBo bo) { - return appLawEnforcementCaseService.selectAppLawEnforcementCaseById(bo); + public R lawCasedetail(AppLawEnforcementCaseBo bo) { + return R.ok(appLawEnforcementCaseService.selectAppLawEnforcementCaseById(bo)); } /** @@ -60,9 +60,9 @@ public class AppEntLawEnforcementCaseController extends BaseController { */ @ApiResponse(description = "企业端-执法信息详情") @GetMapping("/lawDetail") - public AppEnforcementRegistrationVo lawDetail(AppLawEnforcementCaseBo bo) { - return null; -// return appLawEnforcementCaseService.selectAppLawEnforcementLawDetailById(bo); + public R lawDetail(AppLawEnforcementCaseBo bo) { + AppEnforcementRegistrationVo result = appLawEnforcementCaseService.selectAppLawEnforcementLawDetailById(bo); + return R.ok("获取成功", result); } } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpPlanMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpPlanMapper.java index cba91dcb..c39f980c 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpPlanMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpPlanMapper.java @@ -21,7 +21,7 @@ public interface EfcodeCpPlanMapper extends BaseMapperPlus selectOtherPageList( @Param("page") Page page, @Param("bo") EfcodeCpPlanBo bo, - @Param("currentUserId") Long currentUserId, + @Param("currentUserId") String currentUserId, @Param("bureauDeptId") String bureauDeptId ); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpReserveMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpReserveMapper.java index cd4830db..136b408e 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpReserveMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpReserveMapper.java @@ -21,7 +21,7 @@ public interface EfcodeCpReserveMapper extends BaseMapperPlus page, @Param("resFrom") Long resFrom, @Param("opStatus") Long opStatus, - @Param("currentUserId") Long currentUserId + @Param("currentUserId") String currentUserId ); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanServiceImpl.java index b1e6b98c..6791c6ad 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanServiceImpl.java @@ -120,7 +120,7 @@ public class EfcodeCpPlanServiceImpl implements IEfcodeCpPlanService { Long currentUserId = LoginHelper.getUserId(); Page page = pageQuery.build(); - Page result = baseMapper.selectOtherPageList(page, bo, currentUserId, bureauDeptId); + Page result = baseMapper.selectOtherPageList(page, bo, String.valueOf(currentUserId), bureauDeptId); // 后置处理:控制记录是否可预约 afterQueryOtherList(result.getRecords(), bureauDeptId, currentUserId); return TableDataInfo.build(result); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpReserveServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpReserveServiceImpl.java index 971f041e..272469d9 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpReserveServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpReserveServiceImpl.java @@ -66,7 +66,7 @@ public class EfcodeCpReserveServiceImpl implements IEfcodeCpReserveService { pageQuery.build(), bo.getResFrom(), bo.getOpStatus(), - bo.getCreateBy() + bo.getCreateBy() != null ? String.valueOf(bo.getCreateBy()) : null ); return TableDataInfo.build(result); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java index cba310b8..6e3b78d0 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java @@ -1057,7 +1057,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat for (Map.Entry> entry : groupedByNo.entrySet()) { Map map = new HashMap<>(); for (EnforcementRegistration e : entry.getValue()) { - map.put(e.getId(), e); + map.put(null, e); } result.add(map); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpPlanMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpPlanMapper.xml index 8769ee87..f85370fc 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpPlanMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpPlanMapper.xml @@ -22,6 +22,14 @@ AND is_delete = 0 AND create_by != #{currentUserId} + + AND NOT EXISTS ( + SELECT 1 + FROM efcode_cp_reserve r + WHERE r.plan_group_id = efcode_cp_plan.id + AND r.sender_id = #{currentUserId} + AND r.op_status IN (1, 3) + ) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpReserveMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpReserveMapper.xml index 21e2812e..fce05ba6 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpReserveMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpReserveMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - +