Browse Source

新增限制项目列表

anderx 1 year ago
parent
commit
17b65f1d08

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

@@ -0,0 +1,25 @@
+package com.goafanti.business.bo;
+
+import com.goafanti.common.model.RestrictProject;
+
+public class OutRestrictProject extends RestrictProject {
+
+    private String userName;
+    private String adminName;
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getAdminName() {
+        return adminName;
+    }
+
+    public void setAdminName(String adminName) {
+        this.adminName = adminName;
+    }
+}

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

@@ -25,4 +25,12 @@ public class RestrictProjectController extends CertifyApiController {
 
         return res.data(restrictProjectService.add(in));
     }
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public Result list(InputRestrictProject in){
+        Result res = res();
+        if (in.getUid()==null){
+            return res.error(buildError("客户不能为空"));
+        }
+        return res.data(restrictProjectService.list(in));
+    }
 }

+ 1 - 0
src/main/java/com/goafanti/business/service/RestrictProjectService.java

@@ -5,4 +5,5 @@ import com.goafanti.business.bo.InputRestrictProject;
 public interface RestrictProjectService {
     int add(InputRestrictProject in);
 
+    Object list(InputRestrictProject in);
 }

+ 6 - 0
src/main/java/com/goafanti/business/service/impl/RestrictProjectServiceImpl.java

@@ -34,4 +34,10 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
         }
         return 1;
     }
+
+    @Override
+    public Object list(InputRestrictProject in) {
+        in.setAid(TokenManager.getAdminId());
+        return restrictProjectMapper.selectByUidAndAid(in);
+    }
 }

+ 5 - 0
src/main/java/com/goafanti/common/dao/RestrictProjectMapper.java

@@ -1,8 +1,11 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.business.bo.InputRestrictProject;
+import com.goafanti.business.bo.OutRestrictProject;
 import com.goafanti.common.model.RestrictProject;
 
+import java.util.List;
+
 /**
 * @author Administrator
 * @description 针对表【restrict_project(限定项目表)】的数据库操作Mapper
@@ -24,4 +27,6 @@ public interface RestrictProjectMapper {
     int updateByPrimaryKey(RestrictProject record);
 
     RestrictProject selectByPid(InputRestrictProject in);
+
+    List<OutRestrictProject> selectByUidAndAid(InputRestrictProject in);
 }

+ 7 - 0
src/main/java/com/goafanti/common/mapper/RestrictProjectMapper.xml

@@ -112,4 +112,11 @@
         where  pid = #{pid,jdbcType=VARCHAR}
         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
+        from business_project a
+                 left join restrict_project b on a.id =b.pid and b.uid =#{uid} and b.aid= #{aid}
+                 left join user c on b.uid=c.id left join admin d on b.aid=d.id
+        where a.restrict_status =1
+    </select>
 </mapper>

+ 6 - 0
src/main/java/com/goafanti/common/model/RestrictProject.java

@@ -1,5 +1,7 @@
 package com.goafanti.common.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -123,6 +125,7 @@ public class RestrictProject implements Serializable {
     /**
      * 锁定时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     public Date getLockTime() {
         return lockTime;
     }
@@ -137,6 +140,7 @@ public class RestrictProject implements Serializable {
     /**
      * 释放时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     public Date getReleaseTime() {
         return releaseTime;
     }
@@ -144,6 +148,7 @@ public class RestrictProject implements Serializable {
     /**
      * 释放时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     public void setReleaseTime(Date releaseTime) {
         this.releaseTime = releaseTime;
     }
@@ -151,6 +156,7 @@ public class RestrictProject implements Serializable {
     /**
      * 发起时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     public Date getCreateTime() {
         return createTime;
     }