Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-base/src/main/java/com/yihu/jw/base/service/ManageMessagePush/ManageSystemPushMessageService.java

@@ -169,25 +169,26 @@ public class ManageSystemPushMessageService {
        String sql = "SELECT * FROM base_pushrecord_log where 1=1 ";
        String countSql = "Select  count(id) from base_pushrecord_log where 1=1 ";
        String filite = " ";
        String filiteSql = " ";
        String orderSql = " ";
        if(null!=messageType){
            filite +=" and message_type ='"+messageType+"' ";
            filiteSql +=" and message_type ='"+messageType+"' ";
        }
        if (null!=status) {
            filite +=" and status = '"+status+"'";
            filiteSql +=" and status = '"+status+"'";
        }
        if (StringUtils.isNotBlank(name)){
            filite +=" and  send_object like '%"+name+"%'";
            filiteSql +=" and  send_object like '%"+name+"%'";
        }
        sql += " ORDER BY send_time DESC  LIMIT  " + (page - 1) * pageSize + "," + pageSize + "";
        orderSql = " ORDER BY send_time DESC LIMIT  " + (page - 1) * pageSize + "," + pageSize + "";
        List<BasePushRecordLogEntity> entityList = jdbcTemplate.query(sql + filite, new BeanPropertyRowMapper<>(BasePushRecordLogEntity.class));
        List<BasePushRecordLogEntity> entityList = jdbcTemplate.query(sql + filiteSql + orderSql, new BeanPropertyRowMapper<>(BasePushRecordLogEntity.class));
        result.put("obj",entityList);
        Integer count = jdbcTemplate.queryForObject(countSql + filite, Integer.class);
        Integer count = jdbcTemplate.queryForObject(countSql + filiteSql, Integer.class);
        result.put("count",count);

svr/svr-base/src/main/java/com/yihu/jw/base/service/child/ChildManageService.java

@@ -70,6 +70,10 @@ public class ChildManageService {
        if (baseChildManage.getCreateTime()==null) {
            baseChildManage.setCreateTime(new Date());
        }
        if (baseChildManage.getType()==2&&null==baseChildManage.getId()&&baseChildManage.getClick()==null) {
            baseChildManage.setClick(0);
        }
        baseChildManageDao.save(baseChildManage);
    }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/child/ChildNewsListService.java

@@ -52,9 +52,9 @@ public class ChildNewsListService {
            limitSql +=" LIMIT  " + (page - 1) * pageSize + "," + pageSize + "";
        }
        commonSql +=  "ORDER BY create_time DESC "+ limitSql;
        commonSql +=  "ORDER BY create_time DESC ";
        List<BaseChildManage> baseChildManage = jdbcTemplate.query(sql+commonSql, new BeanPropertyRowMapper<>(BaseChildManage.class));
        List<BaseChildManage> baseChildManage = jdbcTemplate.query(sql+commonSql+limitSql, new BeanPropertyRowMapper<>(BaseChildManage.class));
        Integer total = jdbcTemplate.queryForObject(totalSql + commonSql, Integer.class);
        jsonObject.put("obj",baseChildManage);
        jsonObject.put("total",total);