招标修改

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'
+  })
+}

jwtech-admin-page/src/views/project/proposal/index.vue

@@ -211,23 +211,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-<!--          <el-col :span="12">
-            <el-form-item label="项目类型" prop="projectType">
-              <el-select
-                v-model="form.projectType"
-                placeholder="项目类型"
-                clearable
-                size="small"
-              >
-                <el-option
-                  v-for="dict in projectTypeOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>-->
           <el-col :span="12">
             <el-form-item label="编制单位" prop="compilingUnit">
               <el-input
@@ -247,6 +230,16 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="12">
+            <el-form-item label="项目编码" prop="projectCode">
+              <el-input
+                v-model="form.projectCode"
+                placeholder="请输入项目编码"
+                style="width: 200px"
+              />
+            </el-form-item>
+          </el-col>
+
           <el-col :span="12">
             <el-form-item label="是否属于规划内" prop="isBelongPlanning">
               <el-select
@@ -423,7 +416,7 @@ export default {
       total: 0,
       // 加载状态
       loading: true,
-      // 专题项目前期背景信息表格数据
+      // 表格数据
       projectinfoList: [],
       // 表单校验
       rules: {},

jwtech-admin-page/src/views/project/report/index.vue

@@ -185,9 +185,9 @@
               >
                 <el-option
                   v-for="dict in projectNameOptions"
-                  :key="dict.id"
-                  :label="dict.projectName"
-                  :value="dict.projectName"
+                  :key="dict.proNo"
+                  :label="dict.projectName+'['+dict.projectCode+']'"
+                  :value="dict.projectName+'['+dict.projectCode+']'"
                   @click.native="getId(dict)"
                 />
               </el-select>
@@ -229,6 +229,25 @@
             </el-form-item>
           </el-col>
 
+<!--          <el-col :span="12">
+            <el-form-item label="项目编码" prop="projectCode">
+              <el-select
+                v-model="form.projectCode"
+                placeholder="项目编码"
+                clearable
+                size="small"
+              >
+                <el-option
+                  v-for="dict in proCodeList"
+                  :key="dict"
+                  :label="dict"
+                  :value="dict"
+
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>-->
+
           <el-col :span="12">
             <el-form-item label="是否属于规划内" prop="isBelongPlanning">
               <el-select
@@ -360,6 +379,15 @@
 
 <script>
 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("新增成功");

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));
+
+    }
+
+
+
+
+
 }

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<SpecialProjectProposal> 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)));
     }
+
+
+
 }

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;
+
 }

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;
+
 }

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;
+
+
+
+}

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<SpecialProjectProposal> {
 
+    List<SpecialProjectProposal> geProCodeList(@Param("proNo") String proNo);
 }

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<SpecialProjectBidInfoMapper, SpecialProjectBidInfo>{
 
+    @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<ProjectBidDetails> detailsUpdateWrapper = new UpdateWrapper<>();
+        projectBidDetailsMapper.update(projectBidDetails, detailsUpdateWrapper);
+        UpdateWrapper<SpecialProjectBidInfo> bidInfoUpdateWrapper = new UpdateWrapper<>();
+        specialProjectBidInfoMapper.update(specialProjectBidInfo, bidInfoUpdateWrapper);
+        return true;
+    }
+
+
 }

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<SpecialProjectProposalMapper, SpecialProjectProposal>{
 
+    @Autowired
+    private SpecialProjectProposalMapper specialProjectProposalMapper;
+
+    public List<SpecialProjectProposal> geProCodeList(String proNo) {
+
+        List<SpecialProjectProposal> list=specialProjectProposalMapper.geProCodeList(proNo);
+
+        return list;
+    }
 }

jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kms.earlyStage.mapper.SpecialProjectProposalMapper">
+
+    <resultMap type="SpecialProjectProposal" id="SpecialProjectProposal">
+        <id     property="id"      column="id"      />
+        <result property="projectName"    column="PROJECT_NAME"    />
+        <result property="projectType"     column="PROJECT_TYPE"     />
+        <result property="compilingUnit"   column="COMPILING_UNIT"   />
+        <result property="projectContent"    column="PROJECT_CONTENT"    />
+        <result property="projectInvestmentEstimate"    column="PROJECT_INVESTMENT_ESTIMATE"    />
+        <result property="isBelongPlanning"    column="IS_BELONG_PLANNING"    />
+        <result property="projectProposalAttachment"    column="PROJECT_PROPOSAL_ATTACHMENT"    />
+        <result property="reportTime"    column="REPORT_TIME"    />
+        <result property="approvalTime"    column="APPROVAL_TIME"    />
+        <result property="approvalOpinion"    column="APPROVAL_OPINION"    />
+        <result property="approvalOpinionAttachment"    column="APPROVAL_OPINION_ATTACHMENT"    />
+        <result property="projectCode"    column="PROJECT_CODE"    />
+        <result property="proNo"    column="PRO_NO"    />
+        <result property="createUid"      column="create_uid"      />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateUid"      column="update_uid"      />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <select id="geProCodeList" parameterType="String" resultMap="SpecialProjectProposal">
+        select * from bs_slgc_qqjd_spe_pro_proposal where pro_no=#{proNo}
+
+    </select>
+</mapper>