Browse Source

驳回列表详情接口

feature/dangjian
wanggongfeng 3 years ago
parent
commit
209e938fd1
  1. 27
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
  2. 10
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
  3. 19
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
  4. 81
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  5. 95
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

27
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java

@ -79,6 +79,20 @@ public class ItemController {
return new Result<PageData<ItemPendingHandleDTO>>().ok(page);
}
/**
* 项目驳回列表
*
* @Params: [params]
* @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.item.ItemPendingHandleDTO>>
* @Author: liuchuang
* @Date: 2019/9/16 9:56
*/
@GetMapping("rejectPage")
public Result<PageData<ItemPendingHandleDTO>> rejectPage(@RequestParam Map<String, Object> params) {
PageData<ItemPendingHandleDTO> page = itemService.listOfItemsForPCReject(params);
return new Result<PageData<ItemPendingHandleDTO>>().ok(page);
}
/**
* 项目处理详情
*
@ -272,6 +286,19 @@ public class ItemController {
List<ItemPendingHandleDTO> list= itemService.unExportList(params);
ExcelUtils.exportExcelToTarget(response, "null", list, StayItemExcel.class);
}
/**
* 项目管理 - 驳回导出
* @param params
* @param response
* @throws Exception
*/
@GetMapping("rejectUnexport")
public void rejectUnexport(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<ItemPendingHandleDTO> list= itemService.rejectUnexport(params);
ExcelUtils.exportExcelToTarget(response, "null", list, StayItemExcel.class);
}
/**
* 项目管理 - 已超时 -导出
* @param params

10
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java

@ -147,6 +147,16 @@ public interface ItemDao extends BaseDao<ItemEntity> {
*/
List<ItemPendingHandleDTO> selectListOfPendingHandleItems(Map<String, Object> params);
/**
* PC端项目驳回列表
*
* @Params: [params]
* @Return: java.util.List<com.elink.esua.epdc.dto.item.ItemPendingHandleDTO>
* @Author: liuchuang
* @Date: 2019/9/12 18:21
*/
List<ItemPendingHandleDTO> listOfItemsForPCReject(Map<String, Object> params);
/**
* PC端项目详情
*

19
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java

@ -66,6 +66,16 @@ public interface ItemService extends BaseService<ItemEntity> {
*/
PageData<ItemPendingHandleDTO> listOfItemsForPCEnd(Map<String, Object> params);
/**
* PC端项目驳回列表
*
* @Params: [params]
* @Return: com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.ItemPendingHandleDTO>
* @Author: liuchuang
* @Date: 2019/9/12 18:17
*/
PageData<ItemPendingHandleDTO> listOfItemsForPCReject(Map<String, Object> params);
/**
* 默认查询
*
@ -453,6 +463,15 @@ public interface ItemService extends BaseService<ItemEntity> {
*/
List<ItemPendingHandleDTO> unExportList(Map<String, Object> params);
/**
* @describe: 结案申请驳回导出
* @author wgf
* @date 2022/09/08
* @params [params]
* @return list
*/
List<ItemPendingHandleDTO> rejectUnexport(Map<String, Object> params);
void itemTimeOut();
/**

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

@ -241,6 +241,46 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
return new PageData<>(list, page.getTotal());
}
@Override
public PageData<ItemPendingHandleDTO> listOfItemsForPCReject(Map<String, Object> params) {
UserDetail user = SecurityUser.getUser();
if (null == user) {
throw new RuntimeException("获取用户信息失败");
}
if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
if (params.get("streetId") != null && !"".equals(params.get("streetId"))) {
Result<SysDeptDTO> resultdept = adminFeignClient.getSysDeptInfo(Long.parseLong(params.get("streetId").toString()));
SysDeptDTO dept = resultdept.getData();
Object deptId = params.get("streetId");
if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(dept.getTypeKey())) {
params.put("districtDeptId", deptId);
params.remove("streetId");
}
}
}
//部门ID列表
List<Long> deptIdList = new ArrayList<>();
// 判断是否为社区网格,不为社区网格只能查看本部门下的项目数据
if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey()) || OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(user.getTypeKey())) {
deptIdList = user.getDeptIdList();
} else {
deptIdList.add(user.getDeptId());
}
if(OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(user.getTypeKey())){
params.put("isRemind", "isRemind");
}
params.put("deptIdList", null);
if (null != deptIdList && deptIdList.size() > 0) {
params.put("deptIdList", deptIdList);
}
if (null != params.get("itemCode")) {
params.put("itemCode", params.get("itemCode").toString().trim());
}
IPage<ItemPendingHandleDTO> page = getPage(params);
List<ItemPendingHandleDTO> list = baseDao.listOfItemsForPCReject(params);
return new PageData<>(list, page.getTotal());
}
@Override
public List<ItemDTO> list(Map<String, Object> params) {
List<ItemEntity> entityList = baseDao.selectList(getWrapper(params));
@ -2427,6 +2467,47 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
return list;
}
/**
*
* @param params
* @return
*/
@Override
public List<ItemPendingHandleDTO> rejectUnexport(Map<String, Object> params) {
UserDetail user = SecurityUser.getUser();
if (null == user) {
throw new RuntimeException("获取用户信息失败");
}
if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
if (params.get("streetId") != null && !"".equals(params.get("streetId"))) {
Result<SysDeptDTO> resultdept = adminFeignClient.getSysDeptInfo(Long.parseLong(params.get("streetId").toString()));
SysDeptDTO dept = resultdept.getData();
Object deptId = params.get("streetId");
if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(dept.getTypeKey())) {
params.put("districtDeptId", deptId);
params.remove("streetId");
}
}
}
//部门ID列表
List<Long> deptIdList = new ArrayList<>();
// 判断是否为网格,不为网格只能查看本部门下的项目数据
if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey())) {
deptIdList = user.getDeptIdList();
} else {
deptIdList.add(user.getDeptId());
}
params.put("deptIdList", null);
if (null != deptIdList && deptIdList.size() > 0) {
params.put("deptIdList", deptIdList);
}
if (null != params.get("itemCode")) {
params.put("itemCode", params.get("itemCode").toString().trim());
}
List<ItemPendingHandleDTO> list = baseDao.listOfItemsForPCReject(params);
return list;
}
/**
* 分类信息处理
*

95
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@ -519,6 +519,7 @@
) process on process.ITEM_ID = item.ID
WHERE item.DEL_FLAG = '0'
and (item.IS_PEOPLE = '0' or (item.PEOPLE_FLAG = '0' and (process.state is null or process.state not in (11,15))))
and (process.state != 14 or process.state is null)
<if test="peopleFlag != null and peopleFlag != ''">
AND item.PEOPLE_FLAG = #{peopleFlag}
</if>
@ -578,6 +579,100 @@
item.CREATED_TIME DESC
</select>
<select id="listOfItemsForPCReject" resultType="com.elink.esua.epdc.dto.item.ItemPendingHandleDTO">
SELECT
item.ID,
item.ITEM_CONTENT,
item.ITEM_CODE,
item.CREATED_TIME,
item.NICK_NAME,
item.MOBILE,
CASE item.EVALUATION_SCORE
WHEN 0 THEN '不满意'
WHEN 1 THEN '基本满意'
WHEN 2 THEN '非常满意'
ELSE ''
END AS evaluationScore,
eve.APPROVE_NUM,
eve.OPPOSE_NUM,
eve.COMMENT_NUM,
eve.BROWSE_NUM,
<if test="isRemind != null and isRemind != ''">
(case when (process.ID is null and HOUR( timediff( now(), item.CREATED_TIME) ) >= 24) then '1' else '' end) as isRemind,
</if>
( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS participantsNum,
(case when d.ID is not null then '1' else '0' end) as isDelay
FROM epdc_item item
LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0'
left join epdc_item_fusing_delay_record d on d.ITEM_ID = item.ID and d.DEL_FLAG = '0'
left join (
select b.ID,b.ITEM_ID,b.CREATED_TIME,b.state
from epdc_item_handle_process b where b.STATE != 1001 and b.CREATED_TIME = (
SELECT max(CREATED_TIME) from epdc_item_handle_process where b.ITEM_ID = ITEM_ID
)
) process on process.ITEM_ID = item.ID
WHERE item.DEL_FLAG = '0'
and (item.IS_PEOPLE = '0' or (item.PEOPLE_FLAG = '0' and (process.state is null or process.state not in (11,15))))
and process.state = 14
<if test="peopleFlag != null and peopleFlag != ''">
AND item.PEOPLE_FLAG = #{peopleFlag}
</if>
<if test="itemState != null and itemState != ''">
AND item.ITEM_STATE = #{itemState}
</if>
<if test="associatedType != null and associatedType != ''">
AND item.ITEM_STATE in (0,10)
</if>
<if test="keyword != null and keyword != ''">
AND item.ITEM_CONTENT like concat('%', trim(#{keyword}), '%')
</if>
AND item.ID IN (
SELECT
temp.ITEM_ID
FROM
( SELECT dept.ITEM_ID FROM epdc_item_dept dept WHERE dept.DEL_FLAG = '0'
<if test="deptIdList != null">
AND dept.DEPT_ID IN
<foreach item="deptId" collection="deptIdList" open="(" separator="," close=")">
#{deptId}
</foreach>
</if>
<if test="districtDeptId != null and districtDeptId != ''">
AND dept.DEPT_ID = #{districtDeptId}
</if>
) temp
)
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
</if>
<if test="gridId != null and gridId != ''">
AND (item.GRID_ID = #{gridId}
OR find_in_set(#{gridId},item.ALL_DEPT_IDS))
</if>
<if test="streetId != null and streetId != ''">
AND (find_in_set(#{streetId},item.PARENT_DEPT_IDS)
OR find_in_set(#{streetId},item.ALL_DEPT_IDS))
</if>
<if test="communityId != null and communityId != ''">
AND (find_in_set(#{communityId},item.PARENT_DEPT_IDS)
OR find_in_set(#{communityId},item.ALL_DEPT_IDS))
</if>
<if test="itemCode != null and itemCode != ''">
AND item.ITEM_CODE like concat('%', #{itemCode}, '%')
</if>
<if test="itemContent != null and itemContent != ''">
AND item.ITEM_CONTENT like concat('%', #{itemContent}, '%')
</if>
<if test="nickName != null and nickName != ''">
AND item.NICK_NAME like concat('%', #{nickName}, '%')
</if>
<if test="mobile != null and mobile != ''">
AND item.MOBILE like concat('%', #{mobile}, '%')
</if>
ORDER BY
item.CREATED_TIME DESC
</select>
<resultMap id="itemDetailPCEndMap" type="com.elink.esua.epdc.dto.item.result.ItemDetailForPCEndResultDTO">
<result property="id" column="ID"/>
<result property="nickName" column="NICK_NAME"/>

Loading…
Cancel
Save