瀏覽代碼

新增公出情况列表

anderx 1 年之前
父節點
當前提交
bd37f4d5ae

+ 2 - 0
src/main/java/com/goafanti/common/dao/UserMapper.java

@@ -250,4 +250,6 @@ public interface UserMapper {
     int getCountRestrictProject(@Param("uid") String uid, @Param("aid") String aid);
 
     UserArchivesDetails selectUser(String id);
+
+    List<PublicReleaseListBo> getPublicReleaseList(String uid);
 }

+ 25 - 0
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -2396,4 +2396,29 @@ inner join(
 		where a.type = 1
 		  and a.id = #{id}
 	</select>
+	<select id="getPublicReleaseList" resultType="com.goafanti.customer.bo.PublicReleaseListBo">
+		select a.id prdId,a.uid,a.ufid,
+			   date_format(b.release_start, '%Y-%m-%d ') releaseStarts,
+			   a.duration,
+			   c.name                                    aname,
+			   b.assist,
+			   b.assistant_name                          assistantName,
+			   b.assist_aid_name                         assistAidName,
+			   b.remarks,
+			   b.supplement,
+			   b.plan,
+			   b.next_plan                               nextPlan,
+			   b.expected_effect                         expectedEffect,
+			   b.assistant_aid                           assistantAid,
+			   e.follow_name  as                         followName,
+			   e.follow_dep   as                         followDep,
+			   e.`result`,
+			   e.contact_type as                         contactType,
+			   e.create_time                             followTime,
+			   e.follow_count as                         followCount
+		from public_release_details a left join public_release b on a.prid =b.id
+	  left join admin c on b.aid =c.id left join `user` d on a.uid =d.id
+	  left join user_follow e on a.ufid =e.id
+		where main_status =1 and a.uid = #{id}
+	</select>
 </mapper>

+ 243 - 0
src/main/java/com/goafanti/customer/bo/PublicReleaseListBo.java

@@ -0,0 +1,243 @@
+package com.goafanti.customer.bo;
+
+public class PublicReleaseListBo {
+
+    private Integer prdId;
+    private String uid;
+    private String ufid;
+    /**
+     * 公出时间
+     */
+    private String releaseStarts;
+    /**
+     * 公出时长
+     */
+    private String duration;
+    /**
+     * 公出发起人
+     */
+    private String aname;
+    private Integer assist;
+    /**
+     * 协单人
+     */
+    private String assistAidName;
+    /**
+     * 协单助手
+     */
+    private String assistantName;
+    /**
+     * 公出备注
+     */
+    private String remarks;
+    /**
+     * 公出补充
+     */
+    private String supplement;
+    /**
+     * 公出计划
+     */
+    private String plan;
+    /**
+     * 下次计划
+     */
+    private String nextPlan;
+
+    /**
+     * 预计效果
+     */
+    private String expectedEffect;
+    private String assistantAid;
+    /**
+     * 跟进人
+     */
+    private String followName;
+    /**
+     * 跟进部门
+     */
+    private String followDep;
+    /**
+     * 跟进结果
+     */
+    private String result;
+    /**
+     * 联系类型  0外出 1.电话 2.QQ 3.微信4邮件 5公出打卡 6来访面谈
+     */
+    private Integer contactType;
+    /**
+     * 跟进时间
+     */
+    private String followTime;
+    /**
+     * 跟进次数
+     */
+    private Integer followCount;
+
+    public Integer getPrdId() {
+        return prdId;
+    }
+
+    public void setPrdId(Integer prdId) {
+        this.prdId = prdId;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getUfid() {
+        return ufid;
+    }
+
+    public void setUfid(String ufid) {
+        this.ufid = ufid;
+    }
+
+    public String getReleaseStarts() {
+        return releaseStarts;
+    }
+
+    public void setReleaseStarts(String releaseStarts) {
+        this.releaseStarts = releaseStarts;
+    }
+
+    public String getDuration() {
+        return duration;
+    }
+
+    public void setDuration(String duration) {
+        this.duration = duration;
+    }
+
+    public String getAname() {
+        return aname;
+    }
+
+    public void setAname(String aname) {
+        this.aname = aname;
+    }
+
+    public Integer getAssist() {
+        return assist;
+    }
+
+    public void setAssist(Integer assist) {
+        this.assist = assist;
+    }
+
+    public String getAssistantName() {
+        return assistantName;
+    }
+
+    public void setAssistantName(String assistantName) {
+        this.assistantName = assistantName;
+    }
+
+    public String getAssistAidName() {
+        return assistAidName;
+    }
+
+    public void setAssistAidName(String assistAidName) {
+        this.assistAidName = assistAidName;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getSupplement() {
+        return supplement;
+    }
+
+    public void setSupplement(String supplement) {
+        this.supplement = supplement;
+    }
+
+    public String getPlan() {
+        return plan;
+    }
+
+    public void setPlan(String plan) {
+        this.plan = plan;
+    }
+
+    public String getNextPlan() {
+        return nextPlan;
+    }
+
+    public void setNextPlan(String nextPlan) {
+        this.nextPlan = nextPlan;
+    }
+
+    public String getExpectedEffect() {
+        return expectedEffect;
+    }
+
+    public void setExpectedEffect(String expectedEffect) {
+        this.expectedEffect = expectedEffect;
+    }
+
+    public String getAssistantAid() {
+        return assistantAid;
+    }
+
+    public void setAssistantAid(String assistantAid) {
+        this.assistantAid = assistantAid;
+    }
+
+    public String getFollowName() {
+        return followName;
+    }
+
+    public void setFollowName(String followName) {
+        this.followName = followName;
+    }
+
+    public String getFollowDep() {
+        return followDep;
+    }
+
+    public void setFollowDep(String followDep) {
+        this.followDep = followDep;
+    }
+
+    public String getResult() {
+        return result;
+    }
+
+    public void setResult(String result) {
+        this.result = result;
+    }
+
+    public Integer getContactType() {
+        return contactType;
+    }
+
+    public void setContactType(Integer contactType) {
+        this.contactType = contactType;
+    }
+
+    public String getFollowTime() {
+        return followTime;
+    }
+
+    public void setFollowTime(String followTime) {
+        this.followTime = followTime;
+    }
+
+    public Integer getFollowCount() {
+        return followCount;
+    }
+
+    public void setFollowCount(Integer followCount) {
+        this.followCount = followCount;
+    }
+}

+ 12 - 4
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -23,10 +23,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
@@ -1620,4 +1617,15 @@ public class AdminCustomerApiController extends BaseApiController{
 
 		return customerService.importExcel(file);
 	}
+
+
+	/**
+	 * 客户公出情况
+	 */
+	@GetMapping("/getPublicReleaseList")
+	public Result<List<PublicReleaseListBo>> getPublicReleaseList(String uid) {
+		Result res = new Result();
+		res.setData(customerService.getPublicReleaseList(uid));
+		return res;
+	}
 }

+ 2 - 0
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -592,4 +592,6 @@ public interface CustomerService {
 	Object getRestrictCustomerByName(String name);
 
 	UserArchivesDetails selectUserByUid(String id);
+
+	List<PublicReleaseListBo> getPublicReleaseList(String uid);
 }

+ 6 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -3134,8 +3134,13 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		return user;
 	}
 
+    @Override
+    public List<PublicReleaseListBo> getPublicReleaseList(String uid) {
+		return userMapper.getPublicReleaseList(uid);
+    }
+
 
-	private List<InputExcelUser> pushUserName(List<InputExcelUser> list) {
+    private List<InputExcelUser> pushUserName(List<InputExcelUser> list) {
 		List<InputExcelUser> res=new ArrayList<>();
 		List<InputExcelUser> list2=new ArrayList<>();
 		int i = 0;