服务方案服务公示结束后才能展

account/account-service/src/main/resources/mapper/ChDisabAccountsDetailMapper.xml

@@ -51,15 +51,12 @@
 
     <select id="queryNursingRecords" resultType="com.hungraim.ltc.pojo.entity.account.NursingRecordsRespVO">
         select organ.SRV_ORGAN_NAME srvOrganName,
-               detail.MODE_NAME modeName,
-               to_char(item.FCD,'yyyy-MM-dd HH:mm:ss') executionTime,
-               service.SERVICE_TYPE_DETAILED_NAME itemName
-        from CH_DISAB_ACCOUNTS_DETAIL detail
-                 left join CH_SRV_TASK_FINISH_ITEM item on detail.TASK_DETAIL_ID = item.TASK_DETAIL_ID
-                 left join CH_SRV_ORGAN organ on organ.SRV_ORGAN_ID = detail.SRV_ORGAN_ID
-                 LEFT JOIN CH_SRV_ORGAN_PROJECT CSOP ON CSOP.PROJECT_ID = item.ITEM_ID
-                 left join CH_SERVICE_TYPE_DETAILED service on service.SERVICE_TYPE_DETAILED_ID = CSOP.ITEM_NAME
-        where  detail.TASK_DETAIL_ID  = #{taskDetailId}
+              DECODE(plan.MODE_ID, '1','医疗','2', '养老','3','上门', '4', '异地') modeName,
+               to_char(plan.CREATION_TIME,'yyyy-MM-dd HH24:mi:ss') executionTime,
+               plan.item_name itemName
+        from CH_SRV_PLAN plan
+       left join CH_SRV_ORGAN organ on organ.SRV_ORGAN_ID = plan.SRV_ORGAN_ID
+        where  plan.TASK_DETAIL_ID  = #{taskDetailId} and plan.IS_STATUS ='4'
     </select>
 
 

account/account-service/src/main/resources/mapper/ChSrvTaskDetailMapper.xml

@@ -36,7 +36,7 @@
 
 
     <update id="updateSrvPlanById">
-        update CH_SRV_PLAN plan set plan.is_status= '4' where plan.plan_id = #{planId}
+        update CH_SRV_PLAN plan set plan.is_status= '4',plan.creation_time=sysdate where plan.plan_id = #{planId}
     </update>
 
 

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

@@ -107,16 +107,7 @@ public class DisableController {
         List<ChSrvOrgan> chFndSrvModes = disableService.srvOrganList(String.valueOf(organId), srvOrganId, false);
         return Result.success(chFndSrvModes);
     }
-    /**
-     * 查询机构意向服务机构
-     *
-     * @param
-     */
-    @RequestMapping("/srvOrganList2")
-    public Result<List<ChSrvOrgan>> srvOrganList2(String organId) {
-        List<ChSrvOrgan> chFndSrvModes = disableService.srvOrganList2(String.valueOf(organId), false);
-        return Result.success(chFndSrvModes);
-    }
+
 
     /**
      * 查询意向服务机构

apply/apply-service/src/main/resources/mapper/DisableInfoMapper.xml

@@ -27,8 +27,8 @@
         to_char(T2.EXIT_TIME,'yyyy-MM-dd')  exitTime,
         --服务方案起始日
         --服务方案终止日
-        to_char(T1.PROGRAM_DATE,'yyyy-MM-dd HH:mm:ss')  programDate,
-        to_char(T1.PROGRAM_EDN_DATE,'yyyy-MM-dd HH:mm:ss')   programEdnDate,
+        to_char(T1.PROGRAM_DATE,'yyyy-MM-dd HH24:mi:ss')  programDate,
+        to_char(T1.PROGRAM_EDN_DATE,'yyyy-MM-dd HH24:mi:ss')   programEdnDate,
         T2.EXIT_FLAG          exitFlag,
         T2.EXIT_REASON_ID     exitReasonId
         FROM  CH_DISABLE_INFO T2

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

@@ -215,6 +215,7 @@ public class SrvTaskServiceImpl implements SrvTaskService {
             int chSrvTaskDetailCount = chSrvTaskDetailMapper
                     .getSrvTaskDetail(String.valueOf(srvTaskId), nextDay);
             if (chSrvTaskDetailCount > 0) {
+                log.info("{},已经有计划任务了",nextDay);
                 return;
             }
             ChSrvTaskDetail chSrvTaskDetail = new ChSrvTaskDetail();

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

@@ -45,6 +45,7 @@
     left join ch_apr_report report on t.task_id = report.task_id
     <where>
       t.TASK_STATUS = 3 and report.DISABLE_LEVEL_ID in ('3','4','5')
+      and sysdate <![CDATA[ > ]]> report.PUBLICITY_END_TIME
       <if test="chSrvOrgan.organId != null and chSrvOrgan.organId != ''">
         AND o.organ_id = #{chSrvOrgan.organId}
       </if>

system/system-admin-service/src/main/java/com/hungraim/ltc/system/service/impl/SrvTaskScheduledServiceImpl.java

@@ -19,9 +19,8 @@ import org.springframework.stereotype.Service;
 public class SrvTaskScheduledServiceImpl {
 
     private final SrvTaskFeignService srvTaskFeignService;
-    // 表示每天3点5分执行
 
-    @Scheduled(cron = "30 10 17 * * ?")
+    @Scheduled(cron = "30 18 20 * * ?")
     public void timeAllocationSrvTask() {
         log.info("timeAllocationSrvTask========start");
         Result result = srvTaskFeignService.timeAllocationSrvTask();