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:
TL
2025-06-24 17:38:27 +08:00
parent 8c23468885
commit 615ee559eb
11 changed files with 186 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,7 +83,7 @@ public class SynchronousController {
* 供应商品类准入审批回调接口
*/
@PostMapping("/receiveCategoryApprove")
public BaseResponse receiveCategoryApprove(@RequestBody CoscoAccessWork vo) {
public BaseResponse<CoscoSupplierAccessWorkVo> receiveCategoryApprove(@RequestBody CoscoAccessWork vo) {
return BaseResponse.success(coscoAccessWorkCategoryService.receiveApprove(vo));
}

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/MessageType.java
View File

@ -6,6 +6,10 @@ public class MessageType {
public static final String MESSAGETYPE_GYSZR = "MESSAGETYPE_GYSZR";
//供应商品类准入审批处理完成
public static final String MESSAGETYPE_GYSPLZR = "MESSAGETYPE_GYSPLZR";

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

@ -5,6 +5,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessCategory;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage;
@ -51,9 +52,11 @@ public class MessageLogAspect {
if(MessageType.MESSAGETYPE_GYSZR.equals(messageType)){//供应商准入审批处理
pustMessageSupplierWork(result,messageType);
}
if(MessageType.MESSAGETYPE_GYSPLZR.equals(messageType)){//供应商准入审批处理
pustMessageSupplierCategoryWork(result,messageType);
}
} catch (Exception e) {
e.printStackTrace();
log.error("消息处理失败（不影响主流程）", e);
}
return result;
@ -70,11 +73,11 @@ public class MessageLogAspect {
for(CoscoAccessSupplier coscoAccessSupplier : vo.getSupplierList()){
String approveStr = "";
if(CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())){
approveStr = "通过";
approveStr = "已通过";
}else{
approveStr = "驳回";
approveStr = "已驳回";
}
String cont = coscoAccessSupplier.getSupplierName()+"供应商准入"+vo.getDeptId()+"部门"+approveStr;
String cont = coscoAccessSupplier.getSupplierName()+"，准入"+vo.getDeptId()+"部门，"+approveStr;
coscoMessageList.add(coscoMessageData(coscoAccessSupplier.getSupplierId(),cont,messageType));
}
pustMessage(coscoMessageList);
@ -83,6 +86,35 @@ public class MessageLogAspect {
}
}
/**
* 供应商品类准入审批处里
*/
public void pustMessageSupplierCategoryWork(Object result,String messageType){
if (result instanceof CoscoSupplierAccessWorkVo) {
CoscoSupplierAccessWorkVo vo = (CoscoSupplierAccessWorkVo) result;
List<CoscoMessage> coscoMessageList = new ArrayList<>();
// 使用转换后的对象
for(CoscoAccessSupplier coscoAccessSupplier : vo.getSupplierList()){
for(CoscoAccessCategory coscoAccessCategory : coscoAccessSupplier.getCoscoAccessCategoryList()){
String approveStr = "";
if(CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())){
approveStr = "已通过";
}else{
approveStr = "已驳回";
}
String cont = coscoAccessSupplier.getSupplierName()+"，准入"+
vo.getDeptId()+"部门的"+
coscoAccessCategory.getCategoryName()+"品类，"+approveStr;
coscoMessageList.add(coscoMessageData(coscoAccessSupplier.getSupplierId(),cont,messageType));
}
}
pustMessage(coscoMessageList);
} else {
throw new IllegalArgumentException("返回对象类型不匹配");
}
}
/**
* 封装实体
* @param receiverId
@ -92,12 +124,12 @@ public class MessageLogAspect {
public CoscoMessage coscoMessageData(String receiverId,String cont,String messageType){
Date time = CoscoDateUtils.getNowDate();
CoscoMessage coscoMessage = new CoscoMessage();
coscoMessage.setCreateTime(time);
coscoMessage.setUpdateTime(time);
coscoMessage.setId(CoscoIdUtil.getId());
coscoMessage.setReceiverId(receiverId);
coscoMessage.setContent(cont);
coscoMessage.setType(messageType);
coscoMessage.setCreateTime(time);
coscoMessage.setUpdateTime(time);
return coscoMessage;
}

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplier.java
View File

@ -53,4 +53,8 @@ public class CoscoAccessSupplier extends CoscoBaseEntity {
//评审项集合
private List<CoscoAccessItem> coscoAccessItemList;
//供应商需要准入的品类集合
private List<CoscoAccessCategory> coscoAccessCategoryList;
}

3
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkCategoryService.java
View File

@ -2,6 +2,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierAccessWorkVo;
import java.util.List;
@ -29,7 +30,7 @@ public interface ICoscoAccessWorkCategoryService {
public Boolean startApprove(String id);
public Boolean receiveApprove(CoscoAccessWork vo);
public CoscoSupplierAccessWorkVo receiveApprove(CoscoAccessWork vo);
}

42
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java
View File

@ -6,14 +6,19 @@ import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWorkCategoryService;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWorkService;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierAccessWorkVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
@ -85,15 +90,17 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
@Transactional
public Boolean insertCoscoAccessWork(CoscoAccessWorkVo vo) {
String workId = CoscoIdUtil.getId();//工作主体id
Date date = CoscoDateUtils.getNowDate();
//任务主体新增/供应商准入
CoscoAccessWork coscoAccessWork = vo.getCoscoAccessWork();
coscoAccessWork.setId(workId);
coscoAccessWork.setApplyType(CoscoType.APPLY_TYPE_PLZR);
coscoAccessWork.setAccessType(CoscoType.ACCESS_TYPE_ONLINE);
coscoAccessWork.setCreateBy("1");
coscoAccessWork.setCreateTime(CoscoDateUtils.getNowDate());
coscoAccessWork.setCreateTime(date);
coscoAccessWork.setUpdateBy("1");
coscoAccessWork.setUpdateTime(CoscoDateUtils.getNowDate());
coscoAccessWork.setLastUpdateTime(CoscoDateUtils.getNowDate());
coscoAccessWork.setUpdateTime(date);
coscoAccessWork.setLastUpdateTime(date);
coscoAccessWorkMapper.insertCoscoAccessWork(coscoAccessWork);
//品类集合
@ -107,8 +114,10 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
//供应商集合
for(String sId : vo.getSupplierIds()){
CoscoAccessSupplier coscoAccessSupplier = new CoscoAccessSupplier();
coscoAccessSupplier.setId(CoscoIdUtil.getId());
coscoAccessSupplier.setAccessWorkId(workId);
coscoAccessSupplier.setSupplierId(sId);
coscoAccessSupplier.setDeptId(coscoAccessWork.getDeptId());
coscoAccessSupplierMapper.insertCoscoAccessSupplier(coscoAccessSupplier);
}
@ -170,18 +179,23 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
*/
@Override
@Transactional
public Boolean receiveApprove(CoscoAccessWork vo) {
@MessageLog(messageType = MessageType.MESSAGETYPE_GYSPLZR)
public CoscoSupplierAccessWorkVo receiveApprove(CoscoAccessWork vo) {
CoscoSupplierAccessWorkVo coscoSupplierAccessWorkVo = new CoscoSupplierAccessWorkVo();
List<CoscoAccessSupplier> supplierIdList = new ArrayList<>();
//先验证一下主任务表数据状态
CoscoAccessWork coscoAccessWorkData = coscoAccessWorkMapper.selectCoscoAccessWorkById(vo.getId());
if(coscoAccessWorkData == null){
return true;
throw new IllegalArgumentException("任务信息不能为空");
}
if(CoscoType.APPROVE_STATUS_TG.equals(coscoAccessWorkData.getApproveStatus()) ||
CoscoType.APPROVE_STATUS_BH.equals(coscoAccessWorkData.getApproveStatus()) ){
return true;
throw new IllegalArgumentException("任务已处理完成");
}
//修改任务主表审批状态--通过或者驳回
@ -202,18 +216,18 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
coscoAccessSupplier.setAccessWorkId(vo.getId());
List<CoscoAccessSupplier> supplierList = coscoAccessSupplierMapper.selectCoscoAccessSupplierList(coscoAccessSupplier);
for(CoscoAccessSupplier coscoAccessSupplier1 :supplierList ){
//根据id查询全部需要已准入的品类
//根据id查询全部需要准入的品类
CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory();
coscoAccessCategory.setAccessWorkId(vo.getId());
List<CoscoAccessCategory> coscoAccessCategoryList = coscoAccessCategoryMapper.selectCoscoAccessCategoryList(coscoAccessCategory);
List<CoscoAccessCategory> coscoAccessCategoryListAop = new ArrayList<>();
for (CoscoAccessCategory coscoAccessCategory1 : coscoAccessCategoryList){
//验证该品类是否已经准入过了
CoscoAccessSupplierCategory coscoAccessSupplierCategory2 = new CoscoAccessSupplierCategory();
coscoAccessSupplierCategory2.setSupplierId(coscoAccessSupplier1.getSupplierId());
coscoAccessSupplierCategory2.setCategoryId(coscoAccessCategory1.getCategoryId());
coscoAccessSupplierCategory2.setDeptId(coscoAccessWorkData.getDeptId());
Integer num = coscoAccessSupplierCategoryMapper.selectBySupplierIdAndCategoryId(coscoAccessSupplierCategory2);
//如果是0 说明没准入过
if(num == 0){
@ -227,15 +241,23 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
coscoAccessSupplierCategory.setUpdateBy("1");
coscoAccessSupplierCategory.setUpdateTime(CoscoDateUtils.getNowDate());
coscoAccessSupplierCategory.setLastUpdateTime(CoscoDateUtils.getNowDate());
coscoAccessSupplierCategory.setDeptId(coscoAccessWorkData.getDeptId());
coscoAccessSupplierCategoryMapper.insertCoscoAccessSupplierCategory(coscoAccessSupplierCategory);
coscoAccessCategoryListAop.add(coscoAccessCategory1);
}
}
coscoAccessSupplier1.setCoscoAccessCategoryList(coscoAccessCategoryListAop);
supplierIdList.add(coscoAccessSupplier1);
}
}
//封装消息内容实体
coscoSupplierAccessWorkVo.setSupplierList(supplierIdList);
coscoSupplierAccessWorkVo.setApproveStatus(vo.getApproveStatus());
coscoSupplierAccessWorkVo.setDeptId(coscoAccessWorkData.getDeptId());
return true;
return coscoSupplierAccessWorkVo;
}

39
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -541,18 +542,16 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
throw new IllegalArgumentException("该任务已处理完成");
}
Date date = CoscoDateUtils.getNowDate();
//修改任务主表审批状态--通过或者驳回
CoscoAccessWork coscoAccessWork = new CoscoAccessWork();
coscoAccessWork.setId(vo.getId());
coscoAccessWork.setApproveStatus(vo.getApproveStatus());
coscoAccessWork.setWorkFlowId(vo.getWorkFlowId());
coscoAccessWork.setUpdateTime(CoscoDateUtils.getNowDate());
coscoAccessWork.setLastUpdateTime(CoscoDateUtils.getNowDate());
//coscoAccessWorkMapper.updateCoscoAccessWork(coscoAccessWork);
coscoAccessWork.setUpdateTime(date);
coscoAccessWork.setLastUpdateTime(date);
coscoAccessWorkMapper.updateCoscoAccessWork(coscoAccessWork);
//审批通过
if(vo.getApproveStatus().equals(CoscoType.APPROVE_STATUS_TG)){
//把准入的品类添加到已准入品类表
//供应商信息
CoscoAccessSupplier coscoAccessSupplier = new CoscoAccessSupplier();
@ -560,6 +559,11 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
List<CoscoAccessSupplier> supplierList = coscoAccessSupplierMapper.selectCoscoAccessSupplierList(coscoAccessSupplier);
//审批通过
if(vo.getApproveStatus().equals(CoscoType.APPROVE_STATUS_TG)){
for(CoscoAccessSupplier coscoAccessSupplier1 :supplierList ){
//根据id查询全部已准入的品类
CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory();
@ -573,12 +577,12 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
coscoAccessSupplierCategory.setSupplierId(coscoAccessSupplier1.getSupplierId());
coscoAccessSupplierCategory.setCategoryId(coscoAccessCategory1.getCategoryId());
coscoAccessSupplierCategory.setCreateBy("1");
coscoAccessSupplierCategory.setCreateTime(CoscoDateUtils.getNowDate());
coscoAccessSupplierCategory.setCreateTime(date);
coscoAccessSupplierCategory.setUpdateBy("1");
coscoAccessSupplierCategory.setUpdateTime(CoscoDateUtils.getNowDate());
coscoAccessSupplierCategory.setLastUpdateTime(CoscoDateUtils.getNowDate());
coscoAccessSupplierCategory.setUpdateTime(date);
coscoAccessSupplierCategory.setLastUpdateTime(date);
coscoAccessSupplierCategory.setDeptId(coscoAccessWorkData.getDeptId());
//coscoAccessSupplierCategoryMapper.insertCoscoAccessSupplierCategory(coscoAccessSupplierCategory);
coscoAccessSupplierCategoryMapper.insertCoscoAccessSupplierCategory(coscoAccessSupplierCategory);
}
//修改注册信息表状态
@ -586,22 +590,27 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
coscoSupplierBase.setId(coscoAccessSupplier1.getSupplierId());
coscoSupplierBase.setAccessStatus(CoscoType.ACCESS_STATUS_YZR);
coscoSupplierBase.setUpdateBy("1");
coscoSupplierBase.setUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierBase.setLastUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierBase.setUpdateTime(date);
coscoSupplierBase.setLastUpdateTime(date);
coscoSupplierBase.setDeptId(coscoAccessWorkData.getDeptId());
//coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase);
coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase);
//修改准入供应商表状态
CoscoAccessSupplier coscoAccessSupplier2 = new CoscoAccessSupplier();
coscoAccessSupplier2.setId(coscoAccessSupplier1.getId());
coscoAccessSupplier2.setAccessStatus(CoscoType.ACCESS_STATUS_YZR);
//coscoAccessSupplierMapper.updateCoscoAccessSupplier(coscoAccessSupplier2);
coscoAccessSupplierMapper.updateCoscoAccessSupplier(coscoAccessSupplier2);
supplierIdList.add(coscoAccessSupplier1);
}
} if(vo.getApproveStatus().equals(CoscoType.APPROVE_STATUS_BH)){//驳回
//暂时只有消息推送逻辑
for(CoscoAccessSupplier coscoAccessSupplier1 :supplierList ){
supplierIdList.add(coscoAccessSupplier1);
}
}
//封装消息内容实体
coscoSupplierAccessWorkVo.setSupplierList(supplierIdList);
coscoSupplierAccessWorkVo.setApproveStatus(vo.getApproveStatus());
coscoSupplierAccessWorkVo.setDeptId(coscoAccessWorkData.getDeptId());

3
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java
View File

@ -57,9 +57,6 @@ public class CoscoMessageServiceImpl implements ICoscoMessageService {
/**
* 消息保存接口
* @param receiverId 接收人id
* @param content 内容
* @param type 消息类型
* @return
*/
@Override

72
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java
View File

@ -8,6 +8,7 @@ import java.util.List;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.nacos.client.naming.utils.CollectionUtils;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -139,16 +140,18 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
@Transactional
public Boolean insertCoscoSupplierBase(CoscoSupplierVo vo) {
String supplierId = CoscoIdUtil.getId();//企业id
String changeSupplierId = PropertyUtils.getSnowflakeId();
//作废
//String changeSupplierId = PropertyUtils.getSnowflakeId();
Date date = new Date();
//基本信息新增
CoscoSupplierBase coscoSupplierBase = vo.getCoscoSupplierBase();
if(vo.getCoscoSupplierBase() != null){
if(coscoSupplierBase != null){
coscoSupplierBase.setId(supplierId);
coscoSupplierBase.setCreateBy("1");
coscoSupplierBase.setCreateTime(CoscoDateUtils.getNowDate());
coscoSupplierBase.setCreateTime(date);
coscoSupplierBase.setUpdateBy("1");
coscoSupplierBase.setUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierBase.setLastUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierBase.setUpdateTime(date);
coscoSupplierBase.setLastUpdateTime(date);
coscoSupplierBaseMapper.insertCoscoSupplierBase(coscoSupplierBase);
@ -160,17 +163,16 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
coscoSupplierChangeBaseMapper.insertCoscoSupplierChangeBase(coscoSupplierChangeBase);*/
}
//资质信息新增
if(vo.getCoscoSupplierQualifications() != null){
if(vo.getCoscoSupplierQualifications().size() > 0){
if (!CollectionUtils.isEmpty(vo.getCoscoSupplierQualifications())) {
for(CoscoSupplierQualifications coscoSupplierQualifications : vo.getCoscoSupplierQualifications()){
String supplierQualificationsId = CoscoIdUtil.getId();
coscoSupplierQualifications.setId(supplierQualificationsId);
coscoSupplierQualifications.setSupplierId(supplierId);
coscoSupplierQualifications.setCreateBy("1");
coscoSupplierQualifications.setCreateTime(CoscoDateUtils.getNowDate());
coscoSupplierQualifications.setCreateTime(date);
coscoSupplierQualifications.setUpdateBy("1");
coscoSupplierQualifications.setUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierQualifications.setLastUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierQualifications.setUpdateTime(date);
coscoSupplierQualifications.setLastUpdateTime(date);
coscoSupplierQualificationsMapper.insertCoscoSupplierQualifications(coscoSupplierQualifications);
//变更表资质插入--作废
@ -183,20 +185,19 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
}
}
}
//发票信息
if(vo.getCoscoSupplierInvoice() != null){
String supplierInvoiceId = CoscoIdUtil.getId();
CoscoSupplierInvoice coscoSupplierInvoice = vo.getCoscoSupplierInvoice();
if(coscoSupplierInvoice != null){
String supplierInvoiceId = CoscoIdUtil.getId();
coscoSupplierInvoice.setId(supplierInvoiceId);
coscoSupplierInvoice.setSupplierId(supplierId);
coscoSupplierInvoice.setCreateBy("1");
coscoSupplierInvoice.setCreateTime(CoscoDateUtils.getNowDate());
coscoSupplierInvoice.setCreateTime(date);
coscoSupplierInvoice.setUpdateBy("1");
coscoSupplierInvoice.setUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierInvoice.setLastUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierInvoice.setUpdateTime(date);
coscoSupplierInvoice.setLastUpdateTime(date);
coscoSupplierInvoiceMapper.insertCoscoSupplierInvoice(coscoSupplierInvoice);
//变更表发票插入--作废
@ -210,17 +211,16 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
//银行
if(vo.getCoscoSupplierBank() != null){
if(vo.getCoscoSupplierBank().size() > 0){
if (!CollectionUtils.isEmpty(vo.getCoscoSupplierBank())) {
for(CoscoSupplierBank coscoSupplierBank : vo.getCoscoSupplierBank()){
String supplierBankId = CoscoIdUtil.getId();
coscoSupplierBank.setId(supplierBankId);
coscoSupplierBank.setSupplierId(supplierId);
coscoSupplierBank.setCreateBy("1");
coscoSupplierBank.setCreateTime(CoscoDateUtils.getNowDate());
coscoSupplierBank.setCreateTime(date);
coscoSupplierBank.setUpdateBy("1");
coscoSupplierBank.setUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierBank.setLastUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierBank.setUpdateTime(date);
coscoSupplierBank.setLastUpdateTime(date);
coscoSupplierBankMapper.insertCoscoSupplierBank(coscoSupplierBank);
//变更表银行插入---作废
@ -232,52 +232,46 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
coscoSupplierChangeBankMapper.insertCoscoSupplierChangeBank(coscoSupplierChangeBank);*/
}
}
}
//填写人信息
if(vo.getCoscoSupplierSurvey() != null){
CoscoSupplierSurvey coscoSupplierSurvey = vo.getCoscoSupplierSurvey();
if(coscoSupplierSurvey != null){
coscoSupplierSurvey.setId(CoscoIdUtil.getId());
coscoSupplierSurvey.setSupplierId(supplierId);
coscoSupplierSurvey.setCreateBy("1");
coscoSupplierSurvey.setCreateTime(CoscoDateUtils.getNowDate());
coscoSupplierSurvey.setCreateTime(date);
coscoSupplierSurvey.setUpdateBy("1");
coscoSupplierSurvey.setUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierSurvey.setLastUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierSurvey.setUpdateTime(date);
coscoSupplierSurvey.setLastUpdateTime(date);
coscoSupplierSurveyMapper.insertCoscoSupplierSurvey(coscoSupplierSurvey);
}
//问题回复
if(vo.getCoscoSupplierSurveyQuestionReply() != null){
if( vo.getCoscoSupplierSurveyQuestionReply().size() > 0){
if (!CollectionUtils.isEmpty(vo.getCoscoSupplierSurveyQuestionReply())) {
for(CoscoSupplierSurveyQuestionReply coscoSupplierSurveyQuestionReply : vo.getCoscoSupplierSurveyQuestionReply()){
coscoSupplierSurveyQuestionReply.setId(CoscoIdUtil.getId());
coscoSupplierSurveyQuestionReply.setSupplierId(supplierId);
coscoSupplierSurveyQuestionReply.setCreateBy("1");
coscoSupplierSurveyQuestionReply.setCreateTime(CoscoDateUtils.getNowDate());
coscoSupplierSurveyQuestionReply.setCreateTime(date);
coscoSupplierSurveyQuestionReply.setUpdateBy("1");
coscoSupplierSurveyQuestionReply.setUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierSurveyQuestionReply.setLastUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierSurveyQuestionReply.setUpdateTime(date);
coscoSupplierSurveyQuestionReply.setLastUpdateTime(date);
coscoSupplierSurveyQuestionReplyMapper.insertCoscoSupplierSurveyQuestionReply(coscoSupplierSurveyQuestionReply);
}
}
}
//承诺书/其他附件
if(vo.getCoscoSupplierSurveyAttachments() != null){
if(vo.getCoscoSupplierSurveyAttachments().size() > 0){
if (!CollectionUtils.isEmpty(vo.getCoscoSupplierSurveyAttachments())) {
for(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments : vo.getCoscoSupplierSurveyAttachments()){
coscoSupplierSurveyAttachments.setId(CoscoIdUtil.getId());
coscoSupplierSurveyAttachments.setSupplierId(supplierId);
coscoSupplierSurveyAttachments.setCreateBy("1");
coscoSupplierSurveyAttachments.setCreateTime(CoscoDateUtils.getNowDate());
coscoSupplierSurveyAttachments.setCreateTime(date);
coscoSupplierSurveyAttachments.setUpdateBy("1");
coscoSupplierSurveyAttachments.setUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierSurveyAttachments.setLastUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierSurveyAttachments.setUpdateTime(date);
coscoSupplierSurveyAttachments.setLastUpdateTime(date);
coscoSupplierSurveyAttachmentsMapper.insertCoscoSupplierSurveyAttachments(coscoSupplierSurveyAttachments);
}
}
}
return true;
}

1
src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml
View File

@ -132,6 +132,7 @@
select COUNT(0) from cosco_access_supplier_category
where supplier_id = #{supplierId}
and category_id = #{categoryId}
and dept_id = #{deptId}
and del_flag = 'normal'
</select>

4
src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoMessageMapper.xml
View File

@ -66,10 +66,10 @@
</insert>
<insert id="batchCoscoMessage" parameterType="java.util.List">
insert into cosco_message
( id, receiver_id, content, read, type, create_time, update_time)
( id, receiver_id, content, type, create_time, update_time)
values
<foreach item="item" index="index" collection="list" separator=",">
( #{item.id}, #{item.receiverId}, #{item.content}, #{item.read}, #{item.type}, #{item.createTime}, #{item.updateTime})
( #{item.id}, #{item.receiverId}, #{item.content}, #{item.type}, #{item.createTime}, #{item.updateTime})
</foreach>
</insert>
<update id="updateCoscoMessage" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage">