Browse Source

报销列表显示修改

anderx 1 year ago
parent
commit
dc0a95821c

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

@@ -299,7 +299,8 @@
     <select id="selectUserArchivesList" resultType="com.goafanti.customer.bo.OutSelectUserArchives">
         select a.id , a.nickname ,d1.name as  province ,d2.name as  city ,d3.name area ,a.sign_bills signBills,
         a.share_type as shareType ,d.channel_type as channelType ,e.enterprise_count as enterpriseCount,
-        c.name contactName,f.name adminName,e.channel_indicators as channelIndicators,e.update_time as updateTime,
+        c.name contactName,c.mobile contactMobile,
+        f.name adminName,e.channel_indicators as channelIndicators,e.update_time as updateTime,
         e.interview_ideas as interviewIdeas ,b.intended_project as intendedProject,
         e.interview_distribution as interviewDistribution, g.name depName,
         ic.name as  industry ,b.business_scope as businessScope ,e.financial_data as financialData,

+ 9 - 0
src/main/java/com/goafanti/customer/bo/OutSelectUserArchives.java

@@ -29,6 +29,7 @@ public class OutSelectUserArchives {
     private String industry;
     @Excel(name = "联系人")
     private String contactName;
+    private String contactMobile;
     @Excel(name = "所属人")
     private String adminName;
     @Excel(name = "意向合作项目")
@@ -58,6 +59,14 @@ public class OutSelectUserArchives {
     private Date updateTime;
     private String publicContent;
 
+    public String getContactMobile() {
+        return contactMobile;
+    }
+
+    public void setContactMobile(String contactMobile) {
+        this.contactMobile = contactMobile;
+    }
+
     public String getPublicContent() {
         return publicContent;
     }

+ 9 - 6
src/main/java/com/goafanti/customer/bo/OutUserClueList.java

@@ -3,6 +3,8 @@ package com.goafanti.customer.bo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.goafanti.common.utils.excel.Excel;
 
+import java.util.Date;
+
 public class OutUserClueList {
 
     private String id;
@@ -15,8 +17,8 @@ public class OutUserClueList {
     private String adminName;
     private String clueAname;
     private String clueProcess;
-    private String clueTime;
-    private String clueTransferTime;
+    private Date clueTime;
+    private Date clueTransferTime;
 
     public String getClueAname() {
         return clueAname;
@@ -26,11 +28,12 @@ public class OutUserClueList {
         this.clueAname = clueAname;
     }
 
-    public String getClueTransferTime() {
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    public Date getClueTransferTime() {
         return clueTransferTime;
     }
 
-    public void setClueTransferTime(String clueTransferTime) {
+    public void setClueTransferTime(Date clueTransferTime) {
         this.clueTransferTime = clueTransferTime;
     }
 
@@ -83,11 +86,11 @@ public class OutUserClueList {
     }
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    public String getClueTime() {
+    public Date getClueTime() {
         return clueTime;
     }
 
-    public void setClueTime(String clueTime) {
+    public void setClueTime(Date clueTime) {
         this.clueTime = clueTime;
     }
 }

+ 3 - 5
src/main/java/com/goafanti/customer/controller/UserClueApiController.java

@@ -3,10 +3,8 @@ package com.goafanti.customer.controller;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.utils.excel.NewExcelUtil;
-import com.goafanti.customer.bo.InputUserClueBo;
-import com.goafanti.customer.bo.InputUserClueList;
-import com.goafanti.customer.bo.InputUserClueTransferBo;
-import com.goafanti.customer.bo.OutUserClueExcel;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.customer.bo.*;
 import com.goafanti.customer.service.UserClueService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -31,7 +29,7 @@ public class UserClueApiController extends BaseApiController{
 	 * @return
 	 */
 	@GetMapping("/list")
-	public Result list(InputUserClueList in) {
+	public Result<Pagination<OutUserClueList>> list(InputUserClueList in) {
 		return new Result(userClueService.list(in));
 	}
 

+ 3 - 5
src/main/java/com/goafanti/customer/service/UserClueService.java

@@ -1,14 +1,12 @@
 package com.goafanti.customer.service;
 
-import com.goafanti.customer.bo.InputUserClueBo;
-import com.goafanti.customer.bo.InputUserClueList;
-import com.goafanti.customer.bo.InputUserClueTransferBo;
-import com.goafanti.customer.bo.OutUserClueExcel;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.customer.bo.*;
 
 import java.util.List;
 
 public interface UserClueService {
-    Object list(InputUserClueList in);
+    Pagination<OutUserClueList> list(InputUserClueList in);
 
     Object add(InputUserClueBo in);
 

+ 4 - 6
src/main/java/com/goafanti/customer/service/impl/UserClueServiceImpl.java

@@ -8,11 +8,9 @@ import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.*;
 import com.goafanti.common.utils.PasswordUtil;
 import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.customer.bo.InputUserClueBo;
-import com.goafanti.customer.bo.InputUserClueList;
-import com.goafanti.customer.bo.InputUserClueTransferBo;
-import com.goafanti.customer.bo.OutUserClueExcel;
+import com.goafanti.customer.bo.*;
 import com.goafanti.customer.service.UserClueService;
 import org.springframework.stereotype.Service;
 
@@ -48,7 +46,7 @@ public class UserClueServiceImpl extends BaseMybatisDao<UserMapper> implements U
     private PasswordUtil					passwordUtil;
 
     @Override
-    public Object list(InputUserClueList in) {
+    public Pagination<OutUserClueList> list(InputUserClueList in) {
         if (TokenManager.hasRole(AFTConstants.SUPERADMIN)){
             in.setShiroType(0);
         }
@@ -57,7 +55,7 @@ public class UserClueServiceImpl extends BaseMybatisDao<UserMapper> implements U
         }
         in.setAid(TokenManager.getAdminId());
         if(in.getEndTime()!=null)in.setEndTime(in.getEndTime()+ " 23:59:59");
-        return findPage("selectUserClueList", "selectUserClueCount", in);
+        return (Pagination<OutUserClueList>)findPage("selectUserClueList", "selectUserClueCount", in);
     }
 
     @Override