代码修改

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/servicePackage/ServicePackageSubItemEndpoint.java

@@ -46,14 +46,18 @@ public class ServicePackageSubItemEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = "getItemList")
    @ApiOperation(value = "查询所有服务项")
    public PageEnvelop<Map<String, Object>> getSubItemList(
            @ApiParam(name = "jsonStr", value = "Json数据", required = true) @RequestParam String jsonStr
    ) throws Exception {
        jsonStr = URLDecoder.decode(jsonStr, "UTF-8");
        ParamQvo qvo = JSON.parseObject(jsonStr, ParamQvo.class);
        Map<String, Object> map = subItemService.getSubItemList(qvo);
        List<Map<String, Object>> list = (List<Map<String, Object>>) map.get("list");
        Integer count = (Integer) map.get("count");
        return success(list, count, qvo.getPage(), qvo.getPageSize());
            @ApiParam(name = "jsonStr", value = "Json数据", required = true) @RequestParam String jsonStr)  {
        try {
            jsonStr = URLDecoder.decode(jsonStr, "UTF-8");
            ParamQvo qvo = JSON.parseObject(jsonStr, ParamQvo.class);
            Map<String, Object> map = subItemService.getSubItemList(qvo);
            List<Map<String, Object>> list = (List<Map<String, Object>>) map.get("list");
            Integer count = (Integer) map.get("count");
            return success(list, count, qvo.getPage(), qvo.getPageSize());
        }catch (Exception e){
            e.printStackTrace();
            return PageEnvelop.getError("查询失败");
        }
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/followup/FollowupTemplateService.java

@@ -24,7 +24,9 @@ public class FollowupTemplateService extends BaseJpaService<FollowupTemplate, Fo
    public HashMap<String, Object> findList(ParamQvo qvo) {
        String detailSql = "SELECT * ";
        String detailSql = "SELECT id,template_name,followup_statrt_time_type,followup_count,description,template_detail_json,`status` " +
                ",leased_code,leased_name,org_code,org_name,DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%s') create_time,create_user " +
                ",create_user_name,DATE_FORMAT(update_time,'%Y-%m-%d %H:%i:%s') update_time,update_user,update_user_name ";
        String countSql = "SELECT COUNT(1) ";
        String conditionSql = " FROM base_followup_template WHERE 1=1 ";
        String pageSql = "";

svr/svr-base/src/main/java/com/yihu/jw/base/service/servicePackage/ServicePackageSubItemService.java

@@ -26,7 +26,8 @@ public class ServicePackageSubItemService extends BaseJpaService<ServicePackageS
    public Map<String, Object> getSubItemList(ParamQvo qvo) {
        String detailSql = "select * ";
        String detailSql = "select id,dict_item_id,name,introduce,`status`,sort,leased_code,leased_name,org_code,org_name " +
                ",photo,DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%s') create_time,price ";
        String countSql = " select count(1) ";
        String orderBySql = " order by a.sort desc ";
        String pageSql = "";