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;
@@ -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) { 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; /** 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; /** * 消息类型 */ 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); } 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: 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 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>
