暂存代码

pom.xml

@@ -222,18 +222,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-gateway</artifactId>
-<!--            <version>${spring-cloud-gateway.version}</version>-->
-            <exclusions>
-                <exclusion>
-                    <artifactId>spring-boot-starter-web</artifactId>
-                    <groupId>org.springframework.boot</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>com.fasterxml.uuid</groupId>
             <artifactId>java-uuid-generator</artifactId>
@@ -252,6 +240,18 @@
             <version>${aliyun.sts.version}</version>
         </dependency>
 
+        <!-- SpringCloud Openfeign -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Loadbalancer -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

src/main/java/com/wangxiaolu/promotion/WangxiaoluPromotionServiceApplication.java

@@ -3,11 +3,11 @@ package com.wangxiaolu.promotion;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.web.context.request.RequestContextListener;
 
+@EnableFeignClients
 @EnableAsync
 @EnableConfigurationProperties
 @EnableAspectJAutoProxy

src/main/java/com/wangxiaolu/promotion/controller/activityplanv2/PromPlanCoreController.java

@@ -115,6 +115,7 @@ public class PromPlanCoreController {
 
     /**
      * 确认上传（根据任一UUID）
+     * 默认上传的状态为待审核，审核通过后状态为已审核
      */
     @GetMapping("/upload/{uuid}")
     public R selfPlanAf(@PathVariable("uuid") String planUuid){

src/main/java/com/wangxiaolu/promotion/controller/activityplanv2/PromPlanQueryController.java

 package com.wangxiaolu.promotion.controller.activityplanv2;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryActivityWrapper;
 import com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryClockWrapper;
 import com.wangxiaolu.promotion.pojo.PageInfo;
 import com.wangxiaolu.promotion.pojo.activity.examine.dto.ActivityExamineDto;
 import com.wangxiaolu.promotion.pojo.activity.planv2.response.ActivityResponse;
 import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityReportedDto;
 import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryClockDto;
+import com.wangxiaolu.promotion.remote.RemoteSfaOperationService;
 import com.wangxiaolu.promotion.result.basedata.R;
 import com.wangxiaolu.promotion.service.activity.examine.ExaPlanQueryService;
 import com.wangxiaolu.promotion.service.activity.temporary.TemporaryActivityClockQueryService;
@@ -16,7 +16,6 @@ import com.wangxiaolu.promotion.service.activityplanv2.PromPlanQueryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotNull;
 import javax.websocket.server.PathParam;
 import java.util.ArrayList;
 import java.util.List;
@@ -38,6 +37,8 @@ public class PromPlanQueryController {
     private TemporaryActivityQueryService temporaryActivityQueryService;
     @Autowired
     private ExaPlanQueryService exaPlanQueryService;
+    @Autowired
+    private RemoteSfaOperationService remoteSfaOperationService;
 
     @PostMapping("/page")
     public R queryPage(@RequestBody PageInfo pageInfo){
@@ -70,4 +71,13 @@ public class PromPlanQueryController {
         activityResponse.setReporteds(aas);
         return R.success(activityResponse);
     }
+
+    /**
+     * 审批本月未审批的计划
+     */
+    @PutMapping("/approval")
+    public void approvalPlan(){
+        remoteSfaOperationService.createApproval();
+    }
+
 }

src/main/java/com/wangxiaolu/promotion/enums/plan/PlanStatus.java

@@ -10,7 +10,12 @@ public enum PlanStatus {
      * 是否执行：1:执行；0：未执行；
      */
     EXECUTION(1, "执行"),
-    NOT_EXECUTION(0, "未执行");
+    NOT_EXECUTION(0, "未执行"),
+    PENDING(2, "审批中"),
+    REJECTED(3, "审批未通过"),
+    WAIT(4, "待审批"),
+    APPROVED(5, "已通过"),
+    ;
 
     private final Integer code;
     private final String desc;

src/main/java/com/wangxiaolu/promotion/remote/RemoteSfaOperationService.java

+package com.wangxiaolu.promotion.remote;
+
+import com.wangxiaolu.promotion.common.constant.ServiceNameConstants;
+import com.wangxiaolu.promotion.result.basedata.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * @author : liqiulin
+ * @date : 2025-05-27 19
+ * @describe : ,path = "/operation"
+ */
+@FeignClient(contextId = "remoteSfaOperationService", value = ServiceNameConstants.WXL_SFA_OPERATION_SERVICE,path = "/operation")
+public interface RemoteSfaOperationService {
+    @GetMapping("/cpplan/approval")
+    public R createApproval();
+}

src/main/java/com/wangxiaolu/promotion/service/activityplanv2/impl/PromPlanCoreServiceImpl.java

 package com.wangxiaolu.promotion.service.activityplanv2.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -19,17 +18,15 @@ import com.wangxiaolu.promotion.enums.plan.OperationType;
 import com.wangxiaolu.promotion.enums.plan.PlanStatus;
 import com.wangxiaolu.promotion.exception.DataException;
 import com.wangxiaolu.promotion.exception.FlowException;
-import com.wangxiaolu.promotion.exception.ParamException;
+import com.wangxiaolu.promotion.pojo.activity.manage.vo.ActivityPlanVo;
 import com.wangxiaolu.promotion.pojo.activity.planv2.dto.ActivityPlanInfoDto;
 import com.wangxiaolu.promotion.pojo.activity.planv2.dto.ActivityPlanRecordDto;
-import com.wangxiaolu.promotion.pojo.activity.manage.vo.ActivityPlanVo;
 import com.wangxiaolu.promotion.pojo.activity.planv2.vo.ActivityPlanOperVo;
 import com.wangxiaolu.promotion.pojo.user.dto.ManageEmployeeInfoDto;
 import com.wangxiaolu.promotion.pojo.user.dto.QinCeClienteleStoreDto;
 import com.wangxiaolu.promotion.result.basedata.RCode;
 import com.wangxiaolu.promotion.service.activityplanv2.PromPlanCoreService;
 import com.wangxiaolu.promotion.utils.DateUtils;
-import groovyjarjarpicocli.CommandLine;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/resources/application-dev.yml

@@ -12,8 +12,8 @@ spring:
     database: 0
     password: QjL6H5nH
 
-  main:
-    web-application-type: reactive
+#  main:
+#    web-application-type: reactive
 
   cloud:
     nacos: