Bladeren bron

新增公出最大审核配置详情接口

anderx 1 jaar geleden
bovenliggende
commit
37d1872a38

+ 1 - 1
src/main/java/com/goafanti/common/mapper/PublicConfigMapper.xml

@@ -176,7 +176,7 @@
                a.other_auditor_stauts as otherAuditorStauts,
                a.other_auditor as otherAuditor,
             d.name as otherAuditorName,
-               a.create_time
+               a.create_time as createTime
         from public_config a left join admin b on a.tech_auditor=b.id
             left join admin c on a.finance_auditor=c.id
             left join admin d on a.other_auditor=d.id

+ 7 - 0
src/main/java/com/goafanti/weChat/bo/OutPublicConfig.java

@@ -1,7 +1,10 @@
 package com.goafanti.weChat.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.goafanti.common.model.PublicConfig;
 
+import java.util.Date;
+
 public class OutPublicConfig extends PublicConfig {
 
     private String techAuditorName;
@@ -31,4 +34,8 @@ public class OutPublicConfig extends PublicConfig {
     public void setOtherAuditorName(String otherAuditorName) {
         this.otherAuditorName = otherAuditorName;
     }
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    public Date getCreateTime() {
+        return super.getCreateTime();
+    }
 }

+ 1 - 1
src/main/java/com/goafanti/weChat/controller/AdminReleaseApiController.java

@@ -604,7 +604,7 @@ public class AdminReleaseApiController extends CertifyApiController{
 	 * 获取最大公出审核配置
 	 */
 	@RequestMapping(value = "/getPublicConfig",method = RequestMethod.GET)
-	public Result<PublicConfig> getPublicConfig (){
+	public Result<OutPublicConfig> getPublicConfig (){
 		Result res =new Result();
 		return res.data(publicReleaseService.getPublicConfig());
 	}