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 page = getPage(params); List 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