From 02a4b8a6d7fa9e4ea9766bf9384ddbd25c65def2 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Sun, 26 Mar 2023 10:16:30 +0800 Subject: [PATCH] =?UTF-8?q?OA=E4=B8=89=E5=A4=A9=E5=90=8E=E6=92=A4=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/login/security/WebMvcConfig.java | 2 ++ .../controller/EsRevisePlanController.java | 7 +++++++ .../adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java | 10 ++++++++++ .../esRevisePlan/service/IEsRevisePlanService.java | 3 +++ .../service/impl/EsRevisePlanServiceImpl.java | 10 ++++++++++ 5 files changed, 32 insertions(+) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 5256f0be..3f94431f 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -61,6 +61,8 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStandState/getSarBussionessStandStateProcessList"); // 提供企标计划数据 addInterceptor.excludePathPatterns("/api/esRevisePlan/es-revise-plan/getAllPlansByWk"); + // 修改企业计划数据 + addInterceptor.excludePathPatterns("/api/esRevisePlan/es-revise-plan/oaUpdatePlans"); //pcms项目数据下发开放接口 addInterceptor.excludePathPatterns("/api/sarStandProjectLibrary/save"); addInterceptor.excludePathPatterns("/api/sar-stand-project-team/save"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index a8058830..0c4cb4f5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -18,6 +18,7 @@ import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -182,4 +183,10 @@ public class EsRevisePlanController extends BaseController { return Result.success(iEsRevisePlanService.delPlans(ids)); } + @ApiOperation(value = "OA时间添加") + @GetMapping("/oaUpdatePlans") + public ResponseMessage oaUpdatePlans(@RequestParam("esId")String esId, @RequestParam("date") Date date, @RequestParam("s") String s){ + return Result.success(iEsRevisePlanService.oaUpdatePlans(esId,date,s)); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index 06ae6697..663f5efc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -159,4 +159,14 @@ public class EsRevisePlan extends BasePage { @TableField(exist = false) private String logType; + + @ApiModelProperty(value = "OA发送时间记录") + @TableField("OA_DATETIME") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date oaDateIime; + + @ApiModelProperty(value = "OA是否已经发送") + @TableField("OA_IS_SEND") + private String oaIsSend; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java index 6d727bd3..562ac4b4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java @@ -4,6 +4,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Date; import java.util.List; /** @@ -28,4 +29,6 @@ public interface IEsRevisePlanService extends IService { List getDataByName(EsRevisePlan esRevisePlan); List getAllPlansByWk(String esName); + + Object oaUpdatePlans(String esId, Date date, String s);//Ao时间 发送次数 修改 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index 79bc10ed..b51ef3f0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -229,4 +229,14 @@ public class EsRevisePlanServiceImpl extends ServiceImpl