Commit 200dae35 authored by wanghao's avatar wanghao

2 投诉处置的一些问题,是因为在 行唐上做好的,没有拷贝全到 baseversion版本。

parent 8b1ea657
......@@ -99,4 +99,11 @@ public class TPlanInfoController extends BaseController
{
return AjaxResult.success(tPlanInfoService.selectEnterprise());
}
@GetMapping("/transferEnterpriseList/{complainDealId}")
public AjaxResult geTtransferEnterpriseList(@PathVariable("complainDealId") Long complainDealId)
{
return AjaxResult.success(tPlanInfoService.transferEnterpriseList(complainDealId));
}
}
......@@ -23,7 +23,7 @@ public class TComplainDealTransfer extends BaseEntity
private Long complainDealId;
/** 企业id-省平台调整改成字符创 uuid */
@Excel(name = "企业id-省平台调整改成字符创 uuid")
//@Excel(name = "企业id-省平台调整改成字符创 uuid")
private String enterpriseId;
/** 企业名称-结果反显 */
......@@ -31,10 +31,10 @@ public class TComplainDealTransfer extends BaseEntity
private String enterpriseName;
/** 指派人 */
@Excel(name = "指派人id")
//@Excel(name = "指派人id")
private Long complainAssignManId;
/** 指派人id */
/** 指派人 */
@Excel(name = "指派人")
private String complainAssignMan;
......
......@@ -4,6 +4,7 @@ import java.util.List;
import java.util.Map;
import com.zehong.system.domain.TPlanInfo;
import org.apache.ibatis.annotations.Param;
/**
* 应急预案Mapper接口
......@@ -65,4 +66,10 @@ public interface TPlanInfoMapper
* 公司列表
*/
public List<Map<String,Object>> selectEnterprise();
/**
* 公司列表 - 转办时使用 - 排除了一些之前派发的公司
* @return
*/
public List<Map<String,Object>> transferEnterpriseList(@Param(value = "excludeEnterpriseIdList") List<String> excludeEnterpriseIdList);
}
......@@ -62,4 +62,6 @@ public interface ITPlanInfoService
public int deleteTPlanInfoById(Long planId);
public List<Map<String,Object>> selectEnterprise();
public List<Map<String,Object>> transferEnterpriseList(Long complainDealId);
}
package com.zehong.system.service.impl;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.zehong.common.utils.DateUtils;
import com.zehong.system.domain.TComplainDealTransfer;
import com.zehong.system.mapper.TComplainDealTransferMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TPlanInfoMapper;
......@@ -22,6 +26,9 @@ public class TPlanInfoServiceImpl implements ITPlanInfoService
@Autowired
private TPlanInfoMapper tPlanInfoMapper;
@Autowired
private TComplainDealTransferMapper tComplainDealTransferMapper;
/**
* 查询应急预案
*
......@@ -101,4 +108,16 @@ public class TPlanInfoServiceImpl implements ITPlanInfoService
public List<Map<String,Object>> selectEnterprise(){
return tPlanInfoMapper.selectEnterprise();
}
@Override
public List<Map<String, Object>> transferEnterpriseList(Long complainDealId) {
List<TComplainDealTransfer> tComplainDealTransfers =
tComplainDealTransferMapper.queryComplainDealTransferListByComplainDealId(complainDealId);
if (tComplainDealTransfers != null && tComplainDealTransfers.size() > 0) {
List<String> collect = tComplainDealTransfers.stream().map(TComplainDealTransfer::getEnterpriseId).collect(Collectors.toList());
return tPlanInfoMapper.transferEnterpriseList(collect);
} else {
return new ArrayList<>();
}
}
}
......@@ -113,4 +113,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT enterprise_id as enterpriseId,enterprise_name as enterpriseName FROM t_enterprise_info
WHERE is_del = 0
</select>
<select id="transferEnterpriseList" resultType="java.util.HashMap">
SELECT enterprise_id as enterpriseId,enterprise_name as enterpriseName FROM t_enterprise_info
WHERE is_del = 0
and enterprise_id not in
<foreach collection="excludeEnterpriseIdList" close=")" index="i" item="item" open="(" separator=",">
#{item}
</foreach>
</select>
</mapper>
\ No newline at end of file
......@@ -8,6 +8,15 @@ export function listEventInfo(query) {
params: query
})
}
// 公司列表 - 转办使用 - 排除了一些之前派发的公司的数据
export function transferEnterpriseListMethod(complainDealId) {
return request({
url: '/system/planInfo/transferEnterpriseList/' + complainDealId,
method: 'get'
})
}
// 公司列表
export function enterpriseList() {
return request({
......
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