物业项目详情V2版本以及打分系统。

5 years ago · b08f453bfc
6 changed files with 135 additions and 4 deletions
--- 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>
--- 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);
+    }
 }
--- 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);
 }
--- 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);
 }
--- 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);
+    }
+
 }
--- 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>