调整APP提醒接口返回集合

xinyb_

2022-02-21 9460f1b39cf6378ea8e5e30ae46fc3e2fb02e940

调整APP提醒接口返回集合

 src/com/yc/action/personalized/controller/DesktopPanelAction.java

@@ -131,11 +131,14 @@
                    List<Map<String, Object>> contents = new ArrayList<>();//
                    List<Map<String, Object>> panelList = null;//显示出来的信息
                    List<Map<String, Object>> linkList = null;//存在外连接的信息
                    List<Object> header = new ArrayList<>();//存放标题列
                    String sql = DBHelper.getValue(map, "selectsql");
                    Integer fId = DBHelper.getValueInt(map, "formId");
                    Integer fType = DBHelper.getValueInt(map, "formType");
                    String name = DBHelper.getValue(map, "formName");
                    Integer showRowNumber = DBHelper.getValueInt(map, "showRowNumber");
                    Integer panelShowType = DBHelper.getValueInt(map, "panelShowType");
                    Integer showHeader = DBHelper.getValueInt(map, "isshowheader");
                    if (!StringUtils.isBlank(sql)) {
                        try {
                            panelList = panelDataIfc.getEChartsData(DBHelper.getValueShi(sql, request.getSession()));
@@ -144,10 +147,21 @@
                        }
                        if (panelList != null && panelList.size() > 0) {
                            if (panelShowType == 1) {//是表格
                                linkList = panelGridIfc.getPanelGrid(fId, "fieldid,fieldName,sPremissField,dPremissField,FKeFilter,linkformid,linkformtype,isUpdateReadForToDo,displayformat");
                                linkList = panelGridIfc.getPanelGrid(fId, "*");//"fieldid,fieldname,sPremissField,dPremissField,FKeFilter,linkformid,linkformtype,isUpdateReadForToDo,displayformat,align");
                                if (linkList != null && linkList.size() > 0) {
                                    if (showRowNumber > 0 && panelList.size()>showRowNumber) {//设置的条数
                                        panelList = panelList.subList(0, showRowNumber);
                                    }
                                    for (Map<String, Object> p : panelList) {
                                        contents.add(getLink(linkList, p));
                                    }
                                    if (showHeader != null && showHeader > 0) {//显示标题
                                        for (int i = 0; i < linkList.size(); i++) {
//                                            Map<String, Object> map1 = new HashMap<>();
//                                            map1.put("sortBy",i);
//                                            map1.put("title", DBHelper.getValue(linkList.get(i), "fieldName"));
                                            header.add(DBHelper.getValue(linkList.get(i), "fieldName"));
                                        }
                                    }
                                }
                            } else if (panelShowType == 2) {//是图表
@@ -190,6 +204,7 @@
                        dataMap.put("formId", fId);
                        dataMap.put("formType", fType);
                        dataMap.put("panelShowType", panelShowType);
                        dataMap.put("header", header);
                        dataMap.put("content", contents);
                        dataList.add(dataMap);
                    }
@@ -285,7 +300,7 @@
                    map.put("text", value);
                    map.putAll(m);
//                    map.remove("fieldid");
                    map.remove("fieldName");
//                    map.remove("fieldname");
                    list.add(map);
                }
            }

 src/com/yc/service/personalized/PanelDataImpl.java

@@ -233,7 +233,7 @@
        try {
            String sql = "select b.formid,b.formtype,b.formname,a.selectsql, IsNULL(a.panelShowType,1) panelshowtype,\n" +
                    "ISNULL(a.EChartType,1) echarttype,a.titletext,a.titlesubtext,a.yaxisname,a.isshowtoolbox,a.isshowtoolboxsaveasimage,a.isshowtoolboxdatazoom,\n" +
                    "a.isshowtoolboxstack,a.isshowtoolboxdataview,a.seriesareastyleshow,a.yaxissplitlineshow,a.isshowlegenddataname from _sys_PanelData a " +
                    "a.isshowtoolboxstack,a.showrownumber,a.isshowheader,a.isshowtoolboxdataview,a.seriesareastyleshow,a.yaxissplitlineshow,a.isshowlegenddataname from _sys_PanelData a " +
                    "left join _sys_customHomePanelPosition b on a.formId=b.formid " +
                    "where b.usercode=? and b.isShow=1";
            if(formId!=null && formId!=0){