ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
yjz
2023-10-12 14:38:12 +08:00
parent 98f37dcbdc 794f958851
commit 9a9ac6dc3a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java
+3 -3
View File
@@ -12,7 +12,6 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -40,7 +39,7 @@ public class ProcessESInitChangeController {
@AutoLog(value = "企标立项变更流程-生成企标编号并返回") @AutoLog(value = "企标立项变更流程-生成企标编号并返回")
@ApiOperation(value="企标立项变更流程-生成企标编号并返回", notes="企标立项变更流程-生成企标编号并返回") @ApiOperation(value="企标立项变更流程-生成企标编号并返回", notes="企标立项变更流程-生成企标编号并返回")
@PostMapping("/getStandardNo") @PostMapping("/getStandardNo")
public Result<?> getStandardNo(@Valid @RequestBody ProcessEsInitChange esInitChange) { public Result<?> getStandardNo(@RequestBody ProcessEsInitChange esInitChange) {
// 生成企标编号并返回 // 生成企标编号并返回
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put(FieldCommon.ENTERPRISE_STANDARD_CODE, esInitChange.getEnStandardCode()); map.put(FieldCommon.ENTERPRISE_STANDARD_CODE, esInitChange.getEnStandardCode());
@@ -62,8 +61,9 @@ public class ProcessESInitChangeController {
@RequestBody List<ProcessEsInitChange> esInitChangeList) { @RequestBody List<ProcessEsInitChange> esInitChangeList) {
if (StrUtil.isBlank(taskId)) { if (StrUtil.isBlank(taskId)) {
initChangeService.saveToDraft(esInitChangeList); initChangeService.saveToDraft(esInitChangeList);
} else {
initChangeService.saveToWait(taskId, esInitChangeList);
} }
initChangeService.saveToWait(taskId, esInitChangeList);
return Result.OK(); return Result.OK();
} }