Merge remote-tracking branch 'origin/V0.0.8' into V0.0.8

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/controller/CoreDrillDictionaryAppController.java

@@ -1,16 +1,18 @@
 package com.xunmei.core.drill.controller;
 
 
+import com.xunmei.common.core.domain.drill.dto.CoreDrillDictBranchPageDto;
 import com.xunmei.common.core.domain.drill.dto.CoreDrillDictionaryInsertDto;
 import com.xunmei.common.core.domain.drill.dto.CoreDrillDictionaryPageDto;
 import com.xunmei.common.core.domain.drill.dto.CoreDrillDictionaryUpdateDto;
+import com.xunmei.common.core.domain.drill.vo.CoreDrillDictionaryBranchPageVo;
 import com.xunmei.common.core.domain.drill.vo.CoreDrillDictionaryPageVo;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.log.annotation.Log;
 import com.xunmei.common.log.enums.BusinessType;
-import com.xunmei.common.security.annotation.RequiresPermissions;
+import com.xunmei.core.drill.service.ICoreDrillDictionaryBranchService;
 import com.xunmei.core.drill.service.ICoreDrillDictionaryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -31,6 +33,9 @@ public class CoreDrillDictionaryAppController extends BaseController {
     @Autowired
     private ICoreDrillDictionaryService coreDrillDictionaryService;
 
+    @Autowired
+    private ICoreDrillDictionaryBranchService branchService;
+
     /**
      * 查询预案演练库列表
      */
@@ -41,7 +46,6 @@ public class CoreDrillDictionaryAppController extends BaseController {
         return coreDrillDictionaryService.selectPage(coreDrillDictionary);
     }
 
-
     /**
      * 获取预案演练库详细信息
      */
@@ -95,4 +99,11 @@ public class CoreDrillDictionaryAppController extends BaseController {
         return success(coreDrillDictionaryService.selectCoreDrillDictionaryList(orgId, dictValue));
     }
 
+
+    @ApiOperation(value = "查询CoreDrillDictionaryBranch列表")
+//    @RequiresPermissions("core:drillDictionary:list")
+    @GetMapping("/listBranchData")
+    public AjaxResult listBranchData(@RequestParam(value = "orgId") Long orgId, @RequestParam(value = "dictValue",required = false) String dictValue) {
+        return success(branchService.selectCoreDrillDictionaryBranchList(orgId,dictValue));
+    }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/mapper/CoreDrillDictionaryBranchMapper.java

@@ -8,9 +8,12 @@ import com.xunmei.common.core.domain.drill.vo.CoreDrillDictionaryBranchDetailVo;
 import com.xunmei.common.core.domain.drill.vo.CoreDrillDictionaryBranchPageVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface CoreDrillDictionaryBranchMapper extends BaseMapper<CoreDrillDictionaryBranch> {
 
     Page<CoreDrillDictionaryBranchPageVo> selectPageData(Page<CoreDrillDictionaryBranchPageVo> pageRequest, @Param("request") CoreDrillDictBranchPageDto request);
     CoreDrillDictionaryBranchDetailVo getCoreDrillDictionaryBranchById(@Param("id") Long id);
 
+    List<CoreDrillDictionaryBranch> selectCoreDrillDictionaryBranchList(@Param("orgId") Long orgId, @Param("dictValue") String dictValue);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/ICoreDrillDictionaryBranchService.java

@@ -9,10 +9,14 @@ import com.xunmei.common.core.domain.drill.vo.CoreDrillDictionaryBranchDetailVo;
 import com.xunmei.common.core.domain.drill.vo.CoreDrillDictionaryBranchPageVo;
 import com.xunmei.common.core.web.page.TableDataInfo;
 
+import java.util.List;
+
 public interface ICoreDrillDictionaryBranchService extends IService<CoreDrillDictionaryBranch> {
 
     TableDataInfo<CoreDrillDictionaryBranchPageVo> selectPage(CoreDrillDictBranchPageDto coreDrillDictionaryBranch);
 
+    List<CoreDrillDictionaryBranch> selectCoreDrillDictionaryBranchList(Long orgId, String dictValue);
+
     CoreDrillDictionaryBranchDetailVo getCoreDrillDictionaryBranchById(Long id);
 
     int deleteCoreDrillDictionaryBranchById(Long id);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillDictionaryBranchServiceImpl.java

@@ -59,6 +59,15 @@ public class CoreDrillDictionaryBranchServiceImpl extends ServiceImpl<CoreDrillD
     }
 
     @Override
+    public List<CoreDrillDictionaryBranch> selectCoreDrillDictionaryBranchList(Long orgId, String dictValue) {
+        List<CoreDrillDictionaryBranch> list = baseMapper.selectCoreDrillDictionaryBranchList(orgId, dictValue);
+        for (CoreDrillDictionaryBranch branch : list) {
+            branch.setDrillProjects(branch.getDrillTypeName());
+        }
+        return list;
+    }
+
+    @Override
     public CoreDrillDictionaryBranchDetailVo getCoreDrillDictionaryBranchById(Long id) {
         CoreDrillDictionaryBranchDetailVo detailVo = branchMapper.getCoreDrillDictionaryBranchById(id);
         if (ObjectUtil.isNotEmpty(detailVo.getDrillCategory())){

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillDictionaryBranchMapper.xml

@@ -44,4 +44,11 @@
             LEFT JOIN sys_user ss ON d.update_by = ss.id
         where d.id = #{id} and d.deleted = 0
     </select>
+    <select id="selectCoreDrillDictionaryBranchList" resultType="com.xunmei.common.core.domain.drill.domain.CoreDrillDictionaryBranch">
+        select * from core_drill_dictionary_branch d
+        where d.deleted = 0 and d.org_id = #{orgId}
+<!--        <if test="dictValue != null and dictValue != ''">
+            and d.drill_type=#{request.drillType}
+        </if>-->
+    </select>
 </mapper>