1.根据商场或者仓库id返回他的绑定关系

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesCustomerMallController.java

@@ -178,7 +178,16 @@ public class AftersalesCustomerMallController extends BladeController {
 			IPage<AftersalesCustomerMallEntity> pages = aftersalesCustomerMallService.pageListOwn(aftersalesCustomerMallEntity, Condition.getPage(query));
 			return R.data(pages);
 	}
-
+	/**
+	 * 根据商场或者仓库id返回 他的 绑定关系
+	 */
+	@GetMapping("/getByClientId")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "根据商场或者仓库id返回 他的 绑定关系", notes = "id")
+	public R<List<AftersalesCustomerMallEntity>> getByClientId(@RequestParam String clientId) {
+		List<AftersalesCustomerMallEntity> aftersalesCustomerMallEntities = aftersalesCustomerMallService.getByClientId(clientId);
+		return R.data(aftersalesCustomerMallEntities);
+	}
 
 
 

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCustomerMallMapper.java

@@ -65,4 +65,5 @@ public interface AftersalesCustomerMallMapper extends BaseMapper<AftersalesCusto
 
 	IPage<AftersalesCustomerMallEntity> pageListOwn(@Param("param") AftersalesCustomerMallEntity aftersalesCustomerMallEntity, IPage<Object> page);
 
+	List<AftersalesCustomerMallEntity> getByClientId(String clientId);
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCustomerMallMapper.xml

@@ -41,7 +41,7 @@
 
     <select id="pageListOwn" resultType="com.logpm.aftersales.entity.AftersalesCustomerMallEntity">
 
-        select * from logpm_aftersales_customer_mall
+        select customer_service_id,customer_service_name,client_id,client_name,types_of,conditions from logpm_aftersales_customer_mall
         <where>
             is_deleted = 0 and types_of = #{param.typesOf}
             <if test="param.customerServiceId != null  and  param.customerServiceId != ''">and customer_service_id = #{param.customerServiceId}</if>
@@ -49,4 +49,11 @@
             <if test="param.createTime  != null and param.createTime  != '' ">and  date_format(from_unixtime(create_time ),'%Y-%m-%d') = date_format(#{createTime },'%Y-%m-%d')  </if>
         </where>
     </select>
+    <select id="getByClientId" resultType="com.logpm.aftersales.entity.AftersalesCustomerMallEntity">
+        select customer_service_id,customer_service_name,client_id,client_name,types_of,conditions
+        from logpm_aftersales_customer_mall
+        where client_id = #{clientId}
+          and is_deleted = 0
+        order by create_time ASC
+    </select>
 </mapper>

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesCustomerMallService.java

@@ -53,4 +53,6 @@ public interface IAftersalesCustomerMallService extends BaseService<AftersalesCu
 	boolean setDefault(AftersalesCustomerMallEntity aftersalesCustomerMall);
 
 	IPage<AftersalesCustomerMallEntity> pageListOwn(Map<String, Object> aftersalesCustomerMallEntity, IPage<Object> page);
+
+	List<AftersalesCustomerMallEntity> getByClientId(String clientId);
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesCustomerMallServiceImpl.java

@@ -67,4 +67,9 @@ public class AftersalesCustomerMallServiceImpl extends BaseServiceImpl<Aftersale
 		AftersalesCustomerMallEntity workOrderEntity = JSONObject.parseObject(JSONObject.toJSONString(aftersalesCustomerMallEntity), AftersalesCustomerMallEntity.class);
 		return baseMapper.pageListOwn(workOrderEntity, page);
 	}
+
+	@Override
+	public List<AftersalesCustomerMallEntity> getByClientId(String clientId) {
+		return baseMapper.getByClientId(clientId);
+	}
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTripartiteMallMapper.xml

@@ -42,7 +42,8 @@
         limit 1
     </select>
     <select id="getOwn" resultType="com.logpm.basicdata.entity.BasicdataTripartiteMallEntity">
-        select tripartite_mall,id from logpm_basicdata_tripartite_mall where is_deleted = 0
+        select CONCAT(tripartite_mall,',',tripartite_coding ) AS tripartiteMall,id from logpm_basicdata_tripartite_mall where is_deleted = 0
+
     </select>