diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemByQuestionFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemByQuestionFormDTO.java new file mode 100644 index 000000000..b403ea685 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemByQuestionFormDTO.java @@ -0,0 +1,76 @@ +package com.elink.esua.epdc.dto.item.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * @Author wanggongfeng + * @Date 2021/7/5 16:39 + */ +@Data +public class ItemByQuestionFormDTO implements Serializable { + private static final long serialVersionUID = -3034807666143092535L; + + /** + * 用户所属网格ID + */ + @NotNull(message = "用户网格ID不能为空") + private Long deptId; + /** + * 搜索内容 + */ + private String searchContent; + /** + * 页码,从1开始 + */ + @Min(value = 1, message = "页码必须大于0") + private int pageIndex; + /** + * 页容量,默认20页 + */ + @Min(value = 1, message = "每页条数必须大于必须大于0") + private int pageSize = 20; + /** + * 第一页查询发起时的时间 + */ + @NotBlank(message = "时间戳不能为空") + private String timestamp; + /** + * 只查询半年内的数据 + */ + private Date someMonthsAgo; + /** + * 议题一级分类ID + */ + private String firstCategoryCode; + /** + * 用户ID + */ + private String userId; + + /** + * 排序方式 0-创建时间倒叙,1-最后一次处理时间倒叙 + */ + private String orderType; + /** + * 项目状态 0-待处理,5-已关闭,10-已结案 + */ + @NotNull(message = "项目状态不能为空") + private Integer itemState; + + /** + * 项目ID + */ + private String itemId; + + /** + * 项目IDList(能关联到问题录入的项目) + */ + private List itemIdList; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java index 5e26db1f4..e399d0b8b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java @@ -39,6 +39,19 @@ public class EpdcAppItemController { return this.itemService.listItems(formDto); } + /** + * 项目列表(问题采集使用) + * @Params: [formDto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: wanggongfeng + * @Date: 2021/7/5 16:39 + */ + @GetMapping("listByQuestion") + public Result> listByQuestion(@RequestBody ItemByQuestionFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return this.itemService.listByQuestion(formDto); + } + /** * 项目详情 * @Params: [formDto] diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index c8c1902b7..63f608b08 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -18,15 +18,12 @@ package com.elink.esua.epdc.modules.item.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.result.KpiItemTimeLimitByDeptResultDTO; import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; import com.elink.esua.epdc.dto.events.form.GroupFormDTO; import com.elink.esua.epdc.dto.item.ItemDTO; import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; -import com.elink.esua.epdc.dto.item.form.ItemCategoryStatisticsFormDTO; -import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO; -import com.elink.esua.epdc.dto.item.form.ItemFormDTO; -import com.elink.esua.epdc.dto.item.form.ItemStatisticsFormDTO; import com.elink.esua.epdc.dto.item.result.*; import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO; import com.elink.esua.epdc.dto.result.KpiItemHandleAmountResultDTO; @@ -66,6 +63,16 @@ public interface ItemDao extends BaseDao { */ List selectListOfItems(ItemFormDTO formDto, int[] states); + /** + * 移动端-项目列表(问题采集使用) + * + * @Params: [formDto] + * @Return: java.util.List + * @Author: wanggongfeng + * @Date: 2021/7/5 16:39 + */ + List selectListOfItemsByQuestion(ItemByQuestionFormDTO formDto, int[] states); + /** * 移动端-我的项目列表 * @@ -282,14 +289,14 @@ public interface ItemDao extends BaseDao { */ void deleteBatchItemHandleIds(@Param("ids") List ids); - /** - * @Description: 根据项目id,查询当前登录人所在部门,以外的该项目关联的所有部门id + /** + * @Description: 根据项目id,查询当前登录人所在部门,以外的该项目关联的所有部门id * @Param: [itemId] 项目id * @Param: [deptId] 部门id - * @return: java.util.List - * @Author: zy - * @Date: 2020-01-09 - */ + * @return: java.util.List + * @Author: zy + * @Date: 2020-01-09 + */ List queryDeptIdList(String itemId, Long deptId); /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index f15968ac6..def3f4dae 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -156,6 +156,16 @@ public interface ItemService extends BaseService { */ Result> listItems(ItemFormDTO formDto); + /** + * 移动端-项目列表(问题采集使用) + * + * @Params: [formDto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: wanggongfeng + * @Date: 2021/7/5 16:39 + */ + Result> listByQuestion(ItemByQuestionFormDTO formDto); + /** * 项目列表-移动app端用 * diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index dce9ceaa8..990809085 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -278,6 +278,18 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new Result>().ok(data); } + @Override + public Result> listByQuestion(ItemByQuestionFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + // 查询半年内的数据 + formDto.setSomeMonthsAgo(DateUtils.addDateMonths(new Date(), -6)); + // 查询数据状态 + int[] states = {EventIssueItemState.ITEM_HANDLING, EventIssueItemState.ITEM_CLOSEING_CASE}; + List data = baseDao.selectListOfItemsByQuestion(formDto, states); + return new Result>().ok(data); + } + /** * 项目列表-移动app端用 * diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index d792d41ec..f2cf353d8 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -116,6 +116,97 @@ item.CREATED_TIME DESC, img.IMG_URL +