修改代码生成演示

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
     /// </summary>
     [Verify]
     [Route("business/Gendemo")]
-    public class GendemoController : BaseController
+    public class GendemoController: BaseController
     {
         /// <summary>
         /// 代码生成演示接口
@@ -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,7 +72,7 @@ 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);
         }

ZR.Model/Dto/GendemoDto.cs

@@ -27,6 +27,10 @@ namespace ZR.Model.Dto
     /// </summary>
     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; }

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
     /// </summary>
     [SqlSugar.SugarTable("gen_demo")]
     [SqlSugar.Tenant("0")]
@@ -17,7 +18,7 @@ namespace ZR.Model.Models
         /// 描述 :自增id
         /// 空值 :False
         /// </summary>
-        [SqlSugar.SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        [SqlSugar.SugarColumn(IsPrimaryKey = false, IsIdentity = true)]
         public int Id { get; set; }
         /// <summary>
         /// 描述 :名称

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
     /// </summary>
     [AppService(ServiceLifetime = LifeTime.Transient)]
     public class GendemoRepository : BaseRepository<Gendemo>
     {
-        public GendemoRepository()
-        { 
-        }
-
         #region 业务逻辑代码
         #endregion
     }

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
     /// </summary>
     [AppService(ServiceType = typeof(IGendemoService), ServiceLifetime = LifeTime.Transient)]
     public class GendemoService : BaseService<Gendemo>, IGendemoService

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
     /// </summary>
     public interface IGendemoService: IBaseService<Gendemo>
     {

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
+  })
+}

ZR.Vue/src/views/business/gendemo/index.vue

@@ -2,6 +2,18 @@
   <div class="app-container">
     <!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
     <el-form :model="queryParams" label-position="left" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" @submit.native.prevent>
+      <el-form-item label="自增id" :label-width="labelWidth">
+        <el-input v-model.number="queryParams.id"/>
+      </el-form-item>
+      <el-form-item label="名称" :label-width="labelWidth">
+        <el-input v-model="queryParams.name"/>
+      </el-form-item>
+      <el-form-item label="显示状态" :label-width="labelWidth">
+        <el-input v-model.number="queryParams.showStatus"/>
+      </el-form-item>
+      <el-form-item label="时间">
+        <el-date-picker v-model="timeRange" size="small" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
 
       <el-row class="mb8" style="text-align:center">
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -55,9 +67,13 @@
     <!-- 添加或修改菜单对话框 -->
     <el-dialog :title="title" :lock-scroll="false" :visible.sync="open" >
       <el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
+        <el-row>
+    <el-col :span="12">
       <el-form-item label="名称" :label-width="labelWidth" prop="name">
         <el-input v-model="form.name" placeholder="请输入名称" />
       </el-form-item>
+    </el-col>
+    <el-col :span="24">
       <el-form-item label="图片" :label-width="labelWidth" prop="icon">
         <el-upload class="avatar-uploader" name="file" action="/api/upload/saveFile/" :show-file-list="false" :on-success="handleUploadIconSuccess" :before-upload="beforeFileUpload">
           <img v-if="form.icon" :src="form.icon" class="icon">
@@ -65,29 +81,43 @@
         </el-upload>
         <el-input v-model="form.icon" placeholder="请上传文件或手动输入文件地址"></el-input>
       </el-form-item>
+    </el-col>
+    <el-col :span="12">
       <el-form-item label="显示状态" :label-width="labelWidth" prop="showStatus">
         <el-select v-model="form.showStatus">
           <el-option v-for="item in showStatusOptions" :key="item.dictValue" :label="item.dictLabel" :value="parseInt(item.dictValue)"></el-option>
         </el-select>
       </el-form-item>
+    </el-col>
+    <el-col :span="12">
       <el-form-item label="用户性别" :label-width="labelWidth" prop="sex">
-        <el-select v-model="form.sex">
+        <el-radio-group v-model="form.sex">
-          <el-option v-for="item in sexOptions" :key="item.dictValue" :label="item.dictLabel" :value="parseInt(item.dictValue)"></el-option>
+          <el-radio v-for="item in sexOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{item.dictLabel}}</el-radio>
-        </el-select>
+        </el-radio-group>
       </el-form-item>
+    </el-col>
+    <el-col :span="12">
       <el-form-item label="排序" :label-width="labelWidth" prop="sort">
         <el-input-number v-model.number="form.sort" placeholder="请输入排序" />
       </el-form-item>
+    </el-col>
+      <el-col :span="12">
         <el-form-item label="开始时间" :label-width="labelWidth" prop="beginTime">
            <el-date-picker v-model="form.beginTime" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"  type="datetime"  placeholder="选择日期时间"> </el-date-picker>
          </el-form-item>
+     </el-col>
+      <el-col :span="12">
         <el-form-item label="结束时间" :label-width="labelWidth" prop="endTime">
            <el-date-picker v-model="form.endTime" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"  type="datetime"  placeholder="选择日期时间"> </el-date-picker>
          </el-form-item>
+     </el-col>
+    <el-col :span="24">
       <el-form-item label="备注" :label-width="labelWidth" prop="remark">
         <editor v-model="form.remark" :min-height="200" />
       </el-form-item>
+    </el-col>
 
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer" v-if="btnSubmitVisible">
         <el-button @click="cancel">取 消</el-button>
@@ -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();