Commit d648553f authored by caotao's avatar caotao

1.改造变更登记新增转办历史人接口。

2.列表新增根据转办历史人接口数据过滤。
parent a9664fc7
......@@ -26,7 +26,8 @@
ur.apply_no as applyNo,
ifnull(ur.next_executor_ids,'') as nextExecutorIds,
ur.promoter,
ur.next_execute_user_ids as nextExecuteUserIds
ur.next_execute_user_ids as nextExecuteUserIds,
ur.next_task_id as nextTaskId
from tzs_jg_change_registration_reform ur
LEFT JOIN tzs_jg_change_registration_reform_eq re on ur.sequence_nbr = re.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD
......
......@@ -3,8 +3,6 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
......@@ -31,7 +29,7 @@ import javax.servlet.http.HttpServletResponse;
* 改造变更登记
*
* @author system_generator
* @date 2023-12-20
* {@code @Date} 2023-12-20
*/
@RestController
@Api(tags = "改造变更登记Api")
......@@ -44,7 +42,6 @@ public class JgChangeRegistrationReformController extends BaseController {
/**
* 新增改造变更登记
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
......
......@@ -116,9 +116,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
* @return
*/
public Page<Map<String, Object>> getList(JgChangeRegistrationReformDto dto, Page<Map<String, Object>> page, List<String> roleIds) {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
String currentUserId = reginParams.getUserModel().getUserId();
Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds, currentUserId);
Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds, RequestContext.getExeUserId());
return listPage;
}
......
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