修改 dictionarydetail

src/main/java/com/xjrsoft/module/system/controller/DictionarydetailController.java

@@ -1,20 +1,22 @@
 package com.xjrsoft.module.system.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.model.result.R;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.system.dto.AddDictionaryDetailDto;
-import com.xjrsoft.module.system.dto.DictionaryDetailListDto;
-import com.xjrsoft.module.system.dto.DictionaryDetailPageDto;
-import com.xjrsoft.module.system.dto.UpdateDictionaryDetailDto;
+import com.xjrsoft.module.organization.dto.UserChangeStatusDto;
+import com.xjrsoft.module.organization.entity.User;
+import com.xjrsoft.module.system.dto.*;
 import com.xjrsoft.module.system.entity.DictionaryDetail;
 import com.xjrsoft.module.system.service.IDictionarydetailService;
 import com.xjrsoft.module.system.vo.DictionaryDetailListVo;
@@ -168,4 +170,15 @@ public class DictionarydetailController {
     public R delete(@RequestBody List<Long> ids) {
         return R.ok(dictionarydetailService.removeBatchByIds(ids));
     }
+
+    @PostMapping(value = "/change-status")
+    @ApiOperation(value="修改状态")
+    public RT<Boolean> changeStatus(@Valid @RequestBody DictionaryDetailChangeStatusDto dto) throws Exception {
+        DictionaryDetail  dictionaryDetail= dictionarydetailService.getById(dto.getId());
+        if(dictionaryDetail!=null){
+            dictionaryDetail.setEnabledMark(dto.getStatus());
+            dictionarydetailService.updateById(dictionaryDetail);
+        }
+        return RT.ok(true);
+    }
 }

src/main/java/com/xjrsoft/module/system/dto/AddDictionaryDetailDto.java

@@ -42,5 +42,20 @@ public class AddDictionaryDetailDto {
     @ApiModelProperty("备注")
     private String remark;
 
+    @ApiModelProperty("扩展1")
+    private String extendField1;
+
+    @ApiModelProperty("扩展2")
+    private String extendField2;
+
+    @ApiModelProperty("扩展3")
+    private String extendField3;
+
+    @ApiModelProperty("扩展4")
+    private String extendField4;
+
+    @ApiModelProperty("扩展5")
+    private String extendField5;
+
 
 }

src/main/java/com/xjrsoft/module/system/dto/DictionaryDetailChangeStatusDto.java

@@ -0,0 +1,13 @@
+package com.xjrsoft.module.system.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class DictionaryDetailChangeStatusDto {
+
+    @ApiModelProperty("字典明细")
+    private Long id;
+
+    @ApiModelProperty("启用状态(0:停用 1:启用)")
+    private Integer status;
+}

src/main/java/com/xjrsoft/module/system/dto/UpdateDictionaryDetailDto.java

@@ -42,4 +42,19 @@ public class UpdateDictionaryDetailDto {
     @ApiModelProperty("备注")
     private String remark;
 
+    @ApiModelProperty("扩展1")
+    private String extendField1;
+
+    @ApiModelProperty("扩展2")
+    private String extendField2;
+
+    @ApiModelProperty("扩展3")
+    private String extendField3;
+
+    @ApiModelProperty("扩展4")
+    private String extendField4;
+
+    @ApiModelProperty("扩展5")
+    private String extendField5;
+
 }

src/main/java/com/xjrsoft/module/system/entity/DictionaryDetail.java

@@ -48,4 +48,18 @@ public class DictionaryDetail extends AuditEntity implements Serializable {
     @ApiModelProperty("备注")
     private String remark;
 
+    @ApiModelProperty("扩展1")
+    private String extendField1;
+
+    @ApiModelProperty("扩展2")
+    private String extendField2;
+
+    @ApiModelProperty("扩展3")
+    private String extendField3;
+
+    @ApiModelProperty("扩展4")
+    private String extendField4;
+
+    @ApiModelProperty("扩展5")
+    private String extendField5;
 }

src/main/java/com/xjrsoft/module/system/vo/DictionaryDetailListVo.java

@@ -35,4 +35,19 @@ public class DictionaryDetailListVo {
 
     @ApiModelProperty("是否有效，0-无效，1-有效")
     private Integer enabledMark;
+
+    @ApiModelProperty("扩展1")
+    private String extendField1;
+
+    @ApiModelProperty("扩展2")
+    private String extendField2;
+
+    @ApiModelProperty("扩展3")
+    private String extendField3;
+
+    @ApiModelProperty("扩展4")
+    private String extendField4;
+
+    @ApiModelProperty("扩展5")
+    private String extendField5;
 }

src/main/java/com/xjrsoft/module/system/vo/DictionaryDetailPageVo.java

@@ -31,4 +31,19 @@ public class DictionaryDetailPageVo {
 
     @ApiModelProperty("备注")
     private String remark;
+
+    @ApiModelProperty("扩展1")
+    private String extendField1;
+
+    @ApiModelProperty("扩展2")
+    private String extendField2;
+
+    @ApiModelProperty("扩展3")
+    private String extendField3;
+
+    @ApiModelProperty("扩展4")
+    private String extendField4;
+
+    @ApiModelProperty("扩展5")
+    private String extendField5;
 }