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

business/base-service/src/main/java/com/yihu/jw/hospital/message/service/BaseBannerDoctorService.java

@@ -59,5 +59,6 @@ public class BaseBannerDoctorService extends BaseJpaService<BaseBannerDoctorDO,
        jsonObject.put("count",count);
        jsonObject.put("resultlist",list);
        return jsonObject;
    }
}

business/base-service/src/main/java/com/yihu/jw/hospital/message/service/BaseBannerService.java

@@ -58,7 +58,7 @@ public class BaseBannerService extends BaseJpaService<BaseBannerDO, BaseBannerDa
        Map<String,Object> params = new HashedMap();
        String sqlcount = dealSql(name,status,true);
        String sql  = dealSql(name,status,false);
        DateUtil dateUtil =new DateUtil();
        if (StringUtils.isNotEmpty(status)){
            params.put("status",status);
        }
@@ -69,12 +69,12 @@ public class BaseBannerService extends BaseJpaService<BaseBannerDO, BaseBannerDa
            count = hibenateUtils.objTransformLong(total.get(0).get("total"));
        }
        List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql,params,page,pageSize);
        /*for (Map<String,Object> map:list){
        for (Map<String,Object> map:list){
            String createTime= map.get("create_time").toString();
            String updateTime = map.get("update_time").toString();
            map.replace("create_time",createTime,dateUtil.stampToString(createTime));
            map.replace("update_time",createTime,dateUtil.stampToString(updateTime));
        }*/
            map.put("create_time",DateUtil.dateToStrLong(DateUtil.strToDateLong(createTime)));
            map.put("update_time",DateUtil.dateToStrLong(DateUtil.strToDateLong(updateTime)));
        }
        return MixEnvelop.getSuccessListWithPage(BaseHospitalRequestMapping.Prescription.api_success, list, page, pageSize, count);
    }
    private String dealSql(String name, String status,Boolean isCount){
@@ -87,7 +87,7 @@ public class BaseBannerService extends BaseJpaService<BaseBannerDO, BaseBannerDa
        if(StringUtils.isNotEmpty(name)){
            sql.append(" and p.name like '%"+name+"%'");
        }if (StringUtils.isNotEmpty(status)){
            sql.append(" and p,status =:status");
            sql.append(" and p.status =:status");
        }
        sql.append(" order by  p.sort desc ");

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/message/BannerDoctorController.java

@@ -45,8 +45,9 @@ public class BannerDoctorController extends EnvelopRestEndpoint {
    }
    @ApiOperation("查询赠送锦旗")
    @PostMapping(value= BaseHospitalRequestMapping.DoctorBanner.getBanner)
    public JSONObject getBanners(@ApiParam(name = "doctor", value = "doctor", required = false)
    public Envelop getBanners(@ApiParam(name = "doctor", value = "doctor", required = false)
                                     @RequestParam(value = "doctor", required = false)String doctor){
        return baseBannerDoctorService.getDoctorBanners(doctor);
        JSONObject jsonObject = baseBannerDoctorService.getDoctorBanners(doctor);
        return success(jsonObject);
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/message/BaseBannerController.java

@@ -42,7 +42,7 @@ public class BaseBannerController extends EnvelopRestEndpoint{
                                        @ApiParam(name = "pageSize", value = "每页分页大小", required = true, defaultValue = "10")
                                                   @RequestParam(value = "pageSize", required = true,defaultValue = "10")Integer pageSize){
            return success( baseBannerService.queryBannerByNameAndStatus(name,status,page,pageSize));
            return baseBannerService.queryBannerByNameAndStatus(name,status,page,pageSize);
    }
    @PostMapping(value= BaseHospitalRequestMapping.BaseBannerssage.createBanner)