结算提交

account/account-service/src/main/java/com/hungraim/ltc/account/controller/AccountController.java

@@ -202,7 +202,8 @@ public class AccountController {
      */
     @GetMapping("/queryAccountsDeclareList")
     public Result<Page<ChDisabDetailAccountsResp>>   queryAccountsDeclareList(Integer pageNum, Integer pageSize,SrvOrganListReq srvOrganListReq) {
-        srvOrganListReq.setAccountsStatus("0");
+        List<String> accountsStatusList = Arrays.asList("0", "1");
+        srvOrganListReq.setAccountsStatusList(accountsStatusList);
         Page<ChDisabDetailAccountsResp> chAssessDetailAccounts = accountService.queryOrganAccountsDetail(pageNum,pageSize,srvOrganListReq);
         return Result.success(chAssessDetailAccounts);
     }

apply/apply-service/src/main/java/com/hungraim/ltc/controller/DisableController.java

@@ -493,7 +493,7 @@ public class DisableController {
     }
 
     /**
-     * 失能人员信息列表
+     * 失能人员信息退出列表
      *
 
      * @param pageNum            当前页
@@ -513,6 +513,10 @@ public class DisableController {
         return Result.success(page);
     }
 
+
+    /**
+     * 失能人员退出
+     */
     @RequestMapping("/disableInfoExit")
     public Result disableInfoExit(Integer disableInfoId,Integer exitReasonId,Integer applyId, Integer srvOrganId,Integer programId,String exitTime) {
         if (disableInfoId == null|| exitReasonId == null||applyId == null) {

governance/src/main/java/com/hungraim/ltc/api/SrvTaskFeignService.java

+package com.hungraim.ltc.api;
+
+import com.hungraim.ltc.util.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * @author zwl
+ * @ClassName SrvTaskFeignService
+ * @description
+ * @date 2023/2/27 15:11
+ **/
+
+@FeignClient("LTC-GOVERNANCE-SERVICE")
+public interface SrvTaskFeignService {
+
+    @GetMapping("/api.governance/srvTask/timeAllocationSrvTask")
+    Result timeAllocationSrvTask();
+}

governance/src/main/java/com/hungraim/ltc/governance/controller/SrvTaskController.java

@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;

governance/src/main/java/com/hungraim/ltc/governance/service/impl/SrvTaskServiceImpl.java

@@ -212,11 +212,10 @@ public class SrvTaskServiceImpl implements SrvTaskService {
         // 生成计划任务   CH_SRV_TASK_DETAIL
         for (AllocationSrvTaskVO chSrvTask : chSrvTasks) {
             Long srvTaskId =  chSrvTask.getSrvTaskId();
-            // 根据任务id和服务时间查询是否已经生成过计划，已经生成了就不需要再生成了
+            // 根据任务id和服务时间查询是否已经生成过计划，已经生成了就不需要再生成了,已退出
             List<ChSrvTaskDetail> chSrvTaskDetailList = chSrvTaskDetailMapper.selectList(new QueryWrapper<ChSrvTaskDetail>().eq("srv_task_id", srvTaskId));
            if(CollectionUtil.isNotEmpty(chSrvTaskDetailList)){
 
-
            }
             ChSrvTaskDetail chSrvTaskDetail = new ChSrvTaskDetail();
             chSrvTaskDetail.setSrvTaskId(srvTaskId);//taskId

system/system-admin-service/pom.xml

@@ -65,6 +65,12 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
+      <dependency>
+          <groupId>com.hungraim.ltc</groupId>
+          <artifactId>governance</artifactId>
+          <version>0.0.1</version>
+          <scope>compile</scope>
+      </dependency>
   </dependencies>
 
   <build>

system/system-admin-service/src/main/java/com/hungraim/ltc/system/Scheduled/SrvTaskScheduledController.java

+package com.hungraim.ltc.system.Scheduled;
+
+import com.hungraim.ltc.api.AttachFeignService;
+import com.hungraim.ltc.api.SrvTaskFeignService;
+import com.hungraim.ltc.util.Result;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author zwl
+ * @ClassName SrvTaskScheduledController
+ * @description
+ * @date 2023/2/27 15:23
+ **/
+
+@Component
+@AllArgsConstructor
+public class SrvTaskScheduledController {
+    private final SrvTaskFeignService srvTaskFeignService;
+    // 表示每天3点5分执行
+
+    @Scheduled(cron = "30 50 15 * * ?")
+    public void timeAllocationSrvTask() {
+        Result result = srvTaskFeignService.timeAllocationSrvTask();
+        System.out.println();
+    }
+
+}

system/system-admin-service/src/main/resources/bootstrap.yml

 
 spring:
+  main:
+    #允许存在多个Feign调用相同Service的接口
+    allow-bean-definition-overriding: true
   devtools:
     restart:
       enabled: true