Browse Source

新增限制项目列表

anderx 1 year ago
parent
commit
49f60bdce1

+ 9 - 0
src/main/java/com/goafanti/business/bo/OutRestrictProject.java

@@ -6,6 +6,15 @@ public class OutRestrictProject extends RestrictProject {
 
     private String userName;
     private String adminName;
+    private String projectName;
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
 
     public String getUserName() {
         return userName;

+ 6 - 0
src/main/java/com/goafanti/business/controller/RestrictProjectController.java

@@ -25,6 +25,12 @@ public class RestrictProjectController extends CertifyApiController {
 
         return res.data(restrictProjectService.add(in));
     }
+
+    /**
+     * 限制项目列表
+     * @param in
+     * @return
+     */
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     public Result list(InputRestrictProject in){
         Result res = res();

+ 3 - 2
src/main/java/com/goafanti/common/mapper/RestrictProjectMapper.xml

@@ -113,9 +113,10 @@
         and aid = #{aid,jdbcType=VARCHAR}
     </select>
     <select id="selectByUidAndAid" resultType="com.goafanti.business.bo.OutRestrictProject">
-        select a.id,a.bname ,b.type,b.lock_time ,b.release_time ,c.nickname userName ,d.name adminName,b.create_time
+        select a.id pid ,b.id,a.bname projectName,b.type,b.lock_time lockTime,b.release_time releaseTime ,
+               c.nickname userName ,d.name adminName,b.create_time createTime,b.uid,b.aid
         from business_project a
-                 left join restrict_project b on a.id =b.pid and b.uid =#{uid} and b.aid= #{aid}
+                 left join restrict_project b on a.id =b.pid and b.uid =#{uid,jdbcType=VARCHAR} and b.aid= #{aid,jdbcType=VARCHAR}
                  left join user c on b.uid=c.id left join admin d on b.aid=d.id
         where a.restrict_status =1
     </select>