suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into cc_20250529_login

Browse Source 
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
This commit is contained in:
苏竹红
2025-05-30 13:40:53 +08:00
parent 6dfce8b0e2 2bab35ab1a
commit 43f9475549
13 changed files with 167 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java
View File

@@ -128,4 +128,28 @@ public class DataHandlerController {
public ResponseResult<Integer> JingDongStageHandler() {
return ResponseResult.success(dataHandlerServer.JingDongStageHandler());
}
@PostMapping("/dataHandlerV2025029")
@ApiOperation("/处理测量 设计 施工 验收 完成")
public ResponseResult<Boolean> dataHandlerV2025029(MultipartFile file) {
ExcelReader reader = null;
try {
reader = ExcelUtil.getReader(file.getInputStream());
} catch (IOException e) {
log.error("read file error:", e);
}
assert reader != null;
List<Map<String, Object>> dataMapList = reader.read(0, 1, Integer.MAX_VALUE);
ImportTaskDO importTaskDO = new ImportTaskDO();
importTaskDO.setFileName(file.getOriginalFilename());
importTaskDO.setFileType(FileTypeEnum.IMPORT_FITMENT_SHOP_STAGE.getFileType());
importTaskDO.setIsImport(true);
importTaskDO.setStatus(ImportTaskStatusEnum.PROGRESS.getCode());
importTaskDO.setCreateUserId(CurrentUserHolder.getUserId());
importTaskDO.setCreateName(CurrentUserHolder.getUser().getName());
importTaskDO.setCreateTime(System.currentTimeMillis());
importTaskMapper.insert(eid, importTaskDO);
dataHandlerServer.dataHandlerV2025029(dataMapList, file.getOriginalFilename(), CurrentUserHolder.getUser(), importTaskDO);
return ResponseResult.success(true);
}
}

10
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineAuditController.java
View File

@@ -62,10 +62,10 @@ public class LineAuditController {
return ResponseResult.success(bankService.repayment(request));
}
// @ApiOperation("结束跟进")
// @PostMapping("/close")
// public ResponseResult<Boolean> auditClose(@RequestBody AuditCloseRequest request){
// return ResponseResult.success(lineFlowService.auditClose(request, CurrentUserHolder.getUser()));
// }
@ApiOperation("结束跟进")
@PostMapping("/close")
public ResponseResult<Boolean> auditClose(@RequestBody AuditCloseRequest request){
return ResponseResult.success(lineFlowService.auditClose(request, CurrentUserHolder.getUser()));
}
}