diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleListDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleListDTO.java index 1c88944c8..cfdce6608 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleListDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleListDTO.java @@ -67,6 +67,11 @@ public class ItemHandleListDTO implements Serializable { //------------------------------------------------- + /** + * 申请记录id + */ + private String delayId; + /** * 申请状态 */ @@ -82,6 +87,11 @@ public class ItemHandleListDTO implements Serializable { */ private String handleState; + /** + * 处理理由 + */ + private String handleReason; + /** * 处理状态名称 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemFusingDelayController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemFusingDelayController.java index 5fc5cd8ee..826794a4c 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemFusingDelayController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemFusingDelayController.java @@ -72,6 +72,14 @@ public class ItemFusingDelayController { return new Result(); } + @PostMapping("submitApply") + public Result submitApply(@RequestBody ItemFusingDelayInsertDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + itemFusingDelayService.save(dto); + return new Result(); + } + @PutMapping public Result update(@RequestBody ItemFusingDelayDTO dto){ //效验数据 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemFusingDelayDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemFusingDelayDao.java index f0ff37547..0f20d7f41 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemFusingDelayDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemFusingDelayDao.java @@ -18,6 +18,7 @@ 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.ItemFusingDelayInsertDTO; import com.elink.esua.epdc.dto.item.result.ItemHandleListDTO; import com.elink.esua.epdc.modules.item.entity.ItemFusingDelayEntity; import org.apache.ibatis.annotations.Mapper; @@ -42,4 +43,13 @@ public interface ItemFusingDelayDao extends BaseDao { * @return java.util.List */ List selectHandleItemsList(Map params); + + /** + * @describe: 查询实体类 + * @author wangtong + * @date 2021/2/2 18:37 + * @params [dto] + * @return com.elink.esua.epdc.modules.item.entity.ItemFusingDelayEntity + */ + ItemFusingDelayEntity selectHandleInfo(ItemFusingDelayInsertDTO dto); } \ 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/service/impl/ItemFusingDelayServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemFusingDelayServiceImpl.java index 72f8dbbf3..b8cc42811 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemFusingDelayServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemFusingDelayServiceImpl.java @@ -136,13 +136,12 @@ public class ItemFusingDelayServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(queryData); - ItemFusingDelayEntity handleInfo = baseDao.selectOne(wrapper); + ItemFusingDelayEntity handleInfo = baseDao.selectHandleInfo(dto); if(handleInfo != null && handleInfo.getState().equals(dto.getState())){ throw new RenException("此项目已存在该项的申请记录。"); } + dto.setItemId(dto.getId()); + dto.setId(null); ItemFusingDelayEntity entity = ConvertUtils.sourceToTarget(dto, ItemFusingDelayEntity.class); insert(entity); } @@ -176,7 +175,11 @@ public class ItemFusingDelayServiceImpl extends BaseServiceImpl + \ No newline at end of file