diff --git a/common/src/main/java/com/jeesite/common/lang/DateUtils.java b/common/src/main/java/com/jeesite/common/lang/DateUtils.java index e94ec221..98e349d7 100644 --- a/common/src/main/java/com/jeesite/common/lang/DateUtils.java +++ b/common/src/main/java/com/jeesite/common/lang/DateUtils.java @@ -292,7 +292,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { if (StringUtils.isNoneBlank(begin, end)){ return begin + " ~ " + end; } - return StringUtils.EMPTY; + return null; } /** diff --git a/modules/core/src/main/resources/jeesite-core.yml b/modules/core/src/main/resources/jeesite-core.yml index 734b9269..304660c3 100644 --- a/modules/core/src/main/resources/jeesite-core.yml +++ b/modules/core/src/main/resources/jeesite-core.yml @@ -9,7 +9,7 @@ jdbc: # # Mysql 数据库配置 # type: mysql # driver: com.mysql.jdbc.Driver -# url: jdbc:mysql://127.0.0.1:3306/jeesite4?useUnicode=true&characterEncoding=utf-8 +# url: jdbc:mysql://127.0.0.1:3306/jeesite4?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull # username: root # password: 123456 # testSql: SELECT 1 diff --git a/web/db/oracle/test.sql b/web/db/oracle/test.sql index fd75d2e0..c96e883b 100644 --- a/web/db/oracle/test.sql +++ b/web/db/oracle/test.sql @@ -15,7 +15,7 @@ CREATE TABLE test_data ( id varchar2(64) NOT NULL, test_input varchar2(200), - test_textarea varchar2(200), + test_textarea nvarchar2(200), test_select varchar2(10), test_select_multiple varchar2(200), test_radio varchar2(10), @@ -43,7 +43,7 @@ CREATE TABLE test_data_child test_sort number(10,0), test_data_id varchar2(64), test_input varchar2(200), - test_textarea varchar2(200), + test_textarea nvarchar2(200), test_select varchar2(10), test_select_multiple varchar2(200), test_radio varchar2(10), diff --git a/web/db/test.erm b/web/db/test.erm index b06a4735..282aa6bb 100644 --- a/web/db/test.erm +++ b/web/db/test.erm @@ -12,7 +12,7 @@ 0 1.0 0 - 91 + 0 128 128 @@ -840,7 +840,7 @@ integer - 68b1f859bfea8bf1733964c0ccaf826fc05f3b1f + 2fed92437d28f1427e913aba1251fe0807c7b209 200 null false @@ -853,7 +853,7 @@ 多行文本 test_textarea - varchar(n) + nvarchar(n) 2eda719a62fb7e1d3face62555046d938abddda9 @@ -1257,13 +1257,13 @@ - 68b1f859bfea8bf1733964c0ccaf826fc05f3b1f + 2fed92437d28f1427e913aba1251fe0807c7b209 693f8af2fe6cf45255b6f2bc7e9077f3630c3dd8 - varchar(n) + nvarchar(n) false @@ -1717,13 +1717,13 @@ - 68b1f859bfea8bf1733964c0ccaf826fc05f3b1f + 2fed92437d28f1427e913aba1251fe0807c7b209 8050d948828b16267482e9e3716219321f206b81 - varchar(n) + nvarchar(n) false diff --git a/web/src/main/java/com/jeesite/modules/test/dao/TestDataChildDao.java b/web/src/main/java/com/jeesite/modules/test/dao/TestDataChildDao.java index ebf8dd0f..af857ae3 100644 --- a/web/src/main/java/com/jeesite/modules/test/dao/TestDataChildDao.java +++ b/web/src/main/java/com/jeesite/modules/test/dao/TestDataChildDao.java @@ -10,7 +10,7 @@ import com.jeesite.modules.test.entity.TestDataChild; /** * 测试数据DAO接口 * @author ThinkGem - * @version 2018-01-30 + * @version 2018-01-31 */ @MyBatisDao public interface TestDataChildDao extends CrudDao { diff --git a/web/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java b/web/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java index ae2e1fc7..7813a259 100644 --- a/web/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java +++ b/web/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java @@ -10,7 +10,7 @@ import com.jeesite.modules.test.entity.TestData; /** * 测试数据DAO接口 * @author ThinkGem - * @version 2018-01-30 + * @version 2018-01-31 */ @MyBatisDao public interface TestDataDao extends CrudDao { diff --git a/web/src/main/java/com/jeesite/modules/test/entity/TestData.java b/web/src/main/java/com/jeesite/modules/test/entity/TestData.java index 778de9c7..84ba4dab 100644 --- a/web/src/main/java/com/jeesite/modules/test/entity/TestData.java +++ b/web/src/main/java/com/jeesite/modules/test/entity/TestData.java @@ -8,9 +8,9 @@ import java.util.Date; import com.jeesite.common.mybatis.annotation.JoinTable; import com.jeesite.common.mybatis.annotation.JoinTable.Type; import com.fasterxml.jackson.annotation.JsonFormat; +import javax.validation.constraints.NotNull; import com.jeesite.modules.sys.entity.User; import com.jeesite.modules.sys.entity.Office; -import com.jeesite.common.entity.Extend; import java.util.List; import com.jeesite.common.collect.ListUtils; @@ -22,7 +22,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType; /** * 测试数据Entity * @author ThinkGem - * @version 2018-01-30 + * @version 2018-01-31 */ @Table(name="test_data", alias="a", columns={ @Column(name="id", attrName="id", label="编号", isPK=true), @@ -39,7 +39,6 @@ import com.jeesite.common.mybatis.mapper.query.QueryType; @Column(name="test_area_code", attrName="testAreaCode", label="区域选择"), @Column(name="test_area_name", attrName="testAreaName", label="区域名称", isQuery=false), @Column(includeEntity=DataEntity.class), - @Column(includeEntity=Extend.class, attrName="extend"), }, joinTable={ @JoinTable(type=Type.LEFT_JOIN, entity=User.class, attrName="testUser", alias="u10", on="u10.user_code = a.test_user_code", columns={ @@ -68,7 +67,6 @@ public class TestData extends DataEntity { private Office testOffice; // 部门选择 private String testAreaCode; // 区域选择 private String testAreaName; // 区域名称 - private Extend extend; // 扩展字段 private List testDataChildList = ListUtils.newArrayList(); // 子表列表 public TestData() { @@ -134,6 +132,7 @@ public class TestData extends DataEntity { } @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @NotNull(message="日期选择不能为空") public Date getTestDate() { return testDate; } @@ -143,6 +142,7 @@ public class TestData extends DataEntity { } @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @NotNull(message="日期时间不能为空") public Date getTestDatetime() { return testDatetime; } @@ -185,14 +185,6 @@ public class TestData extends DataEntity { this.testAreaName = testAreaName; } - public Extend getExtend() { - return extend; - } - - public void setExtend(Extend extend) { - this.extend = extend; - } - public Date getTestDate_gte() { return sqlMap.getWhere().getValue("test_date", QueryType.GTE); } diff --git a/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java b/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java index 925674c0..2d28bebf 100644 --- a/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java +++ b/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java @@ -8,6 +8,9 @@ import java.util.Date; import com.jeesite.common.mybatis.annotation.JoinTable; import com.jeesite.common.mybatis.annotation.JoinTable.Type; import com.fasterxml.jackson.annotation.JsonFormat; +import javax.validation.constraints.NotNull; +import com.jeesite.modules.sys.entity.User; +import com.jeesite.modules.sys.entity.Office; import com.jeesite.common.entity.DataEntity; import com.jeesite.common.mybatis.annotation.Column; @@ -17,31 +20,42 @@ import com.jeesite.common.mybatis.mapper.query.QueryType; /** * 测试数据Entity * @author ThinkGem - * @version 2018-01-30 + * @version 2018-01-31 */ @Table(name="test_data_child", alias="a", columns={ @Column(name="id", attrName="id", label="编号", isPK=true), @Column(name="test_sort", attrName="testSort", label="排序号"), - @Column(name="test_data_id", attrName="testData.id", label="父表主键"), - @Column(name="test_input", attrName="testInput", label="单行文本"), - @Column(name="test_textarea", attrName="testTextarea", label="多行文本"), + @Column(name="test_data_id", attrName="testDataId.id", label="父表主键"), + @Column(name="test_input", attrName="testInput", label="单行文本", queryType=QueryType.LIKE), + @Column(name="test_textarea", attrName="testTextarea", label="多行文本", queryType=QueryType.LIKE), @Column(name="test_select", attrName="testSelect", label="下拉框"), @Column(name="test_select_multiple", attrName="testSelectMultiple", label="下拉多选"), @Column(name="test_radio", attrName="testRadio", label="单选框"), @Column(name="test_checkbox", attrName="testCheckbox", label="复选框"), @Column(name="test_date", attrName="testDate", label="日期选择"), @Column(name="test_datetime", attrName="testDatetime", label="日期时间"), - @Column(name="test_user_code", attrName="testUserCode", label="用户选择"), - @Column(name="test_office_code", attrName="testOfficeCode", label="部门选择"), + @Column(name="test_user_code", attrName="testUser.userCode", label="用户选择"), + @Column(name="test_office_code", attrName="testOffice.officeCode", label="部门选择"), @Column(name="test_area_code", attrName="testAreaCode", label="区域选择"), - @Column(name="test_area_name", attrName="testAreaName", label="区域名称", queryType=QueryType.LIKE), + @Column(name="test_area_name", attrName="testAreaName", label="区域名称", isQuery=false), + }, joinTable={ + @JoinTable(type=Type.LEFT_JOIN, entity=User.class, attrName="testUser", alias="u12", + on="u12.user_code = a.test_user_code", columns={ + @Column(name="user_code", label="用户编码", isPK=true), + @Column(name="user_name", label="用户名称", isQuery=false), + }), + @JoinTable(type=Type.LEFT_JOIN, entity=Office.class, attrName="testOffice", alias="u13", + on="u13.office_code = a.test_office_code", columns={ + @Column(name="office_code", label="部门编码", isPK=true), + @Column(name="office_name", label="部门名称", isQuery=false), + }), }, orderBy="a.id ASC" ) public class TestDataChild extends DataEntity { private static final long serialVersionUID = 1L; - private Integer testSort; // 排序号 - private TestData testData; // 父表主键 父类 + private Long testSort; // 排序号 + private TestData testDataId; // 父表主键 父类 private String testInput; // 单行文本 private String testTextarea; // 多行文本 private String testSelect; // 下拉框 @@ -50,8 +64,8 @@ public class TestDataChild extends DataEntity { private String testCheckbox; // 复选框 private Date testDate; // 日期选择 private Date testDatetime; // 日期时间 - private String testUserCode; // 用户选择 - private String testOfficeCode; // 部门选择 + private User testUser; // 用户选择 + private Office testOffice; // 部门选择 private String testAreaCode; // 区域选择 private String testAreaName; // 区域名称 @@ -60,25 +74,25 @@ public class TestDataChild extends DataEntity { } - public TestDataChild(TestData testData){ - this.testData = testData; + public TestDataChild(TestData testDataId){ + this.testDataId = testDataId; } - public Integer getTestSort() { + public Long getTestSort() { return testSort; } - public void setTestSort(Integer testSort) { + public void setTestSort(Long testSort) { this.testSort = testSort; } @Length(min=0, max=64, message="父表主键长度不能超过 64 个字符") - public TestData getTestData() { - return testData; + public TestData getTestDataId() { + return testDataId; } - public void setTestData(TestData testData) { - this.testData = testData; + public void setTestDataId(TestData testDataId) { + this.testDataId = testDataId; } @Length(min=0, max=200, message="单行文本长度不能超过 200 个字符") @@ -136,6 +150,7 @@ public class TestDataChild extends DataEntity { } @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @NotNull(message="日期选择不能为空") public Date getTestDate() { return testDate; } @@ -145,6 +160,7 @@ public class TestDataChild extends DataEntity { } @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @NotNull(message="日期时间不能为空") public Date getTestDatetime() { return testDatetime; } @@ -153,22 +169,20 @@ public class TestDataChild extends DataEntity { this.testDatetime = testDatetime; } - @Length(min=0, max=64, message="用户选择长度不能超过 64 个字符") - public String getTestUserCode() { - return testUserCode; + public User getTestUser() { + return testUser; } - public void setTestUserCode(String testUserCode) { - this.testUserCode = testUserCode; + public void setTestUser(User testUser) { + this.testUser = testUser; } - @Length(min=0, max=64, message="部门选择长度不能超过 64 个字符") - public String getTestOfficeCode() { - return testOfficeCode; + public Office getTestOffice() { + return testOffice; } - public void setTestOfficeCode(String testOfficeCode) { - this.testOfficeCode = testOfficeCode; + public void setTestOffice(Office testOffice) { + this.testOffice = testOffice; } @Length(min=0, max=64, message="区域选择长度不能超过 64 个字符") @@ -189,4 +203,36 @@ public class TestDataChild extends DataEntity { this.testAreaName = testAreaName; } + public Date getTestDate_gte() { + return sqlMap.getWhere().getValue("test_date", QueryType.GTE); + } + + public void setTestDate_gte(Date testDate) { + sqlMap.getWhere().and("test_date", QueryType.GTE, testDate); + } + + public Date getTestDate_lte() { + return sqlMap.getWhere().getValue("test_date", QueryType.LTE); + } + + public void setTestDate_lte(Date testDate) { + sqlMap.getWhere().and("test_date", QueryType.LTE, testDate); + } + + public Date getTestDatetime_gte() { + return sqlMap.getWhere().getValue("test_datetime", QueryType.GTE); + } + + public void setTestDatetime_gte(Date testDatetime) { + sqlMap.getWhere().and("test_datetime", QueryType.GTE, testDatetime); + } + + public Date getTestDatetime_lte() { + return sqlMap.getWhere().getValue("test_datetime", QueryType.LTE); + } + + public void setTestDatetime_lte(Date testDatetime) { + sqlMap.getWhere().and("test_datetime", QueryType.LTE, testDatetime); + } + } \ No newline at end of file diff --git a/web/src/main/java/com/jeesite/modules/test/service/TestDataChildService.java b/web/src/main/java/com/jeesite/modules/test/service/TestDataChildService.java new file mode 100644 index 00000000..79b8ff7d --- /dev/null +++ b/web/src/main/java/com/jeesite/modules/test/service/TestDataChildService.java @@ -0,0 +1,71 @@ +/** + * Copyright (c) 2013-Now http://jeesite.com All rights reserved. + */ +package com.jeesite.modules.test.service; + +import java.util.List; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.jeesite.common.entity.Page; +import com.jeesite.common.service.CrudService; +import com.jeesite.modules.test.entity.TestDataChild; +import com.jeesite.modules.test.dao.TestDataChildDao; + +/** + * 测试子表Service + * @author ThinkGem + * @version 2018-01-31 + */ +@Service +@Transactional(readOnly=true) +public class TestDataChildService extends CrudService { + + /** + * 获取单条数据 + * @param testDataChild + * @return + */ + public TestDataChild get(TestDataChild testDataChild) { + return super.get(testDataChild); + } + + /** + * 查询分页数据 + * @param page 分页对象 + * @param testDataChild + * @return + */ + public Page findPage(Page page, TestDataChild testDataChild) { + return super.findPage(page, testDataChild); + } + + /** + * 保存数据（插入或更新） + * @param testDataChild + */ + @Transactional(readOnly=false) + public void save(TestDataChild testDataChild) { + super.save(testDataChild); + } + + /** + * 更新状态 + * @param testDataChild + */ + @Transactional(readOnly=false) + public void updateStatus(TestDataChild testDataChild) { + super.updateStatus(testDataChild); + } + + /** + * 删除数据 + * @param testDataChild + */ + @Transactional(readOnly=false) + public void delete(TestDataChild testDataChild) { + super.delete(testDataChild); + } + +} \ No newline at end of file diff --git a/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java b/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java index 49d57aad..33de0c26 100644 --- a/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java +++ b/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java @@ -20,7 +20,7 @@ import com.jeesite.modules.test.dao.TestDataChildDao; /** * 测试数据Service * @author ThinkGem - * @version 2018-01-30 + * @version 2018-01-31 */ @Service @Transactional(readOnly=true) @@ -68,7 +68,7 @@ public class TestDataService extends CrudService { // 保存 TestData子表 for (TestDataChild testDataChild : testData.getTestDataChildList()){ if (!TestDataChild.STATUS_DELETE.equals(testDataChild.getStatus())){ - testDataChild.setTestData(testData); + testDataChild.setTestDataId(testData); if (testDataChild.getIsNewRecord()){ testDataChild.preInsert(); testDataChildDao.insert(testDataChild); @@ -99,7 +99,7 @@ public class TestDataService extends CrudService { public void delete(TestData testData) { super.delete(testData); TestDataChild testDataChild = new TestDataChild(); - testDataChild.setTestData(testData); + testDataChild.setTestDataId(testData); testDataChildDao.delete(testDataChild); } diff --git a/web/src/main/java/com/jeesite/modules/test/web/TestDataChildController.java b/web/src/main/java/com/jeesite/modules/test/web/TestDataChildController.java new file mode 100644 index 00000000..eec31283 --- /dev/null +++ b/web/src/main/java/com/jeesite/modules/test/web/TestDataChildController.java @@ -0,0 +1,99 @@ +/** + * Copyright (c) 2013-Now http://jeesite.com All rights reserved. + */ +package com.jeesite.modules.test.web; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import com.jeesite.common.config.Global; +import com.jeesite.common.entity.Page; +import com.jeesite.common.web.BaseController; +import com.jeesite.modules.sys.utils.UserUtils; +import com.jeesite.modules.test.entity.TestDataChild; +import com.jeesite.modules.test.service.TestDataChildService; + +/** + * 测试子表Controller + * @author ThinkGem + * @version 2018-01-31 + */ +@Controller +@RequestMapping(value = "${adminPath}/test/testDataChild") +public class TestDataChildController extends BaseController { + + @Autowired + private TestDataChildService testDataChildService; + + /** + * 获取数据 + */ + @ModelAttribute + public TestDataChild get(String id, boolean isNewRecord) { + return testDataChildService.get(id, isNewRecord); + } + + /** + * 查询列表 + */ + @RequiresPermissions("test:testDataChild:view") + @RequestMapping(value = {"list", ""}) + public String list(TestDataChild testDataChild, Model model) { + model.addAttribute("testDataChild", testDataChild); + return "modules/test/testDataChildList"; + } + + /** + * 查询列表数据 + */ + @RequiresPermissions("test:testDataChild:view") + @RequestMapping(value = "listData") + @ResponseBody + public Page listData(TestDataChild testDataChild, HttpServletRequest request, HttpServletResponse response) { + Page page = testDataChildService.findPage(new Page(request, response), testDataChild); + return page; + } + + /** + * 查看编辑表单 + */ + @RequiresPermissions("test:testDataChild:view") + @RequestMapping(value = "form") + public String form(TestDataChild testDataChild, Model model) { + model.addAttribute("testDataChild", testDataChild); + return "modules/test/testDataChildForm"; + } + + /** + * 保存数据 + */ + @RequiresPermissions("test:testDataChild:edit") + @PostMapping(value = "save") + @ResponseBody + public String save(@Validated TestDataChild testDataChild) { + testDataChildService.save(testDataChild); + return renderResult(Global.TRUE, "保存数据成功！"); + } + + /** + * 删除数据 + */ + @RequiresPermissions("test:testDataChild:edit") + @RequestMapping(value = "delete") + @ResponseBody + public String delete(TestDataChild testDataChild) { + testDataChildService.delete(testDataChild); + return renderResult(Global.TRUE, "删除数据成功！"); + } + +} \ No newline at end of file diff --git a/web/src/main/java/com/jeesite/modules/test/web/TestDataController.java b/web/src/main/java/com/jeesite/modules/test/web/TestDataController.java index 0d9768ff..f959ee22 100644 --- a/web/src/main/java/com/jeesite/modules/test/web/TestDataController.java +++ b/web/src/main/java/com/jeesite/modules/test/web/TestDataController.java @@ -26,7 +26,7 @@ import com.jeesite.modules.test.service.TestDataService; /** * 测试数据Controller * @author ThinkGem - * @version 2018-01-30 + * @version 2018-01-31 */ @Controller @RequestMapping(value = "${adminPath}/test/testData") diff --git a/web/src/main/resources/jeesite.yml b/web/src/main/resources/jeesite.yml index 5a84b9e5..9a648623 100644 --- a/web/src/main/resources/jeesite.yml +++ b/web/src/main/resources/jeesite.yml @@ -7,20 +7,20 @@ jdbc: # Mysql 数据库配置 -# type: mysql -# driver: com.mysql.jdbc.Driver -# url: jdbc:mysql://127.0.0.1:3306/jeesite4?useUnicode=true&characterEncoding=utf-8 -# username: root -# password: 123456 -# testSql: SELECT 1 + type: mysql + driver: com.mysql.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3306/jeesite4?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull + username: root + password: 123456 + testSql: SELECT 1 # Oracle 数据库配置 - type: oracle - driver: oracle.jdbc.driver.OracleDriver - url: jdbc:oracle:thin:@127.0.0.1:1521/orcl - username: jeesite - password: jeesite - testSql: SELECT 1 FROM DUAL +# type: oracle +# driver: oracle.jdbc.driver.OracleDriver +# url: jdbc:oracle:thin:@127.0.0.1:1521/orcl +# username: jeesite +# password: jeesite +# testSql: SELECT 1 FROM DUAL # Redis 配置 redis: diff --git a/web/src/main/resources/views/modules/test/testDataForm.html b/web/src/main/resources/views/modules/test/testDataForm.html index 7c387d99..8fbb36fe 100644 --- a/web/src/main/resources/views/modules/test/testDataForm.html +++ b/web/src/main/resources/views/modules/test/testDataForm.html @@ -12,372 +12,171 @@ <#form:form id="inputForm" model="${testData}" action="${ctx}/test/testData/save" method="post" class="form-horizontal">
基本信息
- <#form:hidden path="id"/> -
-
-
- -
- <#form:input path="testInput" maxlength="200" class="form-control "/> -
-
-
-
-
-
-
- -
- <#form:textarea path="testTextarea" rows="4" maxlength="200" class="form-control "/> -
-
-
-
-
-
-
- -
- <#form:select path="testSelect" dictType="sys_menu_type" blankOption="true" class="form-control " /> -
-
-
-
-
- -
- <#form:select path="testSelectMultiple" dictType="sys_menu_type" multiple="true" blankOption="true" class="form-control " /> -
-
-
-
-
-
-
- -
- <#form:radio path="testRadio" dictType="sys_menu_type" class="form-control " /> -
-
-
-
-
- -
- <#form:checkbox path="testCheckbox" dictType="sys_menu_type" class="form-control " /> -
-
-
-
-
-
-
- -
- <#form:input path="testDate" readonly="true" maxlength="20" class="form-control Wdate " - dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/> -
-
-
-
-
- -
- <#form:input path="testDatetime" readonly="true" maxlength="20" class="form-control Wdate " - dataFormat="datetime" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm',isShowClear:false});"/> -
-
-
-
-
-
-
- -
- <#form:treeselect id="testUser" title="用户" - path="testUser.userCode" labelPath="testUser.userName" - url="${ctx}/sys/office/treeData?isLoadUser=true" - class=" " allowClear="true"/> -
-
-
-
-
- -
- <#form:treeselect id="testOffice" title="部门" - path="testOffice.officeCode" labelPath="testOffice.officeName" - url="${ctx}/sys/office/treeData" - class=" " allowClear="true"/> -
-
-
-
-
-
-
- -
- <#form:treeselect id="testAreaCode" title="区域" - path="testAreaCode" labelPath="testAreaName" - url="${ctx}/sys/area/treeData" - class=" " allowClear="true"/> -
-
-
-
-
-
-
- -
- <#form:textarea path="remarks" rows="4" maxlength="500" class="form-control "/> -
-
-
-
-
扩展字段
-
-
-
- -
- <#form:input path="extend.extendS1" maxlength="500" class="form-control "/> -
-
-
-
-
- -
- <#form:input path="extend.extendS2" maxlength="500" class="form-control "/> -
-
-
-
-
-
-
- -
- <#form:input path="extend.extendS3" maxlength="500" class="form-control "/> -
-
-
-
-
- -
- <#form:input path="extend.extendS4" maxlength="500" class="form-control "/> -
-
-
-
-
-
-
- -
- <#form:input path="extend.extendS5" maxlength="500" class="form-control "/> -
-
-
-
-
- -
- <#form:input path="extend.extendS6" maxlength="500" class="form-control "/> -
-
-
-
-
-
-
- -
- <#form:input path="extend.extendS7" maxlength="500" class="form-control "/> -
-
-
-
-
- -
- <#form:input path="extend.extendS8" maxlength="500" class="form-control "/> -
-
-
-
-
-
-
- -
- <#form:input path="extend.extendI1" maxlength="19" class="form-control digits"/> -
-
-
-
-
- -
- <#form:input path="extend.extendI2" maxlength="19" class="form-control digits"/> -
-
-
-
-
-
-
- -
- <#form:input path="extend.extendI3" maxlength="19" class="form-control digits"/> -
-
-
-
-
- -
- <#form:input path="extend.extendI4" maxlength="19" class="form-control digits"/> -
-
-
-
-
-
-
- -
- <#form:input path="extend.extendF1" class="form-control number"/> -
-
-
-
-
- -
- <#form:input path="extend.extendF2" class="form-control number"/> -
-
-
-
-
-
-
- -
- <#form:input path="extend.extendF3" class="form-control number"/> -
-
-
-
-
- -
- <#form:input path="extend.extendF4" class="form-control number"/> -
-
-
-
-
-
-
- -
- <#form:input path="extend.extendD1" maxlength="6" class="form-control "/> -
-
-
-
-
- -
- <#form:input path="extend.extendD2" maxlength="6" class="form-control "/> -
-
-
-
-
-
-
- -
- <#form:input path="extend.extendD3" maxlength="6" class="form-control "/> -
-
-
-
-
- -
- <#form:input path="extend.extendD4" maxlength="6" class="form-control "/> -
-
-
-
-
-
-
- -
- <#form:fileupload id="uploadImage" bizKey="${testData.id}" bizType="testData_image" - uploadType="image" class="" readonly="false"/> -
-
-
-
-
-
-
- -
- <#form:fileupload id="uploadFile" bizKey="${testData.id}" bizType="testData_file" - uploadType="all" class="" readonly="false"/> -
-
-
-
-

测试数据子表

-
-
- <% if (hasPermi('test:testData:edit')){ %> - 增行 - <% } %> -
+ <#form:hidden path="id"/> +
+
+
+ +
+ <#form:input path="testInput" maxlength="200" class="form-control "/> +
+
+
+
+
+
+
+ +
+ <#form:textarea path="testTextarea" rows="4" maxlength="200" class="form-control "/> +
+
+
+
+
+
+
+ +
+ <#form:select path="testSelect" dictType="sys_menu_type" blankOption="true" class="form-control " /> +
+
+
+
+
+ +
+ <#form:select path="testSelectMultiple" dictType="sys_menu_type" multiple="true" blankOption="true" class="form-control required" /> +
+
+
+
+
+
+
+ +
+ <#form:radio path="testRadio" dictType="sys_menu_type" class="form-control " /> +
+
+
+
+
+ +
+ <#form:checkbox path="testCheckbox" dictType="sys_menu_type" class="form-control " /> +
+
+
+
+
+
+
+ +
+ <#form:input path="testDate" readonly="true" maxlength="20" class="form-control Wdate required " + dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/> +
+
+
+
+
+ +
+ <#form:input path="testDatetime" readonly="true" maxlength="20" class="form-control Wdate required " + dataFormat="datetime" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm',isShowClear:false});"/> +
+
+
+
+
+
+
+ +
+ <#form:treeselect id="testUser" title="用户" + path="testUser.userCode" labelPath="testUser.userName" + url="${ctx}/sys/office/treeData?isLoadUser=true" + class=" " allowClear="true"/> +
+
+
+
+
+ +
+ <#form:treeselect id="testOffice" title="部门" + path="testOffice.officeCode" labelPath="testOffice.officeName" + url="${ctx}/sys/office/treeData" + class=" " allowClear="true"/> +
+
+
+
+
+
+
+ +
+ <#form:treeselect id="testAreaCode" title="区域" + path="testAreaCode" labelPath="testAreaName" + url="${ctx}/sys/area/treeData" + class=" " allowClear="true"/> +
+
+
+
+
+
+
+ +
+ <#form:textarea path="remarks" rows="4" maxlength="500" class="form-control "/> +
+
+
+
+
+
+
+ +
+ <#form:fileupload id="uploadImage" bizKey="${testData.id}" bizType="testData_image" + uploadType="image" class="" readonly="false"/> +
+
+
+
+
+
+
+ +
+ <#form:fileupload id="uploadFile" bizKey="${testData.id}" bizType="testData_file" + uploadType="all" class="" readonly="false"/> +
+
+
+
+

测试数据子表

+
+
+ <% if (hasPermi('test:testData:edit')){ %> + 增行 + <% } %> +
@@ -393,57 +192,146 @@
<% } %> - + + + \ No newline at end of file diff --git a/web/src/main/resources/views/modules/test/testDataList.html b/web/src/main/resources/views/modules/test/testDataList.html index d815295d..13c0db8e 100644 --- a/web/src/main/resources/views/modules/test/testDataList.html +++ b/web/src/main/resources/views/modules/test/testDataList.html @@ -111,7 +111,7 @@ - +
diff --git a/web/src/test/java/com/jeesite/test/InitGenData.java b/web/src/test/java/com/jeesite/test/InitGenData.java index a1811fb3..09b28a6c 100644 --- a/web/src/test/java/com/jeesite/test/InitGenData.java +++ b/web/src/test/java/com/jeesite/test/InitGenData.java @@ -21,8 +21,8 @@ public class InitGenData extends com.jeesite.modules.gen.db.InitGenData { @Test public void initGenData() throws Exception{ - initGenTestData(); initGenTreeData(); + initGenTestData(); } }