diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination deleted file mode 100644 index 17778df..0000000 --- a/ABAP_AS_WITH_POOL.jcoDestination +++ /dev/null @@ -1,11 +0,0 @@ -#for tests only ! -#Mon Jul 22 15:09:50 CST 2024 -jco.destination.pool_capacity=10 -jco.client.lang=ZH -jco.client.ashost=172.19.0.125 -jco.client.saprouter= -jco.client.user=RFC -jco.client.sysnr=00 -jco.destination.peak_limit=10 -jco.client.passwd=654321 -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 01a73f0..95b2db3 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 @@ -148,7 +148,19 @@ public class BidController extends BaseController bid.setBidId(UUID.fastUUID().toString()); String bidCode = bidService.getCode("TBXX"); bid.setBidCode(bidCode); - bid.setCreateBy(getUsername()); + + // 获取用户角色 --判断是否是投标小组经理角色 + Boolean bidJlRoleFlag = SecurityUtils.hasRole("BID"); + if(bidJlRoleFlag){ + Long deptId = userService.selectUserByUserName(bid.getBidSalesmanCode()).getDeptId(); + bid.setBidSalesmanDeptId(String.valueOf(deptId)); + SysDept sysDept = deptService.selectDeptById(deptId); + bid.setBidSalesmanDeptName(sysDept.getDeptName()); + bid.setCreateBy(bid.getBidSalesmanCode()); + }else{ + bid.setCreateBy(getUsername()); + } + bid.setUpdateBy(getUsername()); bidService.insertBid(bid); return success(bid); @@ -165,7 +177,17 @@ public class BidController extends BaseController @PutMapping public AjaxResult edit(@RequestBody Bid bid) { - bid.setUpdateBy(getUsername()); + // 获取用户角色 --判断是否是投标小组经理角色 + Boolean bidJlRoleFlag = SecurityUtils.hasRole("BID"); + if(bidJlRoleFlag){ + Long deptId = userService.selectUserByUserName(bid.getBidSalesmanCode()).getDeptId(); + bid.setBidSalesmanDeptId(String.valueOf(deptId)); + SysDept sysDept = deptService.selectDeptById(deptId); + bid.setBidSalesmanDeptName(sysDept.getDeptName()); + bid.setUpdateBy(bid.getBidSalesmanCode()); + }else{ + bid.setUpdateBy(getUsername()); + } return toAjax(bidService.updateBid(bid)); } @@ -327,6 +349,8 @@ public class BidController extends BaseController bid.setBidCode(bidCode); if(bidJlRoleFlag){ + bid.setBidSalesmanDeptId(String.valueOf(deptId)); + bid.setBidSalesmanDeptName(sysDept.getDeptName()); bid.setCreateBy(bid.getBidSalesmanCode()); }else{ bid.setCreateBy(getUsername()); @@ -335,6 +359,8 @@ public class BidController extends BaseController return success(); }else{ if(bidJlRoleFlag){ + bid.setBidSalesmanDeptId(String.valueOf(deptId)); + bid.setBidSalesmanDeptName(sysDept.getDeptName()); bid.setUpdateBy(bid.getBidSalesmanCode()); }else{ bid.setUpdateBy(getUsername()); 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 7af1803..bcb6b57 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 @@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson.JSON; import com.ruoyi.common.constant.WebsocketConst; +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.redis.RedisCache; @@ -30,7 +31,9 @@ import com.ruoyi.quot.domain.*; import com.ruoyi.quot.domain.jsw.*; import com.ruoyi.quot.service.IQuotFileService; import com.ruoyi.system.service.ISysConfigService; +import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysNoticeService; +import com.ruoyi.system.service.ISysUserService; import com.ruoyi.technicalConfirm.domain.QuotJsqr; import com.ruoyi.technicalConfirm.service.IQuotJsqrService; import com.ruoyi.web.utils.IdUtils; @@ -81,6 +84,12 @@ public class QuotController extends BaseController @Autowired private ISysNoticeService noticeService; + @Autowired + private ISysUserService userService; + + @Autowired + private ISysDeptService deptService; + /** * 查询报价列表 @@ -249,6 +258,10 @@ public class QuotController extends BaseController String quotCode = quotService.getCode("BJD"); quot.setQuotCode(quotCode); if(hjRoleFlag){ + Long deptId = userService.selectUserByUserName(quot.getQuotSalesmanCode()).getDeptId(); + quot.setQuotSalesmanDeptId(String.valueOf(deptId)); + SysDept sysDept = deptService.selectDeptById(deptId); + quot.setQuotSalesmanDeptName(sysDept.getDeptName()); quot.setCreateBy(quot.getQuotSalesmanCode()); }else{ quot.setCreateBy(getUsername()); @@ -280,6 +293,10 @@ public class QuotController extends BaseController } } if(hjRoleFlag){ + Long deptId = userService.selectUserByUserName(quot.getQuotSalesmanCode()).getDeptId(); + quot.setQuotSalesmanDeptId(String.valueOf(deptId)); + SysDept sysDept = deptService.selectDeptById(deptId); + quot.setQuotSalesmanDeptName(sysDept.getDeptName()); quot.setUpdateBy(quot.getQuotSalesmanCode()); }else{ quot.setUpdateBy(getUsername()); @@ -448,11 +465,14 @@ public class QuotController extends BaseController if(StringUtils.isEmpty(quot_id)){ quot.setQuotId(UUID.fastUUID().toString()); - //quot.setQuotCode(IdUtils.createNo("BJD_",0)); String quotCode = quotService.getCode("BJD"); quot.setQuotCode(quotCode); if(hjRoleFlag){ + Long deptId = userService.selectUserByUserName(quot.getQuotSalesmanCode()).getDeptId(); + quot.setQuotSalesmanDeptId(String.valueOf(deptId)); + SysDept sysDept = deptService.selectDeptById(deptId); + quot.setQuotSalesmanDeptName(sysDept.getDeptName()); quot.setCreateBy(quot.getQuotSalesmanCode()); }else{ quot.setCreateBy(getUsername()); @@ -464,6 +484,10 @@ public class QuotController extends BaseController return success(); }else{ if(hjRoleFlag){ + Long deptId = userService.selectUserByUserName(quot.getQuotSalesmanCode()).getDeptId(); + quot.setQuotSalesmanDeptId(String.valueOf(deptId)); + SysDept sysDept = deptService.selectDeptById(deptId); + quot.setQuotSalesmanDeptName(sysDept.getDeptName()); quot.setUpdateBy(quot.getQuotSalesmanCode()); }else{ quot.setUpdateBy(getUsername()); @@ -876,7 +900,7 @@ public class QuotController extends BaseController @PostMapping("/saveQuotFeedbackExplanation") public AjaxResult saveQuotFeedbackExplanation(@RequestBody Quot quot) { - quotService.updateQuot(quot); + quotService.saveQuotFeedbackExplanation(quot); return success(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zgys/ZgysController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zgys/ZgysController.java index 610d9f1..2ccabdf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zgys/ZgysController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zgys/ZgysController.java @@ -2,6 +2,8 @@ package com.ruoyi.web.controller.zgys; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; @@ -9,6 +11,8 @@ import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.common.utils.file.MinioUtil; import com.ruoyi.common.utils.uuid.UUID; import com.ruoyi.framework.changeRecord.ChangeRecordLog; +import com.ruoyi.system.service.ISysDeptService; +import com.ruoyi.system.service.ISysUserService; import com.ruoyi.zgys.domain.ZgysFile; import com.ruoyi.zgys.service.IZgysFileService; import org.springframework.security.access.prepost.PreAuthorize; @@ -39,6 +43,13 @@ public class ZgysController extends BaseController @Autowired private IZgysFileService zgysFileService; + + @Autowired + private ISysUserService userService; + + @Autowired + private ISysDeptService deptService; + /** * 查询资格预审列表 */ @@ -85,7 +96,19 @@ public class ZgysController extends BaseController zgys.setPqId(UUID.fastUUID().toString()); String zgysCode = zgysService.getCode("ZGYS"); zgys.setPqCode(zgysCode); - zgys.setCreateBy(getUsername()); + + // 获取用户角色 --判断是否是投标小组经理角色 + Boolean bidJlRoleFlag = SecurityUtils.hasRole("BID"); + if(bidJlRoleFlag){ + Long deptId = userService.selectUserByUserName(zgys.getPqSalesmanCode()).getDeptId(); + zgys.setPqSalesmanDeptId(String.valueOf(deptId)); + SysDept sysDept = deptService.selectDeptById(deptId); + zgys.setPqSalesmanDeptName(sysDept.getDeptName()); + zgys.setCreateBy(zgys.getPqSalesmanCode()); + }else{ + zgys.setCreateBy(getUsername()); + } + zgys.setUpdateBy(getUsername()); zgysService.insertZgys(zgys); return success(zgys); @@ -102,7 +125,17 @@ public class ZgysController extends BaseController @PutMapping public AjaxResult edit(@RequestBody Zgys zgys) { - zgys.setUpdateBy(getUsername()); + // 获取用户角色 --判断是否是投标小组经理角色 + Boolean bidJlRoleFlag = SecurityUtils.hasRole("BID"); + if(bidJlRoleFlag){ + Long deptId = userService.selectUserByUserName(zgys.getPqSalesmanCode()).getDeptId(); + zgys.setPqSalesmanDeptId(String.valueOf(deptId)); + SysDept sysDept = deptService.selectDeptById(deptId); + zgys.setPqSalesmanDeptName(sysDept.getDeptName()); + zgys.setUpdateBy(zgys.getPqSalesmanCode()); + }else{ + zgys.setUpdateBy(getUsername()); + } return toAjax(zgysService.updateZgys(zgys)); } @@ -129,6 +162,10 @@ public class ZgysController extends BaseController zgys.setPqCode(pqCode); if(bidJlRoleFlag){ + Long deptId = userService.selectUserByUserName(zgys.getPqSalesmanCode()).getDeptId(); + zgys.setPqSalesmanDeptId(String.valueOf(deptId)); + SysDept sysDept = deptService.selectDeptById(deptId); + zgys.setPqSalesmanDeptName(sysDept.getDeptName()); zgys.setCreateBy(zgys.getPqSalesmanCode()); }else{ zgys.setCreateBy(getUsername()); @@ -137,6 +174,10 @@ public class ZgysController extends BaseController return success(); }else{ if(bidJlRoleFlag){ + Long deptId = userService.selectUserByUserName(zgys.getPqSalesmanCode()).getDeptId(); + zgys.setPqSalesmanDeptId(String.valueOf(deptId)); + SysDept sysDept = deptService.selectDeptById(deptId); + zgys.setPqSalesmanDeptName(sysDept.getDeptName()); zgys.setUpdateBy(zgys.getPqSalesmanCode()); }else{ zgys.setUpdateBy(getUsername()); 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 8352da8..1dce642 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 @@ -34,6 +34,7 @@ public class Bid extends BaseEntity /** 业务员 */ @Excel(name = "业务员") + @DataName(name = "业务员") private String bidSalesmanName; /** 部门ID */ @@ -254,6 +255,7 @@ public class Bid extends BaseEntity /** 技术协助 */ + @DataName(name = "技术协助-协助状态",readConverterExp="0=待协助,1=协助中,2=已协助,3=已驳回") private String bidJsxzApprovalStatus;//技术协助-协助状态 private String bidJsxzTechnicalRequirement;//技术协助-技术要求 private String[] bidJsxzGroup;//技术协助-分组 diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java b/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java index e68d227..aa79aa5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java @@ -168,4 +168,10 @@ public interface QuotMapper * @return */ List selectZbInfo(Quot quot); + + /** + * 报价组-保存反馈说明 + * @param quot + */ + void saveQuotFeedbackExplanation(Quot quot); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java b/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java index 3cd0e52..e924b58 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java @@ -151,4 +151,10 @@ public interface IQuotService * @return */ List selectZbInfo(Quot quot); + + /** + * 报价组-保存反馈说明 + * @param quot + */ + void saveQuotFeedbackExplanation(Quot quot); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java index 4f0ca7f..9d7270e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java @@ -308,4 +308,13 @@ public class QuotServiceImpl implements IQuotService public List selectZbInfo(Quot quot) { return quotMapper.selectZbInfo(quot); } + + /** + * 报价组-保存反馈说明 + * @param quot + */ + @Override + public void saveQuotFeedbackExplanation(Quot quot) { + quotMapper.saveQuotFeedbackExplanation(quot); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/zgys/domain/Zgys.java b/ruoyi-system/src/main/java/com/ruoyi/zgys/domain/Zgys.java index 4cecbf5..0196e71 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/zgys/domain/Zgys.java +++ b/ruoyi-system/src/main/java/com/ruoyi/zgys/domain/Zgys.java @@ -1,5 +1,6 @@ package com.ruoyi.zgys.domain; +import com.ruoyi.common.annotation.DataName; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -30,6 +31,7 @@ public class Zgys extends BaseEntity /** 业务员 */ @Excel(name = "业务员") + @DataName(name = "业务员") private String pqSalesmanName; /** 部门id */ @@ -44,56 +46,71 @@ public class Zgys extends BaseEntity /** 客户名称 */ @Excel(name = "客户名称") + @DataName(name = "客户名称") private String pqCustomerName; /** 项目 */ @Excel(name = "项目") + @DataName(name = "项目") private String pqProject; /** 中标备注 */ + @DataName(name = "中标备注") private String pqBidWinningRemark; /** 授权人 */ @Excel(name = "授权人") + @DataName(name = "授权人") private String pqAuthorizedRepresentative; /** 投标日期 */ @Excel(name = "投标日期") + @DataName(name = "投标日期") private String pqBidDate; /** 制标人 */ @Excel(name = "制标人") + @DataName(name = "制标人") private String pqZbr; /** 中标状态 */ @Excel(name = "中标状态") + @DataName(name = "中标状态",readConverterExp="0=是,1=否") private String pqBidWinningStatus; /** 说明 */ + @DataName(name = "说明",readConverterExp="1=报名,2=供方调查表,3=资格预审,4=其他资料,5=网站注册") private String pqIllustrate; /** 公告链接网址 */ + @DataName(name = "公告链接网址") private String pqAnnouncementLinkWebsite; /** 联系电话 */ + @DataName(name = "联系电话") private String pqPhone; /** 招标代理 */ + @DataName(name = "招标代理") private String pqAgency; /** 备注 */ + @DataName(name = "备注") private String pqRemark; /** 是否存档 */ @Excel(name = "是否存档") + @DataName(name = "是否存档",readConverterExp="0=是,1=否") private String pqArchiving; /** 授权状态 */ @Excel(name = "授权状态") + @DataName(name = "授权状态",readConverterExp="0=待授权,1=授权中,2=已授权,3=已驳回") private String pqEmpower; /** 提交状态 */ @Excel(name = "提交状态") + @DataName(name = "提交状态",readConverterExp="0=待提交,1=协助中,2=已完成,3=已驳回") private String pqApprovalStatus; diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml index f4ec429..d455413 100644 --- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml @@ -537,6 +537,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update quot set quot_handle = '1' where quot_id = #{quotId} + + update quot set quot_feedback_explanation = #{quotFeedbackExplanation} where quot_id = #{quotId} + diff --git a/ruoyi-ui/src/views/bid/bid/index.vue b/ruoyi-ui/src/views/bid/bid/index.vue index 77b53d5..03e5b56 100644 --- a/ruoyi-ui/src/views/bid/bid/index.vue +++ b/ruoyi-ui/src/views/bid/bid/index.vue @@ -132,7 +132,7 @@ size="mini" :disabled="single" @click="handleChangeRecord" - v-hasPermi="['bid:bid:add']" + v-hasPermi="['bid:bid:changeRecord']" >变更记录 @@ -933,8 +933,11 @@ + + + diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue index 3c6a812..0a3b490 100644 --- a/ruoyi-ui/src/views/quot/quot/index.vue +++ b/ruoyi-ui/src/views/quot/quot/index.vue @@ -540,32 +540,32 @@ diff --git a/ruoyi-ui/src/views/zgys/zgys/index.vue b/ruoyi-ui/src/views/zgys/zgys/index.vue index c3b69bb..eb83408 100644 --- a/ruoyi-ui/src/views/zgys/zgys/index.vue +++ b/ruoyi-ui/src/views/zgys/zgys/index.vue @@ -112,6 +112,17 @@ v-hasPermi="['zgys:zgys:export']" >导出 + + 变更记录 + @@ -355,6 +366,11 @@ + + + + +