Commit abc68df9 authored by zhangwanglin's avatar zhangwanglin

Merge branch 'dev_nursing_records_20230214' into dev_ch_master

parents 33aab16f dfdf5288
...@@ -60,7 +60,7 @@ public class ProgramSetAndProjectVo { ...@@ -60,7 +60,7 @@ public class ProgramSetAndProjectVo {
/** /**
* 是否配置 (是:1;否:0) * 是否配置 (是:1;否:0)
*/ */
private Short isConf = 1; private Short isConf;
/** /**
* 计划频次 * 计划频次
......
...@@ -144,7 +144,7 @@ public class SrvProgramController { ...@@ -144,7 +144,7 @@ public class SrvProgramController {
} else { } else {
List<ProgramSetAndProjectVo> programSetAndProjectVos = programDetailVo.getProgramSetAndProjectVos(); List<ProgramSetAndProjectVo> programSetAndProjectVos = programDetailVo.getProgramSetAndProjectVos();
for (ProgramSetAndProjectVo programSetAndProjectVo : programSetAndProjectVos) { 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); return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
} }
} }
......
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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Component;
/** /**
* @author zwl * @author zwl
* @ClassName SrvTaskScheduledServiceImpl * @ClassName SrvTaskScheduledController
* @description * @description
* @date 2023/3/2 14:37 * @date 2023/3/9 21:08
**/ **/
@Service @Component
@EnableAsync
@Slf4j @Slf4j
public class SrvTaskScheduledServiceImpl { public class SrvTaskScheduledController {
@Autowired @Autowired
private SrvTaskService srvTaskService; private SrvTaskService srvTaskService;
@Scheduled(cron = "30 20 11 * * ?") @Scheduled(cron = "30 50 21 * * ?")
public void timeAllocationSrvTask() { public void timeAllocationSrvTask() {
log.info("timeAllocationSrvTask========start"); log.info("timeAllocationSrvTask========start");
srvTaskService.timeAllocationSrvTask(); srvTaskService.timeAllocationSrvTask();
log.info("timeAllocationSrvTask========end:{}"); log.info("timeAllocationSrvTask========end:{}");
} }
@Scheduled(cron = "30 45 21 * * ?")
public void test111() {
log.info("timeAllocationSrvTask========start");
srvTaskService.timeAllocationSrvTask();
log.info("timeAllocationSrvTask========end:{}");
}
} }
...@@ -52,14 +52,18 @@ ...@@ -52,14 +52,18 @@
CATEGORY_TYPE, CATEGORY_TYPE,
CH_SRV_ORGAN_PROJECT.ITEM_TIMES, CH_SRV_ORGAN_PROJECT.ITEM_TIMES,
ITEM_TIMES_TYPE, ITEM_TIMES_TYPE,
CH_SRV_ORGAN_PROJECT.ITEM_PRICE, CH_SRV_ORGAN_PROJECT.ITEM_PRICE
CH_SRV_ORGAN_PROJECT.IS_CONF IS_NEED <if test="programId == null">
,CH_SRV_ORGAN_PROJECT.IS_CONF IS_CONF
</if>
<if test="programId != null"> <if test="programId != null">
, ,
SET_ID, SET_ID,
PLANNING_FREQUENCY, PLANNING_FREQUENCY,
PLANNING_FREQUENCY_TYPE, PLANNING_FREQUENCY_TYPE,
CH_SRV_PROGRAM_SET.REMARK CH_SRV_PROGRAM_SET.REMARK,
NVL(CH_SRV_PROGRAM_SET.IS_CONF, '0') IS_CONF
</if> </if>
FROM CH_SRV_ORGAN_PROJECT FROM CH_SRV_ORGAN_PROJECT
<if test="programId != null"> <if test="programId != null">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment