Commit a7714823 authored by lisong's avatar lisong

逻辑调整

parent 9990472a
...@@ -57,7 +57,7 @@ public enum BizTypeEnum { ...@@ -57,7 +57,7 @@ public enum BizTypeEnum {
public static String getNameByNum(String num) { public static String getNameByNum(String num) {
for (BizTypeEnum c : BizTypeEnum.values()) { for (BizTypeEnum c : BizTypeEnum.values()) {
if (c.getCode().equals(num)){ if (c.getNum().equals(num)){
return c.getName(); return c.getName();
} }
} }
......
...@@ -80,9 +80,13 @@ public class JyjcOpeningApplicationController extends BaseController { ...@@ -80,9 +80,13 @@ 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 JSONObject jsonObject, @RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr) { public ResponseModel<List<JyjcOpeningApplicationModel>> updateBySequenceNbrAndStartFlow(@RequestBody JSONObject jsonObject, @RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr) {
JyjcOpeningApplicationModel model = new JyjcOpeningApplicationModel(); JyjcOpeningApplicationModel model = new JyjcOpeningApplicationModel();
BeanUtil.copyProperties(jsonObject.get("applyInfo"),model); if (jsonObject.containsKey("applyInfo")) {
BeanUtil.copyProperties(jsonObject.get("applyInfo"), model);
} else {
BeanUtil.copyProperties(jsonObject, model);
}
model.setSequenceNbr(sequenceNbr); model.setSequenceNbr(sequenceNbr);
if (sequenceNbr != null) { if (sequenceNbr != null) {
JyjcOpeningApplicationModel jyjcOpeningApplicationModel = jyjcOpeningApplicationServiceImpl.queryDetail(sequenceNbr); JyjcOpeningApplicationModel jyjcOpeningApplicationModel = jyjcOpeningApplicationServiceImpl.queryDetail(sequenceNbr);
...@@ -90,7 +94,8 @@ public class JyjcOpeningApplicationController extends BaseController { ...@@ -90,7 +94,8 @@ public class JyjcOpeningApplicationController extends BaseController {
throw new BadRequest("企业资质信息和检验人员信息为空,无法提交!"); throw new BadRequest("企业资质信息和检验人员信息为空,无法提交!");
} }
} }
return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model,true)); JyjcOpeningApplicationModel data = jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model, true);
return ResponseHelper.buildResponse(Collections.singletonList(data));
} }
@Deprecated @Deprecated
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
}, { }, {
"type":"114", "type":"114",
"pageType": "look", "pageType": "look",
"url": "/mixuap?appId=1742358052905971713&id=1735201757841092609&roleIds={roleIds}&userId={userId}&pageType=edit" "url": "/mixuap?appId=1742358052905971713&id=1735201757841092609&roleIds={roleIds}&userId={userId}&pageType=look"
}, { }, {
"type":"114", "type":"114",
"pageType": "edit", "pageType": "edit",
......
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