Merge remote-tracking branch 'origin/master'

pqs-system/system-boot/src/main/java/com/njcn/system/mapper/ResourceAdministrationMapper.java

@@ -3,8 +3,11 @@ package com.njcn.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.system.pojo.po.Resinformation;
+import com.njcn.system.pojo.po.ResinformationParam;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * @version 1.0.0
  * @author: zbj
@@ -12,4 +15,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ResourceAdministrationMapper extends BaseMapper<Resinformation> {
+    List<ResinformationParam> listAll();
 }

pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/ResourceAdministrationMapper.xml

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.system.mapper.ResourceAdministrationMapper">
 
+    <select id="listAll" resultType="com.njcn.system.pojo.po.ResinformationParam">
+        SELECT pr.`NAME` "name", sdd.`Name` "type", pr.DESCRIPTION "description", pr.UPDATETIME "time"
+        FROM pqs_resinformation pr
+        left join sys_dict_data sdd on sdd.Id = pr.TYPE
+    </select>
 </mapper>