Merge remote-tracking branch 'origin/master'

ant-design-vue-jeecg/src/views/modulex/ModulexList.vue

@@ -176,11 +176,12 @@ export default {
         //   align: "center",
         //   dataIndex: 'pmDescribe'
         // },
-        // {
+        {
-        //   title:'责任人',
+          title:'责任人',
-        //   align:"center",
+          align:"center",
           // dataIndex: 'managerUsers'
-        // },
+          dataIndex: 'managerUsers_dictText'
+        },
         {
           title: '任务等级',
           align: "center",

ant-design-vue-jeecg/src/views/projectx/ProjectxList.vue

@@ -7,7 +7,7 @@
           <a-col :md="6" :sm="12">
             <a-form-item label="项目名称">
               <!--<a-input placeholder="请输入账号查询" v-model="queryParam.username"></a-input>-->
-              <j-input placeholder="输入账号模糊查询" v-model="queryParam.projectName"></j-input>
+              <j-input placeholder="" v-model="queryParam.projectName"></j-input>
             </a-form-item>
           </a-col>
 

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/controller/ModulexController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.modulex.controller;
 
 
+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.extension.plugins.pagination.Page;
@@ -12,14 +13,18 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.modulex.entity.Modulex;
+import org.jeecg.modules.modulex.mapper.ModulexMapper;
 import org.jeecg.modules.modulex.service.IModulexService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 模块管理
@@ -34,6 +39,8 @@ import java.util.Arrays;
 public class ModulexController extends JeecgController<Modulex, IModulexService> {
     @Autowired
     private IModulexService modulexService;
+    @Resource
+    private ModulexMapper modulexMapper;
 
     /**
      * 分页列表查询
@@ -54,6 +61,27 @@ public class ModulexController extends JeecgController<Modulex, IModulexService>
         QueryWrapper<Modulex> queryWrapper = QueryGenerator.initQueryWrapper(modulex, req.getParameterMap());
         Page<Modulex> page = new Page<Modulex>(pageNo, pageSize);
         IPage<Modulex> pageList = modulexService.page(page, queryWrapper);
+        List<Modulex> modulexList = pageList.getRecords();
+        for (Modulex modu :modulexList) {
+            if (!StringUtils.hasText(modu.getManagerUsers())){
+                break;
+            }else {
+                String[] split = modu.getManagerUsers().split(",");
+                List<String> stringList = Arrays.asList(split);
+                List<String> strings = new ArrayList<>();
+                stringList.forEach(manager -> {
+                    String realName = modulexMapper.getRealName(manager);
+                    if (StringUtils.hasText(realName)) {
+                        strings.add(realName);
+                    } else {
+                        strings.add(manager);
+                    }
+                });
+                String toString = strings.toString();
+                String substring = toString.substring(1, toString.length() - 1);
+                modu.setManagerUsers_dictText(substring);
+            }
+        }
         return Result.OK(pageList);
     }
 
@@ -61,18 +89,22 @@ public class ModulexController extends JeecgController<Modulex, IModulexService>
     public Result<?> fabu(@RequestParam(name = "id") String id) {
         return modulexService.fabu(id);
     }
+
     @GetMapping(value = "/kaishi")
     public Result<?> kaishi(@RequestParam(name = "id") String id) {
         return modulexService.kaishi(id);
     }
+
     @GetMapping(value = "/tijiao")
     public Result<?> tijiao(@RequestParam(name = "id") String id) {
         return modulexService.tijiao(id);
     }
+
     @GetMapping(value = "/cehui")
     public Result<?> cehui(@RequestParam(name = "id") String id) {
-		 return modulexService.cehui(id);
+        return modulexService.chehui(id);
     }
+
     @GetMapping(value = "/shenhe")
     public Result<?> shenhe(@RequestParam(name = "id") String id) {
         return modulexService.shenhe(id);
@@ -80,15 +112,25 @@ public class ModulexController extends JeecgController<Modulex, IModulexService>
 
     /**
      * 添加
-	 *
+     * moduleName 中文名称
-	 * @param modulex
+     * 相同上级的模块不能重名
-	 * @return
      */
     @AutoLog(value = "模块管理-添加")
     @ApiOperation(value = "模块管理-添加", notes = "模块管理-添加")
     @PostMapping(value = "/add")
     public Result<?> add(@RequestBody Modulex modulex) {
         //版本号 顺序累加；初始值1
+        if (StringUtils.hasText(modulex.getPid())) {
+            List<String> collect = modulexService.list(
+                    new LambdaQueryWrapper<Modulex>()
+                            .eq(StringUtils.hasText(modulex.getPid()), Modulex::getPid, modulex.getPid()))
+                    .stream().map(Modulex::getModuleName).collect(Collectors.toList());
+            collect.add(modulex.getModuleName());
+            HashSet<String> setList = new HashSet<>(collect);
+            if (collect.size() != setList.size()){
+                return Result.error("相同上级的模块不能重名");
+            }
+        }
         Integer newVersion = modulexService.getMaxVersion(modulex.getVerison());
         modulex.setVerison(newVersion + 1);
         modulexService.save(modulex);

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/entity/Modulex.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.modulex.entity;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -96,6 +97,13 @@ public class Modulex implements Serializable {
 	@Excel(name = "责任人", width = 15)
     @ApiModelProperty(value = "责任人")
     private String managerUsers;
+
+    /**
+     * 上面的字段 本身的数据字典无法翻译 也不能直接把原来的字段替换掉
+     * 故 用这个字段代表 翻译后的值 不改变原先的
+     */
+	@TableField(exist = false)
+	private String managerUsers_dictText;
 	/**
      * 任务等级
      * 值：1、2、3、4、5，默认2

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/mapper/ModulexMapper.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.modulex.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.modulex.entity.Modulex;
 
 /**
@@ -12,4 +13,6 @@ import org.jeecg.modules.modulex.entity.Modulex;
  */
 public interface ModulexMapper extends BaseMapper<Modulex> {
 
+    @Select("SELECT realname FROM sys_user WHERE id = #{id}")
+    String getRealName(String id);
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/IModulexService.java

@@ -24,7 +24,7 @@ public interface IModulexService extends IService<Modulex> {
 
     Result<?> tijiao(String id);
 
-    Result<?> cehui(String id);
+    Result<?> chehui(String id);
 
     Result<?> shenhe(String id);
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java

@@ -103,7 +103,7 @@ public class ModulexServiceImpl extends ServiceImpl<ModulexMapper, Modulex> impl
      * @param id modulex表的主键id
      */
     @Override
-    public Result<?> cehui(String id) {
+    public Result<?> chehui(String id) {
         Modulex byId = this.getById(id);
         if (byId.getWorkStatus() == 2) {
             return Result.error("正处于开发中");