Browse Source

Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform

dev_shibei_match
sunyuchao 5 years ago
parent
commit
04b8dbb911
  1. 28
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java
  2. 2
      epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
  3. 2
      epmet-module/data-statistical/data-statistical-server/pom.xml
  4. 8
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleDao.java
  5. 6
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java
  6. 8
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleService.java
  7. 9
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleServiceImpl.java
  8. 2
      epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
  9. 2
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleDao.xml
  10. 2
      epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
  11. 2
      epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml
  12. 2
      epmet-module/epmet-heart/epmet-heart-server/pom.xml
  13. 2
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml
  14. 2
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml
  15. 2
      epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml
  16. 2
      epmet-module/epmet-job/epmet-job-server/pom.xml
  17. 2
      epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
  18. 2
      epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
  19. 2
      epmet-module/epmet-point/epmet-point-server/pom.xml
  20. 2
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRuleController.java
  21. 3
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
  22. 2
      epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml
  23. 2
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
  24. 10
      epmet-module/epmet-third/epmet-third-server/pom.xml
  25. 36
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
  26. 12
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
  27. 1
      epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml

28
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java

@ -93,20 +93,28 @@ public class LogMsgSendFilter extends LevelFilter {
/**
* desc:获取服务 ip及profile信息
*
*/
private void getServerInfo() {
if (serverIp == null) {
InetUtils inetUtils = SpringContextUtils.getBean(InetUtils.class);
serverIp = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
try {
if (serverIp == null) {
InetUtils inetUtils = SpringContextUtils.getBean(InetUtils.class);
serverIp = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
}
} catch (Exception e) {
logger.warn("getServerInfo get bean InetUtils exception", e);
return;
}
if (activeEnv == null) {
Environment environment = SpringContextUtils.getBean(Environment.class);
String[] activeProfiles = environment.getActiveProfiles();
if (activeProfiles != null && activeProfiles.length > 0) {
logger.info("activeProfiles:{}", activeProfiles);
activeEnv = activeProfiles[0];
try {
if (activeEnv == null) {
Environment environment = SpringContextUtils.getBean(Environment.class);
String[] activeProfiles = environment.getActiveProfiles();
if (activeProfiles != null && activeProfiles.length > 0) {
logger.info("activeProfiles:{}", activeProfiles);
activeEnv = activeProfiles[0];
}
}
} catch (Exception e) {
logger.warn("getServerInfo get bean Environment exception", e);
}
}

2
epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
data-statistical-server:
container_name: data-statistical-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.41
image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.42
ports:
- "8108:8108"
network_mode: host # 使用现有网络

2
epmet-module/data-statistical/data-statistical-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.41</version>
<version>0.3.42</version>
<parent>
<artifactId>data-statistical</artifactId>
<groupId>com.epmet</groupId>

8
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleDao.java

@ -23,6 +23,7 @@ import com.epmet.entity.voice.ArticleEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
/**
@ -45,11 +46,12 @@ public interface ArticleDao extends BaseDao<ArticleEntity> {
List<ArticleGridPublishedSummaryDTO> getAllPublishedCount(@Param("customerId") String customerId, @Param("publishDate") String publishDate, @Param("publisherType") String publisherType);
/**
* desc:根据客户Id 发布时间 获取文章数据
* desc:根据客户Id 创建时间 获取文章数据
*
* @param customerId
* @param publishDate
* @param startTime
* @param endTime
* @return
*/
List<ArticleEntity> getPublishedArticleByDay(@Param("customerId") String customerId, @Param("publishDate") String publishDate);
List<ArticleEntity> getPublishedArticleByDay(@Param("customerId") String customerId, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
}

6
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java

@ -598,14 +598,14 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
//转换为 需要插入的Entity
Map<String, DimAgencyEntity> dimAgencyEntityMap = agencyDTOList.stream().collect(Collectors.toMap(DimAgencyEntity::getId, o -> o));
Date startTime = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
Date endTime = DateUtils.integrate(DateUtils.addDateDays(statsDate, NumConstant.ONE), DateUtils.DATE_PATTERN);
//获取当天的业务数据
//1获取文章及机关id,网格Id
List<ArticleEntity> publishedArticleList = articleService.getPublishedArticleByPublishTime(customerId, DateUtils.format(statsDate));
List<ArticleEntity> publishedArticleList = articleService.getPublishedArticleByCreateTime(customerId, startTime, endTime);
if (!CollectionUtils.isEmpty(publishedArticleList)) {
//KEY 文章Id
Map<String, ArticleEntity> articleMap = publishedArticleList.stream().collect(Collectors.toMap(ArticleEntity::getId, o -> o));
Date startTime = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
Date endTime = DateUtils.integrate(DateUtils.addDateDays(statsDate, NumConstant.ONE), DateUtils.DATE_PATTERN);
//2 获取文章标签
List<ArticleTagsEntity> articleTagsList = articleTagsService.getArticleTagsByCreateTime(customerId, startTime, endTime);
if (!CollectionUtils.isEmpty(articleTagsList)) {

8
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleService.java

@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.dto.voice.ArticleGridPublishedSummaryDTO;
import com.epmet.entity.voice.ArticleEntity;
import java.util.Date;
import java.util.List;
/**
@ -56,12 +57,13 @@ public interface ArticleService extends BaseService<ArticleEntity> {
List<ArticleGridPublishedSummaryDTO> getAllGridPublishedCount(String customerId, String publishDate);
/**
* desc根据客户id发布时间 获取文章数据
* desc根据客户id创建时间 获取文章数据因为存在当天可以发布之前时间点的数据 所以采用创建时间
* @param customerId
* @param publishDate
* @param startTime
* @param endTime
* @return
*/
List<ArticleEntity> getPublishedArticleByPublishTime(String customerId, String publishDate);
List<ArticleEntity> getPublishedArticleByCreateTime(String customerId, Date startTime, Date endTime);
ArticleEntity selectArticleById(String articleId);
}

9
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleServiceImpl.java

@ -30,6 +30,7 @@ import com.epmet.service.voice.ArticleService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
@ -63,9 +64,11 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
@Override
public List<ArticleEntity> getPublishedArticleByPublishTime(String customerId, String publishDate) {
checkParam(customerId, publishDate);
return baseDao.getPublishedArticleByDay(customerId,publishDate);
public List<ArticleEntity> getPublishedArticleByCreateTime(String customerId, Date startTime, Date endTime) {
if (StringUtils.isBlank(customerId) || startTime == null || endTime == null) {
throw new RenException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg());
}
return baseDao.getPublishedArticleByDay(customerId, startTime, endTime);
}
@Override

2
epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml

@ -10,7 +10,7 @@ spring:
name: data-statistical-server
#环境 dev|test|prod
profiles:
active: dev
active: @spring.profiles.active@
jackson:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss

2
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleDao.xml

@ -65,7 +65,7 @@
FROM
article
WHERE
PUBLISH_DATE = #{publishDate,jdbcType=VARCHAR}
CREATED_TIME BETWEEN #{startTime,jdbcType=TIMESTAMP} AND #{endTime,jdbcType=TIMESTAMP}
AND DEL_FLAG = 0
AND TAGS IS NOT NULL
AND CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}

2
epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-heart-server:
container_name: epmet-heart-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.37
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.38
ports:
- "8111:8111"
network_mode: host # 使用现有网络

2
epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-heart-server:
container_name: epmet-heart-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.37
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.38
ports:
- "8111:8111"
network_mode: host # 使用现有网络

2
epmet-module/epmet-heart/epmet-heart-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.0.37</version>
<version>0.0.38</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-heart</artifactId>

2
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml

@ -10,7 +10,7 @@ spring:
name: epmet-heart-server
#环境 dev|test|prod
profiles:
active: dev
active: @spring.profiles.active@
jackson:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss

2
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml

@ -75,7 +75,7 @@
FROM act_user_relation re
WHERE re.DEL_FLAG = '0'
AND re.ACT_ID = #{actId}
AND re.`STATUS` != 'refused' AND re.`STATUS` != 'cancele'
AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled'
</select>
<update id="updateUserRelationByActIdAndUserId" parameterType="com.epmet.dto.ActUserRelationDTO">

2
epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-job-server:
container_name: epmet-job-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.23
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.24
ports:
- "8084:8084"
network_mode: host # 使用现有网络

2
epmet-module/epmet-job/epmet-job-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.23</version>
<version>0.3.24</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-job</artifactId>

2
epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml

@ -10,7 +10,7 @@ spring:
name: epmet-job-server
#环境 dev|test|prod
profiles:
active: dev
active: @spring.profiles.active@
messages:
encoding: UTF-8
basename: i18n/messages,i18n/messages_common

2
epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-point-server:
container_name: epmet-point-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.31
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.32
ports:
- "8112:8112"
network_mode: host # 使用现有网络

2
epmet-module/epmet-point/epmet-point-server/pom.xml

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.0.31</version>
<version>0.0.32</version>
<parent>
<artifactId>epmet-point</artifactId>
<groupId>com.epmet</groupId>

2
epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRuleController.java

@ -50,14 +50,12 @@ public class PointRuleController {
/**
* desc:根据功能id获取积分规则
*
* @param tokenDTO
* @param formDTO
* @return
*/
@PostMapping(value = "list")
@RequirePermission( requirePermission = RequirePermissionEnum.MORE_POINT_RULE_LIST)
public Result<List<PointRuleResultDTO>> list( @RequestBody PointRuleListFormDTO formDTO) {
formDTO.setCustomerId("3ef7e4bb195eb9e622d68b52509aa940");
ValidatorUtils.validateEntity(formDTO);
return new Result<List<PointRuleResultDTO>>().ok(pointRuleService.list(formDTO));
}

3
epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java

@ -333,8 +333,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
}else{
log.error(String.format("未检测到该用户下有效的积分规则,消息体->【%s】", JSON.toJSON(event)));
throw new RenException("未检测到该用户下有效的积分规则");
log.warn(String.format("未检测到该用户下有效的积分规则,消息体->【%s】", JSON.toJSON(event)));
}

2
epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml

@ -10,7 +10,7 @@ spring:
name: epmet-point-server
#环境 dev|test|prod
profiles:
active: dev
active: @spring.profiles.active@
jackson:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss

2
epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-third-server:
container_name: epmet-third-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.100
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.102
ports:
- "8110:8110"
network_mode: host # 使用现有网络

10
epmet-module/epmet-third/epmet-third-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.0.100</version>
<version>0.0.102</version>
<parent>
<groupId>com.epmet</groupId>
@ -147,6 +147,14 @@
<version>5.1.12.RELEASE</version>
<scope>compile</scope>
</dependency>
<!-- 钉钉机器人 -->
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>alibaba-dingtalk-service-sdk</artifactId>
<version>1.0.1</version>
</dependency>
</dependencies>
<build>

36
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java

@ -3,6 +3,10 @@ package com.epmet.service.impl;
import cn.hutool.json.JSONObject;
import com.alibaba.fastjson.JSON;
import com.alibaba.nacos.client.config.utils.IOUtils;
import com.dingtalk.api.DefaultDingTalkClient;
import com.dingtalk.api.DingTalkClient;
import com.dingtalk.api.request.OapiRobotSendRequest;
import com.dingtalk.api.response.OapiRobotSendResponse;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.HttpClientManager;
@ -24,6 +28,7 @@ import com.epmet.wxapi.constant.WxMaCodeConstant;
import com.fasterxml.jackson.core.JsonEncoding;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.taobao.api.ApiException;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.dom4j.DocumentException;
@ -139,16 +144,20 @@ public class WarrantServiceImpl implements WarrantService {
codeAuditRecordDao.insertCodeAuditRecord(codeAuditRecord);
// 修改 code_audit_result 中的代码审核结果
// String event = codeAuditRecord.getEvent();
String reason = codeAuditRecord.getReason();
String codeResult = null;
switch (event) {
case ModuleConstant.WEAPP_AUDIT_SUCCESS:
codeResult = ModuleConstant.AUDIT_SUCCESS;
this.dingDingRobot(reason,null);
break;
case ModuleConstant.WEAPP_AUDIT_FAIL:
codeResult = ModuleConstant.AUDIT_FAILED;
this.dingDingRobot(reason,codeResult);
break;
case ModuleConstant.WEAPP_AUDIT_DELAY:
codeResult = ModuleConstant.DELAY;
this.dingDingRobot(reason,codeResult);
break;
}
String codeCustomerId = codeCustomerDao.selectCodeCustomerId(codeAuditRecord);
@ -190,6 +199,33 @@ public class WarrantServiceImpl implements WarrantService {
return ModuleConstant.SUCCESS;
}
public void dingDingRobot(String result,String event){
DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/robot/send?access_token=5b48fcbc3fde24b8ba4696aa062b7f8146479a9d3467dbb1f9cf132ec36b955a");
OapiRobotSendRequest request = new OapiRobotSendRequest();
request.setMsgtype("text");
OapiRobotSendRequest.Text text = new OapiRobotSendRequest.Text();
switch (event){
case ModuleConstant.WEAPP_AUDIT_SUCCESS:
text.setContent("代码审核结果: 审核成功");
break;
case ModuleConstant.WEAPP_AUDIT_FAIL:
text.setContent("代码审核结果: 审核不通过,"+
"不通过原因:"+result);
break;
case ModuleConstant.WEAPP_AUDIT_DELAY:
text.setContent("代码审核结果: 审核延时,"+
"延时原因:"+result);
break;
}
request.setText(text);
try {
OapiRobotSendResponse response = client.execute(request);
} catch (ApiException e) {
log.error("机器人生病了......");
e.printStackTrace();
}
}
/**
* 方法描述: 类型为enevt的时候拼接
* @param request

12
epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java

@ -44,6 +44,7 @@ import com.epmet.feign.OperCustomizeFeignClient;
import com.epmet.redis.CustomerRedis;
import com.epmet.service.CustomerService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -400,11 +401,12 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
@Override
public PageData pageQuery(PageQueryFormDTO formDTO) {
//1:查询有效客户数据(不区分是否在有效期内)
PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize());
List<CustomerResultDTO> list = baseDao.selectCustomerList(formDTO.getCustomerName());
//PageInfo<CustomerResultDTO> pi = new PageInfo<>(list);
PageData resultDTO = new PageData(list,list.size());
return resultDTO;
PageInfo<CustomerResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize())
.doSelectPageInfo(() -> baseDao.selectCustomerList(formDTO.getCustomerName()));
// List<CustomerResultDTO> list = baseDao.selectCustomerList(formDTO.getCustomerName());
// //PageInfo<CustomerResultDTO> pi = new PageInfo<>(list);
// int total=baseDao.selectCountByCustomerName(formDTO.getCustomerName());
return new PageData(pageInfo.getList(),pageInfo.getTotal());
}
/**

1
epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml

@ -70,6 +70,7 @@
AND customer_name LIKE concat('%', trim(#{customerName}), '%')
</if>
</select>
<select id="getAllList" resultMap="customerMap">
SELECT
*

Loading…
Cancel
Save