投资效益系统-字典批量新增、项目列表返回项目阶段名称

src/main/java/org/springblade/modules/investment/mapper/IbaProjectMapper.xml

@@ -191,11 +191,13 @@
         SELECT
             a.*,
             b.dict_value typeName,
-            c.dict_value routeTypeName
+            c.dict_value routeTypeName,
+            d.dict_value stageName
         FROM
             iba_project a
             LEFT JOIN blade_dict_biz b ON a.type = b.id
             LEFT JOIN blade_dict_biz c ON a.route_type = c.id
+            LEFT JOIN blade_dict_biz d ON d.code = 'ibaProjectStage' and  a.stage = d.dict_key
         <where>
             a.is_deleted = 0
             <if test="query.projectName != null and query.projectName != ''">

src/main/java/org/springblade/modules/investment/pojo/entity/IbaProject.java

@@ -38,6 +38,10 @@ public class IbaProject extends BaseEntity {
      * 项目阶段（下拉选择框）
      */
     private Integer stage;
+    /**
+     * 项目阶段（下拉选择框） 名称
+     */
+    private String stageName;
 
     /**
      * 建设开始时间

src/main/java/org/springblade/modules/system/controller/DictBizController.java

@@ -159,6 +159,16 @@ public class DictBizController extends BladeController {
 		CacheUtil.clear(DICT_CACHE);
 		return R.status(dictService.submit(dict));
 	}
+	/**
+	 * 批量新增或修改
+	 */
+	@PostMapping("/submitList")
+	@ApiOperationSupport(order = 6)
+	@Operation(summary = "新增或修改", description = "传入dict")
+	public R submit(@Valid @RequestBody List<DictBiz> dict) {
+		CacheUtil.clear(DICT_CACHE);
+		return R.status(dictService.submit(dict));
+	}
 
 
 	/**

src/main/java/org/springblade/modules/system/service/IDictBizService.java

@@ -87,6 +87,13 @@ public interface IDictBizService extends IService<DictBiz> {
 	 * @return
 	 */
 	boolean submit(DictBiz dict);
+	/**
+	 * 新增或修改
+	 *
+	 * @param dict
+	 * @return
+	 */
+	boolean submit(List<DictBiz> dict);
 
 	/**
 	 * 删除字典

src/main/java/org/springblade/modules/system/service/impl/DictBizServiceImpl.java

@@ -47,6 +47,7 @@ import org.springblade.modules.system.service.IDictBizService;
 import org.springblade.modules.system.pojo.vo.DictBizVO;
 import org.springblade.modules.system.wrapper.DictBizWrapper;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -108,6 +109,15 @@ public class DictBizServiceImpl extends ServiceImpl<DictBizMapper, DictBiz> impl
 		return saveOrUpdate(dict);
 	}
 
+	@Override
+	@Transactional
+	public boolean submit(List<DictBiz> dict) {
+		for (DictBiz dictBiz : dict) {
+			submit(dictBiz);
+		}
+		return true;
+	}
+
 	@Override
 	public boolean removeDict(String ids) {
 		Long cnt = baseMapper.selectCount(Wrappers.<DictBiz>query().lambda().in(DictBiz::getParentId, Func.toLongList(ids)));