提交 8c6e8bb7 authored 作者: 000516's avatar 000516

1\查询售点稽唯一查任时,删除按门店名称模糊查询;2\查询唯一售点稽查门店时,判断条件是否满足门店名称/任务ID不可同时为空;3\查询唯一售点任务时,优先使用任务ID查询

package com.sfa.operation.controller.risk.core; package com.sfa.operation.controller.risk.core;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.sfa.common.core.enums.ECode;
import com.sfa.common.core.exception.CheckedException;
import com.sfa.common.security.utils.SecurityUtils; import com.sfa.common.security.utils.SecurityUtils;
import com.sfa.operation.pojo.risk.request.RiskStoreTaskVo; import com.sfa.operation.pojo.risk.request.RiskStoreTaskVo;
import com.sfa.operation.pojo.risk.response.RiskInspectStoreDto; import com.sfa.operation.pojo.risk.response.RiskInspectStoreDto;
...@@ -31,6 +33,9 @@ public class RiskStoreTaskCoreController { ...@@ -31,6 +33,9 @@ public class RiskStoreTaskCoreController {
private IRiskStoreCoreService riskstoreCoreService; private IRiskStoreCoreService riskstoreCoreService;
@PostMapping("/i_store") @PostMapping("/i_store")
public RiskStoreTaskDto inspectStore(@RequestBody RiskStoreTaskVo riskStoreTaskVo) { public RiskStoreTaskDto inspectStore(@RequestBody RiskStoreTaskVo riskStoreTaskVo) {
if (riskStoreTaskVo.getRstId() == null &&StringUtils.isBlank(riskStoreTaskVo.getStoreName())){
throw new CheckedException(ECode.RISK_STORE_TASK_CREATE_ERROR);
}
riskStoreTaskVo.setOperName(SecurityUtils.getNickName()); riskStoreTaskVo.setOperName(SecurityUtils.getNickName());
riskStoreTaskVo.setOperEmpNo(SecurityUtils.getUsername()); riskStoreTaskVo.setOperEmpNo(SecurityUtils.getUsername());
// 保存来源勤策的门店 // 保存来源勤策的门店
......
package com.sfa.operation.controller.risk.query; package com.sfa.operation.controller.risk.query;
import com.sfa.common.core.enums.ECode;
import com.sfa.common.core.exception.CheckedException;
import com.sfa.common.core.utils.DateUtils; import com.sfa.common.core.utils.DateUtils;
import com.sfa.common.core.utils.StringUtils;
import com.sfa.common.core.web.domain.PageInfo; import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.security.utils.SecurityUtils; import com.sfa.common.security.utils.SecurityUtils;
import com.sfa.operation.pojo.risk.request.RiskStoreTaskVo; import com.sfa.operation.pojo.risk.request.RiskStoreTaskVo;
import com.sfa.operation.pojo.risk.response.RiskStoreTaskDto; import com.sfa.operation.pojo.risk.response.RiskStoreTaskDto;
import com.sfa.operation.service.risk.IRiskStoreTaskQueryService; import com.sfa.operation.service.risk.IRiskStoreTaskQueryService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
...@@ -31,11 +33,21 @@ public class RiskStoreTaskQueryController { ...@@ -31,11 +33,21 @@ public class RiskStoreTaskQueryController {
return iRiskStoreTaskQueryService.page(riskStoreTaskVo); return iRiskStoreTaskQueryService.page(riskStoreTaskVo);
} }
@GetMapping("/i_store") @GetMapping("/i_store")
public RiskStoreTaskDto detail(RiskStoreTaskVo riskStoreTaskVo){ public RiskStoreTaskDto detail(RiskStoreTaskVo riskStoreTaskVo) {
if (StringUtils.isNotBlank(riskStoreTaskVo.getStoreCode())){ if (riskStoreTaskVo.getRstId() == null && StringUtils.isBlank(riskStoreTaskVo.getStoreCode())) {
throw new CheckedException(ECode.RISK_STORE_TASK_FIND_ONE_ERROR);
}
// 优先使用任务ID查询
if (riskStoreTaskVo.getRstId() != null){
return iRiskStoreTaskQueryService.getDetail(riskStoreTaskVo);
}
if (StringUtils.isNotBlank(riskStoreTaskVo.getStoreCode())) {
riskStoreTaskVo.setOperEmpNo(SecurityUtils.getUsername()); riskStoreTaskVo.setOperEmpNo(SecurityUtils.getUsername());
riskStoreTaskVo.setOperDate(DateUtils.dateStart(new Date())); riskStoreTaskVo.setOperDate(DateUtils.dateStart(new Date()));
riskStoreTaskVo.setStoreName(null);
return iRiskStoreTaskQueryService.getDetail(riskStoreTaskVo);
} }
return iRiskStoreTaskQueryService.getDetail(riskStoreTaskVo); throw new CheckedException(ECode.RISK_STORE_TASK_FIND_ONE_ERROR);
} }
} }
...@@ -129,7 +129,7 @@ public class RiskStoreTaskDaoImpl implements IRiskStoreTaskDao { ...@@ -129,7 +129,7 @@ public class RiskStoreTaskDaoImpl implements IRiskStoreTaskDao {
wqWrapper.like(RiskStoreTask::getStoreName, wq.getStoreName()); wqWrapper.like(RiskStoreTask::getStoreName, wq.getStoreName());
} }
if (StringUtils.isNotBlank(wq.getStoreCode())){ if (StringUtils.isNotBlank(wq.getStoreCode())){
wqWrapper.like(RiskStoreTask::getStoreCode, wq.getStoreCode()); wqWrapper.eq(RiskStoreTask::getStoreCode, wq.getStoreCode());
} }
if (StringUtils.isNotBlank(wq.getOperEmpNo())){ if (StringUtils.isNotBlank(wq.getOperEmpNo())){
wqWrapper.eq(RiskStoreTask::getCreateEmpNo, wq.getOperEmpNo()); wqWrapper.eq(RiskStoreTask::getCreateEmpNo, wq.getOperEmpNo());
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
class="ch.qos.logback.core.rolling.RollingFileAppender"> class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder> <encoder>
<pattern>${FILE_LOG_PATTERN}</pattern> <pattern>${FILE_LOG_PATTERN}</pattern>
<charset>UTF-8</charset>
</encoder> </encoder>
<file>${LOG_PATH}/${MODEL_NAME}-today.log</file> <file>${LOG_PATH}/${MODEL_NAME}-today.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
...@@ -56,6 +57,7 @@ ...@@ -56,6 +57,7 @@
class="ch.qos.logback.core.rolling.RollingFileAppender"> class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder> <encoder>
<pattern>${FILE_LOG_PATTERN}</pattern> <pattern>${FILE_LOG_PATTERN}</pattern>
<charset>UTF-8</charset>
</encoder> </encoder>
<file>${LOG_PATH}/${MODEL_NAME}-error-today.log</file> <file>${LOG_PATH}/${MODEL_NAME}-error-today.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论