Commit 34c6c463 authored by 王果's avatar 王果

移装变更登记提交接口返回结果

parent c4896967
...@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransfer; ...@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransfer;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.File; import java.io.File;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
...@@ -20,9 +21,9 @@ import java.util.Map; ...@@ -20,9 +21,9 @@ import java.util.Map;
*/ */
public interface IJgChangeRegistrationTransferService extends IService<JgChangeRegistrationTransfer> { public interface IJgChangeRegistrationTransferService extends IService<JgChangeRegistrationTransfer> {
boolean updateTransfer(String submitType, JSONObject map, ReginParams reginParams); List<JgChangeRegistrationTransfer> updateTransfer(String submitType, JSONObject map, ReginParams reginParams);
boolean createTransfer(String submitType, JSONObject map, ReginParams reginParams); List<JgChangeRegistrationTransfer> createTransfer(String submitType, JSONObject map, ReginParams reginParams);
boolean deleteBatchBySequenceNbrs(Long[] sequenceNbrs); boolean deleteBatchBySequenceNbrs(Long[] sequenceNbrs);
......
...@@ -58,7 +58,7 @@ public class JgChangeRegistrationTransferController extends BaseController { ...@@ -58,7 +58,7 @@ public class JgChangeRegistrationTransferController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save") @PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增移装变更登记登记", notes = "新增移装变更登记登记") @ApiOperation(httpMethod = "POST", value = "新增移装变更登记登记", notes = "新增移装变更登记登记")
public ResponseModel<Boolean> save(@RequestParam(value = "submitType") String submitType, public ResponseModel<Object> save(@RequestParam(value = "submitType") String submitType,
@RequestBody JSONObject map) { @RequestBody JSONObject map) {
Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID); Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
if(ValidationUtil.isEmpty(tableData)){ if(ValidationUtil.isEmpty(tableData)){
...@@ -81,7 +81,7 @@ public class JgChangeRegistrationTransferController extends BaseController { ...@@ -81,7 +81,7 @@ public class JgChangeRegistrationTransferController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/update") @PutMapping(value = "/update")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新移装变更登记登记", notes = "根据sequenceNbr更新移装变更登记登记") @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新移装变更登记登记", notes = "根据sequenceNbr更新移装变更登记登记")
public ResponseModel<Boolean> updateBySequenceNbr(@RequestParam(value = "submitType") String submitType, public ResponseModel<Object> updateBySequenceNbr(@RequestParam(value = "submitType") String submitType,
@RequestBody JSONObject map) { @RequestBody JSONObject map) {
Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID); Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
if(ValidationUtil.isEmpty(tableData)){ if(ValidationUtil.isEmpty(tableData)){
......
...@@ -586,7 +586,7 @@ public class CommonServiceImpl implements ICommonService { ...@@ -586,7 +586,7 @@ public class CommonServiceImpl implements ICommonService {
noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1"))); noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
provideMap.put(YZBG_PAGE_ID, noticeObj); provideMap.put(YZBG_PAGE_ID, noticeObj);
JSONObject jsonObject = new JSONObject(provideMap); JSONObject jsonObject = new JSONObject(provideMap);
jgChangeRegistrationTransferService.createTransfer(submitType, jsonObject, reginParams); return jgChangeRegistrationTransferService.createTransfer(submitType, jsonObject, reginParams);
} else if (type.equals(ApplicationFormTypeEnum.DWBG.getBusinessCode())) { } else if (type.equals(ApplicationFormTypeEnum.DWBG.getBusinessCode())) {
noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1"))); noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
......
...@@ -143,7 +143,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -143,7 +143,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
* @param map * @param map
* @return * @return
*/ */
public boolean createTransfer(String submitType, JSONObject map, ReginParams reginParams) { public List<JgChangeRegistrationTransfer> createTransfer(String submitType, JSONObject map, ReginParams reginParams) {
Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID); Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
if (ValidationUtil.isEmpty(tableData)) { if (ValidationUtil.isEmpty(tableData)) {
...@@ -329,7 +329,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -329,7 +329,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
modelDtos.add(dto); modelDtos.add(dto);
commonService.buildTaskModel(modelDtos); commonService.buildTaskModel(modelDtos);
} }
return true; return Collections.singletonList(oldTransfer);
} }
/** /**
...@@ -338,7 +338,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -338,7 +338,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
* @param map * @param map
* @return * @return
*/ */
public boolean updateTransfer(String submitType, JSONObject map, ReginParams reginParams) { public List<JgChangeRegistrationTransfer> updateTransfer(String submitType, JSONObject map, ReginParams reginParams) {
return this.createTransfer(submitType, map, reginParams); return this.createTransfer(submitType, map, reginParams);
} }
......
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