xinyb_
2021-10-23 468e383f6451e05ba885296c56ac17eb607d3c31
添加提醒功能针对 数字格式 的设置
6个文件已修改
44 ■■■■■ 已修改文件
WebRoot/personalized/js/editPaneDataGrid.js 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebRoot/personalized/manager/editPanelDataGrid.jsp 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/yc/action/personalized/PanelDataGridAction.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/yc/action/personalized/controller/DesktopPanelAction.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/yc/service/personalized/PanelGridIfc.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/yc/service/personalized/PanelGridImpl.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebRoot/personalized/js/editPaneDataGrid.js
@@ -73,13 +73,14 @@
    obj.FKeFilter=$("#FKeFilter").val();
    obj.linkformid=$("#linkformid").val();
    obj.linkformtype=$("#linkformtype").val();
    obj.displayformat=$("#displayformat").val();
    obj.isUpdateReadForToDo=($("#isUpdateReadForToDo").is(':checked')?1:0);//$("#isUpdateReadForToDo").val();
    return obj;
}
function clear(){
    $("#fieldId,#fieldName,#align,#borderTop,#borderLeft,#borderRight,#borderBottom" +
            ",#borderColor,#width,#sort,#dPremissField,#FKeFilter,sPremissField" +
            ",#linkformid,#linkformtype,#selectColor").val('');
            ",#linkformid,#linkformtype,#selectColor,#displayformat").val('');
    $("#isUpdateReadForToDo").attr("checked",false);
}
function edit(formid,fieldid){
@@ -101,6 +102,7 @@
            $("#FKeFilter").val(d.fkefilter);
            $("#linkformid").val(d.linkformid);
            $("#linkformtype").val(d.linkformtype);
            $("#displayformat").val(d.displayformat);
            $("#isUpdateReadForToDo").attr("checked",d.isUpdateReadForToDo==1?true:false);
            showUpdate();    
        }
WebRoot/personalized/manager/editPanelDataGrid.jsp
@@ -194,6 +194,12 @@
                                          style="margin-top:2px;border:1px solid #cccccc;height:30px;width:500px;overflow: auto;"></textarea>
                </td>
            </tr>
            <tr class="msgtd">
                <td style="width: 100px">数字格式:</td>
                <td colspan="5" style="text-align: left"><input id="displayformat"
                                                                style="border:1px solid #cccccc;height:25px;width:500px;"></input>
                </td>
            </tr>
            <tr>
                <td class="msgtd">启用已读:</td>
                <td colspan="5"><input id="isUpdateReadForToDo" type="checkbox" style="width: 18px;height: 18px"/></textarea>
src/com/yc/action/personalized/PanelDataGridAction.java
@@ -51,6 +51,7 @@
    String fkefilter = request.getParameter("FKeFilter");
    String linkformtype_str = request.getParameter("linkformtype");
    String linkformid_str = request.getParameter("linkformid");
    String displayformat = request.getParameter("displayformat");
    String isUpdateReadForToDo=request.getParameter("isUpdateReadForToDo");
    if (StringUtils.isBlank(formId_str) || StringUtils.isBlank(fieldId) || StringUtils.isBlank(fieldname) || StringUtils.isBlank(width_str)) {
@@ -75,6 +76,7 @@
        if (sort_str != null) sort = Integer.parseInt(sort_str);
        if (StringUtils.isBlank(linkformid_str)) linkformid_str = "-1";
        if (StringUtils.isBlank(linkformtype_str)) linkformtype_str = "-1";
        if (StringUtils.isBlank(displayformat)) displayformat = "";
        if(isUpdateReadForToDo!=null)isupdateread=Integer.parseInt(isUpdateReadForToDo);
    } catch (Exception e) {
        printText(response, "{\"code\":\"error\",\"info\":\"列宽  边框信息  排列顺序 必须为整数!\"}");
@@ -90,7 +92,7 @@
        // spremissfield,dpremissfield,fkefilter,linkformid,linkformtype);
        SpObserver.setDBtoInstance("_"+request.getSession().getAttribute(SessionKey.DATA_BASE_ID));
        gridIfc.addFiled(formId, fieldId, fieldname, width, align, bordertop, borderright, borderbottom, borderleft,
                bordercolor, sort, spremissfield, dpremissfield, fkefilter, linkformid_str, linkformtype_str,isupdateread);
                bordercolor, sort, spremissfield, dpremissfield, fkefilter, linkformid_str, linkformtype_str,isupdateread,displayformat);
        printText(response, "{\"code\":\"success\",\"info\":\"添加成功!\"}");
    } catch (Exception e) {
@@ -124,6 +126,7 @@
    String fkefilter = request.getParameter("FKeFilter");
    String linkformtype_str = request.getParameter("linkformtype");
    String linkformid_str = request.getParameter("linkformid");
    String displayformat = request.getParameter("displayformat");
    String isUpdateReadForToDo=request.getParameter("isUpdateReadForToDo");
    if (StringUtils.isBlank(formId_str) || StringUtils.isBlank(fieldId) || StringUtils.isBlank(fieldname) || StringUtils.isBlank(width_str)) {
        printText(response, "{\"code\":\"error\",\"info\":\"字段名  字段描述  列宽  必须填写!\"}");
@@ -147,6 +150,7 @@
        if (sort_str != null) sort = Integer.parseInt(sort_str);
        if (StringUtils.isBlank(linkformid_str)) linkformid_str = "-1";
        if (StringUtils.isBlank(linkformtype_str)) linkformtype_str = "-1";
        if (StringUtils.isBlank(displayformat)) displayformat = "";
        if(isUpdateReadForToDo!=null)isupdateread=Integer.parseInt(isUpdateReadForToDo);
    } catch (Exception e) {
        printText(response, "{\"code\":\"error\",\"info\":\"列宽  边框信息  排列顺序  链接表号  链接表类型  必须为整数!\"}");
@@ -155,7 +159,7 @@
    try {
        SpObserver.setDBtoInstance("_"+request.getSession().getAttribute(SessionKey.DATA_BASE_ID));
        gridIfc.updateFiled(formId, fieldId, fieldname, width, align, bordertop, borderright, borderbottom, borderleft,
                bordercolor, sort, spremissfield, dpremissfield, fkefilter, linkformid_str, linkformtype_str,isupdateread);
                bordercolor, sort, spremissfield, dpremissfield, fkefilter, linkformid_str, linkformtype_str,isupdateread,displayformat);
        printText(response, "{\"code\":\"success\",\"info\":\"修改成功!\"}");
    } catch (Exception e) {
        printText(response, "{\"code\":\"error\",\"info\":\"出现异常!\"}");
src/com/yc/action/personalized/controller/DesktopPanelAction.java
@@ -142,7 +142,7 @@
                        }
                        if (panelList != null && panelList.size() > 0) {
                            if (panelShowType == 1) {//是表格
                                linkList = panelGridIfc.getPanelGrid(fId, "fieldid,fieldName,sPremissField,dPremissField,FKeFilter,linkformid,linkformtype,isUpdateReadForToDo");
                                linkList = panelGridIfc.getPanelGrid(fId, "fieldid,fieldName,sPremissField,dPremissField,FKeFilter,linkformid,linkformtype,isUpdateReadForToDo,displayformat");
                                if (linkList != null && linkList.size() > 0) {
                                    for (Map<String, Object> p : panelList) {
                                        contents.add(getLink(linkList, p));
@@ -270,7 +270,7 @@
                        map.put("color", "");
                        m.put("unid", "");
                        m.put("isUpdateReadForToDo", 0);
                        value = getFormat(value, "");//pMap.get("") + ""
                        value = getFormat(value, DBHelper.getValue(m, "displayformat"));
                    }
                    map.put("text", value);
                    map.putAll(m);
src/com/yc/service/personalized/PanelGridIfc.java
@@ -14,11 +14,13 @@
    
    public void addFiled(int formId,String fieldid,String fieldname,int width,String align,int borderTop
            ,int borderRight,int borderBottom,int borderLeft,String borderColor,int sort
            ,String spremissfield,String dpremissfield,String fkefilter,String linkformid,String linkformtype,Integer isUpdateReadForToDo);
            ,String spremissfield,String dpremissfield,String fkefilter,String linkformid,String linkformtype,
                         Integer isUpdateReadForToDo,String displayformat);
    
    public void updateFiled(int formId,String fieldid,String fieldname,int width,String align,int borderTop
            ,int borderRight,int borderBottom,int borderLeft,String borderColor,int sort
            ,String spremissfield,String dpremissfield,String fkefilter,String linkformid,String linkformtype,Integer isUpdateReadForToDo);
            ,String spremissfield,String dpremissfield,String fkefilter,String linkformid,String linkformtype,
                            Integer isUpdateReadForToDo,String displayformat);
    
    public void delField(int formId,String fieldId);
    
src/com/yc/service/personalized/PanelGridImpl.java
@@ -9,17 +9,17 @@
@Service("PanelGridImpl")
public class PanelGridImpl extends BaseService implements PanelGridIfc {
    private static final String GET_PANEL_GRID = "set nocount on ; select formid,fieldid,spremissfield,dpremissfield,fkefilter,linkformid,linkformtype,fieldname,width,align,bordertop,borderright,borderbottom,borderleft,bordercolor,sort,1 as isshow,isUpdateReadForToDo from _sys_PanelDataGrid where formid=? order by sort";
    private static final String GET_PANEL_GRID = "set nocount on ; select formid,fieldid,spremissfield,dpremissfield,fkefilter,linkformid,linkformtype,fieldname,width,align,bordertop,borderright,borderbottom,borderleft,bordercolor,sort,1 as isshow,isUpdateReadForToDo,displayformat from _sys_PanelDataGrid where formid=? order by sort";
    
    private static final String DELETE_FIELD = "set nocount on ; delete _sys_PanelDataGrid where formid=? and fieldid=?";
    
    private static final String DELETE_formid = "set nocount on ; delete _sys_PanelDataGrid where formid=?";
    
    private static final String GET_PANEL_FIELD = "set nocount on ; select  formid,spremissfield,dpremissfield,fkefilter,linkformid,linkformtype,fieldid,fieldname,width,align,bordertop,borderright,borderbottom,borderleft,bordercolor,sort,isUpdateReadForToDo from _sys_PanelDataGrid where formid=? and fieldid=? order by sort";
    private static final String GET_PANEL_FIELD = "set nocount on ; select  formid,spremissfield,dpremissfield,fkefilter,linkformid,linkformtype,fieldid,fieldname,width,align,bordertop,borderright,borderbottom,borderleft,bordercolor,sort,isUpdateReadForToDo,displayformat from _sys_PanelDataGrid where formid=? and fieldid=? order by sort";
    
    private static final String ADD_PANEL_FIELD = "set nocount on ; insert into _sys_PanelDataGrid(formid,fieldid,fieldname,width,align,bordertop,borderright,borderbottom,borderleft,bordercolor,sort,spremissfield,dpremissfield,fkefilter,linkformid,linkformtype,isUpdateReadForToDo) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
    private static final String ADD_PANEL_FIELD = "set nocount on ; insert into _sys_PanelDataGrid(formid,fieldid,fieldname,width,align,bordertop,borderright,borderbottom,borderleft,bordercolor,sort,spremissfield,dpremissfield,fkefilter,linkformid,linkformtype,isUpdateReadForToDo,displayformat) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
    
    private static final String UPDATE_PANEL_FIELD = "set nocount on ; update _sys_PanelDataGrid set fieldname=?,width=?,align=?,bordertop=?,borderright=?,borderbottom=?,borderleft=?,bordercolor=?,sort=?,spremissfield=?,dpremissfield=?,fkefilter=?,linkformid=?,linkformtype=?,isUpdateReadForToDo=? where formid=? and fieldid=?";
    private static final String UPDATE_PANEL_FIELD = "set nocount on ; update _sys_PanelDataGrid set fieldname=?,width=?,align=?,bordertop=?,borderright=?,borderbottom=?,borderleft=?,bordercolor=?,sort=?,spremissfield=?,dpremissfield=?,fkefilter=?,linkformid=?,linkformtype=?,isUpdateReadForToDo=?,displayformat=? where formid=? and fieldid=?";
    
    @Override
    public List<Map<String, Object>> getPanelGrid(int formid) {
@@ -31,10 +31,10 @@
            int width, String align, int borderTop, int borderRight,
            int borderBottom, int borderLeft, String borderColor, int sort
            ,String spremissfield,String dpremissfield,String fkefilter,
            String linkformid,String linkformtype,Integer isUpdateReadForToDo){
            String linkformid,String linkformtype,Integer isUpdateReadForToDo,String displayformat){
        this.jdbcTemplate.update(ADD_PANEL_FIELD,formId,fieldid,fieldname,width
                ,align,borderTop,borderRight,borderBottom,borderLeft,borderColor
                ,sort,spremissfield,dpremissfield,fkefilter,linkformid,linkformtype,isUpdateReadForToDo);
                ,sort,spremissfield,dpremissfield,fkefilter,linkformid,linkformtype,isUpdateReadForToDo,displayformat);
    }
    @Override
@@ -56,10 +56,10 @@
            int width, String align, int borderTop, int borderRight,
            int borderBottom, int borderLeft, String borderColor, int sort
            ,String spremissfield,String dpremissfield,String fkefilter,
            String linkformid,String linkformtype,Integer isUpdateReadForToDo) {
            String linkformid,String linkformtype,Integer isUpdateReadForToDo,String displayformat) {
        this.jdbcTemplate.update(UPDATE_PANEL_FIELD,fieldname,width
                ,align,borderTop,borderRight,borderBottom,borderLeft,borderColor
                ,sort,spremissfield,dpremissfield,fkefilter,linkformid,linkformtype,isUpdateReadForToDo,formId,fieldid);
                ,sort,spremissfield,dpremissfield,fkefilter,linkformid,linkformtype,isUpdateReadForToDo,displayformat,formId,fieldid);
    }
    @Override