Commit 065b915c authored by lisong's avatar lisong

使用登记添加返回值

parent a7714823
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto; import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl; import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl;
import com.yeejoin.amos.component.feign.utils.FeignUtil; import com.yeejoin.amos.component.feign.utils.FeignUtil;
import com.yeejoin.amos.feign.privilege.Privilege; import com.yeejoin.amos.feign.privilege.Privilege;
...@@ -18,10 +19,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper; ...@@ -18,10 +19,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* @author system_generator * @author system_generator
...@@ -40,8 +38,8 @@ public class JgUseRegistrationController extends BaseController { ...@@ -40,8 +38,8 @@ public class JgUseRegistrationController extends BaseController {
@PostMapping(value = "/save") @PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增") @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<Object> save(@RequestBody JSONObject map) { public ResponseModel<Object> save(@RequestBody JSONObject map) {
jgUseRegistrationServiceImpl.save(map); JgUseRegistration data = jgUseRegistrationServiceImpl.save(map);
return ResponseHelper.buildResponse("ok"); return ResponseHelper.buildResponse(Collections.singletonList(data));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
......
...@@ -571,7 +571,7 @@ public class CommonServiceImpl implements ICommonService { ...@@ -571,7 +571,7 @@ public class CommonServiceImpl implements ICommonService {
if (submitType.equals("1")) { if (submitType.equals("1")) {
jsonObject.put("submit", Boolean.TRUE); jsonObject.put("submit", Boolean.TRUE);
} }
jgUseRegistrationServiceImpl.save(jsonObject); return jgUseRegistrationServiceImpl.save(jsonObject);
} else if (type.equals(ApplicationFormTypeEnum.GZBG.getBusinessCode())) { } else if (type.equals(ApplicationFormTypeEnum.GZBG.getBusinessCode())) {
//兼容业务逻辑代码 //兼容业务逻辑代码
if (submitType.equals("1")) { if (submitType.equals("1")) {
......
...@@ -154,7 +154,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -154,7 +154,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
} }
@Transactional @Transactional
public void save(JSONObject map) { public JgUseRegistration save(JSONObject map) {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class); ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
// 使用登记信息 // 使用登记信息
JgUseRegistration jgUseRegistration = new JgUseRegistration(); JgUseRegistration jgUseRegistration = new JgUseRegistration();
...@@ -260,6 +260,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -260,6 +260,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
list.add(dto); list.add(dto);
commonServiceImpl.buildTaskModel(list); commonServiceImpl.buildTaskModel(list);
} }
return jgUseRegistration;
} }
public JgUseRegistration updateData(Long sequenceNbr, String operate, WorkflowResultDto workflowResultDto, Boolean isFirst) { public JgUseRegistration updateData(Long sequenceNbr, String operate, WorkflowResultDto workflowResultDto, Boolean isFirst) {
......
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