elink-star
/
esua-epdc-js
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

产品上报接口 

1、项目信息上报新增项目创建人信息
2、产品小程序和大屏注册人数对应不起来问题修复
ftature/screen
liuchuang 4 years ago
parent
e3bcb57d5d
commit
d8a8ee44b1
3 changed files with 70 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UploadProjectInfoDTO.java
  2. 2
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
  3. 104
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml

5
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UploadProjectInfoDTO.java
View File

@ -118,6 +118,9 @@ public class UploadProjectInfoDTO implements Serializable {
*/
private Integer satisfactionScore;
/**
* 项目创建人ID
*/
private String projectCreator;
}

2
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
View File

@ -22,6 +22,7 @@
<result property="categoryCode" column="categoryCode"/>
<result property="closeCaseTime" column="closeCaseTime"/>
<result property="projectLevel" column="projectLevel"/>
<result property="projectCreator" column="projectCreator"/>
<result property="satisfactionScore" column="satisfactionScore"/>
<collection property="projectImgUrl" ofType="java.lang.String">
<result property="projectImgUrl" column="projectImgUrl"/>
@ -35,6 +36,7 @@
SUBSTRING_INDEX(t1.PARENT_DEPT_IDS,',',-1) as parentId,
PARENT_DEPT_IDS as allParentIds,
t1.ID as projectId,
t1.CREATED_BY as projectCreator,
t1.NICK_NAME as linkName,
t1.MOBILE as linkMobile,
LEFT(t1.ITEM_CONTENT,50)projectTitle,

104
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
View File

@ -2018,15 +2018,21 @@ SELECT gr.id as orgId,
sum(total.topicTotal) as topicTotal,
sum(total.projectTotal) as projectTotal
from
(select eu.DEPT_ID AS GRID_ID,
count(eu.id) as regUserTotal,
0 AS joinUser,
0 as issueTotal,
0 as topicTotal,
0 as projectTotal
from esua_epdc_user.epdc_user eu
where eu.DEL_FLAG=0
group by eu.DEPT_ID
(select tmp1.DEPT_ID AS GRID_ID,
count(tmp1.id) as regUserTotal,
0 AS joinUser,
0 as issueTotal,
0 as topicTotal,
0 as projectTotal
from
(SELECT eut.id, CASE WHEN (eut.`DEPT_ID` IS NULL or eut.`DEPT_ID` = 0 or eut.`DEPT_ID` = '') THEN ttt.grid_id ELSE eut.`DEPT_ID` end AS dept_id FROM esua_epdc_user.epdc_user eut LEFT JOIN
(SELECT tt.user_id,
tt.grid_id
FROM(
SELECT eugr1.`USER_ID`, eugr1.`GRID_ID`
FROM esua_epdc_user.`epdc_user_grid_relation` eugr1 WHERE eugr1.`DEL_FLAG` = '0'
ORDER BY `CREATED_TIME`) tt
GROUP BY tt.user_id) ttt on ttt.user_id = eut.id WHERE eut.`DEL_FLAG` = '0') tmp1 GROUP BY tmp1.dept_id
union all
select be.DEPT_ID GRID_ID,
@ -2135,7 +2141,7 @@ SELECT gr.id as orgId,
and gr.type_key='grid_party'
AND gr.`id` NOT IN( SELECT t.`dept_id`
FROM `esua_epdc_admin`.`sys_dept_config` t
WHERE t.`del_flag`= 0)
WHERE t.`del_flag`= 0 AND t.congig_type <![CDATA[ <> ]]> 'leader_dept')
</select>
<!-- 009 -->
<select id="getGovernrankdata" resultType="com.elink.esua.epdc.dto.screen.result.GovernrankdataResultDTO">
@ -2392,15 +2398,21 @@ SELECT gr.id as orgId,
sum(total.topicTotal) as topicTotal,
sum(total.projectTotal) as projectTotal
from
(select eu.DEPT_ID AS GRID_ID,
count(eu.id) as regUserTotal,
0 AS joinUser,
0 as issueTotal,
0 as topicTotal,
0 as projectTotal
from esua_epdc_user.epdc_user eu
where eu.DEL_FLAG=0
group by eu.DEPT_ID
(select tmp1.DEPT_ID AS GRID_ID,
count(tmp1.id) as regUserTotal,
0 AS joinUser,
0 as issueTotal,
0 as topicTotal,
0 as projectTotal
from
(SELECT eut.id, CASE WHEN (eut.`DEPT_ID` IS NULL or eut.`DEPT_ID` = 0 or eut.`DEPT_ID` = '') THEN ttt.grid_id ELSE eut.`DEPT_ID` end AS dept_id FROM esua_epdc_user.epdc_user eut LEFT JOIN
(SELECT tt.user_id,
tt.grid_id
FROM(
SELECT eugr1.`USER_ID`, eugr1.`GRID_ID`
FROM esua_epdc_user.`epdc_user_grid_relation` eugr1 WHERE eugr1.`DEL_FLAG` = '0'
ORDER BY `CREATED_TIME`) tt
GROUP BY tt.user_id) ttt on ttt.user_id = eut.id WHERE eut.`DEL_FLAG` = '0') tmp1 GROUP BY tmp1.dept_id
union all
@ -2510,7 +2522,7 @@ SELECT gr.id as orgId,
and co.type_key='community_party'
AND co.`id` NOT IN( SELECT t.`dept_id`
FROM `esua_epdc_admin`.`sys_dept_config` t
WHERE t.`del_flag`= 0)
WHERE t.`del_flag`= 0 AND t.congig_type <![CDATA[ <> ]]> 'leader_dept')
GROUP BY co.id
</select>
<select id="publicpartitotaldataForStreetParty"
@ -2537,15 +2549,21 @@ SELECT gr.id as orgId,
sum(total.topicTotal) as topicTotal,
sum(total.projectTotal) as projectTotal
from
(select eu.DEPT_ID AS GRID_ID,
count(eu.id) as regUserTotal,
0 AS joinUser,
0 as issueTotal,
0 as topicTotal,
0 as projectTotal
from esua_epdc_user.epdc_user eu
where eu.DEL_FLAG=0
group by eu.DEPT_ID
(select tmp1.DEPT_ID AS GRID_ID,
count(tmp1.id) as regUserTotal,
0 AS joinUser,
0 as issueTotal,
0 as topicTotal,
0 as projectTotal
from
(SELECT eut.id, CASE WHEN (eut.`DEPT_ID` IS NULL or eut.`DEPT_ID` = 0 or eut.`DEPT_ID` = '') THEN ttt.grid_id ELSE eut.`DEPT_ID` end AS dept_id FROM esua_epdc_user.epdc_user eut LEFT JOIN
(SELECT tt.user_id,
tt.grid_id
FROM(
SELECT eugr1.`USER_ID`, eugr1.`GRID_ID`
FROM esua_epdc_user.`epdc_user_grid_relation` eugr1 WHERE eugr1.`DEL_FLAG` = '0'
ORDER BY `CREATED_TIME`) tt
GROUP BY tt.user_id) ttt on ttt.user_id = eut.id WHERE eut.`DEL_FLAG` = '0') tmp1 GROUP BY tmp1.dept_id
UNION ALL
@ -2656,7 +2674,7 @@ SELECT gr.id as orgId,
and st.type_key='street_party'
AND st.`id` NOT IN( SELECT t.`dept_id`
FROM `esua_epdc_admin`.`sys_dept_config` t
WHERE t.`del_flag`= 0)
WHERE t.`del_flag`= 0 AND t.congig_type <![CDATA[ <> ]]> 'leader_dept')
GROUP BY st.id
</select>
<select id="publicpartitotaldataForDistrictParty"
@ -2684,15 +2702,21 @@ SELECT gr.id as orgId,
sum(total.topicTotal) as topicTotal,
sum(total.projectTotal) as projectTotal
from
(select eu.DEPT_ID AS GRID_ID,
count(eu.id) as regUserTotal,
0 AS joinUser,
0 as issueTotal,
0 as topicTotal,
0 as projectTotal
from esua_epdc_user.epdc_user eu
where eu.DEL_FLAG=0
group by eu.DEPT_ID
(select tmp1.DEPT_ID AS GRID_ID,
count(tmp1.id) as regUserTotal,
0 AS joinUser,
0 as issueTotal,
0 as topicTotal,
0 as projectTotal
from
(SELECT eut.id, CASE WHEN (eut.`DEPT_ID` IS NULL or eut.`DEPT_ID` = 0 or eut.`DEPT_ID` = '') THEN ttt.grid_id ELSE eut.`DEPT_ID` end AS dept_id FROM esua_epdc_user.epdc_user eut LEFT JOIN
(SELECT tt.user_id,
tt.grid_id
FROM(
SELECT eugr1.`USER_ID`, eugr1.`GRID_ID`
FROM esua_epdc_user.`epdc_user_grid_relation` eugr1 WHERE eugr1.`DEL_FLAG` = '0'
ORDER BY `CREATED_TIME`) tt
GROUP BY tt.user_id) ttt on ttt.user_id = eut.id WHERE eut.`DEL_FLAG` = '0') tmp1 GROUP BY tmp1.dept_id
union all
@ -2803,7 +2827,7 @@ SELECT gr.id as orgId,
and city.DEL_FLAG=0
AND gr.`id` NOT IN( SELECT t.`dept_id`
FROM `esua_epdc_admin`.`sys_dept_config` t
WHERE t.`del_flag`= 0)
WHERE t.`del_flag`= 0 AND t.congig_type <![CDATA[ <> ]]> 'leader_dept')
and city.type_key='district_party' and city.party_code='shibei'
GROUP BY city.id;
</select>

Write Preview
Loading…
Cancel
Save