anderx 19 часов назад
Родитель
Сommit
a49d2b7c87

+ 59 - 0
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -1295,6 +1295,65 @@
         where a.status =2 and a.type=0
     </select>
 
+    <select id="findAssistList" resultType="com.goafanti.weChat.bo.OutListAssist">
+        select a.id ,if(a.`type` &lt; 5,0,1)  assistType,
+               c.content_type contentType,c.content ,a.aname,a.assist_aid_name assistAidName,
+        a.user_names userNames ,d.sign_number signNumber ,d.public_count publicCount,d.assist_count assistCount ,
+        d.public_assist_count  publicAssistCount ,d.non_public_count nonPublicCount,a.release_start releaseStart,
+        c.pname ,d.task_names  taskNames
+        from public_release a left join public_release_details b on a.id =b.prid
+        left join public_assist_details c on a.id =c.prid
+        left join user_mid d on b.uid =d.uid
+        where a.assist =1
+        <include refid="findAssistListSql"/>
+        order by a.release_start desc
+        <if test="page_sql != null">
+            ${page_sql}
+        </if>
+    </select>
+    <sql id="findAssistListSql">
+        <if test="assistType==0">
+            and a.type &lt; 5
+        </if>
+        <if test="assistType==1">
+            and a.type &gt; 4
+        </if>
+        <if test="contentType!=null">
+            and c.content_type = #{contentType}
+        </if>
+        <if test="aid !=null">
+            and a.aid = #{aid}
+        </if>
+        <if test="assistAid != null">
+            and  FIND_IN_SET(#{assistAid},a.assist_aid)
+        </if>
+        <if test="uid !=null">
+            and b.uid = #{uid}
+        </if>
+        <if test="projectType !=null">
+            and a.id in (select DISTINCT prid from public_release_type
+            where `type` in
+            <foreach item="item" collection="projectType" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="startTime !=null and endTime !=null">
+            and a.release_start  between #{startTime} and #{endTime}
+        </if>
+        <if test="depId != null">
 
+        </if>
+        <if test="assistCount != null">
+            and d.assist_count = #{assistCount}
+        </if>
+    </sql>
+    <select id="findAssistCount" resultType="java.lang.Integer">
+    select count(*)
+    from public_release a left join public_release_details b on a.id =b.prid
+    left join public_assist_details c on a.id =c.prid
+    left join user_mid d on b.uid =d.uid
+    where a.assist =1
+    <include refid="findAssistListSql"/>
+    </select>
 </mapper>
 

+ 143 - 0
src/main/java/com/goafanti/weChat/bo/InputListAssist.java

@@ -0,0 +1,143 @@
+package com.goafanti.weChat.bo;
+
+public class InputListAssist {
+
+    private Integer pageSize;
+    private Integer pageNo;
+    /**
+     * 协单类型 0协单公出 1=非协单公出
+     */
+    private Integer assistType;
+    /**
+     * 协单内容类型
+     */
+    private Integer contentType;
+    /**
+     * 发起人
+     */
+    private String aid;
+    /**
+     * 协单人
+     */
+    private String assistAid;
+    /**
+     * 客户编号
+     */
+    private String uid;
+    /**
+     * 项目类型
+     */
+    private String projectType;
+    /**
+     * 协单开始时间
+     */
+    private String startTime;
+    /**
+     * 协单结束时间
+     */
+    private String endTime;
+    /**
+     * 部门编号
+     */
+    private String depId;
+    /**
+     * 协单总数
+     */
+    private String assistCount;
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Integer getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public Integer getAssistType() {
+        return assistType;
+    }
+
+    public void setAssistType(Integer assistType) {
+        this.assistType = assistType;
+    }
+
+    public Integer getContentType() {
+        return contentType;
+    }
+
+    public void setContentType(Integer contentType) {
+        this.contentType = contentType;
+    }
+
+    public String getAid() {
+        return aid;
+    }
+
+    public void setAid(String aid) {
+        this.aid = aid;
+    }
+
+    public String getAssistAid() {
+        return assistAid;
+    }
+
+    public void setAssistAid(String assistAid) {
+        this.assistAid = assistAid;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getProjectType() {
+        return projectType;
+    }
+
+    public void setProjectType(String projectType) {
+        this.projectType = projectType;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getDepId() {
+        return depId;
+    }
+
+    public void setDepId(String depId) {
+        this.depId = depId;
+    }
+
+    public String getAssistCount() {
+        return assistCount;
+    }
+
+    public void setAssistCount(String assistCount) {
+        this.assistCount = assistCount;
+    }
+}

+ 184 - 0
src/main/java/com/goafanti/weChat/bo/OutListAssist.java

@@ -0,0 +1,184 @@
+package com.goafanti.weChat.bo;
+
+public class OutListAssist {
+    private Integer id;
+
+    /**
+     * 协单类型
+     */
+    private Integer assistType;
+
+
+    /**
+     * 协单内容类型
+     */
+    private String contentType;
+    /**
+     * 协单内容
+     */
+    private String content;
+    /**
+     * 协单发起人
+     */
+    private String aname;
+    /**
+     * 协单人
+     */
+    private String assistAidName;
+    /**
+     * 客户名称
+     */
+    private String userNames;
+    /**
+     * 签单次数
+     */
+    private String signNumber;
+    /**
+     * 公出次数
+     */
+    private String publicCount;
+    /**
+     * 协单总数
+     */
+    private String assistCount;
+    /**
+     * 公出协单数
+     */
+    private String publicAssistCount;
+    /**
+     * 非公出协单数
+     */
+    private String nonPublicCount;
+    /**
+     * 协单开始时间
+     */
+    private String releaseStart;
+    /**
+     * 协单项目
+     */
+    private String pname;
+    /**
+     * 已签项目
+     */
+    private String taskNames;
+
+    public Integer getAssistType() {
+        return assistType;
+    }
+
+    public void setAssistType(Integer assistType) {
+        this.assistType = assistType;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getContentType() {
+        return contentType;
+    }
+
+    public void setContentType(String contentType) {
+        this.contentType = contentType;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getAname() {
+        return aname;
+    }
+
+    public void setAname(String aname) {
+        this.aname = aname;
+    }
+
+    public String getAssistAidName() {
+        return assistAidName;
+    }
+
+    public void setAssistAidName(String assistAidName) {
+        this.assistAidName = assistAidName;
+    }
+
+    public String getUserNames() {
+        return userNames;
+    }
+
+    public void setUserNames(String userNames) {
+        this.userNames = userNames;
+    }
+
+    public String getSignNumber() {
+        return signNumber;
+    }
+
+    public void setSignNumber(String signNumber) {
+        this.signNumber = signNumber;
+    }
+
+    public String getPublicCount() {
+        return publicCount;
+    }
+
+    public void setPublicCount(String publicCount) {
+        this.publicCount = publicCount;
+    }
+
+    public String getAssistCount() {
+        return assistCount;
+    }
+
+    public void setAssistCount(String assistCount) {
+        this.assistCount = assistCount;
+    }
+
+    public String getPublicAssistCount() {
+        return publicAssistCount;
+    }
+
+    public void setPublicAssistCount(String publicAssistCount) {
+        this.publicAssistCount = publicAssistCount;
+    }
+
+    public String getNonPublicCount() {
+        return nonPublicCount;
+    }
+
+    public void setNonPublicCount(String nonPublicCount) {
+        this.nonPublicCount = nonPublicCount;
+    }
+
+    public String getReleaseStart() {
+        return releaseStart;
+    }
+
+    public void setReleaseStart(String releaseStart) {
+        this.releaseStart = releaseStart;
+    }
+
+    public String getPname() {
+        return pname;
+    }
+
+    public void setPname(String pname) {
+        this.pname = pname;
+    }
+
+    public String getTaskNames() {
+        return taskNames;
+    }
+
+    public void setTaskNames(String taskNames) {
+        this.taskNames = taskNames;
+    }
+}

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

@@ -638,4 +638,14 @@ public class AdminReleaseApiController extends CertifyApiController{
 		Result res =new Result();
 		return res.data(publicReleaseService.getPublicConfig());
 	}
+
+	/**
+	 * 协单统计列表
+	 */
+	@RequestMapping(value = "/listAssist", method = RequestMethod.GET)
+	public Result listAssist(InputListAssist in){
+		Result res =new Result();
+		res.setData(publicReleaseService.listAssist(in));
+		return res;
+	}
 }

+ 2 - 0
src/main/java/com/goafanti/weChat/service/PublicReleaseService.java

@@ -97,4 +97,6 @@ public interface PublicReleaseService {
 	Object updatePublicConfig(PublicConfig in);
 
 	Object getPublicConfig();
+
+	Object listAssist(InputListAssist in);
 }

+ 6 - 0
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1665,6 +1665,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		return publicConfigMapper.selectDetails();
 	}
 
+	@Override
+	public Object listAssist(InputListAssist in) {
+
+		return findPage("findAssistList", "findAssistCount", in);
+	}
+
 	private void pushCompleteMaxDuration(String orderNo) {
 		List<OrderPublicReleaseLog> orderPublicReleaseLogs = orderPublicReleaseLogMapper.queryByOrderNo(orderNo);
 		List<PublicRelease> publicReleases = publicReleaseMapper.selectByOrderNo(orderNo);