服务方案

assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/TaskMapper.java

@@ -76,4 +76,6 @@ public interface TaskMapper extends BaseMapper<ChAprTask> {
     Page<TaskGroupInfoByPageVO> taskGroupInfoListByPage(String aprEmpId, String appointStartTime, String appointEndTime, String queryBeginDate, String queryEndDate, String groupNo, Integer pageNo, Integer pageSize);
 
     List<AprEmpExportVO> aprEmpExportList(String provincial, String city, String area, String organName, String name, String tel, String groupLeader);
+
+    int insertSrvSend(Integer disableInfoId,Integer taskId);
 }

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/TaskServiceImpl.java

@@ -16,6 +16,7 @@ import com.hungraim.ltc.pojo.entity.assessment.*;
 import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvSend;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail;
 import com.hungraim.ltc.pojo.vo.ReportUpdateVO;
 import com.hungraim.ltc.pojo.vo.account.AssessAccountsExportResp;
@@ -28,6 +29,7 @@ import com.hungraim.ltc.service.TppesApiException;
 import com.hungraim.ltc.util.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import net.sf.jsqlparser.expression.LongValue;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
@@ -73,6 +75,7 @@ public class TaskServiceImpl implements TaskService {
 
 
 
+
     /**
      * 评定任务分配列表
      *
@@ -213,6 +216,11 @@ public class TaskServiceImpl implements TaskService {
         task.setFinishTime(new Date());
         task.setTaskStatus(3); // 已完成
         taskMapper.updateById(task);
+        if(2 == reportDetailVO.getEvaluateType()){
+            ChAprTask chAprTask = taskMapper.selectById(reportDetailVO.getTaskId());
+            Integer disableInfoId = chAprTask.getDisableInfoId();
+            taskMapper.insertSrvSend(disableInfoId,reportDetailVO.getTaskId());
+        }
         return Result.success();
     }
 

assessment/assessment-service/src/main/resources/mapper/ChDisableEvaluateMapper.xml

@@ -523,6 +523,10 @@
         </where>
     </select>
 
+    <insert id="insertSrvSend">
+        insert INTO ch_srv_send(SRV_SEND_ID,DISAB_INFO_ID,FCD,STATUS,TASK_ID) values
+        ((SELECT max(srv_send_id)+1 id from CH_SRV_SEND),#{disableInfoId},SYSDATE,0,#{taskId})
+    </insert>
 
 
 </mapper>
\ No newline at end of file

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

@@ -215,7 +215,8 @@ public class BuildBedController {
             return Result.failed("失能人员id不能为空");
         }
         Integer status = disableInfoVo.getStatus();
-        Page<DisableInfoVo> disableInfoVos = disableInfoServie.querySrvYet(disableInfoVo.getDisableInfoId(), disableInfoVo.getCurrent(), disableInfoVo.getLimit(), status);
+        Integer sendId = disableInfoVo.getSrvSendId();
+        Page<DisableInfoVo> disableInfoVos = disableInfoServie.querySrvYet(disableInfoVo.getDisableInfoId(), disableInfoVo.getCurrent(), disableInfoVo.getLimit(), status,sendId);
         long total = disableInfoVos.getTotal();
         List<DisableInfoVo> records = disableInfoVos.getRecords();
         Map map = new HashMap<>();
@@ -254,6 +255,7 @@ public class BuildBedController {
                     }
                     chSrvSend.setSrvSendId(++id);
                 }
+                chSrvSend.setSrvSendId(chrSrvVo.getSrvSendId());
                 sendService.saveOrUpdate(chSrvSend);
             }
         } else {

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

@@ -21,7 +21,7 @@ public class SrvTaskScheduledController {
     @Autowired
     private SrvTaskService srvTaskService;
 
-    @Scheduled(cron = "0 18 21 * * ?")
+    @Scheduled(cron = "0 45 14 * * ?")
     public void timeAllocationSrvTask() {
         log.info("timeAllocationSrvTask========start");
         srvTaskService.timeAllocationSrvTask();

governance/src/main/java/com/hungraim/ltc/governance/dao/DisableInfoMapper.java

@@ -42,6 +42,9 @@ public interface DisableInfoMapper extends BaseMapper<ChDisableInfo> {
             " <if test='status!=null and status !=\"\" '>"+
             " and i.status =#{status} "+
             " </if>"+
+            " <if test='sendId!=null and sendId !=\"\" '>"+
+            " and i.srv_send_id =#{sendId} "+
+            " </if>"+
             "        </script>")
-    Page<DisableInfoVo> querySrvYet(Page page, Integer disableInfoId ,Integer status);
+    Page<DisableInfoVo> querySrvYet(Page page, Integer disableInfoId ,Integer status,Integer sendId);
 }

governance/src/main/java/com/hungraim/ltc/governance/service/DisableInfoServie.java

@@ -10,7 +10,7 @@ import com.hungraim.ltc.pojo.vo.governance.DisableInfoVo;
 public interface DisableInfoServie extends IService<ChDisableInfo> {
 
 
-    Page<DisableInfoVo> querySrvYet(Integer disableInfoId, int current, int limit, Integer status);
+    Page<DisableInfoVo> querySrvYet(Integer disableInfoId, int current, int limit, Integer status, Integer sendId);
 
 
 

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

@@ -15,8 +15,8 @@ public class DisableInfoServieImpl extends ServiceImpl<DisableInfoMapper, ChDisa
 
 
     @Override
-    public Page<DisableInfoVo> querySrvYet(Integer disableInfoId, int current, int limit, Integer status) {
+    public Page<DisableInfoVo> querySrvYet(Integer disableInfoId, int current, int limit, Integer status, Integer sendId) {
         Page<SrvSendVO> page = new Page<>(current,limit);
-        return this.baseMapper.querySrvYet(page,disableInfoId,status);
+        return this.baseMapper.querySrvYet(page,disableInfoId,status,sendId);
     }
 }

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.api.AccountFeignService;
 import com.hungraim.ltc.api.AttachFeignService;
 import com.hungraim.ltc.governance.dao.*;
+import com.hungraim.ltc.governance.service.SrvSendService;
 import com.hungraim.ltc.governance.service.SrvTaskService;
 import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvPlan;
@@ -26,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -44,8 +46,7 @@ public class SrvTaskServiceImpl implements SrvTaskService {
     private final AccountFeignService accountFeignService;
     private final ChSrvProgramMapper chSrvProgramMapper;
     private final ChSrvSendMapper chSrvSendMapper;
-
-
+    private  final SrvSendService sendService;
 
     /**
      * 服务计划制定列表