From afbc1b29cd2ce92484f1be1e533ee075dbe08ff2 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 10 十月 2022 14:46:01 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/entity/message/Message.java | 9 ++++
ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageServiceImpl.java | 8 ++--
ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml | 7 +--
ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java | 10 ++++
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 12 +++--
ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java | 3 -
ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java | 17 ++++++++
ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java | 14 ++++--
8 files changed, 59 insertions(+), 21 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java b/ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java
index 1ebf317..bb68d68 100644
--- a/ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java
+++ b/ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java
@@ -55,8 +55,7 @@
@ApiModelProperty(value = "搴ф満/鍒嗘満")
private String zj;
-
- @NotBlank(message = "瑙掕壊Id鍒楄〃涓嶈兘涓虹┖")
+ @NotEmpty
@ApiModelProperty(value = "瑙掕壊Id鍒楄〃", required = true)
private List<Long> roleIds;
diff --git a/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java b/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java
index 3767c4c..69cad1b 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java
@@ -59,6 +59,23 @@
.like(StringUtils.isNotBlank(carNum), CarSlagcar::getCarNumber, carNum)));
}
+
+ @ApiOperation(value = "鏌ョ湅璇︽儏鎵ф硶杞�")
+ @GetMapping("/query_enforce_one")
+ public CommonResult searchEnforceCar(@RequestParam Integer id) {
+ return CommonResult.success(iCarEnforcecarService
+ .getOne(new LambdaQueryWrapper<CarEnforcecar>()
+ .eq(CarEnforcecar::getId, id)));
+ }
+
+ @ApiOperation(value = "鏌ョ湅璇︽儏娓ｅ湡杞�")
+ @GetMapping("/query_slag_one")
+ public CommonResult searchSlagCar(@RequestParam Integer id) {
+ return CommonResult.success(iCarSlagcarService
+ .getOne(new LambdaQueryWrapper<CarSlagcar>()
+ .eq(CarSlagcar::getId, id)));
+ }
+
@ApiOperation("淇敼鎵ф硶杞�")
@PutMapping("/modification_enforce")
public CommonResult modify(@RequestBody CarEnforcecar carEnforcecar) {
diff --git a/ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java b/ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java
index 82ae17b..7d06d37 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java
@@ -1,5 +1,6 @@
package com.ycl.dto.message;
+import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,9 +25,16 @@
@NotNull(message = "鏍囬涓虹┖")
private String head;
/**
+ * 娓犻亾鐮�01-鍐呯珯淇�02-閭欢03-鐭俊
+ */
+ @TableField("channel_code")
+ @ApiModelProperty(value = "娓犻亾鐮�01-鍐呯珯淇�02-閭欢03-鐭俊")
+ @NotNull(message = "娓犻亾鐮佷负绌�")
+ private String channelCode;
+ /**
* 娑堟伅绫诲瀷
*/
- @ApiModelProperty(value = "娑堟伅绫诲瀷0-绔欏唴淇�1-閭欢2-鐭俊")
+ @ApiModelProperty(value = "娑堟伅绫诲瀷0-绔欏唴淇�1-閭欢2-鐭俊", required = true)
@NotNull(message = "娑堟伅绫诲瀷涓虹┖")
private Integer messageType;
/**
diff --git a/ycl-platform/src/main/java/com/ycl/entity/message/Message.java b/ycl-platform/src/main/java/com/ycl/entity/message/Message.java
index 703a1e3..032f38b 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/message/Message.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/message/Message.java
@@ -45,6 +45,15 @@
@NotBlank(message = "鏍囬涓虹┖")
private String head;
+
+ /**
+ * 娓犻亾鐮�01-鍐呯珯淇�02-閭欢03-鐭俊
+ */
+ @TableField("channel_code")
+ @ApiModelProperty(value = "娓犻亾鐮�01-鍐呯珯淇�02-閭欢03-鐭俊")
+ @NotBlank(message = "娓犻亾鐮佷负绌�")
+ private String channelCode;
+
/**
* 娑堟伅绫诲瀷
*/
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
index 7938ed5..fc5aa94 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -242,7 +242,7 @@
//2.2鏌ヨ澶勭疆娴佺▼鐜妭閰嶇疆
Map mapWcs = new HashMap();
mapWcs.put("workflowConfigId", ddlcId);
- mapWcs.put("baseCaseId", ddlcId);
+ mapWcs.put("baseCaseId", baseCase.getId());
List<WorkflowConfigStep> listWcs = workflowConfigStepMapper.selectRecordByWorkflowConfigStepId(mapWcs);
//澶勭悊鐢ㄧ幆鑺傛椂闂�
for (WorkflowConfigStep step : listWcs) {
@@ -251,10 +251,12 @@
continue;
}
for (DisposeRecord record : records) {
- record.setLinkTime(
- DateUtil.getDistanceDateTime(
- DateUtil.fromLocalDateTime(baseCase.getAlarmTime()),
- DateUtil.fromLocalDateTime(record.getCreateTime())));
+ if (record != null&&record.getCreateTime()!=null) {
+ record.setLinkTime(
+ DateUtil.getDistanceDateTime(
+ DateUtil.fromLocalDateTime(baseCase.getAlarmTime()),
+ DateUtil.fromLocalDateTime(record.getCreateTime())));
+ }
}
step.setDisposeRecords(records);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageServiceImpl.java
index fc5484d..011eeb2 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageServiceImpl.java
@@ -26,18 +26,18 @@
public Message sendMessage(MessageParam messageParam) {
Message message = null;
Provider provider = null;
- switch (messageParam.getMessageType())
+ switch (messageParam.getChannelCode())
{
//鍐呯珯鍙戦��
- case 0:
+ case "01":
provider = new InnerFactory();
break;
//閭欢鍙戦��
- case 1:
+ case "02":
provider = new MailFactory();
break;
//鐭俊鍙戦��
- case 2:
+ case "03":
provider = new SmsFactory();
break;
default:
diff --git a/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
index 33b9652..bd15859 100644
--- a/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.store.StoreInfo;
@@ -17,6 +18,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@@ -32,14 +34,16 @@
@Slf4j
public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo> implements StoreInfoService {
+
+
@Override
public Page<StoreInfo> list(String keyword, Integer pageSize, Integer pageNum) {
Page<StoreInfo> page = new Page<>(pageSize, pageNum);
- LambdaQueryWrapper<StoreInfo> wrapper = new LambdaQueryWrapper<>();
- if (StrUtil.isNotEmpty(keyword)) {
- wrapper.like(StoreInfo::getStoreName, keyword);
- }
- return page(page, wrapper);
+ Page<StoreInfo> storeInfoPage = page(page, new LambdaQueryWrapper<StoreInfo>()
+ .like(StringUtils.isNotBlank(keyword), StoreInfo::getStoreName, keyword));
+ storeInfoPage.setRecords(list(new LambdaQueryWrapper<StoreInfo>()
+ .like(StringUtils.isNotBlank(keyword), StoreInfo::getStoreName, keyword)));
+ return storeInfoPage;
}
@Override
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml
index 9dfc088..bfe75cc 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml
@@ -17,7 +17,7 @@
</sql>
<resultMap type="com.ycl.entity.caseHandler.WorkflowConfigStep" id="RecordResultMap" extends="BaseResultMap">
<collection property="disposeRecords" javaType="ArrayList" ofType="com.ycl.entity.caseHandler.DisposeRecord">
- <id column="id" property="id" />
+ <id column="record_id" property="id" />
<result column="base_case_id" property="baseCaseId" />
<result column="workflow_config_step_id" property="workflowConfigStepId" />
<result column="step_name" property="stepName" />
@@ -33,12 +33,11 @@
<select id="selectRecordByWorkflowConfigStepId" parameterType="map" resultMap="RecordResultMap">
SELECT
- *
+ uwcs.*,udr.*,udr.id record_id
FROM
ums_workflow_config_step uwcs
- LEFT JOIN ums_dispose_record udr ON uwcs.id = udr.workflow_config_step_id
+ LEFT JOIN ums_dispose_record udr ON uwcs.id = udr.workflow_config_step_id AND udr.base_case_id = #{baseCaseId}
WHERE
uwcs.workflow_config_id = #{workflowConfigId}
- AND udr.base_case_id = #{baseCaseId}
</select>
</mapper>
--
Gitblit v1.8.0