diff --git a/province-platform/src/main/java/com/ruoyi/province/platform/domain/CompanyArea.java b/province-platform/src/main/java/com/ruoyi/province/platform/domain/CompanyArea.java new file mode 100644 index 000000000..a7155ed4c --- /dev/null +++ b/province-platform/src/main/java/com/ruoyi/province/platform/domain/CompanyArea.java @@ -0,0 +1,125 @@ +package com.ruoyi.province.platform.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 营业面积对象 platf_company_area + * + * @author dalin + * @date 2020-12-22 + */ +public class CompanyArea extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long companyAreaId; + + /** 名称 */ + @Excel(name = "名称") + private String companyAreaName; + + /** 单据号 */ + @Excel(name = "单据号") + private String docNum; + + /** 资料状态 */ + @Excel(name = "资料状态") + private String status; + + /** 删除标志） */ + private String delFlag; + + /** 制单人 */ + @Excel(name = "制单人") + private String createByuserName; + + /** 修改人 */ + @Excel(name = "修改人") + private String updateByuserName; + + public void setCompanyAreaId(Long companyAreaId) + { + this.companyAreaId = companyAreaId; + } + + public Long getCompanyAreaId() + { + return companyAreaId; + } + public void setCompanyAreaName(String companyAreaName) + { + this.companyAreaName = companyAreaName; + } + + public String getCompanyAreaName() + { + return companyAreaName; + } + public void setDocNum(String docNum) + { + this.docNum = docNum; + } + + public String getDocNum() + { + return docNum; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + public void setCreateByuserName(String createByuserName) + { + this.createByuserName = createByuserName; + } + + public String getCreateByuserName() + { + return createByuserName; + } + public void setUpdateByuserName(String updateByuserName) + { + this.updateByuserName = updateByuserName; + } + + public String getUpdateByuserName() + { + return updateByuserName; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("companyAreaId", getCompanyAreaId()) + .append("companyAreaName", getCompanyAreaName()) + .append("docNum", getDocNum()) + .append("status", getStatus()) + .append("remark", getRemark()) + .append("delFlag", getDelFlag()) + .append("createByuserName", getCreateByuserName()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateByuserName", getUpdateByuserName()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/province-platform/src/main/java/com/ruoyi/province/platform/mapper/CompanyAreaMapper.java b/province-platform/src/main/java/com/ruoyi/province/platform/mapper/CompanyAreaMapper.java new file mode 100644 index 000000000..fa87b01f5 --- /dev/null +++ b/province-platform/src/main/java/com/ruoyi/province/platform/mapper/CompanyAreaMapper.java @@ -0,0 +1,69 @@ +package com.ruoyi.province.platform.mapper; + +import java.util.List; +import com.ruoyi.province.platform.domain.CompanyArea; + +/** + * 营业面积Mapper接口 + * + * @author dalin + * @date 2020-12-22 + */ +public interface CompanyAreaMapper +{ + /** + * 查询营业面积 + * + * @param companyAreaId 营业面积ID + * @return 营业面积 + */ + public CompanyArea selectCompanyAreaById(Long companyAreaId); + + /** + * 校验 营业面积 名称是否重复 + * + * @param CompanyAreaName + * @return 营业面积 + */ + public CompanyArea checkCompanyAreaUnique(String CompanyAreaName); + + /** + * 查询营业面积列表 + * + * @param companyArea 营业面积 + * @return 营业面积集合 + */ + public List selectCompanyAreaList(CompanyArea companyArea); + + /** + * 新增营业面积 + * + * @param companyArea 营业面积 + * @return 结果 + */ + public int insertCompanyArea(CompanyArea companyArea); + + /** + * 修改营业面积 + * + * @param companyArea 营业面积 + * @return 结果 + */ + public int updateCompanyArea(CompanyArea companyArea); + + /** + * 删除营业面积 + * + * @param companyAreaId 营业面积ID + * @return 结果 + */ + public int deleteCompanyAreaById(Long companyAreaId); + + /** + * 批量删除营业面积 + * + * @param companyAreaIds 需要删除的数据ID + * @return 结果 + */ + public int deleteCompanyAreaByIds(String[] companyAreaIds); +} diff --git a/province-platform/src/main/java/com/ruoyi/province/platform/service/ICompanyAreaService.java b/province-platform/src/main/java/com/ruoyi/province/platform/service/ICompanyAreaService.java new file mode 100644 index 000000000..3a028d653 --- /dev/null +++ b/province-platform/src/main/java/com/ruoyi/province/platform/service/ICompanyAreaService.java @@ -0,0 +1,69 @@ +package com.ruoyi.province.platform.service; + +import java.util.List; +import com.ruoyi.province.platform.domain.CompanyArea; + +/** + * 营业面积Service接口 + * + * @author dalin + * @date 2020-12-22 + */ +public interface ICompanyAreaService +{ + /** + * 查询营业面积 + * + * @param companyAreaId 营业面积ID + * @return 营业面积 + */ + public CompanyArea selectCompanyAreaById(Long companyAreaId); + + /** + * 查询营业面积 + * + * @param companyAreaId 营业面积ID + * @return 营业面积 + */ + public String checkCompanyAreaUnique(CompanyArea companyArea); + + /** + * 查询营业面积列表 + * + * @param companyArea 营业面积 + * @return 营业面积集合 + */ + public List selectCompanyAreaList(CompanyArea companyArea); + + /** + * 新增营业面积 + * + * @param companyArea 营业面积 + * @return 结果 + */ + public int insertCompanyArea(CompanyArea companyArea); + + /** + * 修改营业面积 + * + * @param companyArea 营业面积 + * @return 结果 + */ + public int updateCompanyArea(CompanyArea companyArea); + + /** + * 批量删除营业面积 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteCompanyAreaByIds(String ids); + + /** + * 删除营业面积信息 + * + * @param companyAreaId 营业面积ID + * @return 结果 + */ + public int deleteCompanyAreaById(Long companyAreaId); +} diff --git a/province-platform/src/main/java/com/ruoyi/province/platform/service/impl/CompanyAreaServiceImpl.java b/province-platform/src/main/java/com/ruoyi/province/platform/service/impl/CompanyAreaServiceImpl.java new file mode 100644 index 000000000..16ac77076 --- /dev/null +++ b/province-platform/src/main/java/com/ruoyi/province/platform/service/impl/CompanyAreaServiceImpl.java @@ -0,0 +1,118 @@ +package com.ruoyi.province.platform.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.province.platform.Constants.BussiConstants; +import com.ruoyi.province.platform.domain.CompanyArea; +import com.ruoyi.province.platform.mapper.CompanyAreaMapper; +import com.ruoyi.province.platform.service.ICompanyAreaService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 营业面积Service业务层处理 + * + * @author dalin + * @date 2020-12-22 + */ +@Service +public class CompanyAreaServiceImpl implements ICompanyAreaService +{ + @Autowired + private CompanyAreaMapper companyAreaMapper; + + /** + * 查询营业面积 + * + * @param companyAreaId 营业面积ID + * @return 营业面积 + */ + @Override + public CompanyArea selectCompanyAreaById(Long companyAreaId) + { + return companyAreaMapper.selectCompanyAreaById(companyAreaId); + } + + /** + * 查询营业面积 + * + * @param companyAreaId 营业面积ID + * @return 营业面积 + */ + @Override + public String checkCompanyAreaUnique(CompanyArea companyArea) + { + Long docId = StringUtils.isNull( companyArea.getCompanyAreaId() ) ? -1L : companyArea.getCompanyAreaId(); + CompanyArea info = companyAreaMapper.checkCompanyAreaUnique( companyArea.getCompanyAreaName() ); + if (StringUtils.isNotNull(info) && info.getCompanyAreaId().longValue() != docId.longValue()) + { + return BussiConstants.DOC_NAME_NOT_UNIQUE; + } + return BussiConstants.DOC_NAME_UNIQUE; + } + + /** + * 查询营业 面积列表 + * + * @param companyArea 营业面积 + * @return 营业面积 + */ + @Override + public List selectCompanyAreaList(CompanyArea companyArea) + { + return companyAreaMapper.selectCompanyAreaList(companyArea); + } + + /** + * 新增营业面积 + * + * @param companyArea 营业面积 + * @return 结果 + */ + @Override + public int insertCompanyArea(CompanyArea companyArea) + { + companyArea.setCreateTime(DateUtils.getNowDate()); + return companyAreaMapper.insertCompanyArea(companyArea); + } + + /** + * 修改营业面积 + * + * @param companyArea 营业面积 + * @return 结果 + */ + @Override + public int updateCompanyArea(CompanyArea companyArea) + { + companyArea.setUpdateTime(DateUtils.getNowDate()); + return companyAreaMapper.updateCompanyArea(companyArea); + } + + /** + * 删除营业面积对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteCompanyAreaByIds(String ids) + { + return companyAreaMapper.deleteCompanyAreaByIds(Convert.toStrArray(ids)); + } + + /** + * 删除营业面积信息 + * + * @param companyAreaId 营业面积ID + * @return 结果 + */ + @Override + public int deleteCompanyAreaById(Long companyAreaId) + { + return companyAreaMapper.deleteCompanyAreaById(companyAreaId); + } +} diff --git a/province-platform/src/main/resources/mapper/platform/CompanyAreaMapper.xml b/province-platform/src/main/resources/mapper/platform/CompanyAreaMapper.xml new file mode 100644 index 000000000..d89328f6e --- /dev/null +++ b/province-platform/src/main/resources/mapper/platform/CompanyAreaMapper.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + select t.company_area_id, t.company_area_name, t.doc_num, t.status, t.remark, t.del_flag, t.create_by, t.create_time, t.update_by, t.update_time, + a1.user_name as createByuserName, a2.user_name as updateByuserName from platf_company_area t + left join sys_user a1 on t.create_by=a1.login_name + left join sys_user a2 on t.update_by=a2.login_name + + + + + + + + + + insert into platf_company_area + + company_area_name, + doc_num, + status, + remark, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{companyAreaName}, + #{docNum}, + #{status}, + #{remark}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update platf_company_area + + company_area_name = #{companyAreaName}, + doc_num = #{docNum}, + status = #{status}, + remark = #{remark}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where company_area_id = #{companyAreaId} + + + + delete from platf_company_area where company_area_id = #{companyAreaId} + + + + delete from platf_company_area where company_area_id in + + #{companyAreaId} + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/platform/CompanyAreaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/platform/CompanyAreaController.java new file mode 100644 index 000000000..9559d40ca --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/platform/CompanyAreaController.java @@ -0,0 +1,161 @@ +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.DateUtils; +import com.ruoyi.common.utils.ShiroUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.province.platform.Constants.BussiConstants; +import com.ruoyi.province.platform.domain.CompanyArea; +import com.ruoyi.province.platform.service.ICompanyAreaService; +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; + +/** + * 营业面积Controller + * + * @author dalin + * @date 2020-12-22 + */ +@Controller +@RequestMapping("/platform/companyarea") +public class CompanyAreaController extends BaseController +{ + private String prefix = "platform/companyarea"; + + @Autowired + private ICompanyAreaService companyAreaService; + + @RequiresPermissions("platform:companyarea:view") + @GetMapping() + public String companyarea() + { + return prefix + "/companyarea"; + } + + /** + * 查询营业面积列表 + */ + @RequiresPermissions("platform:companyarea:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(CompanyArea companyArea) + { + startPage(); + List list = companyAreaService.selectCompanyAreaList(companyArea); + return getDataTable(list); + } + + /** + * 导出营业面积列表 + */ + @RequiresPermissions("platform:companyarea:export") + @Log(title = "营业面积", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(CompanyArea companyArea) + { + List list = companyAreaService.selectCompanyAreaList(companyArea); + ExcelUtil util = new ExcelUtil(CompanyArea.class); + return util.exportExcel(list, "companyarea"); + } + + /** + * 校验营业面积名称 是否重复 + */ + @PostMapping("/checkcompanyAreaUnique") + @ResponseBody + public String checkcompanyAreaUnique(CompanyArea companyArea) + { + return companyAreaService.checkCompanyAreaUnique(companyArea); + } + + /** + * 新增营业面积 + */ + @GetMapping("/add") + public String add(ModelMap mmap) + { + // 取身份信息 + mmap.put("user", ShiroUtils.getSysUser() ); + + return prefix + "/add"; + } + + /** + * 新增保存营业面积 + */ + @RequiresPermissions("platform:companyarea:add") + @Log(title = "营业面积", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(CompanyArea companyArea) + { + // 控制名称重复! + if (BussiConstants.DOC_NAME_NOT_UNIQUE.equals(companyAreaService.checkCompanyAreaUnique(companyArea))) + { + return error("修改单据'" + companyArea.getCompanyAreaName() + "'失败，名称已存在"); + } + + // 取身份信息 + companyArea.setCreateBy( ShiroUtils.getLoginName() ); + companyArea.setCreateTime(DateUtils.getNowDate() ); + + return toAjax(companyAreaService.insertCompanyArea(companyArea)); + } + + /** + * 修改营业面积 + */ + @GetMapping("/edit/{companyAreaId}") + public String edit(@PathVariable("companyAreaId") Long companyAreaId, ModelMap mmap) + { + CompanyArea companyArea = companyAreaService.selectCompanyAreaById(companyAreaId); + mmap.put("companyArea", companyArea); + + // 取身份信息 + mmap.put("user", ShiroUtils.getSysUser() ); + + return prefix + "/edit"; + } + + /** + * 修改保存营业面积 + */ + @RequiresPermissions("platform:companyarea:edit") + @Log(title = "营业面积", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(CompanyArea companyArea) + { + // 控制名称重复! + if (BussiConstants.DOC_NAME_NOT_UNIQUE.equals(companyAreaService.checkCompanyAreaUnique(companyArea))) + { + return error("修改单据'" + companyArea.getCompanyAreaName() + "'失败，名称已存在"); + } + + companyArea.setUpdateBy( ShiroUtils.getLoginName() ); + companyArea.setUpdateTime( DateUtils.getNowDate() ); + return toAjax(companyAreaService.updateCompanyArea(companyArea)); + } + + /** + * 删除营业面积 + */ + @RequiresPermissions("platform:companyarea:remove") + @Log(title = "营业面积", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(companyAreaService.deleteCompanyAreaByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/resources/templates/platform/companyarea/add.html b/ruoyi-admin/src/main/resources/templates/platform/companyarea/add.html new file mode 100644 index 000000000..36e21cf32 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/platform/companyarea/add.html @@ -0,0 +1,124 @@ + + + + + + +
+
+ + + + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ +
+
+ + +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ + + +
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/platform/companyarea/companyarea.html b/ruoyi-admin/src/main/resources/templates/platform/companyarea/companyarea.html new file mode 100644 index 000000000..b2ac3f3fc --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/platform/companyarea/companyarea.html @@ -0,0 +1,120 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/platform/companyarea/edit.html b/ruoyi-admin/src/main/resources/templates/platform/companyarea/edit.html new file mode 100644 index 000000000..0c2ed26be --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/platform/companyarea/edit.html @@ -0,0 +1,136 @@ + + + + + + +
+
+ + + + + + +
+
+ +
+ +
+
+ + +
+ +
+ +
+
+
+ + +
+
+ +
+
+ + +
+
+
+ + +
+
+
+
+ +
+ +
+
+
+
+ + +
+
+ +
+ +
+
+ + +
+ +
+ +
+
+
+ + +
+
+ +
+ +
+
+ + +
+ +
+ +
+
+
+ +
+
+ + + + \ 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 27b0c66fc..23fcf0003 100644 --- a/ruoyi-admin/src/main/resources/templates/platform/econtype/econtype.html +++ b/ruoyi-admin/src/main/resources/templates/platform/econtype/econtype.html @@ -67,11 +67,6 @@ columns: [{ checkbox: true }, - { - field: 'econId', - title: '主键', - visible: false - }, { field: 'econName', title: '名称' @@ -95,10 +90,6 @@ field: 'createByuserName', title: '制单人' }, - { - field: 'createBy', - title: '制单人ID' - }, { field: 'createTime', title: '制单时间' @@ -107,10 +98,6 @@ field: 'updateByuserName', title: '修改人' }, - { - field: 'updateBy', - title: '修改人ID' - }, { field: 'updateTime', title: '修改时间' diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java index 9fffee8a1..b02ad2532 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java @@ -51,6 +51,8 @@ public class GenConstants /** 页面不需要编辑字段 */ public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "update_by", "update_time", "del_flag" }; + public static final String[] COLUMNNAME_QRYLIST = { "create_by", "create_time", "update_by", "update_time"}; + /** 页面不需要显示的列表字段 */ public static final String[] COLUMNNAME_NOT_LIST = { "id", "create_by", "create_time", "del_flag", "update_by", "update_time" }; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java index 51174f1ea..703f6bc2a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java @@ -1,8 +1,9 @@ package com.ruoyi.common.utils; +import com.ruoyi.common.core.text.StrFormatter; + import java.util.Collection; import java.util.Map; -import com.ruoyi.common.core.text.StrFormatter; /** * 字符串工具类 @@ -362,6 +363,16 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils return result.toString(); } + /** + * 首字母大写 + * 例如：user_name->userName + */ + public static String captureName(String name) { + char[] cs=name.toCharArray(); + cs[0]-=32; + return String.valueOf(cs); + } + /** * 驼峰式命名法 * 例如：user_name->userName 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 6b1aa40db..bd9d4716d 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 @@ -2,6 +2,7 @@ package com.ruoyi.generator.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.util.StringUtil; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.GenConstants; import com.ruoyi.common.core.text.CharsetKit; @@ -228,7 +229,6 @@ public class GenTableServiceImpl implements IGenTableService // 是否 存在制单人 setCreatUpdateByColumn(table); - VelocityInitializer.initVelocity(); List lstRelev = @@ -381,6 +381,7 @@ public class GenTableServiceImpl implements IGenTableService // 设置名称重复列信息 setRepeatDspColumn(table); // 取得制单人 + setCreatUpdateByColumn(table); VelocityInitializer.initVelocity(); @@ -508,7 +509,17 @@ public class GenTableServiceImpl implements IGenTableService { if (column.isRepeatControl()) { - table.setDspColumn(column); + GenTableColumn tempcolumn = null ; // new GenTableColumn() + try{ + tempcolumn = (GenTableColumn) column.clone(); + }catch (Exception e){ + + } + + tempcolumn.setRelevjavafiledname(com.ruoyi.common.utils.StringUtils.captureName( table.getPkColumn().getJavaField() )); + tempcolumn.setJavaField( com.ruoyi.common.utils.StringUtils.captureName( tempcolumn.getJavaField() ) ); // 首字母大写 + table.setDspColumn(tempcolumn); + break; } } 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 200687801..1fb990035 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 @@ -58,7 +58,15 @@ public class GenUtils // 若是 制单时间 和 修改时间 在界面上 用 文本框 if (arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk()) { - column.setJavaType(GenConstants.TYPE_STRING); + + if (arraysContains(GenConstants.COLUMNNAME_QRYLIST, columnName) && !column.isPk()) { + column.setIsEdit("1"); + column.setIsInsert("1"); + column.setIsQuery("0"); + column.setIsList("1"); + } + + column.setJavaType(GenConstants.TYPE_DATE); column.setHtmlType(GenConstants.HTML_INPUT); } else { column.setJavaType(GenConstants.TYPE_DATE); @@ -90,11 +98,20 @@ public class GenUtils // 制单人、修改人 关联《用户操作员》Id if (arraysContains(GenConstants.COLUMNNAME_RELEV_FIELDS, columnName) && !column.isPk()) { - column.setRelevTable("SysUser"); // sys_user + column.setIsList("1"); + column.setIsEdit("1"); + column.setIsInsert("1"); + column.setIsQuery("0"); + + column.setRelevEntity("SysUser"); // sys_user // column.setRelevTableId("login_name"); // column.setRelevTableName("user_name"); } + // 资料状态 + if (column.getColumnName().toLowerCase().equals("status")){ + column.setDictType("platf_doc_statu"); + } // 插入字段（默认所有字段都需要插入） column.setIsInsert(GenConstants.REQUIRE); @@ -132,6 +149,20 @@ public class GenUtils column.setIsRequired("0"); } + // 设置单据号 + if ( columnName.contains("doc_num") ){ + column.setIsQuery("0"); + column.setIsList("1"); + column.setIsRequired("0"); + } + + // 名称 + if ( columnName.contains("_name") ){ + column.setIsRepeatControl("1"); + column.setIsQuery("1"); + column.setIsList("1"); + column.setIsRequired("1"); + } // 查询字段类型 if (StringUtils.endsWithIgnoreCase(columnName, "name")) 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 4274596ff..7d51d9670 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 @@ -61,15 +61,9 @@ public class VelocityUtils { velocityContext.put("author", genTable.getFunctionAuthor()); velocityContext.put("datetime", DateUtils.getDate()); velocityContext.put("pkColumn", genTable.getPkColumn()); - velocityContext.put("dspRepeatColumn", genTable.getDspColumn()); velocityContext.put("importList", getImportList(genTable)); velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName)); - velocityContext.put("billPrefix", genTable.getBillPrefix()); // 单据前缀 - - // 制单人 - velocityContext.put("createByColumn",genTable.getCreateByColumn()); - // 取出页面需要的字段ing List tempcolumns = genTable.getColumns(); List effectivecols = new ArrayList();//定义一个list对象 @@ -154,7 +148,15 @@ public class VelocityUtils { velocityContext.put("mappercols", genTable.getColumns() ); // velocityContext.put("columns", fieldcols ); // genTable.getColumns() + //前缀 + velocityContext.put("billPrefix", genTable.getBillPrefix()); // 单据前缀 + // 名称 重复 + velocityContext.put("dspRepeatColumn", genTable.getDspColumn()); + // 制单人 + velocityContext.put("createByColumn",genTable.getCreateByColumn()); + velocityContext.put("table", genTable); + setMenuVelocityContext(velocityContext, genTable); if (GenConstants.TPL_TREE.equals(tplCategory)) { setTreeVelocityContext(velocityContext, genTable); diff --git a/ruoyi-generator/src/main/resources/templates/tool/gen/edit.html b/ruoyi-generator/src/main/resources/templates/tool/gen/edit.html index 350cd95c2..19a764b8a 100644 --- a/ruoyi-generator/src/main/resources/templates/tool/gen/edit.html +++ b/ruoyi-generator/src/main/resources/templates/tool/gen/edit.html @@ -3,9 +3,12 @@ + + +
@@ -100,9 +103,9 @@ - +
-
+
@@ -285,6 +288,7 @@ + + + + + + + + + + + + + + + + diff --git a/ruoyi-generator/src/main/resources/vm/html/col2/add.html.vm b/ruoyi-generator/src/main/resources/vm/html/col2/add.html.vm index 07aad4799..7ac3dc8be 100644 --- a/ruoyi-generator/src/main/resources/vm/html/col2/add.html.vm +++ b/ruoyi-generator/src/main/resources/vm/html/col2/add.html.vm @@ -133,7 +133,7 @@ #end #end