xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'123'

This commit is contained in:
xd 2024-07-23 13:04:52 +08:00
parent 6476055501
commit 8085815b69
13 changed files with 180 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ABAP_AS_WITH_POOL.jcoDestination
View File

@ -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

30
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java
View File

@ -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());

28
ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
View File

@ -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();
}

45
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zgys/ZgysController.java
View File

@ -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());

2
ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java
View File

@ -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;//技术协助-分组

6
ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java
View File

@ -168,4 +168,10 @@ public interface QuotMapper
* @return
*/
List<QuotZb> selectZbInfo(Quot quot);
/**
* 报价组-保存反馈说明
* @param quot
*/
void saveQuotFeedbackExplanation(Quot quot);
}

6
ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java
View File

@ -151,4 +151,10 @@ public interface IQuotService
* @return
*/
List<QuotZb> selectZbInfo(Quot quot);
/**
* 报价组-保存反馈说明
* @param quot
*/
void saveQuotFeedbackExplanation(Quot quot);
}

9
ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java
View File

@ -308,4 +308,13 @@ public class QuotServiceImpl implements IQuotService
public List<QuotZb> selectZbInfo(Quot quot) {
return quotMapper.selectZbInfo(quot);
}
/**
* 报价组-保存反馈说明
* @param quot
*/
@Override
public void saveQuotFeedbackExplanation(Quot quot) {
quotMapper.saveQuotFeedbackExplanation(quot);
}
}

17
ruoyi-system/src/main/java/com/ruoyi/zgys/domain/Zgys.java
View File

@ -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;

3
ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
View File

@ -537,6 +537,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update quot set quot_handle = '1' where quot_id = #{quotId}
</update>
<update id="saveQuotFeedbackExplanation" parameterType="Quot">
update quot set quot_feedback_explanation = #{quotFeedbackExplanation} where quot_id = #{quotId}
</update>

5
ruoyi-ui/src/views/bid/bid/index.vue
View File

@ -132,7 +132,7 @@
size="mini"
:disabled="single"
@click="handleChangeRecord"
v-hasPermi="['bid:bid:add']"
v-hasPermi="['bid:bid:changeRecord']"
>变更记录</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@ -933,8 +933,11 @@
<!-- 客户选择对话框-->
<CustomerSelect ref="customerSelect" :open="customerOpen" @submit="submitCustomer" @cancel="customerOpen=false"></CustomerSelect>
</el-dialog>
<!--投标信息分派选择人员对话框-->
<PeopleSelect v-if="checkRole(['BID'])" ref="peopleSelect" :type="'single'" :isCheck="true" :open="peopleOpenFp" @cancel="peopleOpenFp=false" @submit="submitPeopleFp"></PeopleSelect>
<!--投标信息变更记录对话框-->
<el-dialog :title="changeRecordTitle" :visible.sync="openChangeRecord" v-if="openChangeRecord" width="1200px" append-to-body>
<ChangeRecord :codeProp="codeProp"></ChangeRecord>
</el-dialog>

12
ruoyi-ui/src/views/quot/quot/index.vue
View File

@ -540,32 +540,32 @@
<el-table-column label="序号" align="center" prop="index" width="50"/>
<el-table-column label="型号" prop="matXingh" width="180">
<template slot-scope="scope">
<el-input v-model="scope.row.matXingh" placeholder="型号" :disabled="scope.row.matId"/>
<el-input v-model="scope.row.matXingh" placeholder="型号" :disabled="scope.row.matId!=null"/>
</template>
</el-table-column>
<el-table-column label="规格" prop="matGuig" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.matGuig" placeholder="规格" :disabled="scope.row.matId"/>
<el-input v-model="scope.row.matGuig" placeholder="规格" :disabled="scope.row.matId!=null"/>
</template>
</el-table-column>
<el-table-column label="电压" prop="matDiany" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.matDiany" placeholder="电压" :disabled="scope.row.matId"/>
<el-input v-model="scope.row.matDiany" placeholder="电压" :disabled="scope.row.matId!=null"/>
</template>
</el-table-column>
<el-table-column label="单位" prop="matDanw" width="100">
<template slot-scope="scope">
<el-input v-model="scope.row.matDanw" placeholder="单位" :disabled="scope.row.matId"/>
<el-input v-model="scope.row.matDanw" placeholder="单位" :disabled="scope.row.matId!=null"/>
</template>
</el-table-column>
<el-table-column label="数量" prop="matSl" width="100">
<template slot-scope="scope">
<el-input v-model="scope.row.matSl" placeholder="数量" :disabled="scope.row.matId"/>
<el-input v-model="scope.row.matSl" placeholder="数量" :disabled="scope.row.matId!=null"/>
</template>
</el-table-column>
<el-table-column label="备注" prop="matRemark" width="180">
<template slot-scope="scope">
<el-input v-model="scope.row.matRemark" placeholder="备注" :disabled="scope.row.matId"/>
<el-input v-model="scope.row.matRemark" placeholder="备注" :disabled="scope.row.matId!=null"/>
</template>
</el-table-column>
<el-table-column label="料单价" prop="matMatprice" v-if="checkRole(['QUOT_MAT_PRICE_DIFF'])" width="130">

30
ruoyi-ui/src/views/zgys/zgys/index.vue
View File

@ -112,6 +112,17 @@
v-hasPermi="['zgys:zgys:export']"
>导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-user-solid"
size="mini"
:disabled="single"
@click="handleChangeRecord"
v-hasPermi="['zgys:zgys:changeRecord']"
>变更记录</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -355,6 +366,11 @@
<!-- 客户选择对话框-->
<CustomerSelect ref="customerSelect" :open="customerOpen" @submit="submitCustomer" @cancel="customerOpen=false"></CustomerSelect>
</el-dialog>
<!--投标信息变更记录对话框-->
<el-dialog :title="changeRecordTitle" :visible.sync="openChangeRecord" v-if="openChangeRecord" width="1200px" append-to-body>
<ChangeRecord :codeProp="codeProp"></ChangeRecord>
</el-dialog>
</div>
</template>
<style>
@ -473,6 +489,11 @@ export default {
peopleOpenFp:false, // 分派
peopleOpenSelectYwy:false, // 投标办选择业务员创建
selectedPeoples:[],
//是否打开变更记录组件
changeRecordTitle: "",
openChangeRecord:false,
codeProp: "",
};
},
created() {
@ -619,6 +640,15 @@ export default {
...this.queryParams
}, `zgys_${new Date().getTime()}.xlsx`)
},
/** 打开变更记录 */
handleChangeRecord(){
const pqIds = this.ids;
this.openChangeRecord=true;
this.changeRecordTitle="变更记录";
this.codeProp = pqIds[0];
},
/*********************************打开选人弹窗*****************************************/
//打开选人弹窗-投标办选择业务员创建
openPeopleSelectYwy(){