Merge remote-tracking branch 'origin/master'

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

@@ -3,6 +3,7 @@ package com.hungraim.ltc.pojo.vo.governance;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hungraim.ltc.pojo.entity.PageInfo;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 @Data
@@ -21,7 +22,7 @@ public class DisableInfoVo extends PageInfo {
     private String certiCode;
     //失能人员手机号
     private String tel;
-
+    private Integer srvModeId;
     //诊断疾病
     private String disease;
     //申请服务方式
@@ -35,6 +36,11 @@ public class DisableInfoVo extends PageInfo {
     private Date aggign_time;
 
     private Date endTime;
+    /**
+     * 服务分配终止时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date stopTime;
 
     private Integer starts;
 

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

@@ -7,7 +7,6 @@ import com.hungraim.ltc.pojo.vo.governance.DisableInfoVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
-import java.util.List;
 
 @Mapper
 public interface DisableInfoMapper extends BaseMapper<ChDisableInfo> {
@@ -35,6 +34,6 @@ public interface DisableInfoMapper extends BaseMapper<ChDisableInfo> {
             "       on s.disab_info_id = i.disab_info_id" +
             "       left join ch_srv_organ j" +
             "       on s.organ_id = j.organ_id" +
-            "       where i.disab_info_id=#{disableInfoId}")
+            "       where i.status=#{disableInfoId}")
     Page<DisableInfoVo> querySrvYet(Page page,Integer disableInfoId);
 }