Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/ExternalClerkRelatedDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ExternalClerkRelatedDTO implements Serializable {
+    private String externalClerkRelatedId;
+
+    private String wxEnterpriseId;
+
+    private String enterpriseId;
+
+    private String storeId;
+
+    private String memberId;
+
+    private String unionid;
+    
+    private String externalUserId;
+
+    private String externalName;
+
+    private String addCreateTime;
+
+    private String memberUnionidRelatedId;
+
+    private String clerkId;
+
+    private String staffId;
+
+    private String wxUserId;
+
+    private Integer statusFlag;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getExternalClerkRelatedId() {
+        return externalClerkRelatedId;
+    }
+
+    public void setExternalClerkRelatedId(String externalClerkRelatedId) {
+        this.externalClerkRelatedId = externalClerkRelatedId == null ? null : externalClerkRelatedId.trim();
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId == null ? null : enterpriseId.trim();
+    }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId == null ? null : storeId.trim();
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId == null ? null : memberId.trim();
+    }
+
+    public String getUnionid() {
+        return unionid;
+    }
+
+    public void setUnionid(String unionid) {
+        this.unionid = unionid == null ? null : unionid.trim();
+    }
+
+    public String getExternalName() {
+        return externalName;
+    }
+
+    public void setExternalName(String externalName) {
+        this.externalName = externalName == null ? null : externalName.trim();
+    }
+
+    public String getAddCreateTime() {
+        return addCreateTime;
+    }
+
+    public void setAddCreateTime(String addCreateTime) {
+        this.addCreateTime = addCreateTime == null ? null : addCreateTime.trim();
+    }
+
+    public String getMemberUnionidRelatedId() {
+        return memberUnionidRelatedId;
+    }
+
+    public void setMemberUnionidRelatedId(String memberUnionidRelatedId) {
+        this.memberUnionidRelatedId = memberUnionidRelatedId == null ? null : memberUnionidRelatedId.trim();
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId == null ? null : clerkId.trim();
+    }
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId == null ? null : staffId.trim();
+    }
+
+    public String getWxUserId() {
+        return wxUserId;
+    }
+
+    public void setWxUserId(String wxUserId) {
+        this.wxUserId = wxUserId == null ? null : wxUserId.trim();
+    }
+
+    public Integer getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+	public String getExternalUserId() {
+		return externalUserId;
+	}
+
+	public void setExternalUserId(String externalUserId) {
+		this.externalUserId = externalUserId;
+	}
+    
+    
+}
\ No newline at end of file

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ExternalClerkRelatedApiService.java

+package com.gic.haoban.manage.api.service;
+
+import java.util.Date;
+import java.util.List;
+
+import com.gic.api.base.commons.Page;
+import com.gic.haoban.base.api.common.BasePageInfo;
+import com.gic.haoban.manage.api.dto.AuditDTO;
+import com.gic.haoban.manage.api.dto.BatchAuditLogDTO;
+import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
+import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
+
+
+/**
+ * Created by tgs on 2020/2/9.
+ */
+public interface ExternalClerkRelatedApiService {
+	List<ExternalClerkRelatedDTO> listByEnterpriseIdAndDate(String enterpriseId,Date date);
+
+}

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java

 package com.gic.haoban.manage.service.dao.mapper;
 
+import java.util.Date;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
@@ -30,4 +31,6 @@ public interface TabHaobanExternalClerkRelatedMapper {
 	TabHaobanExternalClerkRelated getByParams(@Param("userId")String userId, @Param("wxEnterpriseId")String wxEnterpriseId, @Param("name")String name, @Param("createTime")String createTime);
 
 	List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserId(@Param("externalUserid")String externalUserid, @Param("userId")String wxUserId);
+	
+	List<TabHaobanExternalClerkRelated> listByEnterpriseIdAndDate(@Param("enterpriseId")String enterpriseId,@Param("date")Date date);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ExternalClerkRelatedApiServiceImpl.java

+package com.gic.haoban.manage.service.service.out.impl;
+
+
+import com.gic.haoban.manage.api.dto.*;
+import java.util.Date;
+import java.util.List;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.gic.commons.util.EntityUtil;
+import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
+import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
+
+@Service
+public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedApiService{
+	private static final Logger log = LogManager.getLogger(ExternalClerkRelatedApiServiceImpl.class);
+	@Autowired
+	private TabHaobanExternalClerkRelatedMapper tabHaobanExternalClerkRelatedMapper;
+	@Override
+	public List<ExternalClerkRelatedDTO> listByEnterpriseIdAndDate(
+			String enterpriseId, Date date) {
+		List<TabHaobanExternalClerkRelated> list = tabHaobanExternalClerkRelatedMapper.listByEnterpriseIdAndDate(enterpriseId,date);
+		return EntityUtil.changeEntityListByJSON(ExternalClerkRelatedDTO.class,list);	
+	}
+	
+}

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -44,6 +44,7 @@
          <dubbo:service interface="com.gic.haoban.manage.api.service.MaterialApiService" ref="materialApiServiceImpl" timeout="10000"/>
          
          <dubbo:service interface="com.gic.haoban.manage.api.service.ApplicationTemplateApiService" ref="applicationTemplateApiServiceImpl" timeout="10000"/>
+         <dubbo:service interface="com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService" ref="externalClerkRelatedApiServiceImpl" timeout="10000"/>
 
 		 <dubbo:service interface="com.gic.haoban.manage.api.service.StaffClerkRelationApiService" ref="staffClerkRelationApiServiceImpl" timeout="10000"/>	
     <dubbo:service interface="com.gic.haoban.manage.api.service.DealSyncOperationApiService"

haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml

@@ -282,4 +282,16 @@
     and wx_enterprise_id = #{wxEnterpriseId}
     and status_flag = 1
   </select>
+       <select id="listByEnterpriseIdAndDate" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_external_clerk_related
+    where  status_flag = 1
+    and enterprise_id = #{enterpriseId}
+    <if test="date != null" >
+       and TO_DAYS(create_time) <![CDATA[ >= ]]> TO_DAYS(#{date,jdbcType=TIMESTAMP})
+    </if>
+  </select>
+  
+  
 </mapper>
\ No newline at end of file