Commit b8fcdf7c authored by yangyang's avatar yangyang

fix(检验检测开通):1.提交接口问题

parent 6c3d03d0
...@@ -70,7 +70,7 @@ public class JyjcOpeningApplicationController extends BaseController { ...@@ -70,7 +70,7 @@ public class JyjcOpeningApplicationController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/submit") @PutMapping(value = "/submit")
@ApiOperation(httpMethod = "PUT", value = "保存并提交", notes = "保存并提交") @ApiOperation(httpMethod = "PUT", value = "保存并提交", notes = "保存并提交")
public ResponseModel<JyjcOpeningApplicationModel> updateBySequenceNbrAndStartFlow(@RequestBody JyjcOpeningApplicationModel model, @RequestParam(value = "sequenceNbr") Long sequenceNbr) { public ResponseModel<JyjcOpeningApplicationModel> updateBySequenceNbrAndStartFlow(@RequestBody JyjcOpeningApplicationModel model, @RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr); model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model,true)); return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model,true));
} }
......
...@@ -125,7 +125,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp ...@@ -125,7 +125,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
model.setStatus(FlowStatusEnum.SUBMITTED.getCode() + ""); model.setStatus(FlowStatusEnum.SUBMITTED.getCode() + "");
model.setStatusName(FlowStatusEnum.SUBMITTED.getName()); model.setStatusName(FlowStatusEnum.SUBMITTED.getName());
model = this.updateWithModel(model); model = this.updateWithModel(model);
execueFlow("0", model.getWorkflowProstanceId(), ""); execueFlow(MapBuilder.<String,Object>create().put("op", "0").put("instanceId", model.getWorkflowProstanceId()).put("comments", "").build());
return model; return model;
} }
...@@ -220,22 +220,23 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp ...@@ -220,22 +220,23 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
userInfoQueryWrapper.eq("unit_code", unitCode); userInfoQueryWrapper.eq("unit_code", unitCode);
List<TzsUserInfo> userInfos = userInfoMapper.selectList(userInfoQueryWrapper); List<TzsUserInfo> userInfos = userInfoMapper.selectList(userInfoQueryWrapper);
if (!ValidationUtil.isEmpty(userInfos)) { if (!ValidationUtil.isEmpty(userInfos)) {
List<String> codes = userInfos.stream() // List<String> codes = userInfos.stream()
.map(o -> o.getPost() != null ? JSON.parseArray(o.getPost(), String.class) : null) // .map(o -> o.getPost() != null ? JSON.parseArray(o.getPost(), String.class) : null)
.filter(Objects::nonNull) // .filter(Objects::nonNull)
.collect(Collectors.toList()) // .collect(Collectors.toList())
.stream().flatMap(o -> o.stream()).distinct().collect(Collectors.toList()); // .stream().flatMap(o -> o.stream()).distinct().collect(Collectors.toList());
List<Map<String, String>> dicts = baseMapper.selectDataDictionaryList(codes); // List<Map<String, String>> dicts = baseMapper.selectDataDictionaryList(codes);
List<TzsUserInfoDto> userInfoDtos = userInfos.stream().map(o -> { List<TzsUserInfoDto> userInfoDtos = userInfos.stream().map(o -> {
TzsUserInfoDto dto = new TzsUserInfoDto(); TzsUserInfoDto dto = new TzsUserInfoDto();
Bean.toModel(o, dto); Bean.toModel(o, dto);
if (o.getPost() != null) { // 字段不要了
List<String> temps = JSON.parseArray(o.getPost(), String.class); // if (o.getPost() != null) {
String postName = temps.stream().map(m -> dicts.stream().filter(dict -> dict.get("code").equals(m)).findFirst().map(n -> n.get("name")).orElse("")).collect(Collectors.joining(",")); // List<String> temps = JSON.parseArray(o.getPost(), String.class);
dto.setPostName(postName); // String postName = temps.stream().map(m -> dicts.stream().filter(dict -> dict.get("code").equals(m)).findFirst().map(n -> n.get("name")).orElse("")).collect(Collectors.joining(","));
} // dto.setPostName(postName);
// }
return dto; return dto;
}).collect(Collectors.toList()); }).filter(o -> o.getPost() != null && o.getPost().contains("6554")).collect(Collectors.toList());
jyjcOpeningApplicationModel.setUserInfos(userInfoDtos); jyjcOpeningApplicationModel.setUserInfos(userInfoDtos);
} }
return jyjcOpeningApplicationModel; return jyjcOpeningApplicationModel;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment