liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加数据

Browse Source
This commit is contained in:
YY
2025-07-25 14:43:29 +08:00
parent 58975b9bf5
commit dffd5225f3
22 changed files with 545 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/MessageType.java
View File

@ -32,6 +32,18 @@ public class MessageType {
*/
public static final String MESSAGETYPE_GYSNDJY = "MESSAGETYPE_GYSNDJY";
/**
* MESSAGETYPE_GYSNDJYSH：GYS = 供应商（Supplier），ND = 年度（Annual），JY = 评价（Evaluation），SH = 审核（Review）
* 表示：供应商年度评价处理完成
*/
public static final String MESSAGETYPE_GYSNDJYSH = "MESSAGETYPE_GYSNDJYSH";
/**
* MESSAGETYPE_GYSLKRQSH：GYS = 供应商（Supplier），PL = 品类（Category），LKRQ = 库入库（Library Receipt）
* 表示：供应商品类库入库审核完成
*/
public static final String MESSAGETYPE_GYSLKRQSH = "MESSAGETYPE_GYSLKRQSH";
/**
* MESSAGETYPE_GYSPLZR：GYS = 供应商（Supplier），PL = 品类（Category），ZR = 准入（Admission）
* 表示：供应商品类准入审批处理完成

22
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java
View File

@ -59,7 +59,7 @@ public class SynchronousController {
public BaseResponse categroyLibraryApproval(@RequestBody CoscoCategoryLibrary coscoCategoryLibrary) {
int i = coscoCategoryLibraryService
.synchronousCategroyLibraryApproval(coscoCategoryLibrary);
if(i<=0){
if (i <= 0) {
return BaseResponse.fail(ErrorMessageConstant.NO_APPROVAL_ORDER_FOUND);
}
return BaseResponse.success();
@ -70,8 +70,8 @@ public class SynchronousController {
*/
@PostMapping("/librarySupplierApply")
public BaseResponse librarySupplierApply(@RequestBody CoscoCategoryLibrarySupplierApply librarySupplierApply) {
return BaseResponse.success(coscoCategoryLibrarySupplierApplyService
.synchronousLibrarySupplierApply(librarySupplierApply));
coscoCategoryLibrarySupplierApplyService.synchronousLibrarySupplierApply(librarySupplierApply);
return BaseResponse.success();
}
@ -88,8 +88,8 @@ public class SynchronousController {
}
//验证当前工作任务是否已经处理完成
if(CoscoType.APPROVE_STATUS_TG.equals(coscoAccessWorkData.getApproveStatus()) ||
CoscoType.APPROVE_STATUS_BH.equals(coscoAccessWorkData.getApproveStatus()) ){
if (CoscoType.APPROVE_STATUS_TG.equals(coscoAccessWorkData.getApproveStatus()) ||
CoscoType.APPROVE_STATUS_BH.equals(coscoAccessWorkData.getApproveStatus())) {
return BaseResponse.fail("该任务已处理完成");
}
//审批状态
@ -111,8 +111,8 @@ public class SynchronousController {
}
//验证当前工作任务是否已经处理完成
if(CoscoType.APPROVE_STATUS_TG.equals(coscoAccessWorkData.getApproveStatus()) ||
CoscoType.APPROVE_STATUS_BH.equals(coscoAccessWorkData.getApproveStatus()) ){
if (CoscoType.APPROVE_STATUS_TG.equals(coscoAccessWorkData.getApproveStatus()) ||
CoscoType.APPROVE_STATUS_BH.equals(coscoAccessWorkData.getApproveStatus())) {
return BaseResponse.fail("该任务已处理完成");
}
//审批状态
@ -131,8 +131,8 @@ public class SynchronousController {
if (ObjectUtils.isEmpty(coscoSupplierexit)) {
return BaseResponse.fail("任务信息不能为空");
}
if(CoscoType.APPROVE_STATUS_TG.equals(coscoSupplierexit.getApproveStatus()) ||
CoscoType.APPROVE_STATUS_BH.equals(coscoSupplierexit.getApproveStatus()) ){
if (CoscoType.APPROVE_STATUS_TG.equals(coscoSupplierexit.getApproveStatus()) ||
CoscoType.APPROVE_STATUS_BH.equals(coscoSupplierexit.getApproveStatus())) {
return BaseResponse.fail("任务已处理完成");
}
@ -168,8 +168,8 @@ public class SynchronousController {
return BaseResponse.fail("任务信息不能为空");
}
//先验证一下主任务表数据状态
if(CoscoType.APPROVE_STATUS_TG.equals(coscoSupplierChangeApply.getApproveStatus()) ||
CoscoType.APPROVE_STATUS_BH.equals(coscoSupplierChangeApply.getApproveStatus()) ){
if (CoscoType.APPROVE_STATUS_TG.equals(coscoSupplierChangeApply.getApproveStatus()) ||
CoscoType.APPROVE_STATUS_BH.equals(coscoSupplierChangeApply.getApproveStatus())) {
return BaseResponse.fail("任务已处理完成");
}
coscoSupplierChangeApply.setApproveStatus(vo.getApproveStatus());

226
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/aop/MessageLogAspect.java
View File

@ -8,7 +8,13 @@ import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoCategoryConstant;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTaskSupplier;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.MessageAnnualreviewVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklistSupplier;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplier;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.ApplySupplierSupplierName;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.BlackApproveVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskSupplier;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.ApproveVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.NoTaskVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;
@ -49,10 +55,10 @@ public class MessageLogAspect {
private CoscoSupplierBaseMapper coscoSupplierBaseMapper;
// 修改点1：切点定义中添加参数绑定
@Pointcut("@annotation(messageLog)")
public void messageLogPointCut(MessageLog messageLog) {}
public void messageLogPointCut(MessageLog messageLog) {
}
// 成功执行后切入
@Around("messageLogPointCut(messageLog)")
@ -77,6 +83,14 @@ public class MessageLogAspect {
//供应商年度评价开始处理
pustMessageAnnualreviewStart(result, messageType);
}
if (MessageType.MESSAGETYPE_GYSNDJYSH.equals(messageType)) {
//供应商年度评价处理完成
pustMessageSupplierAnnualreviewSH(result, messageType);
}
if (MessageType.MESSAGETYPE_GYSLKRQSH.equals(messageType)) {
//供应商品类库入库处理完成
pustLibrarySupplierWork(result, messageType);
}
if (MessageType.MESSAGETYPE_GYSJYSH.equals(messageType)) {
//供应商评价处理完成
pustMessageEvaluateEnd(result, messageType);
@ -86,20 +100,20 @@ public class MessageLogAspect {
pustMessageBlackEnd(result, messageType);
}
if(MessageType.MESSAGETYPE_GYSPLTC.equals(messageType)){//供应商品类退出审批处理
pustMessageSupplierCategoryTc(result,messageType);
if (MessageType.MESSAGETYPE_GYSPLTC.equals(messageType)) {//供应商品类退出审批处理
pustMessageSupplierCategoryTc(result, messageType);
}
if(MessageType.MESSAGETYPE_GYSJCXX.equals(messageType)){//供应商基础信息审批处理
pustMessageSupplierCategoryJcxx(result,messageType);
if (MessageType.MESSAGETYPE_GYSJCXX.equals(messageType)) {//供应商基础信息审批处理
pustMessageSupplierCategoryJcxx(result, messageType);
}
if(MessageType.MESSAGETYPE_GYSYYZZ.equals(messageType)){//供应商营业执照处理
pustMessageSupplierCategoryYyzz(result,messageType);
if (MessageType.MESSAGETYPE_GYSYYZZ.equals(messageType)) {//供应商营业执照处理
pustMessageSupplierCategoryYyzz(result, messageType);
}
if(MessageType.MESSAGETYPE_GYSZZXX.equals(messageType)){//供应商资质信息处理
pustMessageSupplierCategoryZzxx(result,messageType);
if (MessageType.MESSAGETYPE_GYSZZXX.equals(messageType)) {//供应商资质信息处理
pustMessageSupplierCategoryZzxx(result, messageType);
}
if(MessageType.MESSAGETYPE_PSRY.equals(messageType)){//供应商评审消息处理
pustMessageSupplierCategoryPsry(result,messageType);
if (MessageType.MESSAGETYPE_PSRY.equals(messageType)) {//供应商评审消息处理
pustMessageSupplierCategoryPsry(result, messageType);
}
} catch (Exception e) {
e.printStackTrace();
@ -108,21 +122,64 @@ public class MessageLogAspect {
return result;
}
private void pustLibrarySupplierWork(Object result, String messageType) {
if (result instanceof ApplySupplierSupplierName) {
ApplySupplierSupplierName vo = (ApplySupplierSupplierName) result;
if (vo.getStatus().equals(CoscoCategoryConstant.APPROVE_STATUS_PASS)) {
List<CoscoCategoryLibrarySupplier> suppliers = vo.getSuppliers();
List<SendMessageVo> sendMessageVoList = new ArrayList<>();
suppliers.forEach(supplier -> {
String cont = supplier.getSupplierName() + "在" + vo.getOrgName() + "单位添加品类库" + vo.getLibraryName() + "成功";
getSendMessage(supplier.getSupplierId(), cont, sendMessageVoList);
});
sendMessageList(sendMessageVoList);
}
}
}
private void pustMessageSupplierAnnualreviewSH(Object result, String messageType) {
if (result instanceof List) {
List<?> resultList = (List<?>) result;
if (!resultList.isEmpty() && !(resultList.get(0) instanceof MessageAnnualreviewVo)) {
throw new IllegalArgumentException("返回对象类型不匹配：不是 NoTaskVo 列表");
}
// 如果你确定空列表也合法，可省略上面的非空判断
List<MessageAnnualreviewVo> list = (List<MessageAnnualreviewVo>) result;
List<SendMessageVo> sendMessageVoList = new ArrayList<>();
for (MessageAnnualreviewVo vo : list) {
List<CoscoAnnualreviewTaskSupplier> taskSupplierList = vo.getTaskSupplierList();
taskSupplierList.forEach(supplier -> {
String cont = supplier.getSupplierName() + "在" + vo.getOrgName() + "单位，年度评分为" + supplier.getReviewResult();
getSendMessage(supplier.getSupplierId(), cont, sendMessageVoList);
});
}
//sendMessageList(sendMessageVoList);
}
}
/**
* 黑名单处理完成
*
* @param result
* @param messageType
*/
private void pustMessageBlackEnd(Object result, String messageType) {
if (result instanceof BlackApproveVo) {
BlackApproveVo vo = (BlackApproveVo) result;
String resultast ;
String resultast;
List<CoscoMessage> coscoMessageList = new ArrayList<>();
List<SendMessageVo> sendMessageVoList = new ArrayList<>();
if (CoscoCategoryConstant.APPROVE_STATUS_PASS.equals(vo.getApproveStatus())) {
resultast = "已通过";
for (String supplierId : vo.getSupperierIds()) {
CoscoMessage coscoMessage = coscoMessageData(supplierId, "供应商在" + vo.getDeptName() + "部门，添加黑名单" + resultast, messageType);
for (CoscoBlacklistSupplier supplier : vo.getSupperierIds()) {
String cont = supplier.getSupplierName() + "在" + vo.getDeptName() + "单位，添加黑名单" + resultast;
CoscoMessage coscoMessage = coscoMessageData(supplier.getSupplierId(), cont, messageType);
coscoMessageList.add(coscoMessage);
getSendMessage(supplier.getSupplierId(), cont, sendMessageVoList);
}
} else {
resultast = "已驳回";
@ -130,10 +187,20 @@ public class MessageLogAspect {
CoscoMessage coscoMessage = coscoMessageData(vo.getDeptId(), "供应商在" + vo.getDeptName() + "部门，添加黑名单" + resultast, messageType);
coscoMessageList.add(coscoMessage);
pustMessage(coscoMessageList);
//sendMessageList(sendMessageVoList);
}
}
private void getSendMessage(String supplierId, String cont, List<SendMessageVo> sendMessageVoList) {
SendMessageVo sendMessageVo = new SendMessageVo();
sendMessageVo.setPhone(getSupplierUser(supplierId));
sendMessageVo.setMessage(cont);
sendMessageVo.setId(supplierId);
sendMessageVoList.add(sendMessageVo);
}
private void pustMessageEvaluateEnd(Object result, String messageType) {
if (result instanceof ApproveVo) {
ApproveVo vo = (ApproveVo) result;
String resultast;
@ -145,12 +212,17 @@ public class MessageLogAspect {
List<CoscoMessage> coscoMessageList = new ArrayList<>();
CoscoMessage coscoMessage = coscoMessageData(vo.getCreateBy(), "评价任务" + vo.getTaskName() + resultast, messageType);
coscoMessageList.add(coscoMessage);
for (String supplierId : vo.getSupplierIds()) {
coscoMessageData(supplierId, "供应商在" + vo.getDeptName() + "评价任务" + resultast, messageType);
List<SendMessageVo> sendMessageVoList = new ArrayList<>();
for (CoscoEvaluateTaskSupplier supplier : vo.getSuppliers()) {
String cont = supplier.getSupplierName() + "在" + vo.getOrgName() + "评价任务" + resultast;
coscoMessageData(supplier.getSupplierId(), cont, messageType);
coscoMessageList.add(coscoMessage);
getSendMessage(supplier.getSupplierId(), cont, sendMessageVoList);
}
pustMessage(coscoMessageList);
//sendMessageList(sendMessageVoList);
}
}
@ -226,11 +298,7 @@ public class MessageLogAspect {
//只有审批通过时才发送短信
if (CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())) {
//短信实体封装
SendMessageVo sendMessageVo = new SendMessageVo();
sendMessageVo.setPhone(getSupplierUser(coscoAccessSupplier.getSupplierId()));
sendMessageVo.setMessage(cont);
sendMessageVo.setId(coscoAccessSupplier.getSupplierId());
sendMessageVoList.add(sendMessageVo);
getSendMessage(coscoAccessSupplier.getSupplierId(), cont, sendMessageVoList);
}
}
@ -271,11 +339,7 @@ public class MessageLogAspect {
//审批通过才发短信
if (CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())) {
//短信实体封装
SendMessageVo sendMessageVo = new SendMessageVo();
sendMessageVo.setPhone(getSupplierUser(vo.getSupplierAndCategoryList().get(0).getSupplierId()));
sendMessageVo.setMessage(cont);
sendMessageVo.setId(vo.getSupplierAndCategoryList().get(0).getSupplierId());
sendMessageVoList.add(sendMessageVo);
getSendMessage(vo.getSupplierAndCategoryList().get(0).getSupplierId(), cont, sendMessageVoList);
}
//保存消息
@ -290,21 +354,21 @@ public class MessageLogAspect {
/**
* 供应商品类退出审批处里
*/
public void pustMessageSupplierCategoryTc(Object result,String messageType){
public void pustMessageSupplierCategoryTc(Object result, String messageType) {
if (result instanceof CoscoSupplierExitSupplierCategoryVo) {
CoscoSupplierExitSupplierCategoryVo vo = (CoscoSupplierExitSupplierCategoryVo) result;
List<CoscoMessage> coscoMessageList = new ArrayList<>();
List<SendMessageVo> sendMessageVoList = new ArrayList<>();
String approveStr = "";
if(CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())){
if (CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())) {
approveStr = "已通过";
}else{
} else {
approveStr = "已驳回";
}
//退出的供应商
List<String> exitSupperlierId = new ArrayList<>();
if(!ObjectUtils.isEmpty(vo.getCoscoAccessSupplier())){
if (!ObjectUtils.isEmpty(vo.getCoscoAccessSupplier())) {
CoscoAccessSupplier exitSupperlier = vo.getCoscoAccessSupplier();
exitSupperlierId = exitSupperlier.getIdList();
}
@ -328,18 +392,14 @@ public class MessageLogAspect {
String cont = supplierName + "，" + vo.getOrgName() + "单位的" +
categoryNames + "品类退出，" + approveStr;
if (!CollectionUtils.isEmpty(exitSupperlierId) && exitSupperlierId.contains(supplierId)) {
cont += "，"+supplierName+"已被，"+vo.getOrgName() + "单位退出";
cont += "，" + supplierName + "已被，" + vo.getOrgName() + "单位退出";
}
coscoMessageList.add(coscoMessageData(supplierId, cont, messageType));
if (CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())) {
// 短信实体封装
SendMessageVo sendMessageVo = new SendMessageVo();
sendMessageVo.setPhone(getSupplierUser(supplierId));
sendMessageVo.setMessage(cont);
sendMessageVo.setId(supplierId);
sendMessageVoList.add(sendMessageVo);
getSendMessage(supplierId, cont, sendMessageVoList);
}
}
@ -357,19 +417,19 @@ public class MessageLogAspect {
/**
* 供应商基础信息审批处里
*/
public void pustMessageSupplierCategoryJcxx(Object result,String messageType){
public void pustMessageSupplierCategoryJcxx(Object result, String messageType) {
if (result instanceof CoscoSupplierChangeApply) {
CoscoSupplierChangeApply vo = (CoscoSupplierChangeApply) result;
List<CoscoMessage> coscoMessageList = new ArrayList<>();
// 使用转换后的对象
String approveStr = "";
if(CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())){
if (CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())) {
approveStr = "已通过";
}else{
} else {
approveStr = "已驳回";
}
String cont = vo.getSupplierName()+"，基础信息变更审批"+approveStr;
coscoMessageList.add(coscoMessageData(vo.getSupplierId(),cont,messageType));
String cont = vo.getSupplierName() + "，基础信息变更审批" + approveStr;
coscoMessageList.add(coscoMessageData(vo.getSupplierId(), cont, messageType));
pustMessage(coscoMessageList);
} else {
throw new IllegalArgumentException("返回对象类型不匹配");
@ -379,31 +439,27 @@ public class MessageLogAspect {
/**
* 供应商营业执照处理
*/
public void pustMessageSupplierCategoryYyzz(Object result,String messageType){
public void pustMessageSupplierCategoryYyzz(Object result, String messageType) {
if (result instanceof CoscoSupplierBaseVo) {
CoscoSupplierBaseVo vo = (CoscoSupplierBaseVo) result;
List<CoscoMessage> coscoMessageList = new ArrayList<>();
List<SendMessageVo> sendMessageVoList = new ArrayList<>();
String supplierCont = "您的企业营业执照将于"+vo.getEndTime()+"日到期，请及时更新";
if(vo.getDaysRemaining() == 0){//已经过期
supplierCont = "您的企业营业执照已经到期，您的准入单位和准入品类全撤销移除";
String supplierCont = "您的企业营业执照将于" + vo.getEndTime() + "日到期，请及时更新";
if (vo.getDaysRemaining() == 0) {//已经过期
supplierCont = "您的企业营业执照已经到期，您的准入单位和准入品类全撤销移除";
}
coscoMessageList.add(coscoMessageData(vo.getSupplierId(),supplierCont,messageType));
coscoMessageList.add(coscoMessageData(vo.getSupplierId(), supplierCont, messageType));
for(CoscoAccessSupplier coscoAccessSupplier : vo.getCoscoAccessSupplierList()){
String deptCont = "您准入的"+vo.getSupplierName()+"供应商营业执照将于"+vo.getEndTime()+"日到期";
if(vo.getDaysRemaining() == 0){//已经过期
deptCont = "您准入的"+vo.getSupplierName()+"供应商营业执照已经到期,该供应商准入单位和准入品类全撤销移除";
for (CoscoAccessSupplier coscoAccessSupplier : vo.getCoscoAccessSupplierList()) {
String deptCont = "您准入的" + vo.getSupplierName() + "供应商营业执照将于" + vo.getEndTime() + "日到期";
if (vo.getDaysRemaining() == 0) {//已经过期
deptCont = "您准入的" + vo.getSupplierName() + "供应商营业执照已经到期,该供应商准入单位和准入品类全撤销移除";
}
coscoMessageList.add(coscoMessageData(coscoAccessSupplier.getDeptId(),deptCont,messageType));
coscoMessageList.add(coscoMessageData(coscoAccessSupplier.getDeptId(), deptCont, messageType));
}
//短信实体封装
SendMessageVo sendMessageVo = new SendMessageVo();
sendMessageVo.setPhone(getSupplierUser(vo.getSupplierId()));
sendMessageVo.setMessage(supplierCont);
sendMessageVo.setId(vo.getSupplierId());
sendMessageVoList.add(sendMessageVo);
getSendMessage(vo.getSupplierId(), supplierCont, sendMessageVoList);
//保存消息
pustMessage(coscoMessageList);
@ -417,32 +473,28 @@ public class MessageLogAspect {
/**
* 供应商纸质信息处理
*/
public void pustMessageSupplierCategoryZzxx(Object result,String messageType){
public void pustMessageSupplierCategoryZzxx(Object result, String messageType) {
if (result instanceof CoscoSupplierBaseVo) {
CoscoSupplierBaseVo vo = (CoscoSupplierBaseVo) result;
List<CoscoMessage> coscoMessageList = new ArrayList<>();
List<SendMessageVo> sendMessageVoList = new ArrayList<>();
String supplierCont = "您的企业"+vo.getQualificationsName()+"资质将于"+vo.getEndTime()+"日到期，请及时更新";
if(vo.getDaysRemaining() == 0){//已经过期
supplierCont = "您的企业"+vo.getQualificationsName()+"资质已经到期，请及时更新";
String supplierCont = "您的企业" + vo.getQualificationsName() + "资质将于" + vo.getEndTime() + "日到期，请及时更新";
if (vo.getDaysRemaining() == 0) {//已经过期
supplierCont = "您的企业" + vo.getQualificationsName() + "资质已经到期，请及时更新";
}
coscoMessageList.add(coscoMessageData(vo.getSupplierId(),supplierCont,messageType));
coscoMessageList.add(coscoMessageData(vo.getSupplierId(), supplierCont, messageType));
for(CoscoAccessSupplier coscoAccessSupplier : vo.getCoscoAccessSupplierList()){
String deptCont = "您准入的"+vo.getSupplierName()+"供应商"+vo.getQualificationsName()+"资质将于"+vo.getEndTime()+"日到期";
if(vo.getDaysRemaining() == 0){//已经过期
deptCont = "您准入的"+vo.getSupplierName()+"供应商"+vo.getQualificationsName()+"资质已经到期";
for (CoscoAccessSupplier coscoAccessSupplier : vo.getCoscoAccessSupplierList()) {
String deptCont = "您准入的" + vo.getSupplierName() + "供应商" + vo.getQualificationsName() + "资质将于" + vo.getEndTime() + "日到期";
if (vo.getDaysRemaining() == 0) {//已经过期
deptCont = "您准入的" + vo.getSupplierName() + "供应商" + vo.getQualificationsName() + "资质已经到期";
}
coscoMessageList.add(coscoMessageData(coscoAccessSupplier.getDeptId(),deptCont,messageType));
coscoMessageList.add(coscoMessageData(coscoAccessSupplier.getDeptId(), deptCont, messageType));
}
//短信实体封装
SendMessageVo sendMessageVo = new SendMessageVo();
sendMessageVo.setPhone(getSupplierUser(vo.getSupplierId()));
sendMessageVo.setMessage(supplierCont);
sendMessageVo.setId(vo.getSupplierId());
sendMessageVoList.add(sendMessageVo);
getSendMessage(vo.getSupplierId(), supplierCont, sendMessageVoList);
//消息保存
pustMessage(coscoMessageList);
//发送短信
@ -456,14 +508,14 @@ public class MessageLogAspect {
/**
* 评审人员信息处理
*/
public void pustMessageSupplierCategoryPsry(Object result,String messageType){
public void pustMessageSupplierCategoryPsry(Object result, String messageType) {
if (result instanceof UserItmeMessageVo) {
UserItmeMessageVo vo = (UserItmeMessageVo) result;
List<CoscoMessage> coscoMessageList = new ArrayList<>();
for(CoscoAccessUser coscoAccessUser : vo.getCoscoAccessUserList()){
for (CoscoAccessUser coscoAccessUser : vo.getCoscoAccessUserList()) {
String cont = "您有新的供应商需要评审";
coscoMessageList.add(coscoMessageData(coscoAccessUser.getUserId(),cont,messageType));
coscoMessageList.add(coscoMessageData(coscoAccessUser.getUserId(), cont, messageType));
}
pustMessage(coscoMessageList);
@ -475,6 +527,7 @@ public class MessageLogAspect {
/**
* 封装实体
*
* @param receiverId
* @param cont
* @param messageType
@ -493,23 +546,25 @@ public class MessageLogAspect {
/**
* 查询供应商的主联系人
*
* @param supplierId
*/
public String getSupplierUser(String supplierId){
public String getSupplierUser(String supplierId) {
CoscoSupplierUser coscoSupplierUser = coscoSupplierUserMapper.selectCoscoSupplierUserBySupplierId(supplierId);
return coscoSupplierUser.getContactsPhone();
}
/**
* 查询供应商名称详情
*
* @param supplierId
*/
public String getSupplierName(String supplierId){
public String getSupplierName(String supplierId) {
CoscoSupplierBase coscoSupplierBase = coscoSupplierBaseMapper.selectCoscoSupplierBaseById(supplierId);
//如果是境外用英文名称，否则都是用name
if(CoscoType.SUPPLIER_TYPE_OVS.equals(coscoSupplierBase.getSupplierType())){
if (CoscoType.SUPPLIER_TYPE_OVS.equals(coscoSupplierBase.getSupplierType())) {
return coscoSupplierBase.getNameEn();
}else{
} else {
return coscoSupplierBase.getName();
}
}
@ -526,23 +581,24 @@ public class MessageLogAspect {
* 发送短信
*/
public void sendMessageList(List<SendMessageVo> sendMessageVoList) {
for(SendMessageVo sendMessageVo : sendMessageVoList){
sendMessage(sendMessageVo.getPhone(),sendMessageVo.getMessage(),sendMessageVo.getId());
for (SendMessageVo sendMessageVo : sendMessageVoList) {
sendMessage(sendMessageVo.getPhone(), sendMessageVo.getMessage(), sendMessageVo.getId());
}
}
/**
* 发送短信
* @param phone 需要发送的手机号
*
* @param phone 需要发送的手机号
* @param message 需要发送的内容
* @param id 主键
* @param id 主键
*/
public void sendMessage(String phone,String message,String id){
public void sendMessage(String phone, String message, String id) {
// 发送短信 [中远海运] 您的验证码是：" + code + "，请在5分钟内输入。
//String message = "您的验证码是：" + code + "，请在5分钟内输入。";
BaseResponse<SmsSendResponse.TemplateSMS> templateSMSBaseResponse = smsFeignClient.sendSms(new String[]{phone}, "1180212", new String[]{message}, id, null);
}
}
}

29
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTaskSupplier.java
View File

@ -13,23 +13,38 @@ import java.util.Date;
* @date 2025-06-18
*/
@Data
public class CoscoAnnualreviewTaskSupplier extends BaseEntity{
public class CoscoAnnualreviewTaskSupplier extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 主键ID */
/**
* 主键ID
*/
private String id;
/** 年审任务id(cosco_annualreview_task表主键) */
/**
* 年审任务id(cosco_annualreview_task表主键)
*/
private String annualreviewTaskId;
/** 供应商id(cosco_supplier_base表主键) */
/**
* 供应商名称
*/
private String SupplierName;
/**
* 供应商id(cosco_supplier_base表主键)
*/
private String supplierId;
/** 年审最终结果(1.合格、2.不合格) */
/**
* 年审最终结果(1.合格、2.不合格)
*/
private Long reviewResult;
/** 删除标识(normal.正常、deleted.已删除) */
private String delFlag="normal";
/**
* 删除标识(normal.正常、deleted.已删除)
*/
private String delFlag = "normal";
private String remark;

6
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/AnnualScheduledTasksService.java
View File

@ -1,7 +1,11 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.MessageAnnualreviewVo;
import java.util.List;
public interface AnnualScheduledTasksService {
void closeTask();
List<MessageAnnualreviewVo> closeTask();
}

29
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/AnnualScheduledTasksServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.impl;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.AnnualreviewTaskConstant;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService;
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewScoringMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewTaskMapper;
@ -10,12 +11,15 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualre
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTaskSupplier;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.AnnualScheduledTasksService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AuditQuantityVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.MessageAnnualreviewVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.NoTaskVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@ -30,6 +34,8 @@ public class AnnualScheduledTasksServiceImpl implements AnnualScheduledTasksServ
private CoscoAnnualreviewScoringMapper coscoAnnualreviewScoringMapper;
@Autowired
private CoscoAnnualreviewTaskSupplierMapper coscoAnnualreviewTaskSupplierMapper;
@Autowired
private IOrgService orgService;
/**
@ -41,23 +47,33 @@ public class AnnualScheduledTasksServiceImpl implements AnnualScheduledTasksServ
@Scheduled(cron = "0 15 1 * * ?")
@MessageLog(messageType = MessageType.MESSAGETYPE_GYSJY)
public List<NoTaskVo> checkTask() {
List<NoTaskVo> noTasks =coscoAnnualreviewTaskMapper.selectNoTask();
List<NoTaskVo> noTasks = coscoAnnualreviewTaskMapper.selectNoTask();
//查询小于当前时间 未开启任务
coscoAnnualreviewTaskMapper.updateNOTask();
return noTasks;
}
/**
* 供应商年度审核结束
*/
@Scheduled(cron = "0 15 2 * * ?")
@Transactional(rollbackFor = Exception.class)
public void closeTask() {
@MessageLog(messageType = MessageType.MESSAGETYPE_GYSNDJYSH)
public List<MessageAnnualreviewVo> closeTask() {
//查询所有需要关闭的项目
List<CoscoAnnualreviewTask> coscoAnnualreviewTasks = coscoAnnualreviewTaskMapper.selectCloseTask();
if(!coscoAnnualreviewTasks.isEmpty()){
List<MessageAnnualreviewVo> messageAnnualreviewVos = new ArrayList<>();
if (!coscoAnnualreviewTasks.isEmpty()) {
List<String> ids = coscoAnnualreviewTasks.stream().map(CoscoAnnualreviewTask::getId).collect(Collectors.toList());
List<CoscoAnnualreviewTaskSupplier> coscoAnnualreviewTaskSuppliers =coscoAnnualreviewTaskSupplierMapper.
List<CoscoAnnualreviewTaskSupplier> coscoAnnualreviewTaskSuppliers = coscoAnnualreviewTaskSupplierMapper.
selectByIds(ids);
for (CoscoAnnualreviewTask coscoAnnualreviewTask : coscoAnnualreviewTasks) {
MessageAnnualreviewVo returnVo = new MessageAnnualreviewVo();
OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(coscoAnnualreviewTask.getDeptId());
returnVo.setDeptId(coscoAnnualreviewTask.getDeptId());
returnVo.setDeptName(orgDeptInfo.getDeptName());
returnVo.setOrgName(orgDeptInfo.getOrgName());
//获取年审任务全部信息
CoscoAnnualreviewTaskSupplier coscoAnnualreviewTaskSupplier = new CoscoAnnualreviewTaskSupplier();
coscoAnnualreviewTaskSupplier.setAnnualreviewTaskId(coscoAnnualreviewTask.getId());
@ -79,12 +95,15 @@ public class AnnualScheduledTasksServiceImpl implements AnnualScheduledTasksServ
coscoAnnualreviewTaskSupplierMapper.updateCoscoAnnualreviewTaskSupplier(supplier);
}
});
returnVo.setTaskSupplierList(collect);
//修改任务状态
coscoAnnualreviewTask.setStatus(AnnualreviewTaskConstant.COMPLETED);
coscoAnnualreviewTask.setUpdateTime(new Date());
coscoAnnualreviewTaskMapper.updateCoscoAnnualreviewTask(coscoAnnualreviewTask);
messageAnnualreviewVos.add(returnVo);
}
}
return messageAnnualreviewVos;
}

26
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/MessageAnnualreviewVo.java Normal file
View File

@ -0,0 +1,26 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTaskSupplier;
import lombok.Data;
import java.util.List;
@Data
public class MessageAnnualreviewVo {
/**
* 部门名称
*/
private String deptName;
/**
* 单位名称
*/
private String orgName;
/**
* 单位id
*/
private String deptId;
/**
* 供应商任务列表
*/
private List<CoscoAnnualreviewTaskSupplier> taskSupplierList;
}

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/entity/CoscoBlacklistSupplier.java
View File

@ -19,6 +19,10 @@ public class CoscoBlacklistSupplier extends BaseEntity {
/** 供应商id(cosco_supplier_base表主键) */
private String supplierId;
/**
* 供应商名称
*/
private String supplierName;
}

8
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.entity.SysOrg;
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;
@ -205,7 +206,7 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
@MessageLog(messageType = MessageType.MESSAGETYPE_HBLXSH)
public BlackApproveVo receiveApprove(CoscoBlacklist list) {
CoscoBlacklist coscoBlacklist = coscoBlacklistMapper.selectByWorkFlowId(list.getWorkFlowId());
List<String> supplierList = new ArrayList<>();
List<CoscoBlacklistSupplier> supplierList = new ArrayList<>();
if (CoscoCategoryConstant.APPROVE_STATUS_WAIT.equals(coscoBlacklist.getApproveStatus())) {
coscoBlacklist.setApproveStatus(list.getApproveStatus());
coscoBlacklist.setStartTime(new Date());
@ -217,7 +218,7 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
coscoBlacklistSupplier.setBlacklistId(coscoBlacklist.getId());
List<CoscoBlacklistSupplier> coscoBlacklistSuppliers = coscoBlacklistSupplierService.selectCoscoBlacklistSupplierList(coscoBlacklistSupplier);
coscoBlacklistSuppliers.forEach(cosupplier -> {
supplierList.add(cosupplier.getSupplierId());
supplierList.add(cosupplier);
CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase();
coscoSupplierBase.setId(cosupplier.getSupplierId());
//判断黑名单
@ -234,7 +235,8 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
}
BlackApproveVo vo=new BlackApproveVo();
vo.setDeptId(coscoBlacklist.getDeptId());
vo.setDeptName("部门");
SysOrg orgInfo = orgService.getOrgInfo(coscoBlacklist.getDeptId());
vo.setDeptName(orgInfo.getOrgName());
vo.setApproveStatus(coscoBlacklist.getApproveStatus());
vo.setSupperierIds(supplierList);
return vo;

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistSupplierServiceImpl.java
View File

@ -43,6 +43,8 @@ public class CoscoBlacklistSupplierServiceImpl implements ICoscoBlacklistSupplie
return coscoBlacklistSupplierMapper.selectCoscoBlacklistSupplierList(coscoBlacklistSupplier);
}
/**
* 新增供应商黑名单_供应商加入黑灰名单申请关联供应商
*

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibrarySupplier.java
View File

@ -24,6 +24,10 @@ public class CoscoCategoryLibrarySupplier extends BaseEntity {
/** 供应商id(cosco_supplier_base表主键) */
private String supplierId;
/**
* 供应商名称
*/
private String supplierName;
}

33
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibrarySupplierApply.java
View File

@ -18,20 +18,30 @@ import lombok.Data;
public class CoscoCategoryLibrarySupplierApply extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 主键ID */
/**
* 主键ID
*/
private String id;
/** 品类库id(cosco_category_library表主键) */
/**
* 品类库id(cosco_category_library表主键)
*/
private String categoryLibraryId;
/** 审批状态(0.待审批、1.通过、2.驳回) */
private Long approveStatus=0L;
/**
* 审批状态(0.待审批、1.通过、2.驳回)
*/
private Long approveStatus = 0L;
/** 审批工作流id */
/**
* 审批工作流id
*/
private String workFlowId;
/** 删除标识(normal.正常、deleted.已删除) */
private String delFlag= CoscoCategoryConstant.DELETE_FLAG_YES;
/**
* 删除标识(normal.正常、deleted.已删除)
*/
private String delFlag = CoscoCategoryConstant.DELETE_FLAG_YES;
/**
* 建库方式(online.线上、offline.线下)
@ -41,5 +51,14 @@ public class CoscoCategoryLibrarySupplierApply extends BaseEntity {
private LocalDateTime createTime;
private LocalDateTime updateTime;
/**
* 部门id
*/
private String deptId;
/**
* 品类库名称
*/
private String libraryName;
}

3
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibrarySupplierApplyService.java
View File

@ -6,6 +6,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibr
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibraryContain;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.AddCoscoCategoryLibrarySupplierApplyVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.ApplySupplierSupplierName;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryLibrarySupplierVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.ListCoscoCategoryLibrarySupplierApplyVo;
@ -104,5 +105,5 @@ public interface ICoscoCategoryLibrarySupplierApplyService extends IBaseService<
* @param librarySupplierApply
* @return
*/
int synchronousLibrarySupplierApply(CoscoCategoryLibrarySupplierApply librarySupplierApply);
ApplySupplierSupplierName synchronousLibrarySupplierApply(CoscoCategoryLibrarySupplierApply librarySupplierApply);
}

26
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java
View File

@ -8,13 +8,18 @@ import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
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.MessageType;
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.aop.MessageLog;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarySupplierApplyMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarySupplierMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarAttachments;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplier;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.AddCoscoCategoryLibrarySupplierApplyVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.ApplySupplierSupplierName;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryLibrarySupplierVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.ListCoscoCategoryLibrarySupplierApplyVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo;
@ -47,6 +52,8 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp
private IUserService userService;
@Autowired
private ICoscoCategoryLibrarAttachmentsService coscoCategoryLibrarAttachmentsService;
@Autowired
private CoscoCategoryLibrarySupplierMapper coscoCategoryLibrarySupplierMapper;
/**
* 查询品类库_品类库入库供应商申请单
@ -181,7 +188,7 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp
OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(vo.getDeptId());
vo.setDeptName(orgDeptInfo.getOrgName());
SysUser userById = userService.getUserById(vo.getCreateBy());
if(userById!=null){
if (userById != null) {
vo.setApplyUser(userById.getName());
}
});
@ -207,12 +214,25 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp
}
@Override
public int synchronousLibrarySupplierApply(CoscoCategoryLibrarySupplierApply librarySupplierApply) {
@MessageLog(messageType = MessageType.MESSAGETYPE_GYSLKRQSH)
public ApplySupplierSupplierName synchronousLibrarySupplierApply(CoscoCategoryLibrarySupplierApply librarySupplierApply) {
CoscoCategoryLibrarySupplierApply apply = coscoCategoryLibrarySupplierApplyMapper.selectByWorkFlowId(librarySupplierApply.getWorkFlowId());
if (apply == null) {
throw new RuntimeException("未找到对应的审批单");
}
apply.setApproveStatus(librarySupplierApply.getApproveStatus());
return coscoCategoryLibrarySupplierApplyMapper.updateCoscoCategoryLibrarySupplierApply(apply);
coscoCategoryLibrarySupplierApplyMapper.updateCoscoCategoryLibrarySupplierApply(apply);
ApplySupplierSupplierName supplierName = new ApplySupplierSupplierName();
supplierName.setDeptId(apply.getDeptId());
OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(apply.getDeptId());
supplierName.setDeptName(orgDeptInfo.getDeptName());
supplierName.setOrgName(orgDeptInfo.getOrgName());
supplierName.setLibraryName(apply.getLibraryName());
supplierName.setStatus(apply.getApproveStatus());
CoscoCategoryLibrarySupplier librarySupplier = new CoscoCategoryLibrarySupplier();
librarySupplier.setCategoryLibrarySupplierApplyId(apply.getId());
List<CoscoCategoryLibrarySupplier> coscoCategoryLibrarySuppliers = coscoCategoryLibrarySupplierMapper.selectCoscoCategoryLibrarySupplierList(librarySupplier);
supplierName.setSuppliers(coscoCategoryLibrarySuppliers);
return supplierName;
}
}

36
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ApplySupplierSupplierName.java Normal file
View File

@ -0,0 +1,36 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplier;
import lombok.Data;
import java.util.List;
@Data
public class ApplySupplierSupplierName {
/**
* 部门id
*/
private String deptId;
/**
* 部门名称
*/
private String deptName;
/**
* 单位名称
*/
private String orgName;
/**
* 供应商id,名称
*/
private List<CoscoCategoryLibrarySupplier> suppliers;
/**
* 状态
*/
private Long status;
/**
* 品类库名称
*/
private String LibraryName;
}

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/BlackApproveVo.java
View File

@ -1,6 +1,7 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity;
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklistSupplier;
import lombok.Data;
import java.io.Serializable;
@ -21,10 +22,14 @@ public class BlackApproveVo implements Serializable {
* 状态
*/
private Long approveStatus;
/**
* 单位名称
*/
private String orgName;
/**
* 供应商id
*/
private List<String> supperierIds;
private List<CoscoBlacklistSupplier> supperierIds;
}

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.entity.SysUser;
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;
@ -352,7 +353,10 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
ApproveVo aVo = new ApproveVo();
aVo.setResult(vo.getApproveStatus());
aVo.setCreateBy(coscoEvaluateTask.getCreateBy());
aVo.setDeptName(SupplierUserConstant.CREATE_DEPT);
SysUser userById = userService.getUserById(coscoEvaluateTask.getCreateBy());
OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(userById.getOrgId());
aVo.setDeptName(orgDeptInfo.getDeptName());
aVo.setOrgName(orgDeptInfo.getOrgName());
aVo.setTaskName(coscoEvaluateTask.getEvaluateTheme());
CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier = new CoscoEvaluateTaskSupplier();
coscoEvaluateTaskSupplier.setEvaluateTaskId(coscoEvaluateTask.getId());
@ -360,6 +364,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
List<CoscoEvaluateTaskSupplier> coscoEvaluateTaskSuppliers = coscoEvaluateTaskSupplierMapper.selectCoscoEvaluateTaskSupplierList(coscoEvaluateTaskSupplier);
List<String> supplierIds = coscoEvaluateTaskSuppliers.stream().map(CoscoEvaluateTaskSupplier::getSupplierId).collect(Collectors.toList());
aVo.setSupplierIds(supplierIds);
aVo.setSuppliers(coscoEvaluateTaskSuppliers);
return aVo;
}

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/ApproveVo.java
View File

@ -1,6 +1,7 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskSupplier;
import lombok.Data;
import java.io.Serializable;
@ -16,6 +17,10 @@ public class ApproveVo implements Serializable {
* 部门名称
*/
private String deptName;
/**
* 单位名称
*/
private String orgName;
/**
* 评价任务名称
*/
@ -24,6 +29,8 @@ public class ApproveVo implements Serializable {
* 供应商id
*/
private List<String> supplierIds;
private List<CoscoEvaluateTaskSupplier> suppliers;
/**
* 结果
*/

19
src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml
View File

@ -16,6 +16,9 @@
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="lastUpdateTime" column="last_update_time"/>
<result property="supplierName" column="supplier_name"/>
</resultMap>
<sql id="selectCoscoAnnualreviewTaskSupplierVo">
@ -68,8 +71,20 @@
<select id="selectByIds"
parameterType="list"
resultMap="CoscoAnnualreviewTaskSupplierResult">
<include refid="selectCoscoAnnualreviewTaskSupplierVo"/>
where annualreview_task_id in
select cats.id,
cats.annualreview_task_id,
cats.supplier_id,
cats.review_result,
cats.del_flag,
cats.create_by,
cats.create_time,
cats.update_by,
cats.update_time,
cats.last_update_time,
csb.name as supplier_name
from cosco_annualreview_task_supplier cats
left join cosco_supplier_base csb on csb.id = cats.supplier_id
where cats.annualreview_task_id in
<foreach item="item" collection="list" separator="," open="(" close=")">
#{item}
</foreach>

7
src/main/resources/com/chinaunicom/zyhy/ebtp/coscoBlack/dao/mapper/CoscoBlacklistSupplierMapper.xml
View File

@ -8,6 +8,7 @@
id="CoscoBlacklistSupplierResult">
<result property="blacklistId" column="blacklist_id"/>
<result property="supplierId" column="supplier_id"/>
<result property="supplierName" column="supplier_name"/>
</resultMap>
<sql id="selectCoscoBlacklistSupplierVo">
@ -18,9 +19,11 @@
<select id="selectCoscoBlacklistSupplierList"
parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklistSupplier"
resultMap="CoscoBlacklistSupplierResult">
<include refid="selectCoscoBlacklistSupplierVo"/>
select cbs.blacklist_id, cbs.supplier_id, csb.name as supplier_name
from cosco_blacklist_supplier cbs
left join cosco_supplier_base csb on csb.id = cbs.supplier_id
<where>
blacklist_id = #{blacklistId}
cbs.blacklist_id = #{blacklistId}
</where>
</select>

267
src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml
View File

@ -4,45 +4,72 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarySupplierApplyMapper">
<resultMap type="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply" id="CoscoCategoryLibrarySupplierApplyResult">
<result property="id" column="id"/>
<result property="categoryLibraryId" column="category_library_id"/>
<result property="approveStatus" column="approve_status"/>
<result property="workFlowId" column="work_flow_id"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="lastUpdateTime" column="last_update_time"/>
<resultMap type="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply"
id="CoscoCategoryLibrarySupplierApplyResult">
<result property="id" column="id"/>
<result property="categoryLibraryId" column="category_library_id"/>
<result property="approveStatus" column="approve_status"/>
<result property="workFlowId" column="work_flow_id"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="lastUpdateTime" column="last_update_time"/>
<result property="deptId" column="dept_id"/>
<result property="libraryName" column="libraryName"/>
</resultMap>
<sql id="selectCoscoCategoryLibrarySupplierApplyVo">
select id, category_library_id, approve_status, work_flow_id, del_flag, create_by, create_time, update_by, update_time, last_update_time
select id,
category_library_id,
approve_status,
work_flow_id,
del_flag,
create_by,
create_time,
update_by,
update_time,
last_update_time
from cosco_category_library_supplier_apply
</sql>
<select id="selectCoscoCategoryLibrarySupplierApplyList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply" resultMap="CoscoCategoryLibrarySupplierApplyResult">
<select id="selectCoscoCategoryLibrarySupplierApplyList"
parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply"
resultMap="CoscoCategoryLibrarySupplierApplyResult">
<include refid="selectCoscoCategoryLibrarySupplierApplyVo"/>
<where>
<if test="categoryLibraryId != null and categoryLibraryId != ''">
and category_library_id = #{categoryLibraryId}
</if>
<if test="approveStatus != null ">
and approve_status = #{approveStatus}
</if>
<if test="workFlowId != null and workFlowId != ''">
and work_flow_id = #{workFlowId}
</if>
<if test="lastUpdateTime != null ">
and last_update_time = #{lastUpdateTime}
</if>
<if test="categoryLibraryId != null and categoryLibraryId != ''">
and category_library_id = #{categoryLibraryId}
</if>
<if test="approveStatus != null ">
and approve_status = #{approveStatus}
</if>
<if test="workFlowId != null and workFlowId != ''">
and work_flow_id = #{workFlowId}
</if>
<if test="lastUpdateTime != null ">
and last_update_time = #{lastUpdateTime}
</if>
</where>
</select>
<select id="selectByWorkFlowId" resultMap="CoscoCategoryLibrarySupplierApplyResult" parameterType="string">
<include refid="selectCoscoCategoryLibrarySupplierApplyVo"></include>
where work_flow_id = #{workFlowId}
select cclsa.id,
cclsa.category_library_id,
cclsa.approve_status,
cclsa.work_flow_id,
cclsa.del_flag,
cclsa.create_by,
cclsa.create_time,
cclsa.update_by,
cclsa.update_time,
cclsa.last_update_time,
ccl.dept_id ,
ccl.name as libraryName
from cosco_category_library_supplier_apply cclsa
left join cosco_category_library ccl on cclsa.category_library_id = ccl.id
where cclsa.work_flow_id = #{workFlowId}
</select>
<select id="selectCoscoCategoryLibrarySupplierApplyById" parameterType="String"
@ -50,86 +77,91 @@
select cclsa.id,
ccl.name,
ccl.area,
ccl.id as libraryId,
'张三' as applyUser ,
ccl.create_time as applyTime,
ccl.id as libraryId,
'张三' as applyUser,
ccl.create_time as applyTime,
cclsa.approve_status as approveStatus
from cosco_category_library_supplier_apply cclsa
join cosco_category_library ccl on cclsa.category_library_id=ccl.id
where cclsa.id=#{id}
join cosco_category_library ccl on cclsa.category_library_id = ccl.id
where cclsa.id = #{id}
</select>
<insert id="insertCoscoCategoryLibrarySupplierApply" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply">
<insert id="insertCoscoCategoryLibrarySupplierApply"
parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply">
insert into cosco_category_library_supplier_apply
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="categoryLibraryId != null">category_library_id,</if>
<if test="approveStatus != null">approve_status,</if>
<if test="workFlowId != null">work_flow_id,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="lastUpdateTime != null">last_update_time,</if>
<if test="id != null">id,</if>
<if test="categoryLibraryId != null">category_library_id,</if>
<if test="approveStatus != null">approve_status,</if>
<if test="workFlowId != null">work_flow_id,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="lastUpdateTime != null">last_update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="categoryLibraryId != null">#{categoryLibraryId},</if>
<if test="approveStatus != null">#{approveStatus},</if>
<if test="workFlowId != null">#{workFlowId},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="lastUpdateTime != null">#{lastUpdateTime},</if>
<if test="id != null">#{id},</if>
<if test="categoryLibraryId != null">#{categoryLibraryId},</if>
<if test="approveStatus != null">#{approveStatus},</if>
<if test="workFlowId != null">#{workFlowId},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="lastUpdateTime != null">#{lastUpdateTime},</if>
</trim>
</insert>
<insert id="batchCoscoCategoryLibrarySupplierApply" parameterType="java.util.List">
insert into cosco_category_library_supplier_apply
( id, category_library_id, approve_status, work_flow_id, del_flag, create_by, create_time, update_by, update_time, last_update_time)
( id, category_library_id, approve_status, work_flow_id, del_flag, create_by, create_time, update_by,
update_time, last_update_time)
values
<foreach item="item" index="index" collection="list" separator=",">
( #{item.id}, #{item.categoryLibraryId}, #{item.approveStatus}, #{item.workFlowId}, #{item.delFlag}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.lastUpdateTime})
( #{item.id}, #{item.categoryLibraryId}, #{item.approveStatus}, #{item.workFlowId}, #{item.delFlag},
#{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.lastUpdateTime})
</foreach>
</insert>
<update id="updateCoscoCategoryLibrarySupplierApply" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply">
<update id="updateCoscoCategoryLibrarySupplierApply"
parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply">
update cosco_category_library_supplier_apply
<trim prefix="SET" suffixOverrides=",">
<if test="categoryLibraryId != null">category_library_id =
#{categoryLibraryId},
</if>
<if test="approveStatus != null">approve_status =
#{approveStatus},
</if>
<if test="workFlowId != null">work_flow_id =
#{workFlowId},
</if>
<if test="delFlag != null and delFlag != ''">del_flag =
#{delFlag},
</if>
<if test="createBy != null and createBy != ''">create_by =
#{createBy},
</if>
<if test="createTime != null">create_time =
#{createTime},
</if>
<if test="updateBy != null">update_by =
#{updateBy},
</if>
<if test="updateTime != null">update_time =
#{updateTime},
</if>
<if test="lastUpdateTime != null">last_update_time =
#{lastUpdateTime},
</if>
<if test="categoryLibraryId != null">category_library_id =
#{categoryLibraryId},
</if>
<if test="approveStatus != null">approve_status =
#{approveStatus},
</if>
<if test="workFlowId != null">work_flow_id =
#{workFlowId},
</if>
<if test="delFlag != null and delFlag != ''">del_flag =
#{delFlag},
</if>
<if test="createBy != null and createBy != ''">create_by =
#{createBy},
</if>
<if test="createTime != null">create_time =
#{createTime},
</if>
<if test="updateBy != null">update_by =
#{updateBy},
</if>
<if test="updateTime != null">update_time =
#{updateTime},
</if>
<if test="lastUpdateTime != null">last_update_time =
#{lastUpdateTime},
</if>
</trim>
where id = #{id}
</update>
<update id="deleteCoscoCategoryLibrarySupplierApplyById" parameterType="String">
update cosco_category_library_supplier_apply set del_flag = 2
update cosco_category_library_supplier_apply
set del_flag = 2
where id = #{id}
</update>
@ -140,19 +172,23 @@
</foreach>
</update>
<select id="selectSupplierByLibraryId" parameterType="string" resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryLibrarySupplierVo">
select csb.name as name,
csb.enterprise_type as area,
<select id="selectSupplierByLibraryId" parameterType="string"
resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryLibrarySupplierVo">
select csb.name as name,
csb.enterprise_type as area,
csb.social_credit_code as unifiedSocialCreditCode,
csb.supplier_type as supplierCategory,
csb.supplier_type as supplierCategory,
csb.id
from cosco_category_library_supplier_apply cclsa
join cosco_category_library_supplier ccls on cclsa.id=ccls.category_library_supplier_apply_id
join cosco_supplier_base csb on ccls.supplier_id=csb.id
join cosco_category_library_supplier ccls on cclsa.id = ccls.category_library_supplier_apply_id
join cosco_supplier_base csb on ccls.supplier_id = csb.id
where cclsa.category_library_id = #{id} and cclsa.approve_status=1 and cclsa.del_flag ='normal'
where cclsa.category_library_id = #{id}
and cclsa.approve_status = 1
and cclsa.del_flag = 'normal'
</select>
<select id="selectCategorySupplier" parameterType="list" resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryLibrarySupplierVo">
<select id="selectCategorySupplier" parameterType="list"
resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryLibrarySupplierVo">
select csb.name as name,
csb.enterprise_type as area,
@ -160,8 +196,8 @@
csb.supplier_type as supplierCategory,
csb.id
from
cosco_supplier_base csb
left join cosco_access_supplier_category casc on csb.id=casc.supplier_id
cosco_supplier_base csb
left join cosco_access_supplier_category casc on csb.id=casc.supplier_id
where casc.del_flag='normal' and csb.del_flag='normal'
AND csb.id IN (
SELECT
@ -182,39 +218,40 @@
group by csb.id
</select>
<select id="selectPageList" resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.ListCoscoCategoryLibrarySupplierApplyVo">
<select id="selectPageList"
resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.ListCoscoCategoryLibrarySupplierApplyVo">
select cclsa.id, ccl.name,ccl.area AS area,cclsa.create_by as createBy ,
ccl.create_time as applyTime,cclsa.approve_status as approveStatus,ccl.dept_id as deptId,
case when cclsa.approve_status=0 and cclsa.work_flow_id is null then '未开始'
when cclsa.approve_status=0 and cclsa.work_flow_id is not null then '进行中'
else '已结束'
end as processStatusName,
case when cclsa.approve_status=1 then '通过'
when cclsa.approve_status=2 then '驳回'
end as approveResult,
CASE
WHEN COUNT(csb.id) = 0 THEN NULL
WHEN COUNT(csb.id) = 1 THEN MAX(csb.name)
ELSE CONCAT(MAX(csb.name), ' 等', COUNT(csb.id), '家公司')
END AS supplierName
ccl.create_time as applyTime,cclsa.approve_status as approveStatus,ccl.dept_id as deptId,
case when cclsa.approve_status=0 and cclsa.work_flow_id is null then '未开始'
when cclsa.approve_status=0 and cclsa.work_flow_id is not null then '进行中'
else '已结束'
end as processStatusName,
case when cclsa.approve_status=1 then '通过'
when cclsa.approve_status=2 then '驳回'
end as approveResult,
CASE
WHEN COUNT(csb.id) = 0 THEN NULL
WHEN COUNT(csb.id) = 1 THEN MAX(csb.name)
ELSE CONCAT(MAX(csb.name), ' 等', COUNT(csb.id), '家公司')
END AS supplierName
from cosco_category_library_supplier_apply cclsa
join cosco_category_library ccl on cclsa.category_library_id=ccl.id
left join cosco_category_library_supplier ccls on ccls.category_library_supplier_apply_id=cclsa.id
left join cosco_supplier_base csb on csb.id= ccls.supplier_id
join cosco_category_library ccl on cclsa.category_library_id=ccl.id
left join cosco_category_library_supplier ccls on ccls.category_library_supplier_apply_id=cclsa.id
left join cosco_supplier_base csb on csb.id= ccls.supplier_id
where cclsa.del_flag ='normal'
<if test="vo.name!=null and vo.name!=''">
and ccl.name like concat('%',#{vo.name},'%')
and ccl.name like concat('%',#{vo.name},'%')
</if>
<if test="vo.area!=null and vo.area!=''">
and ccl.area = #{vo.area}
and ccl.area = #{vo.area}
</if>
<if test="vo.approveStatus!=null and vo.approveStatus!=''">
and cclsa.approveStatus = #{vo.approveStatus}
and cclsa.approveStatus = #{vo.approveStatus}
</if>
GROUP BY
cclsa.id
cclsa.id
order by cclsa.create_time desc
</select>

11
src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierMapper.xml
View File

@ -10,6 +10,7 @@
<result property="categoryLibrarySupplierApplyId" column="category_library_supplier_apply_id"/>
<result property="categoryLibraryId" column="category_library_id"/>
<result property="supplierId" column="supplier_id"/>
<result property="supplierName" column="supplierName"/>
</resultMap>
<sql id="selectCoscoCategoryLibrarySupplierVo">
@ -20,7 +21,10 @@
<select id="selectCoscoCategoryLibrarySupplierList"
parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplier"
resultMap="CoscoCategoryLibrarySupplierResult">
<include refid="selectCoscoCategoryLibrarySupplierVo"/>
select ccls.id, ccls.category_library_supplier_apply_id, ccls.category_library_id, ccls.supplier_id,
csb.name as supplierName
from cosco_category_library_supplier ccls
left join cosco_supplier_base csb on ccls.supplier_id = csb.id
<where>
<if test="categoryLibrarySupplierApplyId != null and categoryLibrarySupplierApplyId != ''">
and category_library_supplier_apply_id = #{categoryLibrarySupplierApplyId}
@ -101,7 +105,10 @@
<select id="selectSupplierByApplyId" parameterType="string"
resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryLibrarySupplierVo">
select csb.name, csb.enterprise_type area, csb.supplier_type supplierCategory, csb.id ,
select csb.name,
csb.enterprise_type area,
csb.supplier_type supplierCategory,
csb.id,
csb.social_credit_code unifiedSocialCreditCode
from cosco_category_library_supplier ccls
join cosco_supplier_base csb on ccls.supplier_id = csb.id