From 1a0db13406f8f80f24cec36e324f85b4359b78e4 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Wed, 9 Dec 2020 09:47:13 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BD=91=E6=A0=BC=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E5=8C=96=E8=BF=90=E4=BD=9C=E3=80=91-=E3=80=90=E9=AA=8C?=
 =?UTF-8?q?=E6=94=B6=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/12?=
 =?UTF-8?q?/9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/dto/form/FirstTrialFormDTO.java |  8 +++++++-
 .../SubPositionCheckInfoController.java       | 12 +++++++++++
 .../service/SubPositionCheckInfoService.java  | 10 ++++++++++
 .../impl/SubAuditRecordsLogServiceImpl.java   | 10 ++++++++--
 .../impl/SubPositionCheckInfoServiceImpl.java | 20 ++++++++++++++++++-
 5 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/FirstTrialFormDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/FirstTrialFormDTO.java
index 9b47d7c3c..5b3df2f0d 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/FirstTrialFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/FirstTrialFormDTO.java
@@ -8,7 +8,7 @@ import java.io.Serializable;
 
 /**
  * @program: esua-epdc
- * @description: 初审传参
+ * @description: 初审、验收传参
  * @author: wangtong
  * @create: 2020-12-08 14:46
  **/
@@ -32,4 +32,10 @@ public class FirstTrialFormDTO implements Serializable {
      */
     @Size(min = 1, max = 200, message = "审核意见在200字以内")
     private String checkOpinion;
+
+    /**
+     * 1 初审
+     * 2 验收
+     */
+    private Integer flag;
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubPositionCheckInfoController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubPositionCheckInfoController.java
index 5d8614eff..617a8ca9d 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubPositionCheckInfoController.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubPositionCheckInfoController.java
@@ -105,4 +105,16 @@ public class SubPositionCheckInfoController {
         return subPositionCheckInfoService.firstTrial(dto);
     }
 
+
+    /**
+    * @describe: 验收
+    * @author wangtong
+    * @date 2020/12/9 9:28
+    * @params [dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("/acceptance")
+    public Result acceptance(@RequestBody FirstTrialFormDTO dto){
+        return subPositionCheckInfoService.acceptance(dto);
+    }
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubPositionCheckInfoService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubPositionCheckInfoService.java
index 28481c222..f8ee6ee66 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubPositionCheckInfoService.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubPositionCheckInfoService.java
@@ -113,4 +113,14 @@ public interface SubPositionCheckInfoService extends BaseService<SubPositionChec
     * @return java.lang.String
     */
     String dateToString(Date date);
+
+    /**
+    * @describe: 验收
+    * @author wangtong
+    * @date 2020/12/9 9:29
+    * @params [dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result acceptance(FirstTrialFormDTO dto);
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubAuditRecordsLogServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubAuditRecordsLogServiceImpl.java
index 0115dc387..aab2e3184 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubAuditRecordsLogServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubAuditRecordsLogServiceImpl.java
@@ -129,8 +129,14 @@ public class SubAuditRecordsLogServiceImpl extends BaseServiceImpl<SubAuditRecor
         entity.setCheckTime(subPositionCheckInfoService.dateToString(new Date()));
         entity.setCheckResult(dto.getCheckResult());
         entity.setCheckOpinion(dto.getCheckOpinion());
-        entity.setProcessCode("2");
-        entity.setProcessName("初审");
+        if(1 == dto.getFlag()){
+            entity.setProcessCode("2");
+            entity.setProcessName("初审");
+        }else{
+            entity.setProcessCode("3");
+            entity.setProcessName("验收");
+        }
+
         insert(entity);
         return new Result();
     }
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java
index 8965aa12c..859b1ee93 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java
@@ -68,7 +68,7 @@ public class SubPositionCheckInfoServiceImpl extends BaseServiceImpl<SubPosition
         String userId = SecurityUser.getUser().getId().toString();
         IPage<SubPositionCheckInfoDTO> page = getPage(params);
         List<SubPositionCheckInfoDTO> list = baseDao.getSubPositionList(params);
-        //设置删除按钮展示权限：自己只能删自己的，状态为已提交的
+        //设置删除、修改 按钮展示权限：自己只能删自己的，状态为已提交的
         for(SubPositionCheckInfoDTO spc : list){
             if (StringUtils.isNotBlank(spc.getCreatedBy()) && spc.getCreatedBy().equals(userId) && "1".equals(spc.getStatus())){
                 spc.setDelShow(true);
@@ -134,6 +134,7 @@ public class SubPositionCheckInfoServiceImpl extends BaseServiceImpl<SubPosition
         entity.setApprovalTime(dateToString(new Date()));
         updateById(entity);
         //添加初审记录信息
+        dto.setFlag(1);
         subAuditRecordsLogService.addFirstTrialRecords(dto);
         return new Result();
     }
@@ -149,4 +150,21 @@ public class SubPositionCheckInfoServiceImpl extends BaseServiceImpl<SubPosition
         return sdf.format(date);
     }
 
+    @Override
+    public Result acceptance(FirstTrialFormDTO dto) {
+        SubPositionCheckInfoEntity entity = baseDao.selectById(dto.getInfoId());
+        if(entity ==  null){
+            throw new RenException("根据id未查询到信息");
+        }
+        entity.setStatus(dto.getCheckResult());
+        entity.setApprovalDeptId(SecurityUser.getUser().getDeptId().toString());
+        entity.setApprovalDeptName(SecurityUser.getUser().getDeptName());
+        entity.setApprovalTime(dateToString(new Date()));
+        updateById(entity);
+        //添加验收记录信息
+        dto.setFlag(2);
+        subAuditRecordsLogService.addFirstTrialRecords(dto);
+        return new Result();
+    }
+
 }
\ No newline at end of file