|
|
@ -66,9 +66,9 @@ public class DoorOrderService {
|
|
|
|
|
|
@Autowired
|
|
|
private HttpClientUtil httpClientUtil;
|
|
|
// @Value("${sign.check_upload}")
|
|
|
// @Value("${sign.check_upload}")
|
|
|
private String jwUrl;
|
|
|
// @Value("${server.server_url}")
|
|
|
// @Value("${server.server_url}")
|
|
|
private String wxServerUrl;
|
|
|
//图片服务地址
|
|
|
@Value("${fastDFS.fastdfs_file_url}")
|
|
|
@ -146,23 +146,45 @@ public class DoorOrderService {
|
|
|
|
|
|
/**
|
|
|
* 服务项查询
|
|
|
*
|
|
|
* @param signId 签约id
|
|
|
* @param type doorService 上门服务
|
|
|
* @param type doorService 上门服务
|
|
|
*/
|
|
|
public PageEnvelop getServiceItem(String signId, String name, String type, Integer page, Integer size){
|
|
|
String sql = "SELECT si.* ";
|
|
|
String countSql = "select count(si.id) ";
|
|
|
String filter = " from base_service_package_sign_record r," +
|
|
|
"base_service_package_item i,base_service_package_sub_item si,base_service_package_item_relational ir " +
|
|
|
"WHERE r.id = '"+signId+"' and i.service_package_id=r.service_package_id and i.`code`='"+type+"' and si.status='1' " +
|
|
|
" and i.id = ir.item_id and ir.sub_item_id= si.id ";
|
|
|
if(StringUtils.isNotBlank(name)){
|
|
|
filter += " and si.name like '%"+name+"%' ";
|
|
|
}
|
|
|
String oderBy = " order by si.sort limit "+(page-1)*size+","+size;
|
|
|
List<ServicePackageSubItemDO> list = jdbcTemplate.query(sql+filter+oderBy,new BeanPropertyRowMapper<>(ServicePackageSubItemDO.class));
|
|
|
long count = jdbcTemplate.queryForObject(countSql+filter,Long.class);
|
|
|
return PageEnvelop.getSuccessListWithPage("",list,page,size,count);
|
|
|
public PageEnvelop getServiceItem(String signId, String name, String type, Integer page, Integer size) {
|
|
|
// String sql = "SELECT si.* ";
|
|
|
// String countSql = "select count(si.id) ";
|
|
|
// String filter = " from base_service_package_sign_record r," +
|
|
|
// "base_service_package_item i,base_service_package_sub_item si,base_service_package_item_relational ir " +
|
|
|
// "WHERE r.id = '"+signId+"' and i.service_package_id=r.service_package_id and i.`code`='"+type+"' and si.status='1' " +
|
|
|
// " and i.id = ir.item_id and ir.sub_item_id= si.id ";
|
|
|
// if(StringUtils.isNotBlank(name)){
|
|
|
// filter += " and si.name like '%"+name+"%' ";
|
|
|
// }
|
|
|
// String oderBy = " order by si.sort limit "+(page-1)*size+","+size;
|
|
|
|
|
|
String sql = "SELECT e.* ";
|
|
|
String countSql = "select count(e.id) ";
|
|
|
String filter =
|
|
|
"FROM\n" +
|
|
|
" base_service_package_sign_record a \n" +
|
|
|
" INNER JOIN base_service_package_item b ON a.service_package_id = b.service_package_id\n" +
|
|
|
" INNER JOIN base_service_package_item c ON c.id=b.service_package_item_id\n" +
|
|
|
" INNER JOIN base_service_package_item_relational d ON d.item_id=b.id \n" +
|
|
|
" INNER JOIN base_service_package_sub_item e ON e.id=d.sub_item_id\n" +
|
|
|
"WHERE 1=1\n" +
|
|
|
" AND b.`code` = '" + type + "' \n" +
|
|
|
" AND e.`status` = '1' \n" +
|
|
|
" AND a.id = '" + signId + "' ";
|
|
|
if (StringUtils.isNotBlank(name)) {
|
|
|
filter += " and e.name like '%" + name + "%' ";
|
|
|
}
|
|
|
String oderBy = " order by e.sort limit " + (page - 1) * size + "," + size;
|
|
|
|
|
|
sql = sql + filter + oderBy;
|
|
|
countSql = countSql + filter;
|
|
|
List<ServicePackageSubItemDO> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ServicePackageSubItemDO.class));
|
|
|
long count = jdbcTemplate.queryForObject(countSql, Long.class);
|
|
|
return PageEnvelop.getSuccessListWithPage("", list, page, size, count);
|
|
|
}
|
|
|
|
|
|
public Map<String, String> getNumGroupByStatusTeam(String doctor, Integer type) {
|
suqinyi