diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/LymsHisInfoController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/LymsHisInfoController.java index a0e674a..4463f4a 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/LymsHisInfoController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/LymsHisInfoController.java @@ -14,6 +14,7 @@ import org.springframework.validation.BindingResult; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.Date; import java.util.List; /** @@ -42,9 +43,9 @@ public class LymsHisInfoController { query.eq("up_type", hisInfo.getUpType()); } if(StringUtil.isNotEmpty(hisInfo.getSynthesisQuery())){ - query.and(wrapper -> wrapper .like("name", hisInfo.getName()) - .or().eq("phone", hisInfo.getPhone()) - .or().eq("idCard", hisInfo.getIdcard())); + query.and(wrapper -> wrapper .like("name", hisInfo.getSynthesisQuery()) + .or().eq("phone", hisInfo.getSynthesisQuery()) + .or().eq("idCard", hisInfo.getSynthesisQuery())); } if(StringUtil.isNotEmpty(hisInfo.getStartCreatedtime())){ query.ge("createdtime", hisInfo.getStartCreatedtime()); @@ -71,6 +72,7 @@ public class LymsHisInfoController { baseResponse.setErrormsg(result); }else { lymsHisInfo.setUpType(1); + lymsHisInfo.setUpTime(new Date()); final boolean b = lymsHisInfoService.updateById(lymsHisInfo); if(b){ baseResponse.setErrorcode(0); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsHisInfo.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsHisInfo.java index 6634f56..4c898c6 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsHisInfo.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsHisInfo.java @@ -96,7 +96,7 @@ public class LymsHisInfo implements Serializable { /** * 上传时间 */ - @TableField(value = "up_time",fill = FieldFill.UPDATE) + @TableField(value = "up_time") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date upTime; diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java index 62bbb69..2cfffb2 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java @@ -114,7 +114,7 @@ public class LymsHisInfoServiceImpl extends ServiceImpl