修改计划问题

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

@@ -182,10 +182,10 @@ and organ.SRV_ORGAN_ID = #{req.srvOrganId} order by detail.SRV_DATE desc
     </select>
 
     <select id="queryTaskDetailDisable" parameterType="com.hungraim.ltc.pojo.vo.account.TaskDetailDisableVO" resultType="java.lang.Integer">
-   select count(1) from CH_SRV_TASK_DETAIL  detail
-    left join  CH_SRV_TASK task on detail.SRV_TASK_ID = task.SRV_TASK_ID
-    where task.DISAB_INFO_ID = #{disabInfoId}  and   detail.STATUS = 4 and
-      to_char(detail.SRV_DATE,'yyyy-MM-dd') = #{srvDate}   and detail.TASK_DETAIL_ID  <![CDATA[ <>]]>  #{taskDetailId}
+       select count(1) from CH_SRV_PLAN plan   where  plan.DISAB_INFO_ID = #{disabInfoId}
+        and plan.is_STATUS = 4    and to_char(plan.SRV_PLAN_TIME,'yyyy-MM-dd') = #{srvDate}
+        and plan.TASK_DETAIL_ID  <![CDATA[ <>]]>  #{taskDetailId}
+
     </select>
 
 

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

@@ -25,7 +25,6 @@
      left join CH_SRV_TASK_DETAIL detail on detail.TASK_DETAIL_ID = plan.TASK_DETAIL_ID
      left join CH_SRV_ORGAN organ on organ.SRV_ORGAN_ID = plan.SRV_ORGAN_ID
          <where>
-             <![CDATA[   detail.STATUS<>3 ]]>
              <if test="req.status != null  and req.status != ''">
                 and plan.IS_STATUS = #{req.status}
              </if>

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

@@ -161,10 +161,12 @@ public class SrvTaskServiceImpl implements SrvTaskService {
             } else {
                 // 修改服务计划
                // chSrvTaskDetailMapper.delete(new QueryWrapper<ChSrvTaskDetail>().eq("srv_task_id", Long.parseLong(srvTaskId)));//删除原来的计划详情
+                   if("2".equals(srvTaskInfoVO.getTaskStatus())){
                     UpdateWrapper updateWrapper1 = new UpdateWrapper();
                     updateWrapper1.eq("SRV_TASK_ID",srvTaskId);
                     updateWrapper1.set("STATUS",3);
                     chSrvTaskDetailMapper.update(null,updateWrapper1);
+                   }
                // this.insertTaskDetail(Long.parseLong(srvTaskId), taskDetails);
                 //修改服务计划
                 ChSrvTask chSrvTask = new ChSrvTask();

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

@@ -27,7 +27,7 @@
             LEFT JOIN CH_SRV_ORGAN_PROJECT CSOP ON CSOP.PROJECT_ID = CSTFI.ITEM_ID
         LEFT JOIN CH_SERVICE_TYPE_detailed d on d.service_type_detailed_id = CSOP.item_name
         <where>
-            disable.SRV_MODE_ID   in ('1','2') and program.program_id =#{programId}
+            disable.SRV_MODE_ID   in ('1','2')   and detail.STATUS <![CDATA[<>]]> 3 and program.program_id =#{programId}
             <if test="srvPlanTime != null">
                 and to_char(detail.SRV_DATE,'yyyy-MM-dd') = #{srvPlanTime}
             </if>