|
@@ -20,7 +20,6 @@ import com.querydsl.core.types.dsl.BooleanExpression;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
-import org.springframework.boot.actuate.endpoint.OperationType;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import javax.transaction.Transactional;
|
|
import javax.transaction.Transactional;
|
|
@@ -48,7 +47,7 @@ public class ChangeRecordService {
|
|
list.addAll(CriteriaUtils.parse(qt.id, object.get("id")));
|
|
list.addAll(CriteriaUtils.parse(qt.id, object.get("id")));
|
|
list.addAll(CriteriaUtils.parse(qt.code, object.get("code")));
|
|
list.addAll(CriteriaUtils.parse(qt.code, object.get("code")));
|
|
list.addAll(CriteriaUtils.parse(qt.infoCode, object.get("infoCode")));
|
|
list.addAll(CriteriaUtils.parse(qt.infoCode, object.get("infoCode")));
|
|
- list.addAll(CriteriaUtils.parse(qt.operationType, object.get("operationType"), OperationType.class));
|
|
|
|
|
|
+ list.addAll(CriteriaUtils.parse(qt.operationType, object.get("operationType"), EnumOperationType.class));
|
|
list.addAll(CriteriaUtils.parse(qt.operationUser, object.get("operationUser")));
|
|
list.addAll(CriteriaUtils.parse(qt.operationUser, object.get("operationUser")));
|
|
list.addAll(CriteriaUtils.parse(qt.operationTime, object.get("operationTime")));
|
|
list.addAll(CriteriaUtils.parse(qt.operationTime, object.get("operationTime")));
|
|
list.addAll(CriteriaUtils.parse(qt.confirmUser, object.get("confirmUser")));
|
|
list.addAll(CriteriaUtils.parse(qt.confirmUser, object.get("confirmUser")));
|
|
@@ -71,7 +70,7 @@ public class ChangeRecordService {
|
|
MapResponse response = new MapResponse();
|
|
MapResponse response = new MapResponse();
|
|
if (EnumOperationType.create.equals(param.getOperationType())) {
|
|
if (EnumOperationType.create.equals(param.getOperationType())) {
|
|
Boolean isExists = isExists(param.getCode(), param.getInfoCode());
|
|
Boolean isExists = isExists(param.getCode(), param.getInfoCode());
|
|
- if(!isExists){
|
|
|
|
|
|
+ if (!isExists) {
|
|
response.setFail("code is exists");
|
|
response.setFail("code is exists");
|
|
return response;
|
|
return response;
|
|
}
|
|
}
|