Browse Source

党群1+1 网格长管理增加排序

feature/syp_points
liuchuang 5 years ago
parent
commit
cf8c803af4
  1. 5
      esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyGroupOfficialsDTO.java
  2. 5
      esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupOfficialsEntity.java
  3. 7
      esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml
  4. 12
      esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml

5
esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyGroupOfficialsDTO.java

@ -144,4 +144,9 @@ public class PartyGroupOfficialsDTO implements Serializable {
*/
private List<Long> allDeptIdsShow;
/**
* 排序
*/
private Integer sort;
}

5
esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupOfficialsEntity.java

@ -102,4 +102,9 @@ public class PartyGroupOfficialsEntity extends BaseEpdcEntity {
*/
private String parentDeptNames;
/**
* 排序
*/
private Integer sort;
}

7
esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml

@ -44,7 +44,8 @@
t.CREATED_TIME,
t.UPDATED_BY,
t.UPDATED_TIME,
t1.PARTY_GROUP_NAME
t1.PARTY_GROUP_NAME,
t.SORT
from epdc_party_group_officials t
left join epdc_party_group t1 on t.PARTY_GROUP_ID = t1.ID and t1.DEL_FLAG='0'
where t.DEL_FLAG ='0'
@ -61,7 +62,7 @@
AND (t.GRID_ID = #{gridId}
OR find_in_set(#{gridId},t.ALL_DEPT_IDS))
</if>
order by t.CREATED_TIME desc
order by t.SORT, t.CREATED_TIME desc
</select>
@ -75,7 +76,7 @@
AREA_RESPONSIBILITY
from epdc_party_group_officials
where DEL_FLAG ='0' and PARTY_GROUP_ID = #{partyGroupId}
order by CREATED_TIME desc
order by SORT, CREATED_TIME desc
LIMIT #{pageIndex},#{pageSize}
</select>

12
esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml

@ -188,7 +188,7 @@
t5.NICKNAME as supportNickname,
t5.USER_AVATAR as supportUserAvatar,
(if(find_in_set(t7.DEPT_ID,t6.ALL_DEPT_IDS)>0,'1','0'))as thisCommunity,
t.TOP_FLAG,
t.TOP_FLAG
from epdc_party_topic t
<if test='userId != "" and userId != null'>
left join (select * from epdc_party_topic_user_attitude)t1 on t.ID = t1.PARTY_TOPIC_ID and t1.DEL_FLAG='0' and t1.USER_ID = #{userId}
@ -339,13 +339,13 @@
</select>
<update id="updateTopicTopFlagById">
UPDATE epdc_party_topic SET TOP_FLAG = #{topFlag}
<if test="formDto.topFlag != null and formDto.topFlag != '' and formDto.topFlag == '0'">
, TOP_TIME = CREATED_TIME
UPDATE epdc_party_topic SET TOP_FLAG = #{formDto.topFlag}
<if test='formDto.topFlag == "0"'>
, TOP_TIME = NULL
</if>
<if test="formDto.topFlag != null and formDto.topFlag != '' and formDto.topFlag == '1'">
<if test='formDto.topFlag == "1"'>
, TOP_TIME = NOW()
</if>
WHERE ID = #{topicId}
WHERE ID = #{formDto.topicId}
</update>
</mapper>
Loading…
Cancel
Save