Browse Source

北尚诉办相关

feature/dangjian
Jackwang 3 years ago
parent
commit
0628ad319d
  1. 26
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java
  2. 20
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java
  3. 10
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java
  4. 18
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java
  5. 17
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java
  6. 5
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ImageConstant.java
  7. 46
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAppealPageDTO.java
  8. 104
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java
  9. 109
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealLawDetailResultDTO.java
  10. 77
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java
  11. 31
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
  12. 26
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java
  13. 27
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
  14. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java
  15. 28
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
  16. 44
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  17. 103
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

26
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java

@ -1,6 +1,7 @@
package com.elink.esua.epdc.controller;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.dto.EventDeptFormDTO;
import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
import com.elink.esua.epdc.dto.item.form.*;
@ -143,4 +144,29 @@ public class ApiWorkItemController {
public Result submitLawItem(@RequestBody ItemLawSubmitDTO formDto) {
return workItemService.submitLawItem(formDto);
}
/**
* @describe: 工作端我的上报列表-执法诉求
* @author wangtong
* @date 2022/9/3 18:37
* @params [evaluationFormDTO]
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO>>
*/
@GetMapping("getLawItemList")
public Result<List<ItemAppealPageResultDTO>> getLawItemList(ItemAppealPageDTO dto) {
ValidatorUtils.validateEntity(dto);
return workItemService.getLawItemList(dto);
}
/**
* @describe: 工作端执法诉求详情
* @author wangtong
* @date 2022/9/3 18:37
* @params [id]
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO>
*/
@GetMapping("getLawItemDetail/{id}")
public Result<ItemAppealDetailResultDTO> lawItemDetail(@PathVariable String id) {
return workItemService.lawItemDetail(id);
}
}

20
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java

@ -131,4 +131,24 @@ public interface WorkItemFeignClient {
*/
@PostMapping(value = "events/work/item/submitLawItem", consumes = MediaType.APPLICATION_JSON_VALUE)
Result submitLawItem(ItemLawSubmitDTO formDto);
/**
* @describe: 工作端我的上报列表-执法诉求
* @author wangtong
* @date 2022/9/3 18:37
* @params [evaluationFormDTO]
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO>>
*/
@GetMapping(value = "events/work/item/getLawItemList", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<List<ItemAppealPageResultDTO>> getLawItemList(ItemAppealPageDTO dto);
/**
* @describe: 工作端执法诉求详情
* @author wangtong
* @date 2022/9/3 18:37
* @params [id]
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO>
*/
@GetMapping(value = "events/work/item/lawItemDetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<ItemAppealDetailResultDTO> lawItemDetail(@PathVariable String id);
}

10
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java

@ -72,4 +72,14 @@ public class WorkItemFeignClientFallback implements WorkItemFeignClient {
return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "submitLawItem",formDto);
}
@Override
public Result<List<ItemAppealPageResultDTO>> getLawItemList(ItemAppealPageDTO dto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getLawItemList",dto);
}
@Override
public Result<ItemAppealDetailResultDTO> lawItemDetail(@PathVariable String id) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "lawItemDetail",id);
}
}

18
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java

@ -106,4 +106,22 @@ public interface WorkItemService {
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result submitLawItem(ItemLawSubmitDTO formDto);
/**
* @describe: 工作端我的上报列表-执法诉求
* @author wangtong
* @date 2022/9/3 18:37
* @params [evaluationFormDTO]
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO>>
*/
Result<List<ItemAppealPageResultDTO>> getLawItemList(ItemAppealPageDTO dto);
/**
* @describe: 工作端执法诉求详情
* @author wangtong
* @date 2022/9/3 18:37
* @params [id]
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO>
*/
Result<ItemAppealDetailResultDTO> lawItemDetail(String id);
}

17
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java

@ -1,5 +1,7 @@
package com.elink.esua.epdc.service.impl;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.EventDeptFormDTO;
import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
@ -86,4 +88,19 @@ public class WorkItemServiceImpl implements WorkItemService {
return workItemFeignClient.submitLawItem(formDto);
}
@Override
public Result<List<ItemAppealPageResultDTO>> getLawItemList(ItemAppealPageDTO dto) {
UserDetail user = SecurityUser.getUser();
if (null == user) {
throw new RuntimeException("获取用户信息失败");
}
dto.setUserId("zfsq"+user.getId());
return workItemFeignClient.getLawItemList(dto);
}
@Override
public Result<ItemAppealDetailResultDTO> lawItemDetail(String id) {
return workItemFeignClient.lawItemDetail(id);
}
}

5
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ImageConstant.java

@ -12,6 +12,11 @@ public interface ImageConstant {
*/
public final static String TYPE_IMAGE_BIZ_EVENTS = "events";
/**
* 图片类型-项目
*/
public final static String TYPE_IMAGE_BIZ_ITEMS = "items";
/**
* 图片类型-事件
*/

46
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAppealPageDTO.java

@ -0,0 +1,46 @@
package com.elink.esua.epdc.dto.item.form;
import lombok.Data;
import javax.validation.constraints.Min;
import java.io.Serializable;
/**
* @program: esua-epdc
* @description:工作端我的上报列表
* @author: wangtong
* @create: 2022-09-03 15:21
**/
@Data
public class ItemAppealPageDTO implements Serializable {
@Min(value = 1, message = "页码必须大于0")
private int pageIndex;
/**
* 页容量默认20页
*/
@Min(value = 1, message = "每页条数必须大于必须大于0")
private int pageSize = 20;
private String userId;
// /**
// * 诉求类型 0民生 1发展 2执法
// */
// private String appealType;
//
// /**
// * 上报开始时间:年月日
// */
// private String startTime;
//
// /**
// * 上报结束时间:年月日
// */
// private String endTime;
//
// /**
// * 项目内容
// */
// private String itemContent;
}

104
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java

@ -0,0 +1,104 @@
package com.elink.esua.epdc.dto.item.result;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* 项目详情
* @Author LC
* @Date 2019/9/16 9:41
*/
@Data
public class ItemAppealDetailResultDTO implements Serializable {
private static final long serialVersionUID = -3581048983884408672L;
/**
* 项目ID
*/
private String id;
/**
* 发布人
*/
private String nickName;
/**
* 发布时间
*/
private Date distributeTime;
/**
* 手机号
*/
private String mobile;
/**
* 项目内容
*/
private String itemContent;
/**
* 图片
*/
private List<String> images;
/**
* 语音
*/
private String voice;
/**
* 语音时长
*/
private String duration;
/**
* 地址
*/
private String issueAddress;
/**
* 纬度
*/
private Double issueLatitude;
/**
* 经度
*/
private Double issueLongitude;
/**
* 所属类别
*/
private String categoryName;
/**
* 用户头像
*/
private String userFace;
/**
* 网格ID
*/
private Long gridId;
/**
* 语音
*/
private String itemVoice;
/**
* 联系人
*/
private String contactName;
/**
* 诉求分类0民生 1发展 2执法
*/
private String peopleFlag;
/**
* 执法详情
*/
private ItemAppealLawDetailResultDTO lawDetail;
/**
* 项目处理进度
*/
private List<ItemHandleProgressResultDTO> handleProgressResultDTOS;
}

109
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealLawDetailResultDTO.java

@ -0,0 +1,109 @@
package com.elink.esua.epdc.dto.item.result;
import lombok.Data;
import java.io.Serializable;
@Data
public class ItemAppealLawDetailResultDTO implements Serializable {
private static final long serialVersionUID = -3581048983884408672L;
/**
* ID
*/
private String id;
/**
* 项目ID
*/
private String itemId;
/**
* 事项名称
*/
private String lawName;
/**
* 诉求详情
*/
private String lawContent;
/**
* 主办单位
*/
private String hostUnit;
/**
* 协办单位
*/
private String assistUnit;
/**
* 有关需求
*/
private String demand;
/**
* 事项类型0计划事项 1临时事项
*/
private String lawType;
/**
* 与部门是否沟通 0已经沟通 1尚未沟通
*/
private String isExchange;
/**
* 召集人姓名
*/
private String convenerName;
/**
* 召集人职务
*/
private String convenerJob;
/**
* 召集人电话
*/
private String convenerMobile;
/**
* 联系人姓名
*/
private String contactName;
/**
* 联系人职务
*/
private String contactJob;
/**
* 联系人电话
*/
private String contactMobile;
/**
* 报到时间
*/
private String reportTime;
/**
* 报到地点
*/
private String reportAddress;
/**
* 会议名称
*/
private String meetingName;
/**
* 创建时间
*/
private String createdTime;
}

77
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java

@ -0,0 +1,77 @@
package com.elink.esua.epdc.dto.item.result;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @program: esua-epdc
* @description:
* @author: wangtong
* @create: 2022-09-03 15:26
**/
@Data
public class ItemAppealPageResultDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* id
*/
private String id;
/**
* 用户昵称
*/
private String nickName;
/**
* 内容
*/
private String itemContent;
/**
* 发布时间
*/
private Date distributeTime;
/**
* 网格
*/
private String grid;
/**
* 网格ID
*/
private Long gridId;
/**
* 项目状态 0-处理中5-已关闭10-已结案
*/
private Integer itemState;
/**
* 项目状态 0-处理中5-已关闭10-已结案
*/
private String itemStateName;
/**
* 诉求分类0民生 1发展 2执法
*/
private String peopleFlag;
/**
* 诉求分类0民生 1发展 2执法
*/
private String peopleFlagName;
/**
* 上报时间
*/
private String createdTime;
}

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

@ -32,9 +32,7 @@ import com.elink.esua.epdc.dto.item.ItemDTO;
import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO;
import com.elink.esua.epdc.dto.item.form.HandleResultDTOSFormDTO;
import com.elink.esua.epdc.dto.item.form.ItemHandleSubmitFormDTO;
import com.elink.esua.epdc.dto.item.result.ItemContentForPCEndResultDTO;
import com.elink.esua.epdc.dto.item.result.ItemDetailForPCEndResultDTO;
import com.elink.esua.epdc.dto.item.result.ItemTimeOutDTO;
import com.elink.esua.epdc.dto.item.result.*;
import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO;
import com.elink.esua.epdc.dto.result.KpiItemHandleAmountResultDTO;
import com.elink.esua.epdc.modules.item.excel.ItemExcel;
@ -291,4 +289,31 @@ public class ItemController {
itemService.itemTimeOut();
return new Result();
}
/**
* @describe: 北尚诉求列表
* @author wangtong
* @date 2022/9/3 15:39
* @params [dto]
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO>>
*/
@GetMapping("getItemAppealPage")
public Result<PageData<ItemAppealPageResultDTO>> getItemAppealPage(@RequestParam Map<String, Object> params){
PageData<ItemAppealPageResultDTO> page = itemService.getItemAppealPage(params);
return new Result<PageData<ItemAppealPageResultDTO>>().ok(page);
}
/**
* @describe: 北尚诉求详情
* @author wangtong
* @date 2022/9/3 16:06
* @params [id]
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO>>
*/
@GetMapping("getItemAppealDetail/{id}")
public Result<ItemAppealDetailResultDTO> getItemAppealDetail(@PathVariable("id") String id){
return itemService.getItemAppealDetail(id);
}
}

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

@ -169,8 +169,32 @@ public class WorkItemController {
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
@GetMapping("submitLawItem")
@PostMapping("submitLawItem")
public Result submitLawItem(@RequestBody ItemLawSubmitDTO formDto) {
return itemService.submitLawItem(formDto);
}
/**
* @describe: 工作端我的上报列表-执法诉求
* @author wangtong
* @date 2022/9/3 18:37
* @params [evaluationFormDTO]
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO>>
*/
@GetMapping("getLawItemList")
public Result<List<ItemAppealPageResultDTO>> getLawItemList(@RequestBody ItemAppealPageDTO dto) {
return itemService.getLawItemList(dto);
}
/**
* @describe: 工作端执法诉求详情
* @author wangtong
* @date 2022/9/3 18:37
* @params [id]
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO>
*/
@GetMapping("getLawItemDetail/{id}")
public Result<ItemAppealDetailResultDTO> lawItemDetail(@PathVariable String id) {
return itemService.getItemAppealDetail(id);
}
}

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

@ -382,4 +382,31 @@ public interface ItemDao extends BaseDao<ItemEntity> {
* @return java.lang.Integer
*/
String selectSecondCateByItemId(@Param("id")String id);
/**
* @describe: 北尚诉求列表
* @author wangtong
* @date 2022/9/3 15:48
* @params [params]
* @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO>
*/
List<ItemAppealPageResultDTO> getItemAppealPage(Map<String, Object> params);
/**
* @describe: 北尚诉求详情
* @author wangtong
* @date 2022/9/3 16:21
* @params [id]
* @return com.elink.esua.epdc.dto.item.result.ItemAppealDetailResultDTO
*/
ItemAppealDetailResultDTO getItemAppealDetail(@Param("id") String id);
/**
* @describe: 工作端我的上报列表-执法诉求
* @author wangtong
* @date 2022/9/3 18:37
* @params [evaluationFormDTO]
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO>>
*/
List<ItemAppealPageResultDTO> getLawItemList(ItemAppealPageDTO formDto);
}

2
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java

@ -211,7 +211,7 @@ public class ItemEntity extends BaseEpdcEntity {
private String itemCode;
/**
* 诉求分类0民生 1发展
* 诉求分类0民生 1发展 2执法
*/
private String peopleFlag;

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

@ -481,4 +481,32 @@ public interface ItemService extends BaseService<ItemEntity> {
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result submitLawItem(ItemLawSubmitDTO formDto);
/**
* @describe: 北尚诉求列表
* @author wangtong
* @date 2022/9/3 15:39
* @params [dto]
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO>>
*/
PageData<ItemAppealPageResultDTO> getItemAppealPage(Map<String, Object> params);
/**
* @describe: 北尚诉求详情
* @author wangtong
* @date 2022/9/3 16:06
* @params [id]
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO>>
*/
Result<ItemAppealDetailResultDTO> getItemAppealDetail(String id);
/**
* @describe: 工作端我的上报列表-执法诉求
* @author wangtong
* @date 2022/9/3 18:37
* @params [evaluationFormDTO]
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO>>
*/
Result<List<ItemAppealPageResultDTO>> getLawItemList(ItemAppealPageDTO dto);
}

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

@ -82,6 +82,7 @@ import com.elink.esua.epdc.modules.interfacelog.service.InterfaceLogService;
import com.elink.esua.epdc.modules.issue.service.IssueService;
import com.elink.esua.epdc.modules.item.dao.ItemDao;
import com.elink.esua.epdc.modules.item.dao.ItemGridPlatformDao;
import com.elink.esua.epdc.modules.item.dao.ItemLawDao;
import com.elink.esua.epdc.modules.item.entity.*;
import com.elink.esua.epdc.modules.item.service.*;
import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO;
@ -96,6 +97,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestParam;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
@ -176,6 +178,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
@Autowired
private ItemLawService itemLawService;
@Autowired
private ItemLawDao itemLawDao;
@Override
public PageData<ItemDTO> page(Map<String, Object> params) {
@ -296,6 +300,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
@Transactional(rollbackFor = Exception.class)
public Result submitLawItem(ItemLawSubmitDTO formDto) {
UserDetail userDetail = SecurityUser.getUser();
if (null == userDetail) {
throw new RuntimeException("获取用户信息失败");
}
ItemEntity itemEntity = new ItemEntity();
/**
* userIDzfsq+当前账户ID
@ -328,7 +335,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
//插入项目部门关联表
itemDeptService.savePeopleSubmitInfo(itemEntity);
// 保存图片
imgService.saveImages(formDto.getImages(), itemEntity.getId(), ImageConstant.TYPE_IMAGE_BIZ_EVENTS);
imgService.saveImages(formDto.getImages(), itemEntity.getId(), ImageConstant.TYPE_IMAGE_BIZ_ITEMS);
//保存到执法诉求详情表
formDto.setItemId(itemEntity.getId());
itemLawService.saveLawDetail(formDto);
@ -2019,7 +2026,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
//插入项目部门关联表
itemDeptService.savePeopleSubmitInfo(entity);
// 保存图片
imgService.saveImages(formDto.getImages(), entity.getId(), ImageConstant.TYPE_IMAGE_BIZ_EVENTS);
imgService.saveImages(formDto.getImages(), entity.getId(), ImageConstant.TYPE_IMAGE_BIZ_ITEMS);
return new Result();
}
@ -2093,4 +2100,37 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
return entities;
}
@Override
public PageData<ItemAppealPageResultDTO> getItemAppealPage(@RequestParam Map<String, Object> params) {
IPage<ItemAppealPageResultDTO> page = getPage(params);
List<ItemAppealPageResultDTO> list = baseDao.getItemAppealPage(params);
return new PageData<>(list, page.getTotal());
}
@Override
public Result<ItemAppealDetailResultDTO> getItemAppealDetail(String id) {
ItemAppealDetailResultDTO result = baseDao.getItemAppealDetail(id);
// 获取项目处理进度
List<ItemHandleProgressResultDTO> dtoList = baseDao.selectListOfItemHandleProgressByWork(id);
result.setHandleProgressResultDTOS(dtoList);
//获取执法诉求详情
if(StringUtils.isNotBlank(result.getPeopleFlag()) && "2".equals(result.getPeopleFlag())){
QueryWrapper<ItemLawEntity> wrapper = new QueryWrapper<>();
wrapper.eq("item_id", result.getId());
wrapper.eq("del_flag", "0");
ItemLawEntity itemLaw = itemLawDao.selectOne(wrapper);
result.setLawDetail(ConvertUtils.sourceToTarget(itemLaw, ItemAppealLawDetailResultDTO.class));
}
return new Result<ItemAppealDetailResultDTO>().ok(result);
}
@Override
public Result<List<ItemAppealPageResultDTO>> getLawItemList(ItemAppealPageDTO formDto) {
int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
formDto.setPageIndex(pageIndex);
List<ItemAppealPageResultDTO> list = baseDao.getLawItemList(formDto);
return new Result<List<ItemAppealPageResultDTO>>().ok(list);
}
}

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

@ -1260,4 +1260,107 @@
img.IMG_URL
</select>
<select id="getItemAppealPage" resultType="com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO">
SELECT id,
NICK_NAME,
CREATED_TIME,
ITEM_STATE,
CASE ITEM_STATE
WHEN '0' THEN '处理中'
WHEN '10' THEN '已结案'
ELSE ''
END AS itemStateName,
ITEM_CONTENT,
PEOPLE_FLAG,
CASE PEOPLE_FLAG
WHEN '0' THEN '民生诉求'
WHEN '1' THEN '发展诉求'
WHEN '2' THEN '执法诉求'
ELSE ''
END AS peopleFlagName
FROM epdc_item i
where
i.DEL_FLAG='0'
and IS_PEOPLE = '1'
<if test="appealType != null and appealType != ''">
and i.PEOPLE_FLAG = #{appealType}
</if>
<if test="userId != null and userId != ''">
and i.USER_ID = #{userId}
</if>
<if test="itemContent != null and itemContent != ''">
and i.ITEM_CONTENT like '%${itemContent}%'
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND DATE_FORMAT( i.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
</if>
order by i.CREATED_TIME desc
</select>
<resultMap id="appealDetailMap" type="com.elink.esua.epdc.dto.item.result.ItemAppealDetailResultDTO">
<result property="id" column="ID"/>
<result property="nickName" column="NICK_NAME"/>
<result property="distributeTime" column="DISTRIBUTE_TIME"/>
<result property="mobile" column="MOBILE"/>
<result property="gridId" column="GRID_ID"/>
<result property="userFace" column="USER_FACE"/>
<result property="itemContent" column="ITEM_CONTENT"/>
<result property="issueAddress" column="ISSUE_ADDRESS"/>
<result property="issueLatitude" column="ISSUE_LATITUDE"/>
<result property="issueLongitude" column="ISSUE_LONGITUDE"/>
<result property="categoryName" column="CATEGORY_NAME"/>
<result property="peopleFlag" column="PEOPLE_FLAG"/>
<result property="itemVoice" column="ITEM_VOICE"/>
<result property="contactName" column="CONTACT_NAME"/>
<collection property="images" ofType="java.lang.String">
<result property="image" column="IMG_URL"/>
</collection>
</resultMap>
<select id="getItemAppealDetail"
resultMap="appealDetailMap">
SELECT
item.ID,
item.NICK_NAME,
item.DISTRIBUTE_TIME,
item.MOBILE,
item.ITEM_CONTENT,
item.ISSUE_ADDRESS,
item.ISSUE_LATITUDE,
item.ISSUE_LONGITUDE,
item.USER_FACE,
item.GRID_ID,
item.CATEGORY_FULL_NAME as CATEGORY_NAME,\
item.PEOPLE_FLAG,
img.IMG_URL,
item.ITEM_VOICE,
item.CONTACT_NAME
FROM epdc_item item
LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID
AND img.DEL_FLAG = '0' AND img.IMG_TYPE = 'items'
WHERE
item.DEL_FLAG = '0'
AND item.ID = #{itemId}
</select>
<select id="getLawItemList" resultType="com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO">
SELECT id,
NICK_NAME,
CREATED_TIME,
ITEM_STATE,
CASE ITEM_STATE
WHEN '0' THEN '处理中'
WHEN '10' THEN '已结案'
ELSE ''
END AS itemStateName,
ITEM_CONTENT
FROM epdc_item i
where
i.DEL_FLAG='0'
and IS_PEOPLE = '1'
and PEOPLE_FLAG = '2'
<if test="userId != null and userId != ''">
and i.USER_ID = #{userId}
</if>
order by i.CREATED_TIME desc
LIMIT #{pageIndex},#{pageSize}
</select>
</mapper>

Loading…
Cancel
Save