更新

admin-ui/src/views/system/dict/data.vue

@@ -2,15 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="字典名称" prop="dictType">
-        <el-select v-model="queryParams.dictType"><el-option v-for="item in typeOptions" :key="item.dictId" :label="item.dictName" :value="item.dictType" /></el-select>
-      </el-form-item>
-      <el-form-item label="字典标签" prop="dictLabel">
-        <el-input v-model="queryParams.dictLabel" placeholder="请输入字典标签" clearable @keyup.enter.native="handleQuery" class="se"/>
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="数据状态" clearable>
-          <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
-        </el-select>
+        <el-select v-model="queryParams.dictType"><el-option v-for="item in typeOptions" :key="item.dictId" :label="item.dictName" :value="item.dictType"/></el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -21,13 +13,11 @@
       <el-col :span="1.5"><el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['system:dict:add']">新增</el-button></el-col>
       <el-col :span="1.5"><el-button type="success" icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['system:dict:edit']">修改</el-button></el-col>
       <el-col :span="1.5"><el-button type="danger" icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:dict:remove']">删除</el-button></el-col>
-      <el-col :span="1.5"><el-button type="warning" plain icon="el-icon-download" @click="handleExport" v-hasPermi="['system:dict:export']">导出</el-button></el-col>
-      <el-col :span="1.5"><el-button type="warning" plain icon="el-icon-close" @click="handleClose">关闭</el-button></el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-table border :data="dataList" @selection-change="handleSelectionChange" height="calc(100vh - 273px)">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="字典编码" align="center" prop="dictCode" />
+      <el-table-column type="index" label="序号" align="center" width="80" />
       <el-table-column label="字典标签" align="center" prop="dictLabel">
         <template slot-scope="scope">
           <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{ scope.row.dictLabel }}</span>
@@ -36,18 +26,12 @@
       </el-table-column>
       <el-table-column label="字典键值" align="center" prop="dictValue" />
       <el-table-column label="字典排序" align="center" prop="dictSort" />
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" >
+      <el-table-column label="操作" align="center">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']">删除</el-button>
@@ -64,19 +48,7 @@
         <el-form-item label="字典类型"><el-input v-model="form.dictType" :disabled="true" /></el-form-item>
         <el-form-item label="数据标签" prop="dictLabel"><el-input v-model="form.dictLabel" placeholder="请输入数据标签" /></el-form-item>
         <el-form-item label="数据键值" prop="dictValue"><el-input v-model="form.dictValue" placeholder="请输入数据键值" /></el-form-item>
-        <el-form-item label="样式属性" prop="cssClass"><el-input v-model="form.cssClass" placeholder="请输入样式属性" /></el-form-item>
         <el-form-item label="显示排序" prop="dictSort"><el-input-number v-model="form.dictSort" controls-position="right" :min="0" /></el-form-item>
-        <el-form-item label="回显样式" prop="listClass">
-          <el-select v-model="form.listClass">
-            <el-option v-for="item in listClassOptions" :key="item.value" :label="item.label + '(' + item.value + ')'" :value="item.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark"><el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input></el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -168,7 +140,7 @@ export default {
   methods: {
     /** 查询字典类型详细 */
     getType(dictId) {
-      getType(dictId).then(response => {
+      getType(dictId).then((response) => {
         this.queryParams.dictType = response.data.dictType;
         this.defaultDictType = response.data.dictType;
         this.getList();
@@ -176,13 +148,13 @@ export default {
     },
     /** 查询字典类型列表 */
     getTypeList() {
-      getDictOptionselect().then(response => {
+      getDictOptionselect().then((response) => {
         this.typeOptions = response.data;
       });
     },
     /** 查询字典数据列表 */
     getList() {
-      listData(this.queryParams).then(response => {
+      listData(this.queryParams).then((response) => {
         this.dataList = response.rows;
         this.total = response.total;
       });
@@ -231,7 +203,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dictCode);
+      this.ids = selection.map((item) => item.dictCode);
       this.single = selection.length != 1;
       this.multiple = !selection.length;
     },
@@ -241,23 +213,23 @@ export default {
       this.open = true;
       this.title = '修改字典数据';
       const dictCode = row.dictCode || this.ids;
-      getData(dictCode).then(response => {
+      getData(dictCode).then((response) => {
         this.form = response.data;
       });
     },
     /** 提交按钮 */
-    submitForm: function() {
-      this.$refs['form'].validate(valid => {
+    submitForm: function () {
+      this.$refs['form'].validate((valid) => {
         if (valid) {
           if (this.form.dictCode != undefined) {
-            updateData(this.form).then(response => {
+            updateData(this.form).then((response) => {
               this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
               this.$modal.msgSuccess('修改成功');
               this.open = false;
               this.getList();
             });
           } else {
-            addData(this.form).then(response => {
+            addData(this.form).then((response) => {
               this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
               this.$modal.msgSuccess('新增成功');
               this.open = false;
@@ -272,7 +244,7 @@ export default {
       const dictCodes = row.dictCode || this.ids;
       this.$modal
         .confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？')
-        .then(function() {
+        .then(function () {
           return delData(dictCodes);
         })
         .then(() => {

admin-ui/src/views/system/dict/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="字典名称" prop="dictName">
-        <el-input v-model="queryParams.dictName" placeholder="请输入字典名称" clearable @keyup.enter.native="handleQuery" class="se"/>
+        <el-input v-model="queryParams.dictName" placeholder="请输入字典名称" clearable @keyup.enter.native="handleQuery" class="se" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="字典状态" clearable>
@@ -21,13 +21,12 @@
       <el-col :span="1.5"><el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['system:dict:add']">新增</el-button></el-col>
       <el-col :span="1.5"><el-button type="success" icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['system:dict:edit']">修改</el-button></el-col>
       <el-col :span="1.5"><el-button type="danger" icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:dict:remove']">删除</el-button></el-col>
-      <el-col :span="1.5"><el-button type="warning" icon="el-icon-download" @click="handleExport" v-hasPermi="['system:dict:export']">导出</el-button></el-col>
       <el-col :span="1.5"><el-button type="danger" icon="el-icon-refresh" @click="handleRefreshCache" v-hasPermi="['system:dict:remove']">刷新缓存</el-button></el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-table border :data="typeList" @selection-change="handleSelectionChange" height="calc(100vh - 273px)">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="字典编号" align="center" prop="dictId" />
+      <el-table-column type="index" label="序号" align="center" width="80" />
       <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
       <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
@@ -47,8 +46,13 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" >
+      <el-table-column label="操作" align="center">
         <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-view" v-hasPermi="['system:dict:edit']">
+            <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
+              <span>数据管理</span>
+            </router-link>
+          </el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']">删除</el-button>
         </template>
@@ -130,7 +134,7 @@ export default {
   methods: {
     /** 查询字典类型列表 */
     getList() {
-      listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listType(this.addDateRange(this.queryParams, this.dateRange)).then((response) => {
         this.typeList = response.rows;
         this.total = response.total;
       });
@@ -170,7 +174,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dictId);
+      this.ids = selection.map((item) => item.dictId);
       this.single = selection.length != 1;
       this.multiple = !selection.length;
     },
@@ -180,22 +184,22 @@ export default {
       this.open = true;
       this.title = '修改字典类型';
       const dictId = row.dictId || this.ids;
-      getType(dictId).then(response => {
+      getType(dictId).then((response) => {
         this.form = response.data;
       });
     },
     /** 提交按钮 */
-    submitForm: function() {
-      this.$refs['form'].validate(valid => {
+    submitForm: function () {
+      this.$refs['form'].validate((valid) => {
         if (valid) {
           if (this.form.dictId != undefined) {
-            updateType(this.form).then(response => {
+            updateType(this.form).then((response) => {
               this.$modal.msgSuccess('修改成功');
               this.open = false;
               this.getList();
             });
           } else {
-            addType(this.form).then(response => {
+            addType(this.form).then((response) => {
               this.$modal.msgSuccess('新增成功');
               this.open = false;
               this.getList();
@@ -209,7 +213,7 @@ export default {
       const dictIds = row.dictId || this.ids;
       this.$modal
         .confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？')
-        .then(function() {
+        .then(function () {
           return delType(dictIds);
         })
         .then(() => {

admin-ui/src/views/work/statement/edit.vue

@@ -1,18 +1,6 @@
 <template>
   <div class="cmain">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="关联企业" prop="companyId">
-          <el-input v-model="form.companyId" placeholder="请输入关联企业" clearable/>
-        </el-form-item>
-        <el-form-item label="关联用户" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入关联用户" clearable/>
-        </el-form-item>
-        <el-form-item label="上传文档名称" prop="fileName">
-          <el-input v-model="form.fileName" placeholder="请输入上传文档名称" clearable/>
-        </el-form-item>
-        <el-form-item label="文档路径" prop="filePath">
-          <el-input v-model="form.filePath" placeholder="请输入文档路径" clearable/>
-        </el-form-item>
         <el-form-item label="结算批次" prop="batchName">
           <el-input v-model="form.batchName" placeholder="请输入结算批次" clearable/>
         </el-form-item>
@@ -22,15 +10,6 @@
         <el-form-item label="支付渠道" prop="channel">
           <el-input v-model="form.channel" placeholder="请输入支付渠道" clearable/>
         </el-form-item>
-        <el-form-item label="结算单号" prop="num">
-          <el-input v-model="form.num" placeholder="请输入结算单号" clearable/>
-        </el-form-item>
-        <el-form-item label="发放金额" prop="money">
-          <el-input v-model="form.money" placeholder="请输入发放金额" clearable/>
-        </el-form-item>
-        <el-form-item label="发放人数" prop="peoples">
-          <el-input v-model="form.peoples" placeholder="请输入发放人数" clearable/>
-        </el-form-item>
         <el-form-item label="关联项目" prop="projectId">
           <el-input v-model="form.projectId" placeholder="请输入关联项目" clearable/>
         </el-form-item>

admin-ui/src/views/work/statement/make.vue

@@ -18,20 +18,14 @@
     <el-table :data="response.rows" border @selection-change="selects" height="calc(100vh - 270px)">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="关联企业" align="center" prop="companyId" />
-      <el-table-column label="关联用户" align="center" prop="userId" />
       <el-table-column label="上传文档名称" align="center" prop="fileName" />
       <el-table-column label="文档路径" align="center" prop="filePath" />
       <el-table-column label="结算批次" align="center" prop="batchName" />
-      <el-table-column label="发票类型" align="center" prop="invoice" />
-      <el-table-column label="支付渠道" align="center" prop="channel" />
-      <el-table-column label="结算单号" align="center" prop="num" />
       <el-table-column label="发放金额" align="center" prop="money" />
       <el-table-column label="发放人数" align="center" prop="peoples" />
       <el-table-column label="关联项目" align="center" prop="projectId" />
       <el-table-column label="制单状态" align="center" prop="state" />
       <el-table-column label="发放状态" align="center" prop="give" />
-      <el-table-column label="服务公司" align="center" prop="serviceCompany" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="op('edit', scope.row)" v-hasPermi="['work:statement:edit']">修改</el-button>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java

@@ -1,19 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
@@ -23,6 +9,13 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDictTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 数据字典信息
@@ -71,6 +64,7 @@ public class SysDictTypeController extends BaseController {
         if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
             return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
         }
+        dict.setType(1);
         dict.setCreateBy(getUsername());
         return toAjax(dictTypeService.insertDictType(dict));
     }

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/StatementDetail.java

@@ -27,6 +27,9 @@ public class StatementDetail {
     @ApiModelProperty(value = "关联结算单")
     private Long statementId;
 
+    @ApiModelProperty(value = "关联项目")
+    private Long projectId;
+
     @Excel(name = "姓名")
     private String name;
 

ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/StatementDetailMapper.java

@@ -1,8 +1,10 @@
 package com.ruoyi.web.work.mapper;
 
-import java.util.List;
-import com.ruoyi.web.work.domain.StatementDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.work.domain.StatementDetail;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * @author lsw
@@ -10,4 +12,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface StatementDetailMapper extends BaseMapper<StatementDetail> {
     List<StatementDetail> selectList(StatementDetail statementDetail);
+
+
+    @Select("SELECT * FROM tb_statement_detail WHERE id_card=#{idCard} AND project_id=#{projectId}")
+    StatementDetail check(StatementDetail statementDetail);
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/StatementServiceImpl.java

@@ -1,17 +1,17 @@
 package com.ruoyi.web.work.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.bean.BeanValidators;
 import com.ruoyi.web.work.domain.Statement;
 import com.ruoyi.web.work.domain.StatementDetail;
+import com.ruoyi.web.work.mapper.StatementDetailMapper;
 import com.ruoyi.web.work.mapper.StatementMapper;
+import com.ruoyi.web.work.service.IStatementDetailService;
 import com.ruoyi.web.work.service.IStatementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -24,56 +24,39 @@ public class StatementServiceImpl extends ServiceImpl<StatementMapper, Statement
     @Autowired
     private StatementMapper statementMapper;
 
+    @Autowired
+    private StatementDetailMapper statementDetailMapper;
+
+    @Autowired
+    private IStatementDetailService detailService;
+
     @Override
     public List<Statement> selectList(Statement statement) {
         return statementMapper.selectList(statement);
     }
 
+    @Transactional
     @Override
     public String importData(List<StatementDetail> list, Statement statement) {
         if (StringUtils.isNull(list) || list.size() == 0) {
-            throw new ServiceException("导入数据不能为空！");
+            throw new ServiceException("上传结算单数据不能为空！");
         }
         int successNum = 0;
-        int failureNum = 0;
-        StringBuilder successMsg = new StringBuilder();
-        StringBuilder failureMsg = new StringBuilder();
+        if (!save(statement)) {
+            throw new ServiceException("创建结算单失败,请联系平台");
+        }
         for (StatementDetail detail : list) {
-            try {
-                // 验证是否存在这个用户
-                SysUser u = userMapper.selectUserByUserName(user.getUserName());
-                if (StringUtils.isNull(u)) {
-                    BeanValidators.validateWithException(validator, user);
-                    user.setPassword(SecurityUtils.encryptPassword(password));
-                    user.setCreateBy(operName);
-                    this.insertUser(user);
-                    successNum++;
-                    successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
-                } else if (isUpdateSupport) {
-                    BeanValidators.validateWithException(validator, user);
-                    checkUserAllowed(user);
-                    checkUserDataScope(user.getUserId());
-                    user.setUpdateBy(operName);
-                    this.updateUser(user);
-                    successNum++;
-                    successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
-                } else {
-                    failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
-                }
-            } catch (Exception e) {
-                failureNum++;
-                String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败：";
-                failureMsg.append(msg + e.getMessage());
-                log.error(msg, e);
+            detail.setStatementId(statement.getId());
+            detail.setProjectId(statement.getProjectId());
+            StatementDetail check = statementDetailMapper.check(detail);
+            if (check != null) {
+                throw new ServiceException("导入失败,身份证为：" + detail.getIdCard() + " 的数据已存在");
             }
+            if (!detailService.save(detail)) {
+                throw new ServiceException("导入失败,请联系平台");
+            }
+            successNum++;
         }
-        if (failureNum > 0) {
-            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
-            throw new ServiceException(failureMsg.toString());
-        } else {
-            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
-        }
-        return successMsg.toString();
+        return "创建成功！本次导入" + successNum + " 条数据";
     }
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java

@@ -1,14 +1,14 @@
 package com.ruoyi.common.core.domain.entity;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
 
 /**
  * 字典类型表 sys_dict_type
@@ -24,6 +24,8 @@ public class SysDictType extends BaseEntity {
     @Excel(name = "字典主键", cellType = ColumnType.NUMERIC)
     private Long dictId;
 
+    private Integer type;
+
     /**
      * 字典名称
      */
@@ -42,6 +44,14 @@ public class SysDictType extends BaseEntity {
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
     public Long getDictId() {
         return dictId;
     }

ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="dictName"   column="dict_name"   />
 		<result property="dictType"   column="dict_type"   />
 		<result property="status"     column="status"      />
+		<result property="type"       column="type"      />
 		<result property="createBy"   column="create_by"   />
 		<result property="createTime" column="create_time" />
 		<result property="updateBy"   column="update_by"   />
@@ -23,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectDictTypeList" parameterType="SysDictType" resultMap="SysDictTypeResult">
 	    <include refid="selectDictTypeVo"/>
 		<where>
+			AND type =1
 		    <if test="dictName != null and dictName != ''">
 				AND dict_name like concat('%', #{dictName}, '%')
 			</if>
@@ -43,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectDictTypeAll" resultMap="SysDictTypeResult">
 		<include refid="selectDictTypeVo"/>
+		WHERE type =1
 	</select>
 	
 	<select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult">
@@ -91,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null">status,</if>
  			<if test="remark != null and remark != ''">remark,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
+		    <if test="type != null">type,</if>
  			create_time
  		)values(
  			<if test="dictName != null and dictName != ''">#{dictName},</if>
@@ -98,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null">#{status},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
+		    <if test="type != null">#{type},</if>
  			sysdate()
  		)
 	</insert>