Commit 7206c6e6 authored by 王果's avatar 王果

维保备案增加转办逻辑

parent 43b9a1ce
...@@ -166,4 +166,7 @@ public class JgMaintenanceContractDto extends BaseDto { ...@@ -166,4 +166,7 @@ public class JgMaintenanceContractDto extends BaseDto {
@ApiModelProperty(value = "接收机构统一信用代码-数据隔离使用") @ApiModelProperty(value = "接收机构统一信用代码-数据隔离使用")
private String receiveOrgCodeFilter; private String receiveOrgCodeFilter;
@ApiModelProperty(value = "转办后执行人的Id逗号分割")
private String transferToUserIds;
} }
...@@ -258,4 +258,10 @@ public class JgMaintenanceContract extends BaseEntity { ...@@ -258,4 +258,10 @@ public class JgMaintenanceContract extends BaseEntity {
*/ */
@TableField("next_execute_user_ids") @TableField("next_execute_user_ids")
private String nextExecuteUserIds; private String nextExecuteUserIds;
/**
* 转办后执行人的Id逗号分割
*/
@TableField("transfer_to_user_ids")
private String transferToUserIds;
} }
...@@ -17,7 +17,9 @@ import java.util.Map; ...@@ -17,7 +17,9 @@ import java.util.Map;
*/ */
public interface JgMaintenanceContractMapper extends BaseMapper<JgMaintenanceContract> { public interface JgMaintenanceContractMapper extends BaseMapper<JgMaintenanceContract> {
Page<JgMaintenanceContractDto> getContractList(@Param("page") Page<JgMaintenanceContract> page, @Param("contractDto") JgMaintenanceContractDto contractDto); Page<JgMaintenanceContractDto> getContractList(@Param("page") Page<JgMaintenanceContract> page,
@Param("contractDto") JgMaintenanceContractDto contractDto,
@Param("currentUserId")String currentUserId);
Boolean updateBySequenceNbr(@Param("dto") JgMaintenanceContractDto dto); Boolean updateBySequenceNbr(@Param("dto") JgMaintenanceContractDto dto);
......
...@@ -174,6 +174,9 @@ ...@@ -174,6 +174,9 @@
<if test="contractDto.receiveOrgCodeFilter != '' and contractDto.receiveOrgCodeFilter != null"> <if test="contractDto.receiveOrgCodeFilter != '' and contractDto.receiveOrgCodeFilter != null">
and receive_org_code = #{contractDto.receiveOrgCodeFilter} and receive_org_code = #{contractDto.receiveOrgCodeFilter}
</if> </if>
-- 转办隔离逻辑
and (1=1 or ur.transfer_to_user_ids like concat('%',#{currentUserId},'%'))
-- 数据过滤结束 ---------------------------------------------------- -- 数据过滤结束 ----------------------------------------------------
</where> </where>
order by apply_no desc order by apply_no desc
......
...@@ -116,7 +116,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC ...@@ -116,7 +116,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
dto.setMaintenanceUnitCodeFilter(company.getCompanyCode()); dto.setMaintenanceUnitCodeFilter(company.getCompanyCode());
} }
} }
contractList = maintenanceContractMapper.getContractList(page, dto); contractList = maintenanceContractMapper.getContractList(page, dto, reginParams.getUserModel().getUserId());
// if (MaintenanceEnum.SHIYONG.getCode().equals(phase)) { // if (MaintenanceEnum.SHIYONG.getCode().equals(phase)) {
// //使用单位用"使用单位统一信用代码"匹配数据 // //使用单位用"使用单位统一信用代码"匹配数据
// dto.setUseUnitCode(company.getCompanyCode()); // dto.setUseUnitCode(company.getCompanyCode());
......
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