|
@@ -5,7 +5,12 @@ import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
import com.qmrb.system.framework.security.util.SecurityUtils;
|
|
|
+import com.qmrb.system.pojo.entity.ContractPlaceNumberRel;
|
|
|
+import com.qmrb.system.pojo.entity.ContractPlaceNumberRelHis;
|
|
|
+import com.qmrb.system.service.IContractPlaceNumberRelHisService;
|
|
|
import org.springdoc.core.annotations.ParameterObject;
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
@@ -46,9 +51,13 @@ import lombok.RequiredArgsConstructor;
|
|
|
@RestController
|
|
|
@RequestMapping("/api/v1/contract_place_number_rel")
|
|
|
@RequiredArgsConstructor
|
|
|
-public class ContractPlaceNumberRelController{
|
|
|
+public class ContractPlaceNumberRelController {
|
|
|
|
|
|
private final IContractPlaceNumberRelService contractPlaceNumberRelService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ IContractPlaceNumberRelHisService contractPlaceNumberRelHisService;
|
|
|
+
|
|
|
@Operation(summary = "协议车牌历史记录分页列表", security = {@SecurityRequirement(name = "Authorization")})
|
|
|
@GetMapping("/getHistoryPage")
|
|
|
public PageResult<ContractPlaceNumberRelVO> getHistoryPage(@ParameterObject ContractPlaceNumberRelQuery queryParams) {
|
|
@@ -56,18 +65,18 @@ public class ContractPlaceNumberRelController{
|
|
|
return PageResult.success(result);
|
|
|
}
|
|
|
|
|
|
- @Operation(summary = "协议(客商)车牌关系分页列表", security = {@SecurityRequirement(name = "Authorization")})
|
|
|
+ @Operation(summary = "协议(客商)车牌关系分页列表", security = {@SecurityRequirement(name = "Authorization")})
|
|
|
@GetMapping("/page")
|
|
|
public PageResult<ContractPlaceNumberRelVO> getPage(@ParameterObject ContractPlaceNumberRelQuery queryParams) {
|
|
|
// 校验当前登录用户id
|
|
|
- if(SecurityUtils.getUserId() == null){
|
|
|
+ if (SecurityUtils.getUserId() == null) {
|
|
|
return PageResult.success(null);
|
|
|
}
|
|
|
Page<ContractPlaceNumberRelVO> result = contractPlaceNumberRelService.getPage(queryParams);
|
|
|
return PageResult.success(result);
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
@Operation(summary = "新增协议(客商)车牌关系", security = {@SecurityRequirement(name = "Authorization")})
|
|
|
@PostMapping
|
|
|
public Result<ContractPlaceNumberRelForm> saveForm(@RequestBody @Valid ContractPlaceNumberRelForm form) {
|
|
@@ -78,7 +87,7 @@ public class ContractPlaceNumberRelController{
|
|
|
@Operation(summary = "协议(客商)车牌关系表单数据", security = {@SecurityRequirement(name = "Authorization")})
|
|
|
@GetMapping("/{id}/form")
|
|
|
public Result<ContractPlaceNumberRelForm> getForm(@Parameter(description = "协议(客商)车牌关系ID") @PathVariable Long id) {
|
|
|
- ContractPlaceNumberRelForm formData = contractPlaceNumberRelService.getFormData(id);
|
|
|
+ ContractPlaceNumberRelForm formData = contractPlaceNumberRelService.getFormData(id);
|
|
|
return Result.success(formData);
|
|
|
}
|
|
|
|
|
@@ -86,23 +95,32 @@ public class ContractPlaceNumberRelController{
|
|
|
@PutMapping(value = "/{id}")
|
|
|
public Result<?> updateForm(@Parameter(description = "协议(客商)车牌关系ID") @PathVariable Long id, @RequestBody @Validated ContractPlaceNumberRelForm form) {
|
|
|
|
|
|
- boolean result = contractPlaceNumberRelService.updateForm(id,form);
|
|
|
+ boolean result = contractPlaceNumberRelService.updateForm(id, form);
|
|
|
return Result.judge(result);
|
|
|
}
|
|
|
|
|
|
@Operation(summary = "删除协议(客商)车牌关系", security = {@SecurityRequirement(name = "Authorization")})
|
|
|
@DeleteMapping("/{ids}")
|
|
|
- public Result<?> deleteUsers( @Parameter(description = "协议(客商)车牌关系ID,多个以英文逗号(,)分割") @PathVariable String ids) {
|
|
|
- if(StrUtil.isBlank(ids)) {
|
|
|
- return Result.failed(ResultCode.PARAM_ERROR, "删除的协议(客商)车牌关系数据为空");
|
|
|
- }
|
|
|
+ public Result<?> deleteUsers(@Parameter(description = "协议(客商)车牌关系ID,多个以英文逗号(,)分割") @PathVariable String ids) {
|
|
|
+ if (StrUtil.isBlank(ids)) {
|
|
|
+ return Result.failed(ResultCode.PARAM_ERROR, "删除的协议(客商)车牌关系数据为空");
|
|
|
+ }
|
|
|
// 逻辑删除
|
|
|
List<Long> idList = Arrays.asList(ids.split(",")).stream()
|
|
|
.map(idStr -> Long.parseLong(idStr)).collect(Collectors.toList());
|
|
|
boolean result = contractPlaceNumberRelService.removeByIds(idList);
|
|
|
+ List<ContractPlaceNumberRel> contractPlaceNumberRels = contractPlaceNumberRelService.listByIds(idList);
|
|
|
+ if (result) {
|
|
|
+ for (ContractPlaceNumberRel contractPlaceNumberRel : contractPlaceNumberRels) {
|
|
|
+ // 更新历史记录表
|
|
|
+ ContractPlaceNumberRelHis contractPlaceNumberRelHis = new ContractPlaceNumberRelHis();
|
|
|
+ BeanUtils.copyProperties(contractPlaceNumberRel, contractPlaceNumberRelHis, "id");
|
|
|
+ contractPlaceNumberRelHis.setStatus("4");// 0停用1启用 2到期 3新增 4删除 5修改
|
|
|
+ contractPlaceNumberRelHisService.save(contractPlaceNumberRelHis);
|
|
|
+ }
|
|
|
+ }
|
|
|
return Result.judge(result);
|
|
|
}
|
|
|
-
|
|
|
|
|
|
|
|
|
}
|