修改时间差

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/message/DoctorMessageService.java

@@ -341,7 +341,7 @@ public class DoctorMessageService {
       // List<SystemMessageDO> systemMessageDOS = messageDao.getByReceiverAndType(doctor,"43");
        String sql =  "select DISTINCT sm.id as id,sm.type AS type,sm.title AS title,sm.sender AS sender,sm.sender_name AS senderName,\n" +
                "  sm.receiver AS receiver,sm.receiver_name AS receiver_name,sm.relation_code AS relationCode,\n" +
                "  sm.data AS data,sm.is_read AS isRead,DATE_FORMAT(sm.create_time,'%Y-%m-%d') AS createTime,sm.sender_photo AS sender_photo,pd.category_code,pd.device_name" +
                "  sm.data AS data,sm.is_read AS isRead,DATE_FORMAT(sm.create_time,'%Y-%m-%d') AS createTime,UNIX_TIMESTAMP(sm.create_time) AS createTimeNum,sm.sender_photo AS sender_photo,pd.category_code,pd.device_name" +
                "  from base_system_message sm LEFT JOIN wlyy_patient_device pd ON sm.relation_code = pd.device_sn where sm.receiver = '"+doctor+"' AND sm.type=43 and sm.del=1 ";
        if (StringUtils.isNotBlank(deviceCode)&&!"''".equals(deviceCode)){
@@ -354,6 +354,10 @@ public class DoctorMessageService {
        List<Map<String, Object>> maps = jdbcTemplate.queryForList(sql);
        for (Map<String, Object> map : maps) {
            Long l = (Long) map.get("createTimeNum");
            map.put("timeAgoStr",DateUtil.getTimeAgeStr(l));
        }
        return maps;
    }
@@ -554,7 +558,7 @@ public class DoctorMessageService {
     */
    public PageEnvelop getRepairMassageList(String doctorId,Integer page,Integer pageSize,String name){
        page = page>0?page-1:0;
        String selectSql = "SELECT re.id,re.order_id orderId,p.name patientName,re.device_sn deviceSn,re.device_name deviceName,CAST(DATE_FORMAT(re.deal_time,'%Y-%m-%d %H:%i:%S') as char) dealTime,UNIX_TIMESTAMP(re.deal_time) dealTimeNum,re.deal_peoper dealPeoper,re.deal_peoper_name dealPeoperName,p.photo ";
        String selectSql = "SELECT re.id,re.order_id orderId,p.name patientName,re.device_sn deviceSn,re.device_name deviceName,CAST(DATE_FORMAT(re.deal_time,'%Y-%m-%d %H:%i:%S') as char) dealTime,re.deal_peoper dealPeoper,re.deal_peoper_name dealPeoperName,p.photo ";
        String sql = " from base_device_repair re left join base_patient p on re.bind_user = p.id " +
                " where re.type = 0 and re.status = 1 and re.deal_peoper = '"+doctorId+"' ";
        if(StringUtils.isNotBlank(name)){
@@ -565,10 +569,10 @@ public class DoctorMessageService {
        String countSql = "SELECT COUNT(re.id) ";
        Long total = jdbcTemplate.queryForObject(countSql + sql, Long.class);
        //计算时间差
        for (Map<String, Object> map : list) {
            Long l1 = (Long) map.get("dealTimeNum");
            map.put("timeAgoStr",DateUtil.getTimeAgeStr(l1));
        }
        //for (Map<String, Object> map : list) {
        //    Long l1 = (Long) map.get("dealTimeNum");
        //    map.put("timeAgoStr",DateUtil.getTimeAgeStr(l1));
        //}
        return PageEnvelop.getSuccessListWithPage("获取成功",list,page,pageSize,total);
    }
@@ -578,14 +582,14 @@ public class DoctorMessageService {
     * @return
     */
    public ObjEnvelop getRepairMessageListById(Integer id){
        String sql = "SELECT re.id,re.order_id orderId,p.name patientName,re.device_sn deviceSn,re.device_name deviceName,CAST(DATE_FORMAT(re.deal_time,'%Y-%m-%d %H:%i:%S') as char) dealTime,UNIX_TIMESTAMP(re.deal_time) dealTimeNum,re.deal_peoper dealPeoper,re.deal_peoper_name dealPeoperName,p.photo,re.feedback,re.img " +
        String sql = "SELECT re.id,re.order_id orderId,p.name patientName,re.device_sn deviceSn,re.device_name deviceName,CAST(DATE_FORMAT(re.deal_time,'%Y-%m-%d %H:%i:%S') as char) dealTime,re.deal_peoper dealPeoper,re.deal_peoper_name dealPeoperName,p.photo,re.feedback,re.img " +
                " from base_device_repair re left join base_patient p on re.bind_user = p.id where re.type = 0 and re.id = "+id;
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
        Map<String, Object> map = new HashMap<>();
        if(!ObjectUtils.isEmpty(list)){
            map = list.get(0);
            Long l1 = (Long) map.get("dealTimeNum");
            map.put("timeAgoStr",DateUtil.getTimeAgeStr(l1));
            //Long l1 = (Long) map.get("dealTimeNum");
            //map.put("timeAgoStr",DateUtil.getTimeAgeStr(l1));
            return ObjEnvelop.getSuccess("获取成功",map);
        }
        return ObjEnvelop.getError("无数据");