修改部门
This commit is contained in:
@ -7,6 +7,8 @@ import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
|
||||
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoCategoryConstant;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.EvaluateTaskConstant;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
|
||||
@ -22,6 +24,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackListVo;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.BlackApproveVo;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
@ -46,6 +49,10 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
|
||||
private ICoscoBlacklistSupplierService coscoBlacklistSupplierService;
|
||||
@Autowired
|
||||
private CoscoSupplierBaseMapper coscoSupplierBaseMapper;
|
||||
@Autowired
|
||||
private IOrgService orgService;
|
||||
@Autowired
|
||||
private IUserService userService;
|
||||
|
||||
/**
|
||||
* 查询供应商黑名单_供应商加入黑灰名单申请
|
||||
@ -143,7 +150,13 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
|
||||
public IPage<BlackListVo> getPage(BlackListVo template) {
|
||||
IPage<BlackListVo> p = new Page<>(template.getBasePageRequest().getPageNo(),
|
||||
template.getBasePageRequest().getPageSize());
|
||||
return coscoBlacklistMapper.selectPage(p, template);
|
||||
IPage<BlackListVo> blackListVoIPage = coscoBlacklistMapper.selectPage(p, template);
|
||||
blackListVoIPage.getRecords().forEach(blackListVo -> {
|
||||
OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(blackListVo.getDeptId());
|
||||
blackListVo.setDeptName(orgDeptInfo.getDeptName());
|
||||
blackListVo.setUnitName(orgDeptInfo.getOrgName());
|
||||
});
|
||||
return blackListVoIPage;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -50,6 +50,8 @@ public class BlackListVo implements Serializable {
|
||||
*/
|
||||
private String themeName;
|
||||
|
||||
private String deptId;
|
||||
|
||||
@ApiModelProperty(value = "分页对象信息")
|
||||
private BasePageRequest basePageRequest;
|
||||
}
|
||||
|
@ -213,6 +213,7 @@
|
||||
'发起部门' AS deptName,
|
||||
'发起单位' as unitName,
|
||||
cb.create_time as createTime,
|
||||
cb.dept_id AS deptId,
|
||||
cb.approve_status as approveStatus,
|
||||
cb.restore_approve_status as restoreApproveStatus,
|
||||
case
|
||||
|
Reference in New Issue
Block a user