From da030fca4357d250b2b66cd29abeb1ab71adfa9b Mon Sep 17 00:00:00 2001 From: lin <290541200@qq.com> Date: Thu, 10 Dec 2020 18:02:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E6=AC=A1=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../province/platform/domain/EconType.java | 14 +- .../platform/mapper/EconTypeMapper.java | 6 +- .../platform/service/IEconTypeService.java | 6 +- .../service/impl/EconTypeServiceImpl.java | 6 +- .../mapper/platform/EconTypeMapper.xml | 16 +- .../platform/EconTypeController.java | 29 +- .../templates/platform/econtype/add.html | 153 ++++- .../templates/platform/econtype/econtype.html | 20 +- .../templates/platform/econtype/edit.html | 31 +- .../generator/domain/GenTableColumn.java | 2 +- .../service/impl/GenTableServiceImpl.java | 3 + .../com/ruoyi/generator/util/GenUtils.java | 3 + .../ruoyi/generator/util/VelocityUtils.java | 12 + .../src/main/resources/vm/html/add.html.vm | 541 ++++++++---------- .../src/main/resources/vm/html/formtpl.vm | 115 ++++ 15 files changed, 580 insertions(+), 377 deletions(-) create mode 100644 ruoyi-generator/src/main/resources/vm/html/formtpl.vm diff --git a/province-platform/src/main/java/com/ruoyi/province/platform/domain/EconType.java b/province-platform/src/main/java/com/ruoyi/province/platform/domain/EconType.java index cfb6f9b94..336e2af88 100644 --- a/province-platform/src/main/java/com/ruoyi/province/platform/domain/EconType.java +++ b/province-platform/src/main/java/com/ruoyi/province/platform/domain/EconType.java @@ -9,14 +9,14 @@ import com.ruoyi.common.core.domain.BaseEntity; * 经济类型对象 platf_econ_type * * @author dalin - * @date 2020-12-08 + * @date 2020-12-09 */ public class EconType extends BaseEntity { private static final long serialVersionUID = 1L; /** 主键 */ - private Integer econId; + private Long econId; /** 名称 */ @Excel(name = "名称") @@ -26,19 +26,19 @@ public class EconType extends BaseEntity @Excel(name = "单据号") private String docNum; - /** 资料状态 0有效 1无效 */ - @Excel(name = "资料状态 0有效 1无效") + /** 资料状态 */ + @Excel(name = "资料状态") private String status; - /** 删除标志 删除标志（0代表存在 2代表删除） */ + /** 删除标志 删除标志 */ private String delFlag; - public void setEconId(Integer econId) + public void setEconId(Long econId) { this.econId = econId; } - public Integer getEconId() + public Long getEconId() { return econId; } diff --git a/province-platform/src/main/java/com/ruoyi/province/platform/mapper/EconTypeMapper.java b/province-platform/src/main/java/com/ruoyi/province/platform/mapper/EconTypeMapper.java index a9437c2c5..80d043e37 100644 --- a/province-platform/src/main/java/com/ruoyi/province/platform/mapper/EconTypeMapper.java +++ b/province-platform/src/main/java/com/ruoyi/province/platform/mapper/EconTypeMapper.java @@ -7,7 +7,7 @@ import com.ruoyi.province.platform.domain.EconType; * 经济类型Mapper接口 * * @author dalin - * @date 2020-12-08 + * @date 2020-12-09 */ public interface EconTypeMapper { @@ -17,7 +17,7 @@ public interface EconTypeMapper * @param econId 经济类型ID * @return 经济类型 */ - public EconType selectEconTypeById(Integer econId); + public EconType selectEconTypeById(Long econId); /** * 查询经济类型列表 @@ -49,7 +49,7 @@ public interface EconTypeMapper * @param econId 经济类型ID * @return 结果 */ - public int deleteEconTypeById(Integer econId); + public int deleteEconTypeById(Long econId); /** * 批量删除经济类型 diff --git a/province-platform/src/main/java/com/ruoyi/province/platform/service/IEconTypeService.java b/province-platform/src/main/java/com/ruoyi/province/platform/service/IEconTypeService.java index e49f45139..8861d72c2 100644 --- a/province-platform/src/main/java/com/ruoyi/province/platform/service/IEconTypeService.java +++ b/province-platform/src/main/java/com/ruoyi/province/platform/service/IEconTypeService.java @@ -7,7 +7,7 @@ import com.ruoyi.province.platform.domain.EconType; * 经济类型Service接口 * * @author dalin - * @date 2020-12-08 + * @date 2020-12-09 */ public interface IEconTypeService { @@ -17,7 +17,7 @@ public interface IEconTypeService * @param econId 经济类型ID * @return 经济类型 */ - public EconType selectEconTypeById(Integer econId); + public EconType selectEconTypeById(Long econId); /** * 查询经济类型列表 @@ -57,5 +57,5 @@ public interface IEconTypeService * @param econId 经济类型ID * @return 结果 */ - public int deleteEconTypeById(Integer econId); + public int deleteEconTypeById(Long econId); } diff --git a/province-platform/src/main/java/com/ruoyi/province/platform/service/impl/EconTypeServiceImpl.java b/province-platform/src/main/java/com/ruoyi/province/platform/service/impl/EconTypeServiceImpl.java index 0bf54e011..524cb9b29 100644 --- a/province-platform/src/main/java/com/ruoyi/province/platform/service/impl/EconTypeServiceImpl.java +++ b/province-platform/src/main/java/com/ruoyi/province/platform/service/impl/EconTypeServiceImpl.java @@ -13,7 +13,7 @@ import com.ruoyi.common.core.text.Convert; * 经济类型Service业务层处理 * * @author dalin - * @date 2020-12-08 + * @date 2020-12-09 */ @Service public class EconTypeServiceImpl implements IEconTypeService @@ -28,7 +28,7 @@ public class EconTypeServiceImpl implements IEconTypeService * @return 经济类型 */ @Override - public EconType selectEconTypeById(Integer econId) + public EconType selectEconTypeById(Long econId) { return econTypeMapper.selectEconTypeById(econId); } @@ -90,7 +90,7 @@ public class EconTypeServiceImpl implements IEconTypeService * @return 结果 */ @Override - public int deleteEconTypeById(Integer econId) + public int deleteEconTypeById(Long econId) { return econTypeMapper.deleteEconTypeById(econId); } diff --git a/province-platform/src/main/resources/mapper/platform/EconTypeMapper.xml b/province-platform/src/main/resources/mapper/platform/EconTypeMapper.xml index 71a4dc18f..0eac621b0 100644 --- a/province-platform/src/main/resources/mapper/platform/EconTypeMapper.xml +++ b/province-platform/src/main/resources/mapper/platform/EconTypeMapper.xml @@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where econ_id = #{econId} @@ -38,10 +38,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into platf_econ_type econ_name, - doc_num, + doc_num, status, remark, - del_flag, + del_flag, create_by, create_time, update_by, @@ -49,10 +49,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{econName}, - #{docNum}, + #{docNum}, #{status}, #{remark}, - #{delFlag}, + #{delFlag}, #{createBy}, #{createTime}, #{updateBy}, @@ -64,10 +64,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update platf_econ_type econ_name = #{econName}, - doc_num = #{docNum}, + doc_num = #{docNum}, status = #{status}, remark = #{remark}, - del_flag = #{delFlag}, + del_flag = #{delFlag}, create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, @@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where econ_id = #{econId} - + delete from platf_econ_type where econ_id = #{econId} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/platform/EconTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/platform/EconTypeController.java index dd7f091e0..ee69378b2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/platform/EconTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/platform/EconTypeController.java @@ -1,26 +1,29 @@ package com.ruoyi.web.controller.platform; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.province.platform.domain.EconType; -import com.ruoyi.province.platform.service.IEconTypeService; +import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.*; - -import java.util.List; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.province.platform.domain.EconType; +import com.ruoyi.province.platform.service.IEconTypeService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; /** * 经济类型Controller * * @author dalin - * @date 2020-12-08 + * @date 2020-12-09 */ @Controller @RequestMapping("/platform/econtype") @@ -90,7 +93,7 @@ public class EconTypeController extends BaseController * 修改经济类型 */ @GetMapping("/edit/{econId}") - public String edit(@PathVariable("econId") Integer econId, ModelMap mmap) + public String edit(@PathVariable("econId") Long econId, ModelMap mmap) { EconType econType = econTypeService.selectEconTypeById(econId); mmap.put("econType", econType); diff --git a/ruoyi-admin/src/main/resources/templates/platform/econtype/add.html b/ruoyi-admin/src/main/resources/templates/platform/econtype/add.html index 360ad2a59..ac2824219 100644 --- a/ruoyi-admin/src/main/resources/templates/platform/econtype/add.html +++ b/ruoyi-admin/src/main/resources/templates/platform/econtype/add.html @@ -1,25 +1,36 @@ + + + + + + + + -
-
-
+
+ + +
+ +
-
- -
- -
-
-
- + +
+
@@ -27,32 +38,118 @@
+ + + + + + + + +
+ +
+
+ + +
+
+
+ + + + +
+ +
+
+ + +
+
+
+ +
+ +
+ +
+ +
+ +
+
+ + + + + +
-
- + + + + + + +
+
- +
- -
- - + } + + $("input[name='createTime']").datetimepicker({ + format: "yyyy-mm-dd", + minView: "month", + autoclose: true + }); + + $("input[name='updateTime']").datetimepicker({ + format: "yyyy-mm-dd", + minView: "month", + autoclose: true + }); + - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/templates/platform/econtype/econtype.html b/ruoyi-admin/src/main/resources/templates/platform/econtype/econtype.html index ed062dfef..4d6ef4b7c 100644 --- a/ruoyi-admin/src/main/resources/templates/platform/econtype/econtype.html +++ b/ruoyi-admin/src/main/resources/templates/platform/econtype/econtype.html @@ -15,7 +15,7 @@
  • - + +
    • +
    +
    +
    @@ -28,9 +35,25 @@
    +
    + +
    + +
    +
    +
    + +
    +
    + + +
    +
    +
    + \ No newline at end of file diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java index 0fe7baaaf..c4bc8f4fa 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java @@ -332,7 +332,7 @@ public class GenTableColumn extends BaseEntity { return StringUtils.equalsAnyIgnoreCase(javaField, // BaseEntity - "createBy", "createTime", "updateBy", "updateTime", "remark", + "remark", // TreeEntity "parentName", "parentId", "orderNum", "ancestors"); } diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java index de5cc50f3..80b3a0a56 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java @@ -131,6 +131,9 @@ public class GenTableServiceImpl implements IGenTableService { for (GenTableColumn cenTableColumn : genTable.getColumns()) { + if (cenTableColumn.getJavaField().toLowerCase().equals("delflag")) { + cenTableColumn.setHtmlType(""); + } genTableColumnMapper.updateGenTableColumn(cenTableColumn); } } diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java index 784525129..ba42e1418 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java @@ -47,6 +47,9 @@ public class GenUtils // 字符串长度超过500设置为文本域 Integer columnLength = getColumnLength(column.getColumnType()); String htmlType = columnLength >= 500 ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT; + if ( column.getColumnName().toLowerCase().equals("del_flag") ) { + htmlType = ""; + } column.setHtmlType(htmlType); } else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType)) diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java index 798768110..3d9f92545 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java @@ -54,7 +54,19 @@ public class VelocityUtils velocityContext.put("pkColumn", genTable.getPkColumn()); velocityContext.put("importList", getImportList(genTable)); velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName)); + + // 取出页面需要的字段ing + List tempcolumns = genTable.getColumns(); + List effectivecols = new ArrayList ();//定义一个list对象 + for(GenTableColumn tcolumn : tempcolumns) { + if (tcolumn.isInsert() && !tcolumn.isPk()) + if (tcolumn.isUsableColumn() || !tcolumn.isSuperColumn()) + effectivecols.add(tcolumn) ; + } ; + + velocityContext.put("effectivecols", effectivecols); velocityContext.put("columns", genTable.getColumns()); + velocityContext.put("table", genTable); setMenuVelocityContext(velocityContext, genTable); if (GenConstants.TPL_TREE.equals(tplCategory)) diff --git a/ruoyi-generator/src/main/resources/vm/html/add.html.vm b/ruoyi-generator/src/main/resources/vm/html/add.html.vm index 584464384..22be586ec 100644 --- a/ruoyi-generator/src/main/resources/vm/html/add.html.vm +++ b/ruoyi-generator/src/main/resources/vm/html/add.html.vm @@ -2,161 +2,85 @@ -#foreach($column in $columns) -#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "datetime") - -#break -#end -#end -#foreach($column in $columns) -#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "upload") - -#break -#end -#end -#foreach($column in $columns) -#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "summernote") - -#break -#end -#end + #foreach($column in $columns) + #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "datetime") + + #break + #end + #end + #foreach($column in $columns) + #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "upload") + + #break + #end + #end + #foreach($column in $columns) + #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "summernote") + + #break + #end + #end -
    -
    -#if($table.sub) +
    + + #if($table.sub)

    ${functionName}信息

    -#end -#foreach($column in $columns) -#set($field=$column.javaField) -#if($column.insert && !$column.pk) -#if(($column.usableColumn) || (!$column.superColumn)) -#set($parentheseIndex=$column.columnComment.indexOf("（")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#set($dictType=$column.dictType) -#if("" != $treeParentCode && $column.javaField == $treeParentCode) -
    - -
    -
    -#set($BusinessName=$businessName.substring(0,1).toUpperCase() + ${businessName.substring(1)}) -#set($treeId = "${className}?.${treeCode}") - - - -
    -
    -
    -#elseif($column.htmlType == "input") -
    - -
    - -
    -
    -#elseif($column.htmlType == "upload") -
    - -
    - -
    - -
    -
    -
    -#elseif($column.htmlType == "summernote") -
    - -
    - -
    -
    -
    -#elseif($column.htmlType == "select" && "" != $dictType) -
    - -
    - -
    -
    -#elseif($column.htmlType == "select" && $dictType) -
    - -
    - - 代码生成请选择字典属性 -
    -
    -#elseif($column.htmlType == "checkbox" && "" != $dictType) -
    - -
    - -
    -
    -#elseif($column.htmlType == "checkbox" && $dictType) -
    - -
    - - 代码生成请选择字典属性 -
    -
    -#elseif($column.htmlType == "radio" && "" != $dictType) -
    - -
    -
    - - -
    -
    -
    -#elseif($column.htmlType == "radio" && $dictType) -
    - -
    -
    - - -
    - 代码生成请选择字典属性 -
    -
    -#elseif($column.htmlType == "datetime") -
    - -
    -
    - - -
    -
    -
    -#elseif($column.htmlType == "textarea") -
    - -
    - -
    -
    -#end -#end -#end -#end -#if($table.sub) + #end + + #set($cumvar=0) + #set($field=$column.javaField) +
    + #foreach($column in $effectivecols) + #set($field=$column.javaField) + ##if($column.insert && !$column.pk) + ##if(($column.usableColumn) || (!$column.superColumn)) + #set($parentheseIndex=$column.columnComment.indexOf("（")) + #if($parentheseIndex != -1) + #set($comment=$column.columnComment.substring(0, $parentheseIndex)) + #else + #set($comment=$column.columnComment) + #end + #set($dictType=$column.dictType) + + #set($cumvar=$cumvar+1) + #if($cumvar%2==1) + #parse("vm/html/formtpl.vm") + #end + + ##end + ##end + #end +
    + + #set($cumvar=0) + #set($field=$column.javaField) +
    + #foreach($column in $effectivecols) + #set($field=$column.javaField) + ##if($column.insert && !$column.pk) + ##if(($column.usableColumn) || (!$column.superColumn)) + #set($parentheseIndex=$column.columnComment.indexOf("（")) + #if($parentheseIndex != -1) + #set($comment=$column.columnComment.substring(0, $parentheseIndex)) + #else + #set($comment=$column.columnComment) + #end + #set($dictType=$column.dictType) + + #set($cumvar=$cumvar+1) + + #if($cumvar%2==0) + #parse("vm/html/formtpl.vm") + #end + + ##end + ##end + #end +
    + + + #if($table.sub)

    ${subTable.functionName}信息

    @@ -167,112 +91,113 @@
    -#end -
    -
    - -#foreach($column in $columns) -#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "datetime") - -#break -#end -#end -#foreach($column in $columns) -#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "upload") - -#break -#end -#end -#foreach($column in $columns) -#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "summernote") - -#break -#end -#end - + }); + } + #end + \ No newline at end of file diff --git a/ruoyi-generator/src/main/resources/vm/html/formtpl.vm b/ruoyi-generator/src/main/resources/vm/html/formtpl.vm new file mode 100644 index 000000000..61153d7fe --- /dev/null +++ b/ruoyi-generator/src/main/resources/vm/html/formtpl.vm @@ -0,0 +1,115 @@ +#if("" != $treeParentCode && $column.javaField == $treeParentCode) +
    + +
    +
    + #set($BusinessName=$businessName.substring(0,1).toUpperCase() + ${businessName.substring(1)}) + #set($treeId = "${className}?.${treeCode}") + + + +
    +
    +
    +#elseif($column.htmlType == "input") +
    + +
    + +
    +
    +#elseif($column.htmlType == "upload") +
    + +
    + +
    + +
    +
    +
    +#elseif($column.htmlType == "summernote") +
    + +
    + +
    +
    +
    +#elseif($column.htmlType == "select" && "" != $dictType) +
    + +
    + +
    +
    +#elseif($column.htmlType == "select" && $dictType) +
    + +
    + + 代码生成请选择字典属性 +
    +
    +#elseif($column.htmlType == "checkbox" && "" != $dictType) +
    + +
    + +
    +
    +#elseif($column.htmlType == "checkbox" && $dictType) +
    + +
    + + 代码生成请选择字典属性 +
    +
    +#elseif($column.htmlType == "radio" && "" != $dictType) +
    + +
    +
    + + +
    +
    +
    +#elseif($column.htmlType == "radio" && $dictType) +
    + +
    +
    + + +
    + 代码生成请选择字典属性 +
    +
    +#elseif($column.htmlType == "datetime") +
    + +
    +
    + + +
    +
    +
    +#elseif($column.htmlType == "textarea") +
    + +
    + +
    +
    +#end \ No newline at end of file