From b08f453bfcddc22932e24fb84a350ad14ae5b31c Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 20 May 2020 17:52:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E9=A1=B9=E7=9B=AE=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85V2=E7=89=88=E6=9C=AC=E4=BB=A5=E5=8F=8A=E6=89=93?=
 =?UTF-8?q?=E5=88=86=E7=B3=BB=E7=BB=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epdc-cloud-property/pom.xml                   |  4 +-
 .../AppPropertyProjectController.java         | 28 +++++++
 .../project/dao/PropertyProjectDao.java       | 10 +++
 .../service/PropertyProjectService.java       | 10 +++
 .../impl/PropertyProjectServiceImpl.java      |  5 ++
 .../mapper/project/PropertyProjectDao.xml     | 82 ++++++++++++++++++-
 6 files changed, 135 insertions(+), 4 deletions(-)

diff --git a/epdc-cloud-property/pom.xml b/epdc-cloud-property/pom.xml
index 32704c7..3b86ae6 100644
--- a/epdc-cloud-property/pom.xml
+++ b/epdc-cloud-property/pom.xml
@@ -189,9 +189,9 @@
                 <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_property?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_property?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.username>epdcyushan</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/controller/AppPropertyProjectController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/controller/AppPropertyProjectController.java
index b255360..6e303aa 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/controller/AppPropertyProjectController.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/controller/AppPropertyProjectController.java
@@ -70,4 +70,32 @@ public class AppPropertyProjectController {
         ProjectDetailResultDTO data = propertyProjectService.getProjectDetailById(formDto);
         return new Result<ProjectDetailResultDTO>().ok(data);
     }
+
+    /**
+     * 项目详情V2
+     *
+     * @return
+     * @params [id]
+     * @author zhangyuan
+     * @since 2020/5/13 15:37
+     */
+    @GetMapping("detailV2")
+    public Result<ProjectDetailResultDTO> detailV2(@RequestBody ProjectDetailFormDTO formDto) {
+        ProjectDetailResultDTO data = propertyProjectService.getProjectDetailByIdV2(formDto);
+        return new Result<ProjectDetailResultDTO>().ok(data);
+    }
+
+    /**
+     * 打分详情
+     *
+     * @return
+     * @params [id]
+     * @author zhangyuan
+     * @since 2020/5/13 15:37
+     */
+    @GetMapping("projectScore")
+    public Result<ProjectDetailResultDTO> score(@RequestBody ProjectDetailFormDTO formDto) {
+        ProjectDetailResultDTO data = propertyProjectService.getProjectDetailById(formDto);
+        return new Result<ProjectDetailResultDTO>().ok(data);
+    }
 }
\ No newline at end of file
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/dao/PropertyProjectDao.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/dao/PropertyProjectDao.java
index d8b4df2..9a87c4e 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/dao/PropertyProjectDao.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/dao/PropertyProjectDao.java
@@ -65,4 +65,14 @@ public interface PropertyProjectDao extends BaseDao<PropertyProjectEntity> {
      * @since 2019/10/11 14:54
      */
     ProjectDetailResultDTO selectDetailById(ProjectDetailFormDTO dto);
+
+    /**
+     * 项目详情V2
+     *
+     * @return java.util.List<com.elink.esua.epdc.dto.group.GroupDTO>
+     * @params [params]
+     * @author zhangyuan
+     * @since 2019/10/11 14:54
+     */
+    ProjectDetailResultDTO selectDetailByIdV2(ProjectDetailFormDTO dto);
 }
\ No newline at end of file
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/PropertyProjectService.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/PropertyProjectService.java
index 007b48b..033a385 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/PropertyProjectService.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/PropertyProjectService.java
@@ -116,4 +116,14 @@ public interface PropertyProjectService extends BaseService<PropertyProjectEntit
      * @date 2020-05-09
      */
     ProjectDetailResultDTO getProjectDetailById(ProjectDetailFormDTO dto);
+
+    /**
+     * 物业项目详情V2
+     *
+     * @param dto
+     * @return void
+     * @author zhangy
+     * @date 2020-05-09
+     */
+    ProjectDetailResultDTO getProjectDetailByIdV2(ProjectDetailFormDTO dto);
 }
\ No newline at end of file
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/impl/PropertyProjectServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/impl/PropertyProjectServiceImpl.java
index 4ff81aa..0ce5c02 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/impl/PropertyProjectServiceImpl.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/impl/PropertyProjectServiceImpl.java
@@ -190,4 +190,9 @@ public class PropertyProjectServiceImpl extends BaseServiceImpl<PropertyProjectD
         return baseDao.selectDetailById(dto);
     }
 
+    @Override
+    public ProjectDetailResultDTO getProjectDetailByIdV2(ProjectDetailFormDTO dto) {
+        return baseDao.selectDetailByIdV2(dto);
+    }
+
 }
\ No newline at end of file
diff --git a/epdc-cloud-property/src/main/resources/mapper/project/PropertyProjectDao.xml b/epdc-cloud-property/src/main/resources/mapper/project/PropertyProjectDao.xml
index 0c127ef..e0bc6ee 100644
--- a/epdc-cloud-property/src/main/resources/mapper/project/PropertyProjectDao.xml
+++ b/epdc-cloud-property/src/main/resources/mapper/project/PropertyProjectDao.xml
@@ -31,7 +31,7 @@
     </sql>
     <select id="selectListOfProjects" resultType="com.elink.esua.epdc.modules.project.entity.PropertyProjectEntity">
         SELECT
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         FROM
         epdc_property_project ep
         WHERE
@@ -49,7 +49,7 @@
 
     <select id="listAll" resultType="com.elink.esua.epdc.modules.project.entity.PropertyProjectEntity">
         SELECT
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         FROM
         epdc_property_project
         WHERE
@@ -121,4 +121,82 @@
         GROUP BY
         ep.ID
     </select>
+
+    <select id="selectDetailByIdV2" resultType="com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO">
+        SELECT
+        ep.ID,
+        ep.PROJECT_NAME,
+        ep.PROPERTY_ID,
+        ep.PROPERTY_NAME,
+        ep.PROPERTY_TEL,
+        ep.PROPERTY_MANAGER,
+        ep.PROPERTY_ADDRESS,
+        eg.STATE AS GROUP_STATE,
+        eg.ID AS GROUP_ID,
+        eg.GROUP_NAME,
+        eg.GROUP_AVATAR,
+        SUM(
+        CASE
+        WHEN eu.STATE = '10' THEN
+        1
+        ELSE
+        0
+        END
+        ) AS NUMBER_GROUP_MEMBER,
+        SUM(
+        CASE
+        WHEN eu.PARTY_MEMBER = '1'
+        AND eu.STATE = '10' THEN
+        1
+        ELSE
+        0
+        END
+        ) AS NUMBER_GROUP_PARTY_MEMBER,
+        SUM(
+        CASE
+        WHEN eu.USER_ID = #{userId}
+        AND eu.STATE = '0' THEN
+        1
+        WHEN eu.USER_ID = #{userId}
+        AND eu.STATE = '10' THEN
+        2
+        ELSE
+        0
+        END
+        ) AS GROUP_MEMBER_FLAG,
+        CASE
+        WHEN es.SCORE IS NOT NULL
+        AND es.USER_ID = #{userId} THEN
+        es.SCORE
+        ELSE
+        ''
+        END AS USER_SCORE,
+        IFNULL(
+        CONVERT (
+        avg(es.score),
+        DECIMAL (10, 2)
+        ),
+        ''
+        ) AS AVA_SCORE
+        FROM
+        epdc_property_project ep
+        LEFT JOIN epdc_group eg ON ep.id = eg.REFERENCE_BUSINESS_ID
+        LEFT JOIN epdc_user_group eu ON eg.id = eu.GROUP_ID
+        AND eu.DEL_FLAG = '0'
+        LEFT JOIN epdc_property_project_score es ON ep.id = es.PROJECT_ID
+        AND ep.PROPERTY_ID = es.PROPERTY_ID
+        AND es.DEL_FLAG = '0'
+        WHERE
+        ep.DEL_FLAG = '0'
+        AND eg.DEL_FLAG = '0'
+        <if test="id != null and id != ''">
+            AND ep.ID = #{id}
+        </if>
+        <if test="gridId != null and gridId != ''">
+            AND (ep.GRID_ID = #{gridId}
+            OR find_in_set(#{gridId},ep.ALL_DEPT_IDS))
+        </if>
+        GROUP BY
+        ep.ID
+    </select>
 </mapper>
\ No newline at end of file