diff --git a/jwtech-admin-page/src/api/earlyStage/proposal.js b/jwtech-admin-page/src/api/earlyStage/proposal.js index 416bd50f..dad73424 100644 --- a/jwtech-admin-page/src/api/earlyStage/proposal.js +++ b/jwtech-admin-page/src/api/earlyStage/proposal.js @@ -51,3 +51,11 @@ export function exportProposal(query) { params: query }) } + +// 获取项目全部编码 +export function getProjectCode(proNo) { + return request({ + url: '/earlyStage/proposal/getProjectCode/'+ proNo, + method: 'get' + }) +} diff --git a/jwtech-admin-page/src/views/project/proposal/index.vue b/jwtech-admin-page/src/views/project/proposal/index.vue index 7ff5de35..3520ee97 100644 --- a/jwtech-admin-page/src/views/project/proposal/index.vue +++ b/jwtech-admin-page/src/views/project/proposal/index.vue @@ -211,23 +211,6 @@ - + + + + + + @@ -229,6 +229,25 @@ + + import { listFeasibility, getFeasibility, delFeasibility, addFeasibility, updateFeasibility, exportFeasibility } from "@/api/earlyStage/feasibility"; +import { + listProposal, + getProposal, + delProposal, + addProposal, + updateProposal, + exportProposal, + getProjectCode +} from "@/api/earlyStage/proposal"; import {getProjectinfo, listProjectinfo} from "@/api/earlyStage/projectinfo"; import {getFileStream} from "@/api/system/upload"; import { getToken } from "@/utils/auth"; @@ -371,12 +399,7 @@ export default { //附件 attachmentList:[], // 文件 - fileList: [ - // { - // name: "food.jpeg", - // url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100", - // }, - ], + fileList: [], // 请求头 headers: { jianwei: "jwtech " + getToken(), @@ -452,6 +475,9 @@ export default { }, projectType:"", proNo: "", + proCodeList:[], + // projectCode: "", + }; @@ -466,14 +492,14 @@ export default { clear(){ this.fileList = []; this.attachmentList = []; + this.proCodeList = []; }, getId(res){ - // console.log(res) - getProjectinfo(res.id).then((response)=>{ - // console.log(response.data) - this.projectType = response.data.projectType; - this.proNo = res.proNo; - }) + + // console.log(res.projectType) + this.form.projectType = res.projectType; + this.form.projectCode = res.projectCode; + }, // 规划类型字典翻译 @@ -584,16 +610,21 @@ export default { this.attachmentList = []; this.open = true; this.title = "添加可行性研究报告"; - listProjectinfo(this.queryParams).then((response) => { + listProposal(this.queryParams).then((response)=>{ this.projectNameOptions = response.records; + }) - }); }, /** 修改按钮操作 */ handleUpdate(row) { this.reset(); this.open = true; this.title = "修改可行性研究报告"; + + // listProjectinfo(this.queryParams).then((response)=>{ + // this.projectNameOptions = response.records; + // }) + const id = row.id || this.ids getFeasibility(id).then(response => { this.form = response.data; @@ -605,6 +636,16 @@ export default { this.attachmentList = JSON.parse(response.data.feasibilityReportAttachment); } + // getProjectCode(response.data.proNo).then((response)=>{ + // + // this.proCodeList = response.data; + // // console.log(this.proCodeList) + // }) + listProposal(this.queryParams).then((response)=>{ + this.projectNameOptions = response.records; + }) + + }); }, /** 提交按钮 */ @@ -613,9 +654,12 @@ export default { // 附件 this.form.feasibilityReportFile = JSON.stringify(this.fileList); this.form.feasibilityReportAttachment = JSON.stringify(this.attachmentList); - // console.log(this.fileList); if (valid) { if (this.form.id != null) { + + + this.form.projectName=this.form.projectName.slice(0, this.form.projectName.indexOf('[')); + updateFeasibility(this.form).then(response => { if (response.code === 200) { this.msgSuccess("修改成功"); @@ -625,7 +669,8 @@ export default { }); } else { this.form.proNo=this.proNo; - this.form.projectType = this.projectType; + // this.form.projectType = this.projectType; + this.form.projectName=this.form.projectName.slice(0, this.form.projectName.indexOf('[')); addFeasibility(this.form).then(response => { if (response.code === 200) { this.msgSuccess("新增成功"); diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectBidInfoController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectBidInfoController.java index a859229d..94c9fc2f 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectBidInfoController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectBidInfoController.java @@ -9,6 +9,8 @@ import com.jianwei.common.utils.poi.ExcelUtil; import com.kms.common.utils.BaseEntityUtils; +import com.kms.earlyStage.domain.ProjectBidDetails; +import com.kms.earlyStage.domain.vo.BidInfoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -110,4 +112,29 @@ public class SpecialProjectBidInfoController extends BaseController { return toAjax(specialProjectBidInfoService.removeByIds(Arrays.asList(ids))); } + + + @PostMapping("/addVO") + public AjaxResult addVO(@RequestBody BidInfoVO bidInfoVO) { + SpecialProjectBidInfo specialProjectBidInfo = bidInfoVO.getSpecialProjectBidInfo(); + ProjectBidDetails projectBidDetails = bidInfoVO.getProjectBidDetails(); + BaseEntityUtils.preInsert(specialProjectBidInfo); + BaseEntityUtils.preInsert(projectBidDetails); + + return toAjax(specialProjectBidInfoService.saveVO(specialProjectBidInfo, projectBidDetails)); + } + + @PutMapping("/editVO") + public AjaxResult editVO(@RequestBody BidInfoVO bidInfoVO) { + SpecialProjectBidInfo specialProjectBidInfo = bidInfoVO.getSpecialProjectBidInfo(); + ProjectBidDetails projectBidDetails = bidInfoVO.getProjectBidDetails(); + + return toAjax(specialProjectBidInfoService.editVO(specialProjectBidInfo, projectBidDetails)); + + } + + + + + } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectProposalController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectProposalController.java index 0fa3a369..440618f3 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectProposalController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectProposalController.java @@ -10,6 +10,7 @@ import com.kms.common.utils.BaseEntityUtils; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -45,6 +46,26 @@ public class SpecialProjectProposalController extends BaseController @Autowired private SpecialProjectProposalService specialProjectProposalService; + + + /*@ApiOperation("项目建议书获取全部项目编码") + @GetMapping(value = "/getProjectCode/{proNo}") + public AjaxResult getProjectCode(@PathVariable("proNo") String proNo) { + List list=specialProjectProposalService.geProCodeList(proNo); + return AjaxResult.success(list); + + }*/ + + /** + * 获取项目建议书详细信息 + */ + @ApiOperation(" 项目建议书详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable String id) + { + return AjaxResult.success(specialProjectProposalService.getById(id)); + } + /** * 查询项目建议书列表 */ @@ -68,15 +89,9 @@ public class SpecialProjectProposalController extends BaseController return util.exportExcel(list, "proposal"); } - /** - * 获取项目建议书详细信息 - */ - @ApiOperation(" 项目建议书详情") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") String id) - { - return AjaxResult.success(specialProjectProposalService.getById(id)); - } + + + /** * 新增项目建议书 @@ -111,4 +126,7 @@ public class SpecialProjectProposalController extends BaseController { return toAjax(specialProjectProposalService.removeByIds(Arrays.asList(ids))); } + + + } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectBidInfo.java b/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectBidInfo.java index 34ee25d5..88595694 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectBidInfo.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectBidInfo.java @@ -85,4 +85,6 @@ public class SpecialProjectBidInfo extends BaseEntity @ApiModelProperty("招标人统一社会信用代码") private String owerDept; + private String bidId; + } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java b/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java index c192cd35..37e694a6 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java @@ -90,4 +90,7 @@ public class SpecialProjectPreDesign extends BaseEntity @ApiModelProperty("数源部门") private String owerDept; + @ApiModelProperty("项目类型") + private String projectType; + } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/domain/vo/BidInfoVO.java b/jwtech-system/src/main/java/com/kms/earlyStage/domain/vo/BidInfoVO.java new file mode 100644 index 00000000..bb788f50 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/earlyStage/domain/vo/BidInfoVO.java @@ -0,0 +1,29 @@ +package com.kms.earlyStage.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jianwei.common.annotation.Excel; +import com.jianwei.common.core.domain.BaseEntity; +import com.kms.earlyStage.domain.ProjectBidDetails; +import com.kms.earlyStage.domain.SpecialProjectBidInfo; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class BidInfoVO extends BaseEntity { + + private static final long serialVersionUID = 1L; + + + private SpecialProjectBidInfo specialProjectBidInfo; + + private ProjectBidDetails projectBidDetails; + + + +} diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectProposalMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectProposalMapper.java index eef7e1c3..b06a6e15 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectProposalMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectProposalMapper.java @@ -1,9 +1,12 @@ package com.kms.earlyStage.mapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.earlyStage.domain.SpecialProjectProposal; +import java.util.List; + /** * 项目建议书Mapper接口 * @@ -13,4 +16,5 @@ import com.kms.earlyStage.domain.SpecialProjectProposal; @Repository public interface SpecialProjectProposalMapper extends BaseMapper { + List geProCodeList(@Param("proNo") String proNo); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectBidInfoService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectBidInfoService.java index 9a162a45..ce84ab4a 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectBidInfoService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectBidInfoService.java @@ -1,5 +1,14 @@ package com.kms.earlyStage.service; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.utils.uuid.UUID; +import com.kms.earlyStage.domain.ProjectBidDetails; +import com.kms.earlyStage.domain.ProjectBidNotice; +import com.kms.earlyStage.mapper.ProjectBidDetailsMapper; +import com.kms.earlyStage.mapper.ProjectBidNoticeMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.earlyStage.mapper.SpecialProjectBidInfoMapper; @@ -14,4 +23,35 @@ import com.kms.earlyStage.domain.SpecialProjectBidInfo; @Service public class SpecialProjectBidInfoService extends BaseService{ + @Autowired + private SpecialProjectBidInfoMapper specialProjectBidInfoMapper; + + @Autowired + private ProjectBidDetailsMapper projectBidDetailsMapper; + + public boolean saveVO(SpecialProjectBidInfo specialProjectBidInfo, ProjectBidDetails projectBidDetails) { + + String randomID = UUID.randomUUID().toString(); + + specialProjectBidInfo.setBidId(randomID); + projectBidDetails.setBidId(randomID); + projectBidDetailsMapper.insert(projectBidDetails); + + specialProjectBidInfoMapper.insert(specialProjectBidInfo); + + + + return true; + } + + public boolean editVO(SpecialProjectBidInfo specialProjectBidInfo, ProjectBidDetails projectBidDetails) { + + UpdateWrapper detailsUpdateWrapper = new UpdateWrapper<>(); + projectBidDetailsMapper.update(projectBidDetails, detailsUpdateWrapper); + UpdateWrapper bidInfoUpdateWrapper = new UpdateWrapper<>(); + specialProjectBidInfoMapper.update(specialProjectBidInfo, bidInfoUpdateWrapper); + return true; + } + + } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java index 6ee72896..7524a9ea 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java @@ -1,10 +1,13 @@ package com.kms.earlyStage.service; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.earlyStage.mapper.SpecialProjectProposalMapper; import com.kms.earlyStage.domain.SpecialProjectProposal; +import java.util.List; + /** * 项目建议书Service接口 * @@ -14,4 +17,13 @@ import com.kms.earlyStage.domain.SpecialProjectProposal; @Service public class SpecialProjectProposalService extends BaseService{ + @Autowired + private SpecialProjectProposalMapper specialProjectProposalMapper; + + public List geProCodeList(String proNo) { + + List list=specialProjectProposalMapper.geProCodeList(proNo); + + return list; + } } diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml new file mode 100644 index 00000000..1e390a6b --- /dev/null +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file