diff --git a/WebRoot/WEB-INF/jsp/sunvote/basestation/basestation_edit.jsp b/WebRoot/WEB-INF/jsp/sunvote/basestation/basestation_edit.jsp index 855eee7..7e16a06 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/basestation/basestation_edit.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/basestation/basestation_edit.jsp @@ -28,7 +28,7 @@
- +
diff --git a/WebRoot/WEB-INF/jsp/sunvote/basestation/basestation_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/basestation/basestation_list.jsp index b8895d2..4743e18 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/basestation/basestation_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/basestation/basestation_list.jsp @@ -86,7 +86,7 @@ @@ -103,12 +103,12 @@
- + ${vs.index+1} ${var.NAME}
diff --git a/WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_list.jsp index 862d9c8..b056906 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_list.jsp @@ -83,7 +83,7 @@ @@ -97,12 +97,12 @@
- + ${vs.index+1} ${var.NO}
diff --git a/WebRoot/WEB-INF/jsp/sunvote/papertype/papertype_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/papertype/papertype_list.jsp index 64d7fbe..2e03e60 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/papertype/papertype_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/papertype/papertype_list.jsp @@ -80,7 +80,7 @@ @@ -91,12 +91,12 @@
- + ${vs.index+1} ${var.NAME}
diff --git a/WebRoot/WEB-INF/jsp/sunvote/school/school_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/school/school_list.jsp index 2d32891..e6773ca 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/school/school_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/school/school_list.jsp @@ -83,7 +83,7 @@ @@ -97,12 +97,12 @@
- + ${vs.index+1} ${var.NAME}
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teachingmaterial/teachingmaterial_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/teachingmaterial/teachingmaterial_list.jsp index f9bbb93..bc637c7 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teachingmaterial/teachingmaterial_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teachingmaterial/teachingmaterial_list.jsp @@ -83,7 +83,7 @@ @@ -97,12 +97,12 @@
- + ${vs.index+1} ${var.NAME}
<#list fieldList as var> diff --git a/resources/ftl/createCode/jsp_list_Template.ftl b/resources/ftl/createCode/jsp_list_Template.ftl index 7a71b9b..05e3cb9 100644 --- a/resources/ftl/createCode/jsp_list_Template.ftl +++ b/resources/ftl/createCode/jsp_list_Template.ftl @@ -81,7 +81,7 @@ <#list fieldList as var> @@ -93,12 +93,12 @@
- + ${r"${vs.index+1}"}
<#list fieldList as var> @@ -74,7 +74,7 @@
- +
diff --git a/resources/ftl/createFaCode/jsp_list_Template.ftl b/resources/ftl/createFaCode/jsp_list_Template.ftl index c24fa4b..b87b1f9 100644 --- a/resources/ftl/createFaCode/jsp_list_Template.ftl +++ b/resources/ftl/createFaCode/jsp_list_Template.ftl @@ -87,12 +87,12 @@
diff --git a/resources/ftl/createSoCode/jsp_list_Template.ftl b/resources/ftl/createSoCode/jsp_list_Template.ftl index 6b78b39..5778ca3 100644 --- a/resources/ftl/createSoCode/jsp_list_Template.ftl +++ b/resources/ftl/createSoCode/jsp_list_Template.ftl @@ -83,7 +83,7 @@ <#list fieldList as var> @@ -95,12 +95,12 @@
- + ${r"${vs.index+1}"}
diff --git a/resources/ftl/createTreeCode/jsp_list_Template.ftl b/resources/ftl/createTreeCode/jsp_list_Template.ftl index 50daf64..1b299e2 100644 --- a/resources/ftl/createTreeCode/jsp_list_Template.ftl +++ b/resources/ftl/createTreeCode/jsp_list_Template.ftl @@ -79,7 +79,7 @@ - + <#list fieldList as var> @@ -89,12 +89,12 @@ @@ -203,9 +203,9 @@ } //去此ID下子级列表 - function goSondict(${objectNameUpper}_ID){ + function goSondict(${ID){ top.jzts(); - window.location.href="<%=basePath%>${objectNameLower}/list.do?${objectNameUpper}_ID="+${objectNameUpper}_ID; + window.location.href="<%=basePath%>${objectNameLower}/list.do?${ID="+${ID; }; $(function() { @@ -245,12 +245,12 @@ }); //新增 - function add(${objectNameUpper}_ID){ + function add(${ID){ top.jzts(); var diag = new top.Dialog(); diag.Drag=true; diag.Title ="新增"; - diag.URL = '<%=basePath%>${objectNameLower}/goAdd.do?${objectNameUpper}_ID='+${objectNameUpper}_ID; + diag.URL = '<%=basePath%>${objectNameLower}/goAdd.do?${ID='+${ID; diag.Width = 800; diag.Height = 600; diag.Modal = true; //有无遮罩窗口 @@ -258,7 +258,7 @@ diag.ShowMinButton = true; //最小化按钮 diag.CancelEvent = function(){ //关闭事件 if(diag.innerFrame.contentWindow.document.getElementById('zhongxin').style.display == 'none'){ - parent.location.href="<%=basePath%>${objectNameLower}/listTree.do?${objectNameUpper}_ID=${r"${"}${objectNameUpper}_ID${r"}"}&dnowPage=${r"${page.currentPage}"}"; + parent.location.href="<%=basePath%>${objectNameLower}/listTree.do?${ID=${r"${"}${ID${r"}"}&dnowPage=${r"${page.currentPage}"}"; } diag.close(); }; @@ -270,7 +270,7 @@ bootbox.confirm("确定要删除吗?", function(result) { if(result) { top.jzts(); - var url = "<%=basePath%>${objectNameLower}/delete.do?${objectNameUpper}_ID="+Id+"&tm="+new Date().getTime(); + var url = "<%=basePath%>${objectNameLower}/delete.do?${ID="+Id+"&tm="+new Date().getTime(); $.get(url,function(data){ tosearch(); }); @@ -283,10 +283,10 @@ bootbox.confirm("确定要删除吗?", function(result) { if(result) { top.jzts(); - var url = "<%=basePath%>${objectNameLower}/delete.do?${objectNameUpper}_ID="+Id+"&tm="+new Date().getTime(); + var url = "<%=basePath%>${objectNameLower}/delete.do?${ID="+Id+"&tm="+new Date().getTime(); $.get(url,function(data){ if("success" == data.result){ - parent.location.href="<%=basePath%>${objectNameLower}/listTree.do?${objectNameUpper}_ID=${r"${"}${objectNameUpper}_ID${r"}"}&dnowPage=${r"${page.currentPage}"}"; + parent.location.href="<%=basePath%>${objectNameLower}/listTree.do?${ID=${r"${"}${ID${r"}"}&dnowPage=${r"${page.currentPage}"}"; }else if("false" == data.result){ top.hangge(); bootbox.dialog({ @@ -313,7 +313,7 @@ var diag = new top.Dialog(); diag.Drag=true; diag.Title ="编辑"; - diag.URL = '<%=basePath%>${objectNameLower}/goEdit.do?${objectNameUpper}_ID='+Id; + diag.URL = '<%=basePath%>${objectNameLower}/goEdit.do?${ID='+Id; diag.Width = 800; diag.Height = 600; diag.Modal = true; //有无遮罩窗口 @@ -321,7 +321,7 @@ diag.ShowMinButton = true; //最小化按钮 diag.CancelEvent = function(){ //关闭事件 if(diag.innerFrame.contentWindow.document.getElementById('zhongxin').style.display == 'none'){ - parent.location.href="<%=basePath%>${objectNameLower}/listTree.do?${objectNameUpper}_ID=${r"${"}${objectNameUpper}_ID${r"}"}&dnowPage=${r"${page.currentPage}"}"; + parent.location.href="<%=basePath%>${objectNameLower}/listTree.do?${ID=${r"${"}${ID${r"}"}&dnowPage=${r"${page.currentPage}"}"; } diag.close(); }; diff --git a/resources/mybatis1/sunvote/PaperTypeMapper.xml b/resources/mybatis1/sunvote/PaperTypeMapper.xml index 4f59ffe..3255195 100644 --- a/resources/mybatis1/sunvote/PaperTypeMapper.xml +++ b/resources/mybatis1/sunvote/PaperTypeMapper.xml @@ -11,14 +11,14 @@ NAME, REMARK, - $ID + ID #{NAME}, #{REMARK}, - #{$ID} + #{ID} @@ -37,7 +37,7 @@ delete from where - $ID = #{$ID} + ID = #{ID} @@ -47,9 +47,9 @@ set NAME = #{NAME}, REMARK = #{REMARK}, - $ID = $ID + ID = ID where - $ID = #{$ID} + ID = #{ID} @@ -59,7 +59,7 @@ from where - $ID = #{$ID} + ID = #{ID} @@ -94,7 +94,7 @@ delete from where - $ID in + ID in #{item}
${r"${vs.index+1}"} ${r"${var.NAME}"} ${r"${var.NAME}"}${r"${var."}${var[0]}${r"}"}
- 新增 + 新增 - + 返回