From 4595a01b7849092765779e24746e5b6fae8b4e07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Sat, 27 Nov 2021 20:00:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=BC=94=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/business/GendemoController.cs | 50 ++++++++++-------- ZR.Model/Dto/GendemoDto.cs | 4 ++ ZR.Model/Models/Gendemo.cs | 5 +- .../Repositories/GendemoRepository.cs | 7 +-- ZR.Service/Business/GendemoService.cs | 3 +- .../Business/IBusService/IGendemoService.cs | 2 +- ZR.Vue/src/api/gendemo.js | 38 ++++++++------ ZR.Vue/src/views/business/gendemo/index.vue | 52 ++++++++++++++++--- 8 files changed, 106 insertions(+), 55 deletions(-) diff --git a/ZR.Admin.WebApi/Controllers/business/GendemoController.cs b/ZR.Admin.WebApi/Controllers/business/GendemoController.cs index 2201819..98b5993 100644 --- a/ZR.Admin.WebApi/Controllers/business/GendemoController.cs +++ b/ZR.Admin.WebApi/Controllers/business/GendemoController.cs @@ -15,6 +15,7 @@ using ZR.Admin.WebApi.Extensions; using ZR.Admin.WebApi.Filters; using ZR.Common; using Infrastructure.Extensions; +using System.Linq; namespace ZR.Admin.WebApi.Controllers { @@ -22,11 +23,11 @@ namespace ZR.Admin.WebApi.Controllers /// 代码生成演示Controller /// /// @author zr - /// @date 2021-11-24 + /// @date 2021-11-27 /// [Verify] [Route("business/Gendemo")] - public class GendemoController : BaseController + public class GendemoController: BaseController { /// /// 代码生成演示接口 @@ -51,6 +52,11 @@ namespace ZR.Admin.WebApi.Controllers //TODO 自己实现搜索条件查询语法参考Sqlsugar，默认查询所有 //predicate = predicate.And(m => m.Name.Contains(parm.Name)); + predicate = predicate.AndIF(parm.Id > 0, m => m.Id == parm.Id); + predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.Name), m => m.Name.Contains(parm.Name)); + predicate = predicate.AndIF(parm.ShowStatus > 0, m => m.ShowStatus != parm.ShowStatus); + predicate = predicate.AndIF(parm.BeginTime != null, it => it.AddTime >= parm.BeginTime); + predicate = predicate.AndIF(parm.EndTime != null, it => it.AddTime <= parm.EndTime); var response = _GendemoService.GetPages(predicate.ToExpression(), parm); @@ -66,8 +72,8 @@ namespace ZR.Admin.WebApi.Controllers [ActionPermissionFilter(Permission = "business:gendemo:query")] public IActionResult GetGendemo(int Id) { - var response = _GendemoService.GetId(Id); - + var response = _GendemoService.GetFirst(x => x.Id == Id); + return SUCCESS(response); } @@ -89,15 +95,15 @@ namespace ZR.Admin.WebApi.Controllers return SUCCESS(_GendemoService.Insert(model, it => new { - it.Name, - it.Icon, - it.ShowStatus, - it.AddTime, - it.Sex, - it.Sort, - it.BeginTime, - it.EndTime, - it.Remark, + it.Name, + it.Icon, + it.ShowStatus, + it.AddTime, + it.Sex, + it.Sort, + it.BeginTime, + it.EndTime, + it.Remark, })); } @@ -120,15 +126,15 @@ namespace ZR.Admin.WebApi.Controllers var response = _GendemoService.Update(w => w.Id == model.Id, it => new Gendemo() { //Update 字段映射 - Name = model.Name, - Icon = model.Icon, - ShowStatus = model.ShowStatus, - AddTime = model.AddTime, - Sex = model.Sex, - Sort = model.Sort, - BeginTime = model.BeginTime, - EndTime = model.EndTime, - Remark = model.Remark, + Name = model.Name, + Icon = model.Icon, + ShowStatus = model.ShowStatus, + AddTime = model.AddTime, + Sex = model.Sex, + Sort = model.Sort, + BeginTime = model.BeginTime, + EndTime = model.EndTime, + Remark = model.Remark, }); return SUCCESS(response); diff --git a/ZR.Model/Dto/GendemoDto.cs b/ZR.Model/Dto/GendemoDto.cs index 7f86d2a..ed61fb0 100644 --- a/ZR.Model/Dto/GendemoDto.cs +++ b/ZR.Model/Dto/GendemoDto.cs @@ -27,6 +27,10 @@ namespace ZR.Model.Dto /// public class GendemoQueryDto: PagerInfo { + public int Id { get; set; } + public string Name { get; set; } + public int ShowStatus { get; set; } + public DateTime AddTime { get; set; } public DateTime? BeginTime { get; set; } public DateTime? EndTime { get; set; } diff --git a/ZR.Model/Models/Gendemo.cs b/ZR.Model/Models/Gendemo.cs index ae0ae49..27c558b 100644 --- a/ZR.Model/Models/Gendemo.cs +++ b/ZR.Model/Models/Gendemo.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using SqlSugar; namespace ZR.Model.Models { @@ -7,7 +8,7 @@ namespace ZR.Model.Models /// 代码生成演示，数据实体对象 /// /// @author zr - /// @date 2021-11-24 + /// @date 2021-11-27 /// [SqlSugar.SugarTable("gen_demo")] [SqlSugar.Tenant("0")] @@ -17,7 +18,7 @@ namespace ZR.Model.Models /// 描述 :自增id /// 空值 :False /// - [SqlSugar.SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + [SqlSugar.SugarColumn(IsPrimaryKey = false, IsIdentity = true)] public int Id { get; set; } /// /// 描述 :名称 diff --git a/ZR.Repository/Repositories/GendemoRepository.cs b/ZR.Repository/Repositories/GendemoRepository.cs index ac6a610..ec4f341 100644 --- a/ZR.Repository/Repositories/GendemoRepository.cs +++ b/ZR.Repository/Repositories/GendemoRepository.cs @@ -2,7 +2,6 @@ using System; using Infrastructure.Attribute; using ZR.Repository.System; using ZR.Model.Models; -using SqlSugar; namespace ZR.Repository { @@ -10,15 +9,11 @@ namespace ZR.Repository /// 代码生成演示仓储接口的实现 /// /// @author zr - /// @date 2021-11-24 + /// @date 2021-11-27 /// [AppService(ServiceLifetime = LifeTime.Transient)] public class GendemoRepository : BaseRepository { - public GendemoRepository() - { - } - #region 业务逻辑代码 #endregion } diff --git a/ZR.Service/Business/GendemoService.cs b/ZR.Service/Business/GendemoService.cs index d5a1af0..eebec8a 100644 --- a/ZR.Service/Business/GendemoService.cs +++ b/ZR.Service/Business/GendemoService.cs @@ -1,6 +1,5 @@ using Infrastructure; using Infrastructure.Attribute; -using SqlSugar; using ZR.Model.Models; using ZR.Repository; @@ -10,7 +9,7 @@ namespace ZR.Service.Business /// 代码生成演示Service业务层处理 /// /// @author zr - /// @date 2021-11-24 + /// @date 2021-11-27 /// [AppService(ServiceType = typeof(IGendemoService), ServiceLifetime = LifeTime.Transient)] public class GendemoService : BaseService, IGendemoService diff --git a/ZR.Service/Business/IBusService/IGendemoService.cs b/ZR.Service/Business/IBusService/IGendemoService.cs index 2274ec3..7e3ec35 100644 --- a/ZR.Service/Business/IBusService/IGendemoService.cs +++ b/ZR.Service/Business/IBusService/IGendemoService.cs @@ -7,7 +7,7 @@ namespace ZR.Service.Business /// 代码生成演示service接口 /// /// @author zr - /// @date 2021-11-24 + /// @date 2021-11-27 /// public interface IGendemoService: IBaseService { diff --git a/ZR.Vue/src/api/gendemo.js b/ZR.Vue/src/api/gendemo.js index 394e903..2f20714 100644 --- a/ZR.Vue/src/api/gendemo.js +++ b/ZR.Vue/src/api/gendemo.js @@ -1,9 +1,9 @@ import request from '@/utils/request' /** - * 代码生成演示分页查询 - * @param {查询条件} data - */ +* 代码生成演示分页查询 +* @param {查询条件} data +*/ export function listGendemo(query) { return request({ url: 'business/Gendemo/list', @@ -13,9 +13,9 @@ export function listGendemo(query) { } /** - * 新增代码生成演示 - * @param data - */ +* 新增代码生成演示 +* @param data +*/ export function addGendemo(data) { return request({ url: 'business/Gendemo', @@ -25,9 +25,9 @@ export function addGendemo(data) { } /** - * 修改代码生成演示 - * @param data - */ +* 修改代码生成演示 +* @param data +*/ export function updateGendemo(data) { return request({ url: 'business/Gendemo', @@ -37,9 +37,9 @@ export function updateGendemo(data) { } /** - * 获取代码生成演示详情 - * @param {Id} 代码生成演示Id - */ +* 获取代码生成演示详情 +* @param {Id} 代码生成演示Id +*/ export function getGendemo(id) { return request({ url: 'business/Gendemo/' + id, @@ -48,12 +48,20 @@ export function getGendemo(id) { } /** - * 删除 - * @param {主键} pid - */ +* 删除 +* @param {主键} pid +*/ export function delGendemo(pid) { return request({ url: 'business/Gendemo/' + pid, method: 'delete' }) } +// 导出 +export function exportGendemo(query) { + return request({ + url: 'business/Gendemo/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/ZR.Vue/src/views/business/gendemo/index.vue b/ZR.Vue/src/views/business/gendemo/index.vue index a1bf969..4fc82c3 100644 --- a/ZR.Vue/src/views/business/gendemo/index.vue +++ b/ZR.Vue/src/views/business/gendemo/index.vue @@ -2,6 +2,18 @@
+ + + + + + + + + + + + 搜索 @@ -55,9 +67,13 @@ + + + + @@ -65,29 +81,43 @@ + + + + - - - + + {{item.dictLabel}} + + + + + + + + + - + + +
取 消 @@ -110,7 +140,7 @@ import Editor from '@/components/Editor'; export default { - name: 'Gendemo', + name: "Gendemo", components: { Editor }, data() { return { @@ -214,7 +244,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map((item) => item.id); - this.single = selection.length!=1 + this.single = selection.length !=1 this.multiple = !selection.length; }, /** 搜索按钮操作 */ @@ -268,14 +298,22 @@ export default { if (valid) { console.log(JSON.stringify(this.form)); - if (this.form.id != undefined || this.title === '修改数据') { + if (this.form.id != undefined || this.title === "修改数据") { updateGendemo(this.form).then((res) => { + if (!res.data) { + this.msgError("修改失败"); + return; + } this.msgSuccess("修改成功"); this.open = false; this.getList(); }); } else { addGendemo(this.form).then((res) => { + if (!res.data) { + this.msgError("新增失败"); + return; + } this.msgSuccess("新增成功"); this.open = false; this.getList();