diff --git a/hchyun-ui/src/api/test/father.js b/hchyun-ui/src/api/test/father.js new file mode 100644 index 0000000..467d9b5 --- /dev/null +++ b/hchyun-ui/src/api/test/father.js @@ -0,0 +1,54 @@ +import request from '@/utils/request' + +// 查询关联查询父列表 +export function listFather(query) { + console.log(query) + return request({ + url: '/test/father/list', + method: 'put', + data: query + }) +} + +// 查询关联查询父详细 +export function getFather(id) { + return request({ + url: '/test/father/' + id, + method: 'get' + }) +} + +// 新增关联查询父 +export function addFather(data) { + return request({ + url: '/test/father', + method: 'post', + data: data + }) +} + +// 修改关联查询父 +export function updateFather(data) { + return request({ + url: '/test/father', + method: 'put', + data: data + }) +} + +// 删除关联查询父 +export function delFather(id) { + return request({ + url: '/test/father/' + id, + method: 'delete' + }) +} + +// 导出关联查询父 +export function exportFather(query) { + return request({ + url: '/test/father/export', + method: 'get', + params: query + }) +} diff --git a/hchyun-ui/src/utils/hcy.js b/hchyun-ui/src/utils/hcy.js index 0d1500b..e587de4 100644 --- a/hchyun-ui/src/utils/hcy.js +++ b/hchyun-ui/src/utils/hcy.js @@ -67,15 +67,16 @@ export function addDateRange(params, dateRange) { // 添加搜索创建时间日期范围 export function addCreateDateRange(params, dateRange) { var search = params; - search.parameter= { - beginCreateTime : "", + let data = { + beginCreateTime : "", endCreateTime : "", }; if (null != dateRange && '' != dateRange) { - search.parameter.beginCreateTime = dateRange[0]; - search.parameter.endCreateTime = dateRange[1]; + data.beginCreateTime = dateRange[0]; + data.endCreateTime = dateRange[1]; } - return search; + search.parameter= JSON.stringify(data) + return search; } // 回显数据字典 diff --git a/hchyun-ui/src/views/test/father/index.vue b/hchyun-ui/src/views/test/father/index.vue new file mode 100644 index 0000000..9407233 --- /dev/null +++ b/hchyun-ui/src/views/test/father/index.vue @@ -0,0 +1,348 @@ + + + diff --git a/hchyun/hchyun-admin/pom.xml b/hchyun/hchyun-admin/pom.xml index 10cd880..9fa07f4 100644 --- a/hchyun/hchyun-admin/pom.xml +++ b/hchyun/hchyun-admin/pom.xml @@ -71,13 +71,12 @@ com.hchyun hchyun-test - - com.hchyun hchyun-generator + org.springframework.boot spring-boot-autoconfigure diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/controller/HcyBaseController.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/controller/HcyBaseController.java index ce1b665..bf92396 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/controller/HcyBaseController.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/controller/HcyBaseController.java @@ -14,8 +14,11 @@ import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; import java.beans.PropertyEditorSupport; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.Date; import java.util.List; +import java.util.Map; public class HcyBaseController { @@ -23,14 +26,11 @@ public class HcyBaseController { * 将前台传递过来的日期格式的字符串，自动转化为Date类型 */ @InitBinder - public void initBinder(WebDataBinder binder) - { + public void initBinder(WebDataBinder binder) { // Date 类型转换 - binder.registerCustomEditor(Date.class, new PropertyEditorSupport() - { + binder.registerCustomEditor(Date.class, new PropertyEditorSupport() { @Override - public void setAsText(String text) - { + public void setAsText(String text) { setValue(DateUtils.parseDate(text)); } }); @@ -39,24 +39,22 @@ public class HcyBaseController { /** * 设置请求分页数据 */ - protected void startPage() - { + protected void startPage() { PageDomain pageDomain = TableSupport.buildPageRequest(); Integer pageNum = pageDomain.getPageNum(); Integer pageSize = pageDomain.getPageSize(); - if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) - { + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) { String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); PageHelper.startPage(pageNum, pageSize, orderBy); } } + /** * 响应请求分页数据 */ - @SuppressWarnings({ "rawtypes", "unchecked" }) - protected TableDataInfo getDataTable(List list) - { + @SuppressWarnings({"rawtypes", "unchecked"}) + protected TableDataInfo getDataTable(List list) { TableDataInfo rspData = new TableDataInfo(); rspData.setCode(HttpStatus.SUCCESS); rspData.setMsg("查询成功"); @@ -65,6 +63,8 @@ public class HcyBaseController { return rspData; } + + // /** // * 响应返回结果 // * @@ -79,8 +79,7 @@ public class HcyBaseController { /** * 页面跳转 */ - public String redirect(String url) - { + public String redirect(String url) { return StringUtils.format("redirect:{}", url); } } diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/BaseEntity.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/BaseEntity.java index 15628cb..4b3128e 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/BaseEntity.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/BaseEntity.java @@ -49,11 +49,6 @@ public class BaseEntity implements Serializable { */ private String remark; - /** - * 参数 - */ - private String parameter; - /** * 开始时间 */ @@ -71,20 +66,6 @@ public class BaseEntity implements Serializable { */ private Map params; - public void setParameter(String parameter) { - if (parameter != null || parameter.equals("")) { - this.parameter = parameter; - JSONObject jsonObject = JSONObject.parseObject(parameter); - Object beginCreateTime = jsonObject.get("beginCreateTime"); - Object endCreateTime = jsonObject.get("endCreateTime"); - if (beginCreateTime != null && !beginCreateTime.equals("") && endCreateTime != null && !endCreateTime.equals("")) { - params = new HashMap<>(); - params.put("beginCreateTime", beginCreateTime); - params.put("endCreateTime", endCreateTime); - } - } - } - public String getSearchValue() { return searchValue; } diff --git a/hchyun/hchyun-generator/src/main/resources/vm/java/controller.java.vm b/hchyun/hchyun-generator/src/main/resources/vm/java/controller.java.vm index 23ff3bc..ffe47a7 100644 --- a/hchyun/hchyun-generator/src/main/resources/vm/java/controller.java.vm +++ b/hchyun/hchyun-generator/src/main/resources/vm/java/controller.java.vm @@ -57,15 +57,18 @@ public class ${ClassName}Controller extends HcyBaseController { */ @ApiOperation("查询${functionName}列表") @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')") - @GetMapping("/list") #if($table.crud || $table.sub || $table.tplCategory.equals("ass")) #if($table.tplCategory.equals("ass")) - public Serializable list(@Validated ${ClassName} ${className}) { + @PutMapping("/list") + public Serializable list(@Validated @RequestBody ${ClassName} ${className}) { + try { + startPage(assFather.getParams()); #else + @GetMapping("/list") public Serializable list(${ClassName} ${className}) { -#end try { startPage(); +#end ServerResult> serverResult = ${className}Service.select${ClassName}List(${className}); if (serverResult.isStart()) { return getDataTable(serverResult.getData()); @@ -78,6 +81,7 @@ public class ${ClassName}Controller extends HcyBaseController { } } #elseif($table.tree) + @GetMapping("/list") public AjaxResult list(${ClassName} ${className}) { List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); return AjaxResult.success(list); @@ -238,4 +242,19 @@ public class ${ClassName}Controller extends HcyBaseController { return AjaxResult.error(ReturnConstants.SYS_ERROR); } } + +#if($table.tplCategory.equals("ass")) + /** + * 设置请求分页数据 + */ + public void startPage(Map map) { + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = (Integer) map.get("pageNum"); + Integer pageSize = (Integer) map.get("pageSize"); + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) { + String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); + PageHelper.startPage(pageNum, pageSize, orderBy); + } + } +#end } diff --git a/hchyun/hchyun-generator/src/main/resources/vm/js/api.js.vm b/hchyun/hchyun-generator/src/main/resources/vm/js/api.js.vm index 296d41a..738ee99 100644 --- a/hchyun/hchyun-generator/src/main/resources/vm/js/api.js.vm +++ b/hchyun/hchyun-generator/src/main/resources/vm/js/api.js.vm @@ -1,6 +1,16 @@ import request from '@/utils/request' + // 查询${functionName}列表 +#if($table.tplCategory.equals("ass")) +export function list${BusinessName}(data) { + return request({ + url: '/${moduleName}/${businessName}/list', + method: 'put', + params: data + }) +} +#else export function list${BusinessName}(query) { return request({ url: '/${moduleName}/${businessName}/list', @@ -8,6 +18,7 @@ export function list${BusinessName}(query) { params: query }) } +#end // 查询${functionName}详细 export function get${BusinessName}(${pkColumn.javaField}) { diff --git a/hchyun/hchyun-generator/src/main/resources/vm/vue/index.vue.vm b/hchyun/hchyun-generator/src/main/resources/vm/vue/index.vue.vm index fda0491..c2ad9fd 100644 --- a/hchyun/hchyun-generator/src/main/resources/vm/vue/index.vue.vm +++ b/hchyun/hchyun-generator/src/main/resources/vm/vue/index.vue.vm @@ -112,7 +112,7 @@ #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN") { -#else +#if($variable == 1) + this.queryParams.params = {}; +#end +#foreach ($column in $columns) +#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN") +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) + if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) { + this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0]; + this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1]; + } +#end +#end +#foreach ($column in $table.assColumns) +#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN") +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) + if (null != this.ass${AttrName} && '' != this.ass${AttrName}) { + this.queryParams.params["assbegin${AttrName}"] = this.ass${AttrName}[0]; + this.queryParams.params["assend${AttrName}"] = this.ass${AttrName}[1]; + } +#end +#end list${BusinessName}(this.queryParams).then(response => { -#end this.${businessName}List = response.rows; this.total = response.total; this.loading = false; diff --git a/hchyun/hchyun-generator/src/main/resources/vm/xml/mapper.xml.vm b/hchyun/hchyun-generator/src/main/resources/vm/xml/mapper.xml.vm index 46d4f23..777707c 100644 --- a/hchyun/hchyun-generator/src/main/resources/vm/xml/mapper.xml.vm +++ b/hchyun/hchyun-generator/src/main/resources/vm/xml/mapper.xml.vm @@ -35,8 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select#foreach($column in $columns) $column.columnName#if($velocityCount != $columns.size()),#end#end from ${tableName} - select#foreach($column in $columns) ${tableMapping}.$column.columnName#if($velocityCount != $columns.size()),#end#end, #foreach($column in $table.assColumns) ${assMapping}.$column.columnName#if($velocityCount != $table.assColumns.size()),#end#end @@ -91,12 +91,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #elseif($queryType == "LIKE") and $columnName like concat('%', #{$javaField}, '%') #elseif($queryType == "BETWEEN") - and $columnName between #{params.begin$AttrName} and #{params.end$AttrName} + and $columnName between #{params.assbegin$AttrName} and #{params.assend$AttrName} #end #end #end - #else + + select taf.id, taf.name, taf.info, taf.create_time, + tas.id, tas.f_id, tas.sname, tas.create_time + from test_ass_father taf + left join test_ass_sun tas on tas.f_id = taf.id + + and taf.name like concat('%', #{name}, '%') + and taf.info = #{info} + and taf.create_time between #{params.beginCreateTime} and #{params.endCreateTime} + and tas.sname like concat('%', #{assSun.sname}, '%') + and tas.create_time between #{params.assbeginCreateTime} and #{params.assendCreateTime} + + + + + + + insert into test_ass_father + + id, + name, + info, + + + #{id}, + #{name}, + #{info}, + + + + + update test_ass_father + + name = #{name}, + info = #{info}, + + where id = #{id} + + + + delete from test_ass_father where id = #{id} + + + + delete from test_ass_father where id in + + #{id} + + + \ No newline at end of file