From 083cf37f38f883843284011fb19f90fddd7dd2aa Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 29 Dec 2021 09:32:39 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/ActInfoDTO.java   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActInfoDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActInfoDTO.java
index b747b77985..10180e0222 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActInfoDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActInfoDTO.java
@@ -44,6 +44,27 @@ public class ActInfoDTO implements Serializable {
      */
 	private String customerId;
 
+    /**
+     * 活动类型爱心活动heart 联建活动party
+     */
+    private String actType;
+
+    /**
+     * 联建单位
+     */
+    private String unitId;
+    private String unitName;
+    /**
+     * 活动目标
+     */
+    private String target;
+
+    /**
+     * 服务事项
+     */
+    private String serviceMatter;
+    private String serviceMatterName;
+
     /**
      * 活动标题
      */

From d60e31ce99636d64985b8b827ddd2a3b1dab9860 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 29 Dec 2021 09:38:13 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/redis/IssueVoteDetailRedis.java | 2 +-
 .../src/main/resources/mapper/IssueVoteStatisticalDao.xml   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java
index 155627f390..79068b4124 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java
@@ -256,7 +256,7 @@ public class IssueVoteDetailRedis {
         IssueDTO issue = issueService.get(issueId);
         if(null != issue){
             // 如果是表决中的议题，数据现算
-            VoteRedisFormDTO voteCache = new VoteRedisFormDTO();
+            VoteRedisFormDTO voteCache;
             if (issue.getIssueStatus().equals(IssueConstant.ISSUE_VOTING)){
                 SelectIssueVotingDetailFormDTO formDTO = new SelectIssueVotingDetailFormDTO();
                 formDTO.setIssueId(issueId);
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
index edde73cb25..fa89630a63 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
@@ -119,9 +119,9 @@
     <select id="selectVoteDetail" resultType="com.epmet.dto.form.VoteRedisFormDTO">
         SELECT
             ISSUE_ID,
-            SUPPORT_COUNT,
-            OPPOSITION_COUNT,
-            VOTABLE_COUNT
+            SUPPORT_COUNT AS supportAmount,
+            OPPOSITION_COUNT AS oppositionAmount,
+            VOTABLE_COUNT AS shouldVoteCount
         FROM issue_vote_statistical
         WHERE DEL_FLAG = '0'
           AND ISSUE_ID = #{issueId}

From 0ce1b0a8b8b07746b54a9b170d52d62b8c5f06ca Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 29 Dec 2021 09:58:45 +0800
Subject: [PATCH 3/5] =?UTF-8?q?sql=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/govorg/CustomerStaffAgencyDao.xml  | 19 ++-------
 .../resources/mapper/CustomerAgencyDao.xml    | 19 ++-------
 .../main/resources/mapper/CustomerGridDao.xml | 40 +++----------------
 3 files changed, 12 insertions(+), 66 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml
index ee8caafc3e..d2c47a0922 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml
@@ -27,25 +27,12 @@
             ca.level,
             ca.area_code,
             ca.parent_area_code,
-            ( CASE WHEN ca.longitude is null THEN
-                ( SELECT longitude FROM customer_agency
-                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
-                    ORDER BY pid ASC LIMIT 1
-                )
-                ELSE ca.longitude
-                END
-            ) longitude,
-            ( CASE WHEN ca.latitude is null THEN
-                ( SELECT latitude FROM customer_agency
-                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
-                    ORDER BY pid ASC LIMIT 1
-                )
-                ELSE ca.latitude
-                END
-            ) latitude
+            IFNULL(ca.longitude, cc.longitude) longitude,
+            IFNULL(ca.latitude, cc.latitude) latitude
         FROM
             customer_staff_agency csa
         INNER JOIN customer_agency ca ON csa.agency_id = ca.id
+        INNER JOIN customer_agency cc ON cc.pid = '0' AND ca.customer_id = cc.customer_id
         WHERE
             csa.del_flag = '0'
         AND ca.del_flag = '0'
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index be7125e80c..13629cef31 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -190,23 +190,10 @@
             ca.organization_name AS "agencyName",
             ca.pids AS "pids",
             ca.level level,
-	        ( CASE WHEN ca.longitude is null THEN
-                ( SELECT longitude FROM customer_agency
-                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
-                    ORDER BY pid ASC LIMIT 1
-                )
-                ELSE ca.longitude
-                END
-            ) longitude,
-            ( CASE WHEN ca.latitude is null THEN
-                ( SELECT latitude FROM customer_agency
-                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
-                    ORDER BY pid ASC LIMIT 1
-                )
-                ELSE ca.latitude
-                END
-            ) latitude
+	        IFNULL(ca.longitude, cc.longitude) longitude,
+            IFNULL(ca.latitude, cc.latitude) latitude
         FROM customer_agency ca
+        INNER JOIN customer_agency cc ON cc.pid = '0' AND ca.customer_id = cc.customer_id
         WHERE ca.del_flag = '0'
         AND ca.pids = #{subAgencyPids}
         ORDER BY ca.created_time DESC
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index a08a4f534c..4c34ea5bed 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -409,25 +409,11 @@
             ) agencyGridName,
             cg.grid_name gridName,
             <!-- 网格没有经纬度时获取客户根组织下的 -->
-            ( CASE WHEN cg.longitude is null THEN
-                ( SELECT longitude FROM customer_agency
-                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
-                    ORDER BY pid ASC LIMIT 1
-                )
-                ELSE cg.longitude
-                END
-            ) longitude,
-            ( CASE WHEN cg.latitude is null THEN
-                ( SELECT latitude FROM customer_agency
-                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
-                    ORDER BY pid ASC LIMIT 1
-                )
-                ELSE cg.latitude
-                END
-            ) latitude
+            IFNULL(cg.longitude, ca.longitude) longitude,
+            IFNULL(cg.latitude, ca.latitude) latitude
         FROM
             customer_grid cg
-        INNER JOIN customer_agency ca ON cg.pid = ca.id
+        INNER JOIN customer_agency ca ON ca.pid = '0' AND ca.customer_id = cg.customer_id
         WHERE
             cg.del_flag = '0'
         AND ca.del_flag = '0'
@@ -758,25 +744,11 @@
             cg.contacts,
             cg.mobile,
             <!-- 网格没有经纬度时获取客户根组织下的 -->
-            ( CASE WHEN cg.longitude is null THEN
-                ( SELECT longitude FROM customer_agency
-                WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
-                ORDER BY pid ASC LIMIT 1
-                )
-                ELSE cg.longitude
-                END
-            ) longitude,
-                ( CASE WHEN cg.latitude is null THEN
-                ( SELECT latitude FROM customer_agency
-                WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
-                ORDER BY pid ASC LIMIT 1
-                )
-                ELSE cg.latitude
-                END
-            ) latitude
+            IFNULL(cg.longitude,ca.longitude) longitude,
+            IFNULL(cg.latitude,ca.latitude) latitude
         FROM
             customer_grid cg
-        INNER JOIN customer_agency ca ON cg.pid = ca.id
+        INNER JOIN customer_agency ca ON ca.pid = '0' AND ca.customer_id = cg.customer_id
         WHERE
             cg.del_flag = '0'
         AND ca.del_flag = '0'

From 36f7e1d87b7d3242bfea4c1a0b34a649e525d92d Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 29 Dec 2021 10:26:03 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/controller/WorkActDraftController.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActDraftController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActDraftController.java
index e960a2f926..9d018d7d81 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActDraftController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActDraftController.java
@@ -1,5 +1,7 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.work.*;
@@ -82,8 +84,9 @@ public class WorkActDraftController {
      * @Date 2020/7/21 17:24 
      **/
     @PostMapping("preview")
-    public Result<ActPreviewResultDTO> previewActDetail(@RequestBody ActPreviewFormDTO formDTO){
+    public Result<ActPreviewResultDTO> previewActDetail(@LoginUser TokenDto tokenDto, @RequestBody ActPreviewFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO,ActPreviewFormDTO.UserInternalGroup.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         ActPreviewResultDTO resultDTO=workActDraftService.previewActDetail(formDTO);
         return new Result<ActPreviewResultDTO>().ok(resultDTO);
     }

From 38eeeecee2962c4f7828717d0abc1c9c7713a7e9 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 29 Dec 2021 10:36:43 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E7=9A=84=E9=9C=80=E6=B1=82=EF=BC=8C=E6=8C=87=E6=B4=BE?=
 =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E6=97=B6=EF=BC=8C=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=8E=E6=9C=8D=E5=8A=A1=E6=96=B9=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E6=98=AF=E4=B8=80=E4=B8=AA=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcUserDemandRecServiceImpl.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
index 17833fe7cb..45a1e6f1f8 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
@@ -373,6 +373,9 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             //待处理+已派单才可以指派
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), String.format("需求当前状态为【%s】,不可指派",entity.getStatus()),"当前状态,不可指派");
         }
+        if (UserDemandConstant.VOLUNTEER.equals(formDTO.getServiceType()) && formDTO.getServerId().equals(entity.getDemandUserId())) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), String.format("居民端用户上报的需求【%s】,需求人与服务方（志愿者）不能同为一人", entity.getId()), "需求人与服务方不能同为一人");
+        }
         //1、修改主表
         //置为已派单
         entity.setStatus(UserDemandConstant.ASSIGNED);