From 348c82122a7542a612f91239f16bd30e0c83d0ee Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Mon, 15 Jul 2024 15:22:39 +0800 Subject: [PATCH] '123' --- ABAP_AS_WITH_POOL.jcoDestination | 4 +- .../web/controller/bid/BidController.java | 87 +++++- .../web/controller/quot/QuotController.java | 2 +- .../controller/system/SysDeptController.java | 2 +- .../common/core/domain/entity/SysDept.java | 11 +- .../main/java/com/ruoyi/bid/domain/Bid.java | 20 ++ .../java/com/ruoyi/bid/domain/SysOaBid.java | 281 ++++++++++++++++++ .../java/com/ruoyi/bid/mapper/BidMapper.java | 13 + .../com/ruoyi/bid/service/IBidService.java | 15 +- .../bid/service/impl/BidServiceImpl.java | 22 ++ .../java/com/ruoyi/quot/domain/SysOaQuot.java | 7 + .../main/resources/mapper/bid/BidMapper.xml | 148 ++++++--- .../main/resources/mapper/quot/QuotMapper.xml | 2 + .../resources/mapper/system/SysDeptMapper.xml | 40 +-- ruoyi-ui/src/views/bid/bid/index.vue | 152 ++++++++-- ruoyi-ui/src/views/quot/quot/index.vue | 28 +- ruoyi-ui/src/views/system/dept/index.vue | 19 +- 17 files changed, 738 insertions(+), 115 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/bid/domain/SysOaBid.java diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination index b54c69e..f9f4df9 100644 --- a/ABAP_AS_WITH_POOL.jcoDestination +++ b/ABAP_AS_WITH_POOL.jcoDestination @@ -1,5 +1,5 @@ #for tests only ! -#Sun Jul 14 09:24:48 CST 2024 +#Mon Jul 15 15:20:26 CST 2024 jco.destination.pool_capacity=10 jco.client.lang=ZH jco.client.ashost=172.19.0.125 @@ -7,5 +7,5 @@ jco.client.saprouter= jco.client.user=RFC jco.client.sysnr=00 jco.destination.peak_limit=10 -jco.client.passwd=wl1ohKB{(qG12134rfI2_aP1$-R2Li3KI(-4`GAN*gJkQ1]B +jco.client.passwd=dYY1^[j]hj;aDf7jt@xtoi_t?5.0qx/_q7yH^w?b;i2cDbM~ jco.client.client=800 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java index 6e56d35..763c7c5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java @@ -1,12 +1,10 @@ package com.ruoyi.web.controller.bid; - -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; import javax.servlet.http.HttpServletResponse; - import com.ruoyi.bid.domain.BidFile; +import com.ruoyi.bid.domain.SysOaBid; import com.ruoyi.bid.service.IBidFileService; +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; @@ -14,7 +12,7 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.common.utils.file.MinioUtil; import com.ruoyi.common.utils.uuid.UUID; -import com.ruoyi.quot.domain.Quot; +import com.ruoyi.system.service.ISysDeptService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -44,6 +42,9 @@ public class BidController extends BaseController @Autowired private IBidFileService bidFileService; + @Autowired + private ISysDeptService deptService; + /** * 分派 */ @@ -56,9 +57,9 @@ public class BidController extends BaseController String receiveUserName = bid.getReceiveUserName(); for(String bidId:bidIds){ Bid entity = bidService.selectBidByBidId(bidId); - if(StringUtils.isNotEmpty(entity.getReceiveUserName())){ +/* if(StringUtils.isNotEmpty(entity.getReceiveUserName())){ return error("投标信息:"+entity.getBidCode()+" 已分派"); - } + }*/ entity.setReceiveUserName(receiveUserName); bidService.updateBid(entity); } @@ -74,17 +75,17 @@ public class BidController extends BaseController { startPage(); - // 获取用户角色 --判断是否是投标小组经理角色 - Boolean tbbRoleFlag = false; + // 获取用户角色 --判断是否是投标小组-标书制作员角色 + Boolean bidBszzYRoleFlag = false; List roles = SecurityUtils.getLoginUser().getUser().getRoles(); for(SysRole sysRole:roles){ String roleKey = sysRole.getRoleKey(); - if("BID".equals(roleKey)){ - tbbRoleFlag = true; + if("BID_BSZZY".equals(roleKey)){ + bidBszzYRoleFlag = true; break; } } - if(!tbbRoleFlag){ + if(bidBszzYRoleFlag){ bid.setReceiveUserName(getUsername()); } List list = bidService.selectBidList(bid); @@ -237,8 +238,66 @@ public class BidController extends BaseController String bid_id = bid.getBidId(); bid.setUpdateBy(getUsername()); - // TODO 如果是事业部、直营店 则提交OA审核， 如果是业务员则提交投标办审批 - bid.setBidApprovalStatus("1"); + // TODO 如果是事业部、直营店 则提交OA审核， 如果是业务员则提交投标办审批(1-直营店，2-事业部) + Long deptId = getLoginUser().getUser().getDeptId(); + SysDept sysDept = deptService.selectDeptById(deptId); + String zydSyb = sysDept.getZydSyb(); + if("1".equals(zydSyb)||"2".equals(zydSyb)){ + // 投标信息提交OA,插入中间表 sys_oa_bid + SysOaBid sysOaBid = new SysOaBid(); + SysOaBid oauser = bidService.selectOAUserByUserName(getUsername());// 查询OA用户 + if(oauser==null){ + return error("该账户:"+getUsername()+"在OA中不存在"); + } + sysOaBid.setUserId(oauser.getUserId()); + sysOaBid.setDepartmentId(oauser.getDepartmentId()); + sysOaBid.setSubmissionTime(DateUtils.getDate()); + sysOaBid.setBidId(UUID.fastUUID().toString()); + sysOaBid.setBidCode(bid.getBidCode()); + sysOaBid.setBidSalesmanName(bid.getBidSalesmanName()); + sysOaBid.setBidHasRegistration(bid.getBidHasRegistration()); + sysOaBid.setBidRegistrationNumber(bid.getBidRegistrationNumber()); + sysOaBid.setBidOpeningDate(bid.getBidOpeningDate()); + sysOaBid.setBidOnlineQuotation(bid.getBidOnlineQuotation()); + sysOaBid.setBidWebsite(bid.getBidWebsite()); + sysOaBid.setBidTenderingUnit(bid.getBidTenderingUnit()); + sysOaBid.setBidAgency(bid.getBidAgency()); + sysOaBid.setBidProject(bid.getBidProject()); + sysOaBid.setBidAuthorizedRepresentative(bid.getBidAuthorizedRepresentative()); + sysOaBid.setBidAuthorizedPhone(bid.getBidAuthorizedPhone()); + sysOaBid.setBidFilePaymentMethod(bid.getBidFilePaymentMethod()); + sysOaBid.setBidPaymentDeviation(bid.getBidPaymentDeviation()); + sysOaBid.setBidCopperPriceLinkage(bid.getBidCopperPriceLinkage()); + sysOaBid.setBidPriceLinkageMethod(bid.getBidPriceLinkageMethod()); + sysOaBid.setBidOtherRequire(bid.getBidOtherRequire()); + sysOaBid.setBidRemark(bid.getBidRemark()); + + // 上传业务员附件 + BidFile bidFile = new BidFile(); + bidFile.setRelationId(bid.getBidId()); + bidFile.setFileType("bidYwyFile"); + List fileList = bidFileService.selectBidFileList(bidFile); + String fileString = ""; + if(fileList!=null&&fileList.size()>0){ + for(BidFile f:fileList){ + String fileUrl = f.getFileUrl(); + if(StringUtils.isEmpty(fileString)){ + fileString = fileString+fileUrl; + }else{ + fileString = fileString+","+fileUrl; + } + } + } + + sysOaBid.setBidYwyFile(fileString); + sysOaBid.setCreateTime(DateUtils.getNowDate()); + sysOaBid.setIsFinish("0");// 投标信息已提交OA审批中 + bidService.insertSysOABid(sysOaBid); + + bid.setBidApprovalStatus("4"); + }else{ + bid.setBidApprovalStatus("1"); + } if(StringUtils.isEmpty(bid_id)){ bid.setBidId(UUID.fastUUID().toString()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java index 30d48e7..f77e084 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java @@ -746,7 +746,6 @@ public class QuotController extends BaseController } sysOaQuot.setUserId(oauser.getUserId()); - sysOaQuot.setDepartmentId(oauser.getUserId()); sysOaQuot.setDepartmentId(oauser.getDepartmentId()); sysOaQuot.setSubmissionTime(DateUtils.getDate()); sysOaQuot.setQuotId(UUID.fastUUID().toString()); @@ -780,6 +779,7 @@ public class QuotController extends BaseController } } sysOaQuot.setQuotFkFile(fileString); + sysOaQuot.setQuotTotalPrice(quot.getQuotTotalPrice()); sysOaQuot.setCreateTime(DateUtils.getNowDate()); sysOaQuot.setIsFinish("0");// 报价已提交OA审批中 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java index 59e7588..1315ed3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java @@ -24,7 +24,7 @@ import com.ruoyi.system.service.ISysDeptService; /** * 部门信息 - * + * * @author ruoyi */ @RestController diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java index fb18c5c..2dffa29 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java @@ -12,7 +12,7 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 部门表 sys_dept - * + * * @author ruoyi */ public class SysDept extends BaseEntity @@ -46,12 +46,15 @@ public class SysDept extends BaseEntity /** 部门状态:0正常,1停用 */ private String status; + /** 直营店、事业部 */ + private String zydSyb; + /** 删除标志（0代表存在 2代表删除） */ private String delFlag; /** 父部门名称 */ private String parentName; - + /** 子部门 */ private List children = new ArrayList(); @@ -151,6 +154,10 @@ public class SysDept extends BaseEntity this.status = status; } + public String getZydSyb() { return zydSyb; } + + public void setZydSyb(String zydSyb) { this.zydSyb = zydSyb; } + public String getDelFlag() { return delFlag; diff --git a/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java b/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java index 12250a1..547eab6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java @@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.util.Date; + /** * 投标信息对象 bid * @@ -33,6 +35,15 @@ public class Bid extends BaseEntity @Excel(name = "业务员") private String bidSalesmanName; + /** 部门ID */ + private String bidSalesmanDeptId; + + /** 部门名称 */ + private String bidSalesmanDeptName; + + /** 是否报名 */ + private String bidHasRegistration; + /** 原报名编号 */ @Excel(name = "原报名编号") private String bidRegistrationNumber; @@ -214,6 +225,15 @@ public class Bid extends BaseEntity public String getBidSalesmanName() { return bidSalesmanName; } public void setBidSalesmanName(String bidSalesmanName) { this.bidSalesmanName = bidSalesmanName; } + public String getBidSalesmanDeptId() { return bidSalesmanDeptId; } + + public void setBidSalesmanDeptId(String bidSalesmanDeptId) { this.bidSalesmanDeptId = bidSalesmanDeptId; } + public String getBidSalesmanDeptName() { return bidSalesmanDeptName; } + + public void setBidSalesmanDeptName(String bidSalesmanDeptName) { this.bidSalesmanDeptName = bidSalesmanDeptName; } + public String getBidHasRegistration() { return bidHasRegistration; } + + public void setBidHasRegistration(String bidHasRegistration) { this.bidHasRegistration = bidHasRegistration; } public void setBidRegistrationNumber(String bidRegistrationNumber) { this.bidRegistrationNumber = bidRegistrationNumber; } public String getBidRegistrationNumber() diff --git a/ruoyi-system/src/main/java/com/ruoyi/bid/domain/SysOaBid.java b/ruoyi-system/src/main/java/com/ruoyi/bid/domain/SysOaBid.java new file mode 100644 index 0000000..6e4f8d7 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/bid/domain/SysOaBid.java @@ -0,0 +1,281 @@ +package com.ruoyi.bid.domain; + +import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.quot.domain.QuotMaterial; + +import java.util.Date; +import java.util.List; + +/** + * 报价对象 SysOaBid + * + * @author ruoyi + * @date 2024-04-01 + */ +public class SysOaBid extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** oa用户id */ + private Integer userId; + /** oa部门ID */ + private Integer departmentId; + /** 提交oa时间 */ + private String submissionTime; + /** 投标信息ID */ + private String bidId; + /** 投标信息ID单号 */ + private String bidCode; + /** 业务员 */ + private String bidSalesmanName; + /** 是否报名 */ + private String bidHasRegistration; + /** 原报名编号 */ + private String bidRegistrationNumber; + /** 开标日期 */ + private String bidOpeningDate; + /** 是否网上报价 */ + private String bidOnlineQuotation; + /** 报价平台网址 */ + private String bidWebsite; + /** 招标单位 */ + private String bidTenderingUnit; + /** 招标代理 */ + private String bidAgency; + /** 项目名称 */ + private String bidProject; + /** 授权代表 */ + private String bidAuthorizedRepresentative; + /** 授权人联系方式 */ + private String bidAuthorizedPhone; + /** 招标文件付款方式 */ + private String bidFilePaymentMethod; + /** 投标付款偏差 */ + private String bidPaymentDeviation; + /** 是否铜价联动 */ + private String bidCopperPriceLinkage; + /** 价格联动方式 */ + private String bidPriceLinkageMethod; + /** 其他投标要求*/ + private String bidOtherRequire; + /** 备注*/ + private String bidRemark; + /** 业务员附件*/ + private String bidYwyFile; + /** 审批状态*/ + private String state; + /** 审批备注*/ + private String remark; + /** 投标信息审核状态*/ + private String isFinish; + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Integer getDepartmentId() { + return departmentId; + } + + public void setDepartmentId(Integer departmentId) { + this.departmentId = departmentId; + } + + public String getSubmissionTime() { + return submissionTime; + } + + public void setSubmissionTime(String submissionTime) { + this.submissionTime = submissionTime; + } + + public String getBidId() { + return bidId; + } + + public void setBidId(String bidId) { + this.bidId = bidId; + } + + public String getBidCode() { + return bidCode; + } + + public void setBidCode(String bidCode) { + this.bidCode = bidCode; + } + + public String getBidSalesmanName() { + return bidSalesmanName; + } + + public void setBidSalesmanName(String bidSalesmanName) { + this.bidSalesmanName = bidSalesmanName; + } + + public String getBidHasRegistration() { + return bidHasRegistration; + } + + public void setBidHasRegistration(String bidHasRegistration) { + this.bidHasRegistration = bidHasRegistration; + } + + public String getBidRegistrationNumber() { + return bidRegistrationNumber; + } + + public void setBidRegistrationNumber(String bidRegistrationNumber) { + this.bidRegistrationNumber = bidRegistrationNumber; + } + + public String getBidOpeningDate() { + return bidOpeningDate; + } + + public void setBidOpeningDate(String bidOpeningDate) { + this.bidOpeningDate = bidOpeningDate; + } + + public String getBidOnlineQuotation() { + return bidOnlineQuotation; + } + + public void setBidOnlineQuotation(String bidOnlineQuotation) { + this.bidOnlineQuotation = bidOnlineQuotation; + } + + public String getBidWebsite() { + return bidWebsite; + } + + public void setBidWebsite(String bidWebsite) { + this.bidWebsite = bidWebsite; + } + + public String getBidTenderingUnit() { + return bidTenderingUnit; + } + + public void setBidTenderingUnit(String bidTenderingUnit) { + this.bidTenderingUnit = bidTenderingUnit; + } + + public String getBidAgency() { + return bidAgency; + } + + public void setBidAgency(String bidAgency) { + this.bidAgency = bidAgency; + } + + public String getBidProject() { + return bidProject; + } + + public void setBidProject(String bidProject) { + this.bidProject = bidProject; + } + + public String getBidAuthorizedRepresentative() { + return bidAuthorizedRepresentative; + } + + public void setBidAuthorizedRepresentative(String bidAuthorizedRepresentative) { + this.bidAuthorizedRepresentative = bidAuthorizedRepresentative; + } + + public String getBidAuthorizedPhone() { + return bidAuthorizedPhone; + } + + public void setBidAuthorizedPhone(String bidAuthorizedPhone) { + this.bidAuthorizedPhone = bidAuthorizedPhone; + } + + public String getBidFilePaymentMethod() { + return bidFilePaymentMethod; + } + + public void setBidFilePaymentMethod(String bidFilePaymentMethod) { + this.bidFilePaymentMethod = bidFilePaymentMethod; + } + + public String getBidPaymentDeviation() { + return bidPaymentDeviation; + } + + public void setBidPaymentDeviation(String bidPaymentDeviation) { + this.bidPaymentDeviation = bidPaymentDeviation; + } + + public String getBidCopperPriceLinkage() { + return bidCopperPriceLinkage; + } + + public void setBidCopperPriceLinkage(String bidCopperPriceLinkage) { + this.bidCopperPriceLinkage = bidCopperPriceLinkage; + } + + public String getBidPriceLinkageMethod() { + return bidPriceLinkageMethod; + } + + public void setBidPriceLinkageMethod(String bidPriceLinkageMethod) { + this.bidPriceLinkageMethod = bidPriceLinkageMethod; + } + + public String getBidOtherRequire() { + return bidOtherRequire; + } + + public void setBidOtherRequire(String bidOtherRequire) { + this.bidOtherRequire = bidOtherRequire; + } + + public String getBidRemark() { + return bidRemark; + } + + public void setBidRemark(String bidRemark) { + this.bidRemark = bidRemark; + } + + public String getBidYwyFile() { + return bidYwyFile; + } + + public void setBidYwyFile(String bidYwyFile) { + this.bidYwyFile = bidYwyFile; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + @Override + public String getRemark() { + return remark; + } + + @Override + public void setRemark(String remark) { + this.remark = remark; + } + + public String getIsFinish() { + return isFinish; + } + + public void setIsFinish(String isFinish) { + this.isFinish = isFinish; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/bid/mapper/BidMapper.java b/ruoyi-system/src/main/java/com/ruoyi/bid/mapper/BidMapper.java index 76eefa7..2534a29 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bid/mapper/BidMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bid/mapper/BidMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.bid.mapper; import java.util.List; import com.ruoyi.bid.domain.Bid; +import com.ruoyi.bid.domain.SysOaBid; /** * 投标信息Mapper接口 @@ -65,4 +66,16 @@ public interface BidMapper * @return */ String getCode(String type); + + /** + * 查询OA用户 + * @return + */ + SysOaBid selectOAUserByUserName(String loginid); + + /** + * 投标信息提交OA,插入中间表 sys_oa_bid + * @param sysOaBid + */ + void insertSysOABid(SysOaBid sysOaBid); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/bid/service/IBidService.java b/ruoyi-system/src/main/java/com/ruoyi/bid/service/IBidService.java index ec9f4e0..435a3c7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bid/service/IBidService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bid/service/IBidService.java @@ -2,6 +2,7 @@ package com.ruoyi.bid.service; import java.util.List; import com.ruoyi.bid.domain.Bid; +import com.ruoyi.bid.domain.SysOaBid; /** * 投标信息Service接口 @@ -61,8 +62,20 @@ public interface IBidService /** * 获取单据编号 - * @param bjd + * @param type * @return */ String getCode(String type); + + /** + * 查询OA用户 + * @return + */ + SysOaBid selectOAUserByUserName(String username); + + /** + * 投标信息提交OA,插入中间表 sys_oa_bid + * @param sysOaBid + */ + void insertSysOABid(SysOaBid sysOaBid); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/bid/service/impl/BidServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/bid/service/impl/BidServiceImpl.java index 20442e7..afef790 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bid/service/impl/BidServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bid/service/impl/BidServiceImpl.java @@ -2,7 +2,10 @@ package com.ruoyi.bid.service.impl; import java.util.List; +import com.ruoyi.bid.domain.SysOaBid; import com.ruoyi.common.annotation.DataScope; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.enums.DataSourceType; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -107,4 +110,23 @@ public class BidServiceImpl implements IBidService public String getCode(String type) { return bidMapper.getCode(type); } + + /** + * 查询OA用户 + * @return + */ + @Override + @DataSource(DataSourceType.OA) + public SysOaBid selectOAUserByUserName(String loginid) { + return bidMapper.selectOAUserByUserName(loginid); + } + + /** + * 投标信息提交OA,插入中间表 sys_oa_bid + * @param sysOaBid + */ + @Override + public void insertSysOABid(SysOaBid sysOaBid) { + bidMapper.insertSysOABid(sysOaBid); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/SysOaQuot.java b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/SysOaQuot.java index 670e2d5..443c8a4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/SysOaQuot.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/SysOaQuot.java @@ -66,6 +66,9 @@ public class SysOaQuot extends BaseEntity /** 询价单-询价清单地址 */ private String quotFkFile; + /** 总价 */ + private String quotTotalPrice; + /** OA审批状态 */ private String state; @@ -204,6 +207,10 @@ public class SysOaQuot extends BaseEntity public void setQuotFkFile(String quotFkFile) { this.quotFkFile = quotFkFile; } + public String getQuotTotalPrice() { return quotTotalPrice; } + + public void setQuotTotalPrice(String quotTotalPrice) { this.quotTotalPrice = quotTotalPrice; } + public String getState() { return state; } public void setState(String state) { this.state = state; } diff --git a/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml b/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml index 7498da0..db38634 100644 --- a/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml @@ -10,6 +10,9 @@ + + + @@ -71,7 +74,7 @@ select a.bid_id, a.bid_code,a.bid_salesman_code, a.bid_salesman_bm, a.bid_salesman_name, - a.bid_registration_number, a.bid_opening_date, + a.bid_salesman_dept_id, a.bid_salesman_dept_name,a.bid_has_registration,a.bid_registration_number, a.bid_opening_date, a.bid_online_quotation, a.bid_website, a.bid_tendering_unit_bm,a.bid_tendering_unit, a.bid_agency, a.bid_project, a.bid_authorized_representative, a.bid_authorized_phone, a.bid_file_payment_method, a.bid_payment_deviation, a.bid_copper_price_linkage, @@ -118,6 +121,9 @@ bid_salesman_code, bid_salesman_bm, bid_salesman_name, + bid_salesman_dept_id, + bid_salesman_dept_name, + bid_has_registration, bid_registration_number, bid_opening_date, bid_online_quotation, @@ -176,6 +182,9 @@ #{bidSalesmanCode}, #{bidSalesmanBm}, #{bidSalesmanName}, + #{bidSalesmanDeptId}, + #{bidSalesmanDeptName}, + #{bidHasRegistration}, #{bidRegistrationNumber}, #{bidOpeningDate}, #{bidOnlineQuotation}, @@ -230,6 +239,64 @@ + + insert into sys_oa_bid + + user_id, + department_id, + submission_time, + bid_id, + bid_code, + bid_salesman_name, + bid_has_registration, + bid_registration_number, + bid_opening_date, + bid_online_quotation, + bid_website, + bid_tendering_unit, + bid_agency, + bid_project, + bid_authorized_representative, + bid_authorized_phone, + bid_file_payment_method, + bid_payment_deviation, + bid_copper_price_linkage, + bid_price_linkage_method, + bid_other_require, + bid_remark, + bid_ywy_file, + create_time, + isFinish, + + + #{userId}, + #{departmentId}, + #{submissionTime}, + #{bidId}, + #{bidCode}, + #{bidSalesmanName}, + #{bidHasRegistration}, + #{bidRegistrationNumber}, + #{bidOpeningDate}, + #{bidOnlineQuotation}, + #{bidWebsite}, + #{bidTenderingUnit}, + #{bidAgency}, + #{bidProject}, + #{bidAuthorizedRepresentative}, + #{bidAuthorizedPhone}, + #{bidFilePaymentMethod}, + #{bidPaymentDeviation}, + #{bidCopperPriceLinkage}, + #{bidPriceLinkageMethod}, + #{bidOtherRequire}, + #{bidRemark}, + #{bidYwyFile}, + #{createTime}, + #{isFinish}, + + + update bid @@ -237,52 +304,55 @@ bid_salesman_code = #{bidSalesmanCode}, bid_salesman_bm = #{bidSalesmanBm}, bid_salesman_name = #{bidSalesmanName}, - bid_registration_number = #{bidRegistrationNumber}, + bid_salesman_dept_id = #{bidSalesmanDeptId}, + bid_salesman_dept_name = #{bidSalesmanDeptName}, + bid_has_registration = #{bidHasRegistration}, + bid_registration_number = #{bidRegistrationNumber}, bid_opening_date = #{bidOpeningDate}, bid_online_quotation = #{bidOnlineQuotation}, - bid_website = #{bidWebsite}, + bid_website = #{bidWebsite}, bid_tendering_unit_bm = #{bidTenderingUnitBm}, bid_tendering_unit = #{bidTenderingUnit}, - bid_agency = #{bidAgency}, + bid_agency = #{bidAgency}, bid_project = #{bidProject}, bid_authorized_representative = #{bidAuthorizedRepresentative}, bid_authorized_phone = #{bidAuthorizedPhone}, bid_file_payment_method = #{bidFilePaymentMethod}, bid_payment_deviation = #{bidPaymentDeviation}, bid_copper_price_linkage = #{bidCopperPriceLinkage}, - bid_price_linkage_method = #{bidPriceLinkageMethod}, - bid_other_require = #{bidOtherRequire}, - bid_winning_amount = #{bidWinningAmount}, - bid_copper_cable_amount = #{bidCopperCableAmount}, - bid_aluminum_cable_amount = #{bidAluminumCableAmount}, - bid_open_close = #{bidOpenClose}, - bid_price_adjustment_notice = #{bidPriceAdjustmentNotice}, - bid_validity_period = #{bidValidityPeriod}, - bid_tong_price = #{bidTongPrice}, - bid_lv_price = #{bidLvPrice}, - bid_ds = #{bidDs}, - bid_factory_price = #{bidFactoryPrice}, - bid_price = #{bidPrice}, - bid_business_settlement = #{bidBusinessSettlement}, - bid_bond = #{bidBond}, - bid_winning_service_fee = #{bidWinningServiceFee}, - bid_performance_bond = #{bidPerformanceBond}, - bid_delivery_date = #{bidDeliveryDate}, - bid_warranty_period = #{bidWarrantyPeriod}, - bid_bidding = #{bidBidding}, - bid_evaluation_method = #{bidEvaluationMethod}, - bid_technical_require = #{bidTechnicalRequire}, - bid_price_linkage = #{bidPriceLinkage}, - bid_payment_method = #{bidPaymentMethod}, - bid_other_matters = #{bidOtherMatters}, - bid_zbr = #{bidZbr}, - bid_jdr = #{bidJdr}, - bid_shr = #{bidShr}, - bid_approval_status = #{bidApprovalStatus}, - bid_notification_award = #{bidNotificationAward}, - bid_remark = #{bidRemark}, - bid_returnRemark = #{bidReturnRemark}, - receive_user_name = #{receiveUserName}, + bid_price_linkage_method = #{bidPriceLinkageMethod}, + bid_other_require = #{bidOtherRequire}, + bid_winning_amount = #{bidWinningAmount}, + bid_copper_cable_amount = #{bidCopperCableAmount}, + bid_aluminum_cable_amount = #{bidAluminumCableAmount}, + bid_open_close = #{bidOpenClose}, + bid_price_adjustment_notice = #{bidPriceAdjustmentNotice}, + bid_validity_period = #{bidValidityPeriod}, + bid_tong_price = #{bidTongPrice}, + bid_lv_price = #{bidLvPrice}, + bid_ds = #{bidDs}, + bid_factory_price = #{bidFactoryPrice}, + bid_price = #{bidPrice}, + bid_business_settlement = #{bidBusinessSettlement}, + bid_bond = #{bidBond}, + bid_winning_service_fee = #{bidWinningServiceFee}, + bid_performance_bond = #{bidPerformanceBond}, + bid_delivery_date = #{bidDeliveryDate}, + bid_warranty_period = #{bidWarrantyPeriod}, + bid_bidding = #{bidBidding}, + bid_evaluation_method = #{bidEvaluationMethod}, + bid_technical_require = #{bidTechnicalRequire}, + bid_price_linkage = #{bidPriceLinkage}, + bid_payment_method = #{bidPaymentMethod}, + bid_other_matters = #{bidOtherMatters}, + bid_zbr = #{bidZbr}, + bid_jdr = #{bidJdr}, + bid_shr = #{bidShr}, + bid_approval_status = #{bidApprovalStatus}, + bid_notification_award = #{bidNotificationAward}, + bid_remark = #{bidRemark}, + bid_returnRemark = #{bidReturnRemark}, + receive_user_name = #{receiveUserName}, create_by = #{createBy}, create_time = #{createTime}, @@ -306,4 +376,8 @@ + + diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml index 1dea577..c180f02 100644 --- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml @@ -351,6 +351,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quot_matprice_diff, quot_matprice_diff2, quot_fk_file, + quot_total_price, create_time, isFinish, @@ -373,6 +374,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{quotMatpriceDiff}, #{quotMatpriceDiff2}, #{quotFkFile}, + #{quotTotalPrice}, #{createTime}, #{isFinish}, diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index fe69ae7..80d0fa5 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -21,12 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time + select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.zyd_syb,d.del_flag, d.create_by, d.create_time from sys_dept d - + - + - + - + - + - + - + - + - + insert into sys_dept( dept_id, @@ -99,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" phone, email, status, + zyd_syb, create_by, create_time )values( @@ -111,11 +113,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{phone}, #{email}, #{status}, + #{zydSyb}, #{createBy}, getdate() ) - + update sys_dept @@ -127,12 +130,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" phone = #{phone}, email = #{email}, status = #{status}, + zyd_syb = #{zydSyb}, update_by = #{updateBy}, update_time = getdate() where dept_id = #{deptId} - + update sys_dept set ancestors = - + - update sys_dept set status = '0' where dept_id in + update sys_dept set status = '0' where dept_id in #{deptId} - + update sys_dept set del_flag = '2' where dept_id = #{deptId} - \ No newline at end of file + diff --git a/ruoyi-ui/src/views/bid/bid/index.vue b/ruoyi-ui/src/views/bid/bid/index.vue index 9a0a54f..1b74d94 100644 --- a/ruoyi-ui/src/views/bid/bid/index.vue +++ b/ruoyi-ui/src/views/bid/bid/index.vue @@ -130,26 +130,39 @@ + + + + + + - + + - - - + @@ -181,21 +194,39 @@ - - + + + + + + + + + + + - + + + + + + + - - + + - - - + @@ -233,7 +264,7 @@ - + @@ -524,6 +555,42 @@ + 投标办附件 +
+ + 上传文件 + +
+ + + + + + + + + + @@ -534,11 +601,11 @@ 提 交 - + - +