From 4f30a08e1bd5b4d4e09397ad177c42d51a3fa834 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 30 八月 2021 15:22:32 +0800
Subject: [PATCH] 城管端 预约登记修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml | 8 ++++++--
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java | 8 ++++++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java | 3 +++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ExportEasyPhotoVO.java | 2 +-
4 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ExportEasyPhotoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ExportEasyPhotoVO.java
index 99b4dde..196c798 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ExportEasyPhotoVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ExportEasyPhotoVO.java
@@ -17,7 +17,7 @@
@ExcelProperty("发生地点")
private String happenAddr;
@ExcelProperty("事件类型")
- private String photoType = "其他";
+ private String photoType;
@ExcelProperty("联系电话")
private String phone;
@ExcelProperty("创建时间")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
index 35b85e0..ad42d5b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -356,6 +356,9 @@
cmActEasyPhotoDO.setFeedbackAt(nowDate);
cmActEasyPhotoDO.setStatus(ComActEasyPhotoDO.status.ywc);
cmActEasyPhotoDO.setCompleteId(comActEasyPhotoVO.getUserId());
+ if(comActEasyPhotoVO.getUrbanStatus()!=null&&comActEasyPhotoVO.getUrbanStatus()==2){
+ cmActEasyPhotoDO.setUrbanStatus(2);
+ }
break;
default:
break;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java
index b891448..85ed47f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java
@@ -83,6 +83,14 @@
ComActReserveDO comActReserveDO=comActReserveMapper.selectById(comActReserveCommitVO.getId());
if(comActReserveDO!=null){
//查询当前用户是否已预约并判断是否能继续预约
+ if(comActReserveDO.getJoinAllCount()!=0){
+ Integer count=comActReserveRecordMapper.selectCount(new QueryWrapper<ComActReserveRecordDO>().eq("reserve_id",comActReserveCommitVO.getId()));
+ if(count>=comActReserveDO.getJoinCount()){
+ return R.fail("预约已上限");
+ }
+ }
+
+
List<ComActReserveRecordDO> list=comActReserveRecordMapper.selectList(new QueryWrapper<ComActReserveRecordDO>().eq("reserve_id",comActReserveCommitVO.getId()).eq("user_id",comActReserveCommitVO.getUserId()).in("status",1,2,3));
if(!list.isEmpty()&&list.size()>1&&comActReserveDO.getIsRepeat()==ComActReserveDO.isRepeat.no){
return R.fail("提交失败，不可重复预约");
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml
index 90e1618..3ea3393 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml
@@ -178,13 +178,15 @@
p.examine_at,
c.name communityName,
p.is_report_urban,
- p.urban_status
+ p.urban_status,
+ ca.`name` as photoType
FROM
com_act_easy_photo p
LEFT JOIN sys_user u ON p.sponsor_id = u.user_id
LEFT JOIN com_act_easy_photo_user pu ON p.id = pu.easy_photo_id
LEFT JOIN sys_user su ON p.handler_id = su.user_id
left join com_act c on p.community_id =c.community_id
+ left join com_act_easy_photo_classify ca on ca.id = p.classify_id
WHERE
p.del_tag = 0 and p.`is_report_urban` =1
<if test='communityId != null and communityId != 0'>
@@ -234,13 +236,15 @@
p.examine_at,
c.name communityName,
p.is_report_urban,
- p.urban_status
+ p.urban_status,
+ ca.`name` as photoType
FROM
com_act_easy_photo p
LEFT JOIN sys_user u ON p.sponsor_id = u.user_id
LEFT JOIN com_act_easy_photo_user pu ON p.id = pu.easy_photo_id
LEFT JOIN sys_user su ON p.handler_id = su.user_id
left join com_act c on p.community_id =c.community_id
+ left join com_act_easy_photo_classify ca on ca.id = p.classify_id
WHERE
p.id in
<foreach collection="list" item="ids" index="index"
--
Gitblit v1.7.1