diff --git a/module-form/src/main/java/ink/wgink/module/form/dao/design/IFormFieldDao.java b/module-form/src/main/java/ink/wgink/module/form/dao/design/IFormFieldDao.java index c1b76ed8..92cec591 100644 --- a/module-form/src/main/java/ink/wgink/module/form/dao/design/IFormFieldDao.java +++ b/module-form/src/main/java/ink/wgink/module/form/dao/design/IFormFieldDao.java @@ -28,5 +28,5 @@ public interface IFormFieldDao extends IInitBaseTable { List list(Map params) throws SearchException; - List listPO(Map params) throws SearchException; + List listPO(Map params) throws SearchException; } diff --git a/module-form/src/main/java/ink/wgink/module/form/service/design/IFormFieldService.java b/module-form/src/main/java/ink/wgink/module/form/service/design/IFormFieldService.java index 56099d18..adffc075 100644 --- a/module-form/src/main/java/ink/wgink/module/form/service/design/IFormFieldService.java +++ b/module-form/src/main/java/ink/wgink/module/form/service/design/IFormFieldService.java @@ -89,7 +89,15 @@ public interface IFormFieldService { * @param params * @return */ - List listPO(Map params); + List listPO(Map params); + + /** + * 表单字段列表 + * + * @param formId + * @return + */ + List listPO(String formId); /** * 分页列表 @@ -99,4 +107,5 @@ public interface IFormFieldService { */ SuccessResultList> listPage(ListPage page); + } diff --git a/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormFieldServiceImpl.java b/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormFieldServiceImpl.java index 0498c386..4b15a475 100644 --- a/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormFieldServiceImpl.java +++ b/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormFieldServiceImpl.java @@ -87,11 +87,18 @@ public class FormFieldServiceImpl extends DefaultBaseService implements IFormFie } @Override - public List listPO(Map params) { + public List listPO(Map params) { params = params == null ? getHashMap(2) : params; return formFieldDao.listPO(params); } + @Override + public List listPO(String formId) { + Map params = getHashMap(2); + params.put("formId", formId); + return listPO(params); + } + @Override public SuccessResultList> listPage(ListPage page) { PageHelper.startPage(page.getPage(), page.getRows()); diff --git a/module-form/src/main/resources/mybatis/mapper/design/form-field-mapper.xml b/module-form/src/main/resources/mybatis/mapper/design/form-field-mapper.xml index 16b39f01..1dd1a11d 100644 --- a/module-form/src/main/resources/mybatis/mapper/design/form-field-mapper.xml +++ b/module-form/src/main/resources/mybatis/mapper/design/form-field-mapper.xml @@ -139,6 +139,12 @@ field_default FROM form_field + + + AND + form_id = #{formId} + + @@ -153,6 +159,12 @@ field_default FROM form_field + + + AND + form_id = #{formId} + + \ No newline at end of file diff --git a/module-form/src/main/resources/templates/form/list.html b/module-form/src/main/resources/templates/form/list.html index c0d29af0..3f71619f 100644 --- a/module-form/src/main/resources/templates/form/list.html +++ b/module-form/src/main/resources/templates/form/list.html @@ -78,6 +78,11 @@ [ {type:'checkbox', fixed: 'left'}, {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '{{d.LAY_INDEX}}'}, + {field:'formId', width:200, title: '表单ID', align:'center', + templet: function(row) { + return row.formId; + } + }, {field:'formCode', width:200, title: '表单编码', align:'center', templet: function(row) { return row.formCode +' v:'+ row.formVersion +'';