From 4d4b5cc5c6bb2a94f5fa4d603785c01130c80096 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 24 Jan 2022 11:54:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=20=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6,=E5=88=97=E8=A1=A8=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4,=E6=96=B0=E5=A2=9E=E8=A1=A8=E5=8D=95,=E8=AF=A6?= =?UTF-8?q?=E6=83=85,=E7=BC=96=E8=BE=91=E8=A1=A8=E5=8D=95=E5=8F=8A?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/common/constant/enums/TableEnum.java | 24 ++ .../jero/common/constant/enums/YesOrNo.java | 36 +++ .../common/constant/enums/moduleEnum.java | 35 +++ .../online/cgform/entity/OnlCgformField.java | 18 ++ .../cgform/mapper/OnlCgformFieldMapper.java | 2 + .../mapper/xml/OnlCgformFieldMapper.xml | 41 +-- .../impl/OnlCgformFieldServiceImpl.java | 14 + .../impl/OnlCgformHeadServiceImpl.java | 1 + .../BussDocumentLibraryEOController.java | 226 +++++++++++++++ .../entity/BussDocumentLibraryEO.java | 193 +++++++++++++ .../mapper/BussDocumentLibraryEOMapper.java | 17 ++ .../xml/BussDocumentLibraryEOMapper.xml | 37 +++ .../IBussDocumentLibraryEOService.java | 90 ++++++ .../BussDocumentLibraryEOServiceImpl.java | 232 +++++++++++++++ .../vue/BussDocumentLibraryEOList.vue | 240 ++++++++++++++++ .../vue/modules/BussDocumentLibraryEOForm.vue | 264 ++++++++++++++++++ .../modules/BussDocumentLibraryEOModal.vue | 60 ++++ ...ssDocumentLibraryEOModal__Style#Drawer.vue | 83 ++++++ .../impl/OnlCgformAreaServiceImpl.java | 5 +- 19 files changed, 1600 insertions(+), 18 deletions(-) create mode 100644 jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/TableEnum.java create mode 100644 jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/YesOrNo.java create mode 100644 jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/moduleEnum.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/BussDocumentLibraryEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/vue/BussDocumentLibraryEOList.vue create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/vue/modules/BussDocumentLibraryEOForm.vue create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/vue/modules/BussDocumentLibraryEOModal.vue create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/vue/modules/BussDocumentLibraryEOModal__Style#Drawer.vue diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/TableEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/TableEnum.java new file mode 100644 index 000000000..d533526f5 --- /dev/null +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/TableEnum.java @@ -0,0 +1,24 @@ +package com.jero.common.constant.enums; + +/** + * @description + * @date 2022/1/21 15:02 + * @auth zhn + */ +public enum TableEnum { + BUSS_DOCUMENT_LIBRARY("buss_document_library"); + + String table; + + private TableEnum(String table) { + this.table = table; + } + + public String getTable() { + return table; + } + + public void setTable(String table) { + this.table = table; + } +} diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/YesOrNo.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/YesOrNo.java new file mode 100644 index 000000000..7a34186e7 --- /dev/null +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/YesOrNo.java @@ -0,0 +1,36 @@ +package com.jero.common.constant.enums; + +/** + * @description + * @date 2022/1/21 15:22 + * @auth zhn + */ +public enum YesOrNo { + NO("否","0"), + YES("是","1"); + + + String name; + String value; + + private YesOrNo(String name,String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/moduleEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/moduleEnum.java new file mode 100644 index 000000000..7a0a3a6b7 --- /dev/null +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/moduleEnum.java @@ -0,0 +1,35 @@ +package com.jero.common.constant.enums; + +/** + * @description + * @date 2022/1/21 16:42 + * @auth zhn + */ +public enum moduleEnum { + DOCUMENT_LIBRARY("文档管理","1"); + + + String name; + String value; + + private moduleEnum(String name,String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformField.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformField.java index c8e5effc6..793130043 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformField.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformField.java @@ -18,6 +18,7 @@ public class OnlCgformField implements Serializable { private String id; private String cgformHeadId; private String dbFieldName; + private String dbFieldEnName;//db_field_en_name private String dbFieldTxt; private String dbFieldNameOld; private Integer dbIsKey; @@ -45,6 +46,7 @@ public class OnlCgformField implements Serializable { private String mainField; private Integer orderNum; private String updateBy; + private String showArea; @JsonFormat( timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss" @@ -73,6 +75,22 @@ public class OnlCgformField implements Serializable { private String queryMustInput; private String sortFlag; + public String getShowArea() { + return showArea; + } + + public void setShowArea(String showArea) { + this.showArea = showArea; + } + + public String getDbFieldEnName() { + return dbFieldEnName; + } + + public void setDbFieldEnName(String dbFieldEnName) { + this.dbFieldEnName = dbFieldEnName; + } + public OnlCgformField() { } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/OnlCgformFieldMapper.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/OnlCgformFieldMapper.java index 2655cb792..171a257eb 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/OnlCgformFieldMapper.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/OnlCgformFieldMapper.java @@ -42,4 +42,6 @@ public interface OnlCgformFieldMapper extends BaseMapper { /** @deprecated */ @Deprecated List queryDataListByLinkDown(@Param("query") LinkDown var1); + + List getFieldList(@Param("tableName") String tableName); } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml index 4d8b62535..3a3a39d74 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml @@ -11,32 +11,32 @@ - + ${sqlStr} - + ${sqlStr} - + - + - + ${sqlStr} - + - select t.perms from sys_permission t where menu_type = 2 and t.perms like #{online_tbname} - and (t.perms_type = '0' - or (t.perms_type = '1' + select t.perms from sys_permission t where menu_type = 2 and t.perms like #{online_tbname} + and (t.perms_type = '0' + or (t.perms_type = '1' and NOT EXISTS( - select * from sys_user a + select * from sys_user a join sys_user_role b on a.id = b.user_id join sys_role c on c.id = b.role_id join sys_role_permission d on d.role_id = c. id @@ -67,13 +67,13 @@ ) ) - + - \ No newline at end of file + + + diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java index 1169cf17e..d086b4ed5 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java @@ -14,6 +14,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import com.jero.common.constant.enums.TableEnum; +import com.jero.common.constant.enums.moduleEnum; import com.jero.common.system.util.JeroDataAutorUtils; import com.jero.generater.modules.online.auth.mapper.OnlAuthDataMapper; import com.jero.generater.modules.online.auth.service.IOnlAuthPageService; @@ -810,4 +812,16 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl getFieldList(String flag){ + List fieldList = new ArrayList<>(); + if(moduleEnum.DOCUMENT_LIBRARY.getValue().equals(flag)){ + fieldList = onlCgformFieldMapper.getFieldList(TableEnum.BUSS_DOCUMENT_LIBRARY.getTable()); + } + return fieldList; + } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java index 0a26b0567..df941ef20 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java @@ -110,6 +110,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl { + @Autowired + private IBussDocumentLibraryEOService bussDocumentLibraryEOService; + + /** + * 分页列表查询 + * + * @param bussDocumentLibraryEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "文档库信息表-分页列表查询") + @ApiOperation(value="文档库信息表-分页列表查询", notes="文档库信息表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(BussDocumentLibraryEO bussDocumentLibraryEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bussDocumentLibraryEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = bussDocumentLibraryEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "文档库信息表-列表查询") + @ApiOperation(value="文档库信息表-列表查询", notes="文档库信息表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = bussDocumentLibraryEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param bussDocumentLibraryEO + * @return + */ + @AutoLog(value = "文档库信息表-添加") + @ApiOperation(value="文档库信息表-添加", notes="文档库信息表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody BussDocumentLibraryEO bussDocumentLibraryEO) { + bussDocumentLibraryEOService.add(bussDocumentLibraryEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param bussDocumentLibraryEO + * @return + */ + @AutoLog(value = "文档库信息表-编辑") + @ApiOperation(value="文档库信息表-编辑", notes="文档库信息表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody BussDocumentLibraryEO bussDocumentLibraryEO) { + bussDocumentLibraryEOService.editById(bussDocumentLibraryEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "文档库信息表-通过id删除") + @ApiOperation(value="文档库信息表-通过id删除", notes="文档库信息表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + bussDocumentLibraryEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "文档库信息表-批量删除") + @ApiOperation(value="文档库信息表-批量删除", notes="文档库信息表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.bussDocumentLibraryEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "文档库信息表-通过id查询") + @ApiOperation(value="文档库信息表-通过id查询", notes="文档库信息表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(id); + if(bussDocumentLibraryEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bussDocumentLibraryEO); + } + + /** + * 导出excel + * + * @param request + * @param bussDocumentLibraryEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, BussDocumentLibraryEO bussDocumentLibraryEO) { + return super.exportXls(request, bussDocumentLibraryEO, BussDocumentLibraryEO.class, "文档库信息表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, BussDocumentLibraryEO.class); + } + + + /** + * 列表查询条件 + * + * @return + */ + @AutoLog(value = "文档库信息表-查询条件") + @ApiOperation(value="文档库信息表-查询条件", notes="文档库信息表-查询条件") + @GetMapping(value = "/queryCondition") + public Result>> queryCondition(@RequestParam(name="flag",required=true) String flag) { + List> list = bussDocumentLibraryEOService.queryCondition(flag); + return Result.OK(list); + } + /** + * 列表表头 + * + * @return + */ + @AutoLog(value = "文档库信息表-列表表头") + @ApiOperation(value="文档库信息表-列表表头", notes="文档库信息表-列表表头") + @GetMapping(value = "/getHeader") + public Result>> getHeader(@RequestParam(name="flag",required=true) String flag) { + List> list = bussDocumentLibraryEOService.getHeader(flag); + return Result.OK(list); + } + /** + * 新增表单 + * + * @return + */ + @AutoLog(value = "文档库信息表-新增表单") + @ApiOperation(value="文档库信息表-新增表单", notes="文档库信息表-新增表单") + @GetMapping(value = "/getAddForm") + public Result>> getAddForm(@RequestParam(name="flag",required=true) String flag) { + List> list = bussDocumentLibraryEOService.getAddForm(flag); + return Result.OK(list); + } + + /** + * 详情,编辑数据查询 + * @param id + * @param flag 标识-->用于区分字段查询(根据表名) + * @return + */ + @AutoLog(value = "详情,编辑数据查询") + @ApiOperation(value="详情,编辑数据查询", notes="详情,编辑数据查询") + @GetMapping(value = "/getDocumentInfoById") + public Result>> getDocumentInfoById(@RequestParam(name="id",required=true) String id, + @RequestParam(name="flag",required=true) String flag) { + List> list = bussDocumentLibraryEOService.getDocumentInfoById(id,flag); + return Result.OK(list); + } + + + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java new file mode 100644 index 000000000..90da831b8 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java @@ -0,0 +1,193 @@ +package com.jero.modules.document.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 文档库信息表 + * @Author: jero-boot + * @Date: 2022-01-21 + * @Version: V1.0 + */ +@Data +@TableName("buss_document_library") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="buss_document_library对象", description="文档库信息表") +public class BussDocumentLibraryEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**适用地区*/ + @Excel(name = "适用地区", width = 15) + @ApiModelProperty(value = "适用地区") + private java.lang.String region; + + /**类别*/ + @Excel(name = "类别", width = 15) + @ApiModelProperty(value = "类别") + private java.lang.String type; + + /**标准体系*/ + @Excel(name = "标准体系", width = 15) + @ApiModelProperty(value = "标准体系") + private java.lang.String standardSystem; + + /**状态*/ + @Excel(name = "状态", width = 15) + @ApiModelProperty(value = "状态") + private java.lang.String state; + + /**适用车型*/ + @Excel(name = "适用车型", width = 15) + @ApiModelProperty(value = "适用车型") + private java.lang.String carType; + + /**能源种类*/ + @Excel(name = "能源种类", width = 15) + @ApiModelProperty(value = "能源种类") + private java.lang.String energyType; + + /**适用范围*/ + @Excel(name = "适用范围", width = 15) + @ApiModelProperty(value = "适用范围") + private java.lang.String applyScope; + + /**功能领域*/ + @Excel(name = "功能领域", width = 15) + @ApiModelProperty(value = "功能领域") + private java.lang.String functionTerritory; + + /**技术领域*/ + @Excel(name = "技术领域", width = 15) + @ApiModelProperty(value = "技术领域") + private java.lang.String technologyTerritory; + + /**编号*/ + @Excel(name = "编号", width = 15) + @ApiModelProperty(value = "编号") + private java.lang.String serialNumber; + + /**标题*/ + @Excel(name = "标题", width = 15) + @ApiModelProperty(value = "标题") + private java.lang.String title; + + /**发布日期*/ + @Excel(name = "发布日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "发布日期") + private java.util.Date issueTime; + + /**标准实施日期*/ + @Excel(name = "标准实施日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "标准实施日期") + private java.util.Date implementTime; + + /**代替标准*/ + @Excel(name = "代替标准", width = 15) + @ApiModelProperty(value = "代替标准") + private java.lang.String replaceStandard; + + /**被代替标准*/ + @Excel(name = "被代替标准", width = 15) + @ApiModelProperty(value = "被代替标准") + private java.lang.String replacedStandard; + + /**描述*/ + @Excel(name = "描述", width = 15) + @ApiModelProperty(value = "描述") + private java.lang.String description; + + /**对应标准*/ + @Excel(name = "对应标准", width = 15) + @ApiModelProperty(value = "对应标准") + private java.lang.String correspondingStandard; + + /**测试程序*/ + @Excel(name = "测试程序", width = 15) + @ApiModelProperty(value = "测试程序") + private java.lang.String testProgram; + + /**发布稿(必读)*/ + @Excel(name = "发布稿(必读)", width = 15) + @ApiModelProperty(value = "发布稿(必读)") + private java.lang.String releaseDraft; + + /**增补件(必读)*/ + @Excel(name = "增补件(必读)", width = 15) + @ApiModelProperty(value = "增补件(必读)") + private java.lang.String supplement; + + /**报批稿*/ + @Excel(name = "报批稿", width = 15) + @ApiModelProperty(value = "报批稿") + private java.lang.String approvalDraft; + + /**征求意见稿*/ + @Excel(name = "征求意见稿", width = 15) + @ApiModelProperty(value = "征求意见稿") + private java.lang.String exposureDraft; + + /**相关资料*/ + @Excel(name = "相关资料", width = 15) + @ApiModelProperty(value = "相关资料") + private java.lang.String datum; + + /**预警标识*/ + @Excel(name = "预警标识", width = 15) + @ApiModelProperty(value = "预警标识") + private java.lang.String warnFlag; + + /**订阅标志*/ + @Excel(name = "订阅标志", width = 15) + @ApiModelProperty(value = "订阅标志") + private java.lang.String readFlag; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/BussDocumentLibraryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/BussDocumentLibraryEOMapper.java new file mode 100644 index 000000000..7225aaaf9 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/BussDocumentLibraryEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.document.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.document.entity.BussDocumentLibraryEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 文档库信息表 + * @Author: jero-boot + * @Date: 2022-01-21 + * @Version: V1.0 + */ +public interface BussDocumentLibraryEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml new file mode 100644 index 000000000..29b85813a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java new file mode 100644 index 000000000..e78fe132a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java @@ -0,0 +1,90 @@ +package com.jero.modules.document.service; + +import com.jero.modules.document.entity.BussDocumentLibraryEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; +import java.util.Map; + +/** + * @Description: 文档库信息表 + * @Author: jero-boot + * @Date: 2022-01-21 + * @Version: V1.0 + */ +public interface IBussDocumentLibraryEOService extends IService { + + /** + * 保存 + * + * @param bussDocumentLibraryEO + * @return + */ + void add(BussDocumentLibraryEO bussDocumentLibraryEO); + + /** + * 更新 + * + * @param bussDocumentLibraryEO + * @return + */ + void editById(BussDocumentLibraryEO bussDocumentLibraryEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + BussDocumentLibraryEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + /** + * 查询条件 + * + * @return + */ + List> queryCondition(String flag); + + /** + * 列表表头 + * + * @return + */ + List> getHeader(String flag); + + /** + * 新增表单 + * + * @return + */ + List> getAddForm(String flag); + + /** + * 详情,编辑数据查询 + * @param id + * @return + */ + List> getDocumentInfoById(String id,String flag); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java new file mode 100644 index 000000000..0a7ef7990 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -0,0 +1,232 @@ +package com.jero.modules.document.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.common.constant.enums.YesOrNo; +import com.jero.generater.modules.online.cgform.entity.OnlCgformField; +import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; +import com.jero.modules.document.entity.BussDocumentLibraryEO; +import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; +import com.jero.modules.document.service.IBussDocumentLibraryEOService; +import com.jero.modules.tag.entity.OnlCgformArea; +import com.jero.modules.tag.service.impl.OnlCgformAreaServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Date; +import java.util.Map; +import java.util.stream.Collectors; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 文档库信息表 + * @Author: jero-boot + * @Date: 2022-01-21 + * @Version: V1.0 + */ +@Service +public class BussDocumentLibraryEOServiceImpl extends ServiceImpl implements IBussDocumentLibraryEOService { + + @Autowired + private OnlCgformFieldServiceImpl onlCgformFieldService; + @Autowired + private OnlCgformAreaServiceImpl onlCgformAreaServiceImpl; + @Autowired + private BussDocumentLibraryEOMapper bussDocumentLibraryEOMapper; + + + /** + * 保存 + * + * @param bussDocumentLibraryEO + * @return + */ + @Override + public void add(BussDocumentLibraryEO bussDocumentLibraryEO) { + Date now = new Date(); + bussDocumentLibraryEO.setCreateTime(now); + bussDocumentLibraryEO.setUpdateTime(now); + save(bussDocumentLibraryEO); + } + + /** + * 更新 + * + * @param bussDocumentLibraryEO + * @return + */ + @Override + public void editById(BussDocumentLibraryEO bussDocumentLibraryEO) { + Date now = new Date(); + bussDocumentLibraryEO.setUpdateTime(now); + saveOrUpdate(bussDocumentLibraryEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public BussDocumentLibraryEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + /** + * 查询条件 + * @return + */ + @Override + public List> queryCondition(String flag) { + List fieldList = onlCgformFieldService.getFieldList(flag); + if(fieldList.size() != 0){ + //过滤出搜索条件() + fieldList = fieldList.stream().filter(e-> YesOrNo.YES.getValue().equals(String.valueOf(e.getIsQuery()))).collect(Collectors.toList()); + } + List> list = new ArrayList<>(); + for (OnlCgformField onlCgformField : fieldList) { + Map map = new HashMap<>(); + map.put("field_show_type",onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等) + map.put("dict_field",onlCgformField.getDictField()); + map.put("db_field_name",onlCgformField.getDbFieldName());//字段 + map.put("db_field_txt",onlCgformField.getDbFieldTxt());//字段中文名 + map.put("db_field_en_name",onlCgformField.getDbFieldEnName());//字段英文名 + list.add(map); + } + return list; + } + + /** + * 列表表头 + * @return + */ + @Override + public List> getHeader(String flag) { + List fieldList = onlCgformFieldService.getFieldList(flag); + if(fieldList.size() != 0){ + //过滤列表字段(is_show_list-->列表是否显示0否 1是) + fieldList = fieldList.stream().filter(e-> YesOrNo.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList()); + } + List> list = new ArrayList<>(); + for (OnlCgformField onlCgformField : fieldList) { + Map map = new HashMap<>(); + map.put("db_field_name",onlCgformField.getDbFieldName());//字段 + map.put("db_field_txt",onlCgformField.getDbFieldTxt());//字段中文名 + map.put("db_field_en_name",onlCgformField.getDbFieldEnName());//字段英文名 + list.add(map); + } + return list; + } + + /** + * 新增表单 + * @return + */ + @Override + public List> getAddForm(String flag) { + //区域管理 + List areaList = onlCgformAreaServiceImpl.queryList(); + //字段属性 + List fieldList = onlCgformFieldService.getFieldList(flag); + + if(fieldList.size() != 0){ + //过滤出表单字段(is_show_form-->表单是否显示0否 1是) + fieldList = fieldList.stream().filter(e-> YesOrNo.YES.getValue().equals(String.valueOf(e.getIsShowForm()))).collect(Collectors.toList()); + } + List> result = new ArrayList<>(); + for (OnlCgformArea onlCgformAreaTemp : areaList) { + fieldList = fieldList.stream().filter(e->onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList()); + for (OnlCgformField onlCgformField : fieldList) { + Map map = new HashMap<>(); + map.put("field_show_type",onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等) + map.put("dict_field",onlCgformField.getDictField()); + map.put("db_field_name",onlCgformField.getDbFieldName());//字段 + map.put("db_field_txt",onlCgformField.getDbFieldTxt());//字段中文名 + map.put("db_field_en_name",onlCgformField.getDbFieldEnName());//字段英文名 + map.put("area",onlCgformAreaTemp.getShowArea());//区域 + result.add(map); + } + } + return result; + } + + /** + * 详情,编辑数据查询 + * @param id + * @return + */ + @Override + public List> getDocumentInfoById(String id,String flag) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(BussDocumentLibraryEO::getId,id); + //通过id查询数据 + List> dateList = bussDocumentLibraryEOMapper.selectMaps(queryWrapper); + //区域管理 + List areaList = onlCgformAreaServiceImpl.queryList(); + //字段属性 + List fieldList = onlCgformFieldService.getFieldList(flag); + + if(fieldList.size() != 0){ + //过滤出表单字段(is_show_form-->表单是否显示0否 1是) + fieldList = fieldList.stream().filter(e-> YesOrNo.YES.getValue().equals(String.valueOf(e.getIsShowForm()))).collect(Collectors.toList()); + } + List> result = new ArrayList<>(); + for (OnlCgformArea onlCgformAreaTemp : areaList) { + fieldList = fieldList.stream().filter(e->onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList()); + for (OnlCgformField onlCgformField : fieldList) { + Map map = new HashMap<>(); + if(dateList.size() != 0){ + dateList.get(0).entrySet().forEach(entry->{ + if(onlCgformField.getDbFieldName().equals(entry.getKey())){ + map.put("value",entry.getValue()); + } + }); + } + map.put("field_show_type",onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等) + map.put("dict_field",onlCgformField.getDictField()); + map.put("db_field_name",onlCgformField.getDbFieldName());//字段 + map.put("db_field_txt",onlCgformField.getDbFieldTxt());//字段中文名 + map.put("db_field_en_name",onlCgformField.getDbFieldEnName());//字段英文名 + map.put("area",onlCgformAreaTemp.getShowArea());//区域 + result.add(map); + } + } + return result; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/vue/BussDocumentLibraryEOList.vue b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/vue/BussDocumentLibraryEOList.vue new file mode 100644 index 000000000..fdbb0b121 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/vue/BussDocumentLibraryEOList.vue @@ -0,0 +1,240 @@ + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/vue/modules/BussDocumentLibraryEOForm.vue b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/vue/modules/BussDocumentLibraryEOForm.vue new file mode 100644 index 000000000..ab0319a37 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/vue/modules/BussDocumentLibraryEOForm.vue @@ -0,0 +1,264 @@ + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/vue/modules/BussDocumentLibraryEOModal.vue b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/vue/modules/BussDocumentLibraryEOModal.vue new file mode 100644 index 000000000..d62f3d7b9 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/vue/modules/BussDocumentLibraryEOModal.vue @@ -0,0 +1,60 @@ + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/vue/modules/BussDocumentLibraryEOModal__Style#Drawer.vue b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/vue/modules/BussDocumentLibraryEOModal__Style#Drawer.vue new file mode 100644 index 000000000..1cbf7e5ad --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/vue/modules/BussDocumentLibraryEOModal__Style#Drawer.vue @@ -0,0 +1,83 @@ + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java index bcf696101..5669ef0ca 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.tag.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.mapper.OnlCgformAreaMapper; import com.jero.modules.tag.service.IOnlCgformAreaService; @@ -84,6 +85,8 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl queryList() { - return list(); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.orderByAsc(OnlCgformArea::getSort); + return list(lambdaQueryWrapper); } }