111

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

@@ -19,7 +19,7 @@ public interface WxEnterpriseApiService {
 	 * 运维后台获取微信企业id列表
 	 * @return
 	 */
-	com.gic.api.base.commons.Page<YwWxEnterpriseDTO> list(BasePageInfo pageInfo,String keyword,String gicContactFlag,String version);
+	com.gic.api.base.commons.Page<YwWxEnterpriseDTO> list(BasePageInfo pageInfo,String keyword,Integer gicContactFlag,String version);
 	/**
 	 * 获取一个
 	 * @param wxEnterpriseId

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/EnterpriseController.java

@@ -31,7 +31,7 @@ public class EnterpriseController extends WebBaseController{
 	private WxEnterpriseApiService wxEnterpriseApiService;
 	//企业列表
 	@RequestMapping("wx-enterprise-list")
-	public HaobanResponse wxEnterpriseList(BasePageInfo pageInfo,String keyword,String contactFlag,String version) {
+	public HaobanResponse wxEnterpriseList(BasePageInfo pageInfo,String keyword,Integer contactFlag,String version) {
 		Page<YwWxEnterpriseDTO> page = wxEnterpriseApiService.list(pageInfo,keyword,contactFlag,version);
 		PageResult<YwWxEnterpriseDTO> pageVo = new PageResult<>();
         pageVo.setList(EntityUtil.changeEntityListByJSON(YwWxEnterpriseDTO.class, page.getResult()));

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

@@ -21,7 +21,7 @@ public interface WxEnterpriseMapper {
 
     int updateByPrimaryKey(TabHaobanWxEnterprise record);
     
-    Page<TabHaobanWxEnterprise> list(@Param("keyword") String keyword,@Param("gicContactFlag") String gicContactFlag,@Param("version") String version);
+    Page<TabHaobanWxEnterprise> list(@Param("keyword") String keyword,@Param("gicContactFlag") int gicContactFlag,@Param("version") String version);
 
     List<TabHaobanWxEnterprise> listBycorpId(@Param("corpId") String corpId);
 }
\ No newline at end of file

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

@@ -88,7 +88,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
 	}
 
 	@Override
-	public com.gic.api.base.commons.Page<YwWxEnterpriseDTO> list(BasePageInfo pageInfo,String keyword,String gicContactFlag,String version) {
+	public com.gic.api.base.commons.Page<YwWxEnterpriseDTO> list(BasePageInfo pageInfo,String keyword,Integer gicContactFlag,String version) {
 		PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
 		Page<TabHaobanWxEnterprise>  page = wxEnterpriseMapper.list(keyword,gicContactFlag,version);
 		return  PageUtil.changePageHelperToCurrentPage(page, YwWxEnterpriseDTO.class);

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

@@ -363,11 +363,17 @@
     where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
   </update>
   
-  <select id="list" resultMap="BaseResultMap" parameterType="java.lang.String" >
+  <select id="list" resultMap="BaseResultMap"  >
     select 
     <include refid="Base_Column_List" />
     from tab_haoban_wx_enterprise
     where status_flag = 1
+    	<if test="keyword != null and keyword != ''">
+    	    and corp_name like CONCAT('%',#{keyword},'%')
+    	</if>
+    	<if test="gicContactFlag != null and gicContactFlag != ''">
+    		and contact_flag = #{gicContactFlag,jdbcType=INTEGER}
+    	</if>
   </select>
   <select id="listBycorpId" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select