Merge branch 'develop_3' into 'develop_master'

标准入库流程带入标准的目录体系:返回体系目录名称

See merge request LiuChao/foton-slrs-system-rest!386

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java

@@ -29,4 +29,6 @@ public interface SarStandMenuDao extends BaseMapper<SarStandMenu> {
 
     List<SarStandMenu> selectAllMenuByStandId(SarStandMenu sarStandMenuEO);
 
+    List<SarStandMenu> getMenuByStandId(SarStandMenu sarStandMenu);
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java

@@ -15,7 +15,7 @@ import org.springframework.data.annotation.Transient;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author super_liu
@@ -58,4 +58,7 @@ public class SarStandMenu extends BaseEntity {
     private List<String> menuIds;
 
 
+    @TableField(exist = false)
+    private String menuName;
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java

@@ -588,7 +588,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
     @GetMapping("/getStandMenuId")
     public ResponseMessage<List<SarStandMenu>> getStandMenuId(SarStandMenu getStandId){
 
-        List<SarStandMenu> sarStandMenus = sarStandMenuDao.selectAllMenuByStandId(getStandId);
+        List<SarStandMenu> sarStandMenus = sarStandMenuDao.getMenuByStandId(getStandId);
 
         return Result.success(sarStandMenus);
 

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml

@@ -12,7 +12,7 @@
 
     <!-- SAR_STAND_MENU table all fields -->
     <sql id="Base_Column_List" >
-     valid_flag, menu_id, stand_id, id
+     valid_flag, menu_id, stand_id, id,menu_name
   </sql>
 
     <!-- 查询条件 -->
@@ -82,5 +82,21 @@
         from SAR_STAND_MENU
         where stand_id = #{standId} and valid_flag=0
     </select>
+    <select id="getMenuByStandId" resultType="com.adc.da.slrs.sarStandMenu.entity.SarStandMenu">
+                SELECT
+        	SAR_STAND_MENU.valid_flag as validFlag,
+        	menu_id as menuId,
+        	stand_id as standId,
+        	SAR_STAND_MENU.id as id,
+        	MENU_NAME as menuName
+        FROM
+        	SAR_STAND_MENU
+        LEFT JOIN ts_resource ON SAR_STAND_MENU.MENU_ID = ts_resource.ID
+        WHERE
+        	stand_id =  #{standId}
+        AND SAR_STAND_MENU.VALID_FLAG = 0
+
+    </select>
+
 
 </mapper>