Merge branch 'dev_nursing_records_20230214' into dev_ch_master

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/ProgramSetAndProjectVo.java

@@ -60,7 +60,7 @@ public class ProgramSetAndProjectVo {
     /**
      * 是否配置 (是：1；否：0)
      */
-    private Short isConf = 1;
+    private Short isConf;
 
     /**
      * 计划频次

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

@@ -144,7 +144,7 @@ public class SrvProgramController {
             } else {
                 List<ProgramSetAndProjectVo> programSetAndProjectVos = programDetailVo.getProgramSetAndProjectVos();
                 for (ProgramSetAndProjectVo programSetAndProjectVo : programSetAndProjectVos) {
-                    if (programSetAndProjectVo.getIsConf().intValue() == 1 && programSetAndProjectVo.getPlanningFrequency() == null) {
+                    if (programSetAndProjectVo.getIsConf().intValue() == 1 && programSetAndProjectVo.getPlanningFrequency() == null&&programSetAndProjectVo.getPlanningFrequencyType()!= 2) {
                         return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
                     }
                 }

governance/src/main/java/com/hungraim/ltc/governance/service/SrvTaskScheduledServiceImpl.java → governance/src/main/java/com/hungraim/ltc/governance/controller/SrvTaskScheduledController.java

-package com.hungraim.ltc.governance.service;
+package com.hungraim.ltc.governance.controller;
 
+import com.hungraim.ltc.governance.service.SrvTaskService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Component;
 
 /**
  * @author zwl
- * @ClassName SrvTaskScheduledServiceImpl
+ * @ClassName SrvTaskScheduledController
  * @description
- * @date 2023/3/2 14:37
+ * @date 2023/3/9 21:08
  **/
-@Service
+@Component
+@EnableAsync
 @Slf4j
-public class SrvTaskScheduledServiceImpl {
+public class SrvTaskScheduledController {
 
     @Autowired
     private SrvTaskService srvTaskService;
 
-    @Scheduled(cron = "30 20 11 * * ?")
+    @Scheduled(cron = "30 50 21 * * ?")
     public void timeAllocationSrvTask() {
         log.info("timeAllocationSrvTask========start");
         srvTaskService.timeAllocationSrvTask();
         log.info("timeAllocationSrvTask========end:{}");
 
     }
+
+
+    @Scheduled(cron = "30 45 21 * * ?")
+    public void test111() {
+        log.info("timeAllocationSrvTask========start");
+        srvTaskService.timeAllocationSrvTask();
+        log.info("timeAllocationSrvTask========end:{}");
+
+    }
 }

governance/src/main/resources/com/hungraim/ltc/governance/mapper/ChSrvOrganProjectMapper.xml

@@ -52,14 +52,18 @@
         CATEGORY_TYPE,
         CH_SRV_ORGAN_PROJECT.ITEM_TIMES,
         ITEM_TIMES_TYPE,
-        CH_SRV_ORGAN_PROJECT.ITEM_PRICE,
-        CH_SRV_ORGAN_PROJECT.IS_CONF IS_NEED
+        CH_SRV_ORGAN_PROJECT.ITEM_PRICE
+        <if test="programId == null">
+            ,CH_SRV_ORGAN_PROJECT.IS_CONF IS_CONF
+        </if>
+
         <if test="programId != null">
             ,
             SET_ID,
             PLANNING_FREQUENCY,
             PLANNING_FREQUENCY_TYPE,
-            CH_SRV_PROGRAM_SET.REMARK
+            CH_SRV_PROGRAM_SET.REMARK,
+            NVL(CH_SRV_PROGRAM_SET.IS_CONF, '0') IS_CONF
         </if>
         FROM CH_SRV_ORGAN_PROJECT
         <if test="programId != null">