From f946722be5a5b36ba4877c6242ef02661dad3a00 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 5 Jul 2021 17:47:14 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=97=AE=E9=A2=98=E9=87=87=E9=9B=86-?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=97=AE=E9=A2=98=E3=80=91-=E7=8E=8B?= =?UTF-8?q?=E7=AB=A5-2021-07-05?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/AddQuestionCollectionFormDTO.java | 59 +++++++++++++++++++ .../controller/EpdcAppItemController.java | 12 ++++ .../modules/item/service/ItemService.java | 9 +++ .../item/service/impl/ItemServiceImpl.java | 27 +++++++++ 4 files changed, 107 insertions(+) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AddQuestionCollectionFormDTO.java diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AddQuestionCollectionFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AddQuestionCollectionFormDTO.java new file mode 100644 index 000000000..10178b7e3 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AddQuestionCollectionFormDTO.java @@ -0,0 +1,59 @@ +package com.elink.esua.epdc.dto.item.form; + +import com.elink.esua.epdc.commons.tools.security.user.UserDetail; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @program: epdc-cloud-work-record + * @description: + * @author: wangtong + * @create: 2021-06-29 14:07 + **/ +@Data +public class AddQuestionCollectionFormDTO implements Serializable { + private static final long serialVersionUID = -3199520837345015894L; + + /** + * + */ + private String id; + + /** + *帮扶家庭ID + */ + private String familyId; + + /** + *帮扶家庭名称 + */ + private String helpFamilyName; + + /** + * 问题类型 + */ + private String questionType; + + /** + * 问题描述 + */ + private String questionDescribe; + + /** + * 问题状态（1：待处理；2：已结案） + */ + private String questionSatte; + + /** + *图片list + */ + private List imgs; + + + /** + * 当前登录用户信息 + */ + private UserDetail userInfo; +} \ No newline at end of file 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 e399d0b8b..072d0dfef 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 @@ -52,6 +52,18 @@ public class EpdcAppItemController { return this.itemService.listByQuestion(formDto); } + /** + * @describe: 新增问题采集-关联新增项目表 + * @author wangtong + * @date 2021/7/5 17:09 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping(value = "addQuestionInfo") + public Result addQuestionInfo(@RequestBody AddQuestionCollectionFormDTO formDto) { + return itemService.addQuestionInfo(formDto); + } + /** * 项目详情 * @Params: [formDto] 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 def3f4dae..02a4eb591 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 @@ -166,6 +166,15 @@ public interface ItemService extends BaseService { */ Result> listByQuestion(ItemByQuestionFormDTO formDto); + /** + * @describe: 新增问题采集-关联新增项目表 + * @author wangtong + * @date 2021/7/5 17:09 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result addQuestionInfo(AddQuestionCollectionFormDTO 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 990809085..1da9e7eb2 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 @@ -290,6 +290,33 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new Result>().ok(data); } + @Override + public Result addQuestionInfo(AddQuestionCollectionFormDTO formDto) { + Result userResult = userInfoFeignClient.getUserInfoById(formDto.getUserInfo().getId().toString()); + UserDTO user = null; + if(null == userResult.getData()){ + throw new RenException("根据id未查到用户信息。"); + } + user = userResult.getData(); + ItemEntity entity = new ItemEntity(); + entity.setUserId(user.getId()); + entity.setNickName(user.getNickname()); + entity.setUserFace(user.getFaceImg()); + entity.setIsPartyMember(user.getPartyFlag()); + entity.setMobile(user.getMobile()); + entity.setItemContent(formDto.getQuestionDescribe()); + entity.setDistributeTime(new Date()); + entity.setGrid(user.getGrid()); + entity.setGridId(user.getGridId()); + entity.setItemState(0); + entity.setParentDeptIds(user.getParentDeptIds()); + entity.setParentDeptNames(user.getParentDeptNames()); + entity.setAllDeptIds(user.getAllDeptIds()); + entity.setAllDeptNames(user.getAllDeptNames()); + baseDao.insert(entity); + return new Result().ok(entity.getId()); + } + /** * 项目列表-移动app端用 *