【项目延期-熔断】-【审核】-（王童）-2021/2/2

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

@@ -0,0 +1,56 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.item.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+
+/**
+ * 项目熔断/延期  审核
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-02-01
+ */
+@Data
+public class ItemAuditDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 申请状态：0-延期，5-熔断
+     */
+    @NotBlank(message = "审核状态不能为空")
+	private Integer handleState;
+
+    /**
+     * 申请理由
+     */
+    @NotNull(message = "审核理由不能为空")
+	private String handleReason;
+
+
+}

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

@@ -26,6 +26,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.item.ItemFusingDelayDTO;
+import com.elink.esua.epdc.dto.item.form.ItemAuditDTO;
 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.excel.ItemFusingDelayExcel;
@@ -93,4 +94,18 @@ public class ItemFusingDelayController {
         ExcelUtils.exportExcelToTarget(response, null, list, ItemFusingDelayExcel.class);
     }
 
+    /**
+    * @describe: 审核项目熔断/延期
+    * @author wangtong
+    * @date 2021/2/1 18:07
+    * @params [dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("auditRecord")
+    public Result auditRecord(@RequestBody ItemAuditDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        return itemFusingDelayService.auditRecord(dto);
+    }
+
 }

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

@@ -19,7 +19,9 @@ package com.elink.esua.epdc.modules.item.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.item.ItemFusingDelayDTO;
+import com.elink.esua.epdc.dto.item.form.ItemAuditDTO;
 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;
@@ -94,4 +96,13 @@ public interface ItemFusingDelayService extends BaseService<ItemFusingDelayEntit
      * @date 2021-02-01
      */
     void delete(String[] ids);
+
+    /**
+    * @describe: 审核项目熔断/延期
+    * @author wangtong
+    * @date 2021/2/1 18:07
+    * @params [dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result auditRecord(ItemAuditDTO dto);
 }

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

@@ -30,11 +30,16 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.dto.item.ItemFusingDelayDTO;
+import com.elink.esua.epdc.dto.item.form.ItemAuditDTO;
 import com.elink.esua.epdc.dto.item.form.ItemFusingDelayInsertDTO;
 import com.elink.esua.epdc.dto.item.result.ItemHandleListDTO;
 import com.elink.esua.epdc.modules.feign.AdminFeignClient;
+import com.elink.esua.epdc.modules.item.dao.ItemDao;
 import com.elink.esua.epdc.modules.item.dao.ItemFusingDelayDao;
+import com.elink.esua.epdc.modules.item.dao.ItemHandleProcessDao;
+import com.elink.esua.epdc.modules.item.entity.ItemEntity;
 import com.elink.esua.epdc.modules.item.entity.ItemFusingDelayEntity;
+import com.elink.esua.epdc.modules.item.entity.ItemHandleProcessEntity;
 import com.elink.esua.epdc.modules.item.redis.ItemFusingDelayRedis;
 import com.elink.esua.epdc.modules.item.service.ItemFusingDelayService;
 import org.apache.commons.lang3.StringUtils;
@@ -62,6 +67,12 @@ public class ItemFusingDelayServiceImpl extends BaseServiceImpl<ItemFusingDelayD
     @Autowired
     private AdminFeignClient adminFeignClient;
 
+    @Autowired
+    private ItemDao itemDao;
+
+    @Autowired
+    private ItemHandleProcessDao itemHandleProcessDao;
+
     @Override
     public PageData<ItemHandleListDTO> page(Map<String, Object> params) {
         UserDetail user = SecurityUser.getUser();
@@ -150,4 +161,29 @@ public class ItemFusingDelayServiceImpl extends BaseServiceImpl<ItemFusingDelayD
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+
+    @Override
+    public Result auditRecord(ItemAuditDTO dto) {
+        ItemFusingDelayEntity entity = baseDao.selectById(dto.getId());
+        if(entity == null){
+            throw new RenException("未查到需要更新的数据。");
+        }
+        entity.setHandleState(dto.getHandleState());
+        entity.setHandleReason(dto.getHandleReason());
+        baseDao.updateById(entity);
+        //添加项目处理进程记录
+        if(10 == dto.getHandleState()){
+            ItemEntity item =  itemDao.selectById(entity.getItemId());
+            ItemHandleProcessEntity process = new ItemHandleProcessEntity();
+            process.setItemId(item.getId());
+            process.setState(85);//项目熔断-延期审核通过
+            process.setHandleAdvice(dto.getHandleReason());
+            process.setOutHandleAdvice(dto.getHandleReason());
+            process.setHandlerDeptId(SecurityUser.getUser().getDeptId());
+            process.setHandlerDept(SecurityUser.getUser().getDeptName());
+            itemHandleProcessDao.insert(process);
+        }
+        return new Result<>().ok("审核成功！");
+    }
+
 }