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

修改工作端测试bug

dev
liuchuang 6 years ago
parent
a9b6f9dd8f
commit
0bac339570
15 changed files with 69 additions and 43 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. 7
      esua-epdc/epdc-admin/epdc-admin-server/pom.xml
  2. 7
      esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
  3. 7
      esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
  4. 8
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
  5. 3
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java
  6. 3
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java
  7. 3
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
  8. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java
  9. 14
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
  10. 11
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  11. 8
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml
  12. 15
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
  13. 15
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
  14. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemInformationDao.xml
  15. 7
      esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml

7
esua-epdc/epdc-admin/epdc-admin-server/pom.xml
View File

@ -151,8 +151,11 @@
<spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
<!--小程序配置-->
<wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
<wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
<!-- <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>-->
<!-- <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>-->
<wx.ma.appId>wx5d3e97461d248397</wx.ma.appId>
<wx.ma.secret>bfed51b731e53db9affb9e6131e7ae12</wx.ma.secret>
<!--工作端小程序-->
<work.wx.ma.appId>wx9f20a46906ab2c3e</work.wx.ma.appId>
<work.wx.ma.secret>dc13065f79429979d9f687d249eb5c4e</work.wx.ma.secret>

7
esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
View File

@ -198,8 +198,11 @@
<wx.mp.configs.token>111</wx.mp.configs.token>
<wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
<!--小程序配置-->
<wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
<wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
<!-- <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>-->
<!-- <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>-->
<wx.ma.appId>wx5d3e97461d248397</wx.ma.appId>
<wx.ma.secret>bfed51b731e53db9affb9e6131e7ae12</wx.ma.secret>
<!--工作端小程序-->
<work.wx.ma.appId>wx9f20a46906ab2c3e</work.wx.ma.appId>
<work.wx.ma.secret>dc13065f79429979d9f687d249eb5c4e</work.wx.ma.secret>

7
esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
View File

@ -179,8 +179,11 @@
<docker.tag>test</docker.tag>
<!--小程序配置-->
<wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
<wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
<!-- <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>-->
<!-- <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>-->
<wx.ma.appId>wx5d3e97461d248397</wx.ma.appId>
<wx.ma.secret>bfed51b731e53db9affb9e6131e7ae12</wx.ma.secret>
<!--工作端小程序-->
<work.wx.ma.appId>wx9f20a46906ab2c3e</work.wx.ma.appId>
<work.wx.ma.secret>dc13065f79429979d9f687d249eb5c4e</work.wx.ma.secret>

8
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
View File

@ -362,12 +362,14 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
/**
* 工作端-事件评论列表
* @param formDTO
* @param formDto
* @return
*/
@Override
public Result<List<WorkEventCommentResultDTO>> selectWorkHotOrNewEventComment(WorkEventCommentListFormDTO formDTO) {
List<WorkEventCommentResultDTO> list = baseDao.selectWorkHotOrNewEventComment(formDTO);
public Result<List<WorkEventCommentResultDTO>> selectWorkHotOrNewEventComment(WorkEventCommentListFormDTO formDto) {
int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
formDto.setPageIndex(pageIndex);
List<WorkEventCommentResultDTO> list = baseDao.selectWorkHotOrNewEventComment(formDto);
return new Result<List<WorkEventCommentResultDTO>>().ok(list);
}

3
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java
View File

@ -23,6 +23,7 @@ import com.elink.esua.epdc.dto.events.*;
import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO;
import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO;
import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -134,7 +135,7 @@ public interface EpdcEventsDao extends BaseDao<EpdcEventsEntity> {
* @param deptIdList
* @return
*/
Map selectCountOfEventState(@Param("deptIdList") List<Long> deptIdList);
IssueStateStatisticsResultDTO selectCountOfEventState(@Param("deptIdList") List<Long> deptIdList);
/**
* 查询待回应列表

3
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java
View File

@ -27,6 +27,7 @@ import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
import com.elink.esua.epdc.dto.issue.IssueDTO;
import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO;
import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO;
import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity;
import java.util.List;
@ -187,7 +188,7 @@ public interface EpdcEventsService extends BaseService<EpdcEventsEntity> {
* @param deptIdList
* @return
*/
Map selectCountOfEventState(List<Long> deptIdList);
IssueStateStatisticsResultDTO selectCountOfEventState(List<Long> deptIdList);
/**
* 待回应列表

3
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
View File

@ -43,6 +43,7 @@ import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
import com.elink.esua.epdc.dto.issue.IssueDTO;
import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO;
import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO;
import com.elink.esua.epdc.modules.async.NewsTask;
import com.elink.esua.epdc.modules.category.entity.CategoryEntity;
import com.elink.esua.epdc.modules.category.service.CategoryService;
@ -417,7 +418,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
}
@Override
public Map selectCountOfEventState(List<Long> deptIdList) {
public IssueStateStatisticsResultDTO selectCountOfEventState(List<Long> deptIdList) {
return baseDao.selectCountOfEventState(deptIdList);
}

2
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java
View File

@ -136,7 +136,7 @@ public interface IssueDao extends BaseDao<IssueEntity> {
* @param deptIdList
* @return
*/
Map selectCountOfIssueState(@Param("deptIdList") List<Long> deptIdList);
IssueStateStatisticsResultDTO selectCountOfIssueState(@Param("deptIdList") List<Long> deptIdList);
/**
* 工作端-议题待处理或者已关闭的最新最热列表

14
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
View File

@ -417,15 +417,11 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
}else {
list = SecurityUser.getUser().getDeptIdList();
}
Map map1 = baseDao.selectCountOfIssueState(list);
Map map2 = epdcEventsService.selectCountOfEventState(list);
IssueStateStatisticsResultDTO dto = new IssueStateStatisticsResultDTO();
dto.setClosed(Integer.parseInt(map1.get("closed").toString()));
dto.setPendingHandleNum(Integer.parseInt(map1.get("pendingHandleNum").toString()));
dto.setRejectedNum(Integer.parseInt(map2.get("rejectedNum").toString()));
dto.setPendingResponseNum(Integer.parseInt(map2.get("pendingResponseNum").toString()));
return new Result<IssueStateStatisticsResultDTO>().ok(dto);
IssueStateStatisticsResultDTO issueDto = baseDao.selectCountOfIssueState(list);
IssueStateStatisticsResultDTO eventDto = epdcEventsService.selectCountOfEventState(list);
issueDto.setPendingResponseNum(eventDto.getPendingResponseNum());
issueDto.setRejectedNum(eventDto.getRejectedNum());
return new Result<IssueStateStatisticsResultDTO>().ok(issueDto);
}
/**

11
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
View File

@ -219,11 +219,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
public Result<List<ItemResultDTO>> listItemsByWork(ItemFormDTO formDto) {
int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
formDto.setPageIndex(pageIndex);
System.out.println("userid");
System.out.println(SecurityUser.getUserId());
System.out.println("user");
System.out.println(SecurityUser.getUser());
System.out.println(SecurityUser.getUser().getDeptIdList());
List<ItemResultDTO> data = baseDao.selectListOfItemsByWork(formDto, SecurityUser.getUser().getDeptIdList());
return new Result<List<ItemResultDTO>>().ok(data);
}
@ -631,14 +626,14 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
// 吹哨处理
}else if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) {
List<ItemCirculationDeptResultDTO> deptList = dto.getDeptResultDTOS();
// 拼接被吹哨部门Id
// 拼接被吹哨部门
String whistlDept = "";
for (int i =0; i < deptList.size(); i++) {
ItemCirculationDeptResultDTO indexDto = (ItemCirculationDeptResultDTO)deptList.get(i);
if (i == 0) {
whistlDept += indexDto.getDeptId();
whistlDept += indexDto.getDeptName();
} else {
whistlDept += (",".concat(indexDto.getDeptId().toString()));
whistlDept += (",".concat(indexDto.getDeptName()));
}
}
itemInfoDto.setWhistleDept(whistlDept);

8
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml
View File

@ -197,15 +197,15 @@
epdc_event_comment
WHERE
DEL_FLAG = '0'
AND COMMENT_TYPE = '0'
AND SHIELD_FLAG = '0'
AND EVENT_ID = #{eventId}
<![CDATA[ AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
ORDER BY
<if test='orderType == "1"'>
( UN_LIKE_COUNT + LIKE_COUNT + REPLY_COUNT ) DESC
( UN_LIKE_COUNT + LIKE_COUNT + REPLY_COUNT ) DESC,
</if>
<if test='orderType == "0"'>
CREATED_TIME DESC
</if>
LIMIT #{pageIndex},#{pageSize}
</select>
@ -245,6 +245,8 @@
WHERE
com.DEL_FLAG = '0'
AND com.ID = #{commentId}
ORDER BY
rep.CREATED_TIME DESC
</select>
</mapper>

15
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
View File

@ -274,10 +274,17 @@
SELECT COUNT(ID) AS num FROM epdc_events WHERE DEL_FLAG = '0' AND grid_id = #{deptId} AND EVENT_STATE = #{state}
</select>
<select id="selectCountOfEventState" resultType="java.util.HashMap">
<select id="selectCountOfEventState" resultType="com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO">
SELECT
sum(case when EVENT_STATE=0 then 1 else 0 end ) as rejectedNum,
sum(case when EVENT_STATE=2 then 1 else 0 end ) as pendingResponseNum
CASE
WHEN
SUM( EVENT_STATE = 0 ) IS NULL THEN
0 ELSE SUM( EVENT_STATE = 0 )
END AS rejectedNum,
CASE
WHEN SUM( EVENT_STATE = 2 ) IS NULL THEN
0 ELSE SUM( EVENT_STATE = 2 )
END AS pendingResponseNum
FROM epdc_events
WHERE DEL_FLAG = '0'
AND GRID_ID IN
@ -307,7 +314,7 @@
<if test="timestamp != null">
<![CDATA[ AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
</if>
order by CREATED_TIME
order by CREATED_TIME DESC
LIMIT #{pageIndex},#{pageSize}
</select>

15
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
View File

@ -441,10 +441,17 @@
AND ID NOT IN ( SELECT ISSUE_ID FROM epdc_issue_handle WHERE DEL_FLAG = '0' AND HANDLER_DEPT_ID = #{deptId} AND STATE <![CDATA[ <> ]]> 0 )
</select>
<select id="selectCountOfIssueState" resultType="java.util.HashMap">
<select id="selectCountOfIssueState" resultType="com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO">
SELECT
sum(case when ISSUE_STATE=0 then 1 else 0 end ) as pendingHandleNum,
sum(case when ISSUE_STATE=2 then 1 else 0 end ) as closed
CASE
WHEN
SUM( ISSUE_STATE = 0 ) IS NULL THEN
0 ELSE SUM( ISSUE_STATE = 0 )
END AS pendingHandleNum,
CASE
WHEN SUM( ISSUE_STATE = 2 ) IS NULL THEN
0 ELSE SUM( ISSUE_STATE = 2 )
END AS closed
FROM
epdc_issue
WHERE
@ -517,6 +524,7 @@
<result property="mobile" column="MOBILE"/>
<result property="distributeTime" column="DISTRIBUTE_TIME"/>
<result property="categoryName" column="CATEGORY_FULL_NAME"/>
<result property="mobile" column="MOBILE"/>
<result property="nickname" column="NICK_NAME"/>
<result property="avatar" column="USER_FACE"/>
<result property="address" column="ISSUE_ADDRESS"/>
@ -539,6 +547,7 @@
issue.USER_FACE,
issue.ISSUE_ADDRESS,
issue.CATEGORY_FULL_NAME,
issue.MOBILE,
eve.APPROVE_NUM,
eve.OPPOSE_NUM,
eve.BROWSE_NUM,

2
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemInformationDao.xml
View File

@ -29,7 +29,7 @@
WHERE
information.DEL_FLAG = '0'
AND information.READ_FLAG = '1'
<if test="deptId != null">
<if test="deptId != null and deptId > 0">
AND information.DEPT_ID = #{deptId}
</if>
AND information.DEPT_ID IN

7
esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml
View File

@ -190,8 +190,11 @@
<wx.mp.configs.token>111</wx.mp.configs.token>
<wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
<!--小程序配置-->
<wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
<wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
<!-- <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>-->
<!-- <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>-->
<wx.ma.appId>wx5d3e97461d248397</wx.ma.appId>
<wx.ma.secret>bfed51b731e53db9affb9e6131e7ae12</wx.ma.secret>
</properties>
</profile>

Write Preview
Loading…
Cancel
Save