投标调整

src/main/java/com/zhgd/xmgl/modules/jz/controller/JzBidBuyController.java

@@ -105,8 +105,7 @@ public class JzBidBuyController {
     @ApiOperation(value = " 添加标书购买信息", notes = "添加标书购买信息", httpMethod = "POST")
     @PostMapping(value = "/add")
     public Result<Object> add(@RequestBody JzBidBuy jzBidBuy) {
-        Result<JzBidBuy> result = new Result<JzBidBuy>();
+        jzBidBuyService.saveInfo(jzBidBuy);
-        jzBidBuyService.save(jzBidBuy);
         return Result.success("添加成功！");
     }
 

src/main/java/com/zhgd/xmgl/modules/jz/controller/JzBidController.java

@@ -1,5 +1,6 @@
 package com.zhgd.xmgl.modules.jz.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.xmgl.modules.jz.entity.JzBidBuy;
 import com.zhgd.xmgl.modules.jz.entity.JzBidExam;
@@ -104,7 +105,66 @@ public class JzBidController {
     @ApiOperation(value = " 添加投标决策信息", notes = "添加投标决策信息", httpMethod = "POST")
     @PostMapping(value = "/add")
     public Result<Object> add(@RequestBody JzBid jzBid) {
-        Result<JzBid> result = new Result<JzBid>();
+        jzBidService.save(jzBid);
+        return Result.success("添加成功！");
+    }
+
+    /**
+     * 添加
+     *
+     * @param object
+     * @return
+     */
+    @OperLog(operModul = "投标决策管理", operType = "新增", operDesc = "添加投标决策信息")
+    @ApiOperation(value = " 添加投标决策信息", notes = "添加投标决策信息", httpMethod = "POST")
+    @PostMapping(value = "/flowSave")
+    public Result<Object> flowSave(@RequestBody JSONObject object) {
+        log.info("添加投标决策信息=======" + object);
+        String [] sources = {"自筹", "财政拨款", "政府补贴", "其他"};
+        String [] types = {"公开招标", "邀标", "议标"};
+        String projectId = object.getJSONArray("projectId").getString(0);
+        String budget = object.getString("budget");
+        String source = object.getString("source");
+        Date bidTime = object.getDate("bidTime");
+        Date buyBidTime = object.getDate("buyBidTime");
+        String type = object.getString("type");
+        String competitor = object.getString("competitor");
+        String depositRequired = object.getString("depositRequired");
+        String depositAmount = object.getString("depositAmount");
+        Date openBidTime = object.getDate("openBidTime");
+        Date depositBackTime = object.getDate("depositBackTime");
+        String internalResources = object.getString("internalResources");
+        String graspDegree = object.getString("graspDegree");
+        String overview = object.getString("overview");
+        String introduction = object.getString("introduction");
+        String fileUrl = JSON.toJSONString(object.getJSONArray("fileUrl"));
+        JzBid jzBid = new JzBid();
+        jzBid.setProjectId(Long.valueOf(projectId));
+        jzBid.setBudget(budget);
+        for (int i = 0; i < sources.length; i++) {
+            if (sources[i].equals(source)) {
+                int j = i + 1;
+                jzBid.setSource(j + "");
+            }
+        }
+        jzBid.setBidTime(bidTime);
+        jzBid.setBuyBidTime(buyBidTime);
+        for (int i = 0; i < types.length; i++) {
+            if (types[i].equals(type)) {
+                int j = i + 1;
+                jzBid.setType(j + "");
+            }
+        }
+        jzBid.setCompetitor(competitor);
+        jzBid.setDepositRequired(depositRequired.equals("是") ? "1" : "0");
+        jzBid.setDepositAmount(depositAmount);
+        jzBid.setOpenBidTime(openBidTime);
+        jzBid.setDepositBackTime(depositBackTime);
+        jzBid.setInternalResources(internalResources.equals("是") ? "1" : "0");
+        jzBid.setGraspDegree(graspDegree);
+        jzBid.setOverview(overview);
+        jzBid.setIntroduction(introduction);
+        jzBid.setFileUrl(fileUrl);
         jzBidService.save(jzBid);
         return Result.success("添加成功！");
     }

src/main/java/com/zhgd/xmgl/modules/jz/controller/JzProjectController.java

@@ -214,7 +214,7 @@ public class JzProjectController {
     @PostMapping(value = "/queryById")
     public Result<JzProject> queryById(@ApiIgnore @RequestBody Map<String, Object> map) {
         Result<JzProject> result = new Result<JzProject>();
-        JzProject jzProject = jzProjectService.getById(MapUtils.getString(map, "id"));
+        JzProject jzProject = jzProjectService.queryById(MapUtils.getString(map, "id"));
         if (jzProject == null) {
             result.error500("未找到对应实体");
         } else {

src/main/java/com/zhgd/xmgl/modules/jz/entity/JzBidBuy.java

@@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.jz.entity;
 import java.io.Serializable;
 import java.util.Date;
 
+import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -38,6 +39,12 @@ public class JzBidBuy implements Serializable {
     @Excel(name = "项目ID", width = 15)
     @ApiModelProperty(value = "项目ID")
     private Long projectId;
+    /**
+     * 标书编号
+     */
+    @Excel(name = "标书编号", width = 15)
+    @ApiModelProperty(value = "标书编号")
+    private String code;
     /**
      * 招标公司名称
      */
@@ -127,10 +134,21 @@ public class JzBidBuy implements Serializable {
     @ApiModelProperty(value = "附件")
     private String fileUrl;
 
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间", width = 15)
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "项目名称")
     private String projectName;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "项目编号")
+    private String projectSn;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "客户名称")
     private String customerName;

src/main/java/com/zhgd/xmgl/modules/jz/entity/JzBidExam.java

@@ -50,6 +50,12 @@ public class JzBidExam implements Serializable {
      */
     @Excel(name = "审查编号", width = 15)
     @ApiModelProperty(value = "审查编号")
+    private String examCode;
+    /**
+     * 标书编号
+     */
+    @Excel(name = "标书编号", width = 15)
+    @ApiModelProperty(value = "标书编号")
     private String code;
     /**
      * 开标日期
@@ -108,7 +114,7 @@ public class JzBidExam implements Serializable {
      */
     @Excel(name = "总金额", width = 15)
     @ApiModelProperty(value = "总金额")
-    private String amount;
+    private String businessAmount;
     /**
      * 税率
      */
@@ -146,18 +152,93 @@ public class JzBidExam implements Serializable {
     @ApiModelProperty(value = "商务审查附件")
     private String businessFile;
 
+    /**
+     * 招标公司名称
+     */
+    @Excel(name = "招标公司名称", width = 15)
+    @ApiModelProperty(value = "招标公司名称")
+    private String inviteCompanyName;
+    /**
+     * 投标公司名称
+     */
+    @Excel(name = "投标公司名称", width = 15)
+    @ApiModelProperty(value = "投标公司名称")
+    private String bidCompanyName;
+    /**
+     * 购买人员
+     */
+    @Excel(name = "购买人员", width = 15)
+    @ApiModelProperty(value = "购买人员")
+    private String createBy;
+    /**
+     * 购买标书金额
+     */
+    @Excel(name = "购买标书金额", width = 15)
+    @ApiModelProperty(value = "购买标书金额")
+    private String amount;
+    /**
+     * 招标项目资金来源
+     */
+    @Excel(name = "招标项目资金来源", width = 15)
+    @ApiModelProperty(value = "招标项目资金来源")
+    private String source;
+    /**
+     * 投标时间
+     */
+    @Excel(name = "投标时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "投标时间")
+    private Date bidTime;
+    /**
+     * 购买标书时间
+     */
+    @Excel(name = "购买标书时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "购买标书时间")
+    private Date buyBidTime;
+    /**
+     * 招标方式
+     */
+    @Excel(name = "招标方式", width = 15)
+    @ApiModelProperty(value = "招标方式")
+    private String type;
+    /**
+     * 投标地址
+     */
+    @Excel(name = "投标地址", width = 15)
+    @ApiModelProperty(value = "投标地址")
+    private String bidAddress;
+    /**
+     * 是否需要保证金
+     */
+    @Excel(name = "是否需要保证金", width = 15)
+    @ApiModelProperty(value = "是否需要保证金")
+    private String depositRequired;
+    /**
+     * 保证金金额(元)
+     */
+    @Excel(name = "保证金金额(元)", width = 15)
+    @ApiModelProperty(value = "保证金金额(元)")
+    private String depositAmount;
+
     /**
      * 创建时间
      */
     @Excel(name = "创建时间", width = 15)
     @ApiModelProperty(value = "创建时间")
-    private DateTime createTime;
+    private Date createTime;
 
 
     @TableField(exist = false)
     @ApiModelProperty(value = "项目名称")
     private String projectName;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "项目编码")
+    private String projectSn;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "客户名称")
     private String customerName;

src/main/java/com/zhgd/xmgl/modules/jz/entity/JzBidResult.java

@@ -80,11 +80,37 @@ public class JzBidResult implements Serializable {
     @Excel(name = "附件", width = 15)
     @ApiModelProperty(value = "附件")
     private String fileUrl;
+    /**
+     * 投标时间
+     */
+    @Excel(name = "投标时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "投标时间")
+    private Date bidTime;
+    /**
+     * 开标日期
+     */
+    @Excel(name = "开标日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "开标日期")
+    private Date openBidTime;
+    /**
+     * 标书编号
+     */
+    @Excel(name = "标书编号", width = 15)
+    @ApiModelProperty(value = "标书编号")
+    private String code;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "项目名称")
     private String projectName;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "项目编码")
+    private String projectSn;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "客户名称")
     private String customerName;

src/main/java/com/zhgd/xmgl/modules/jz/service/IJzBidBuyService.java

@@ -15,4 +15,6 @@ import com.zhgd.xmgl.modules.jz.entity.JzCompetitor;
 public interface IJzBidBuyService extends IService<JzBidBuy> {
 
     Page<JzBidBuy> pageList(Page page, Wrapper<JzBidBuy> wrapper);
+
+    boolean saveInfo(JzBidBuy jzBidBuy);
 }

src/main/java/com/zhgd/xmgl/modules/jz/service/IJzProjectService.java

@@ -16,5 +16,7 @@ public interface IJzProjectService extends IService<JzProject> {
 
     Page<JzProject> pageList(Page page, Wrapper<JzProject> wrapper);
 
+    JzProject queryById(String id);
+
     boolean saveInfo(JzProject jzProject);
 }

src/main/java/com/zhgd/xmgl/modules/jz/service/impl/JzBidBuyServiceImpl.java

@@ -1,11 +1,11 @@
 package com.zhgd.xmgl.modules.jz.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhgd.xmgl.modules.jz.entity.JzBidBuy;
+import com.zhgd.xmgl.modules.jz.entity.*;
-import com.zhgd.xmgl.modules.jz.entity.JzCompetitor;
-import com.zhgd.xmgl.modules.jz.entity.JzCustomer;
-import com.zhgd.xmgl.modules.jz.entity.JzProject;
 import com.zhgd.xmgl.modules.jz.mapper.JzBidBuyMapper;
 import com.zhgd.xmgl.modules.jz.service.IJzBidBuyService;
 import com.zhgd.xmgl.modules.jz.service.IJzCustomerService;
@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -41,10 +42,23 @@ public class JzBidBuyServiceImpl extends ServiceImpl<JzBidBuyMapper, JzBidBuy> i
             List<JzProject> jzProjects = jzProjectList.stream().filter(j -> j.getId().toString().equals(record.getProjectId().toString())).collect(Collectors.toList());
             if (jzProjects.size() > 0) {
                 record.setProjectName(jzProjects.get(0).getName());
+                record.setProjectSn(jzProjects.get(0).getProjectSn());
                 List<JzCustomer> jzCustomers = jzCustomerList.stream().filter(j -> j.getId().toString().equals(jzProjects.get(0).getCustomerId().toString())).collect(Collectors.toList());
                 record.setCustomerName(jzCustomers.size() > 0 ? jzCustomers.get(0).getName() : "");
             }
         }
         return pageList;
     }
+
+    @Override
+    public boolean saveInfo(JzBidBuy jzBidBuy) {
+        DateTime beginOfDay = DateUtil.beginOfDay(new Date());
+        DateTime endOfDay = DateUtil.endOfDay(new Date());
+        List<JzBidBuy> list = this.list(Wrappers.<JzBidBuy>lambdaQuery().ge(JzBidBuy::getCreateTime, beginOfDay)
+                .le(JzBidBuy::getCreateTime, endOfDay));
+        int count = list.size() + 1;
+        jzBidBuy.setCode("BSNO-" + DateUtil.format(new Date(), "yyyyMMdd")  + "-" + count);
+        jzBidBuy.setCreateTime(new Date());
+        return this.save(jzBidBuy);
+    }
 }

src/main/java/com/zhgd/xmgl/modules/jz/service/impl/JzBidExamServiceImpl.java

@@ -8,10 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sun.corba.se.impl.encoding.WrapperInputStream;
 import com.zhgd.xmgl.modules.jz.entity.*;
 import com.zhgd.xmgl.modules.jz.mapper.JzBidExamMapper;
-import com.zhgd.xmgl.modules.jz.service.IJzBidExamService;
+import com.zhgd.xmgl.modules.jz.service.*;
-import com.zhgd.xmgl.modules.jz.service.IJzBidService;
-import com.zhgd.xmgl.modules.jz.service.IJzCustomerService;
-import com.zhgd.xmgl.modules.jz.service.IJzProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -37,7 +34,7 @@ public class JzBidExamServiceImpl extends ServiceImpl<JzBidExamMapper, JzBidExam
     private IJzProjectService jzProjectService;
 
     @Autowired
-    private IJzBidService iJzBidService;
+    private IJzBidBuyService jzBidBuyService;
 
     @Override
     public Page<JzBidExam> pageList(Page page, Wrapper<JzBidExam> wrapper) {
@@ -48,6 +45,7 @@ public class JzBidExamServiceImpl extends ServiceImpl<JzBidExamMapper, JzBidExam
             List<JzProject> jzProjects = jzProjectList.stream().filter(j -> j.getId().toString().equals(record.getProjectId().toString())).collect(Collectors.toList());
             if (jzProjects.size() > 0) {
                 record.setProjectName(jzProjects.get(0).getName());
+                record.setProjectSn(jzProjects.get(0).getProjectSn());
                 List<JzCustomer> jzCustomers = jzCustomerList.stream().filter(j -> j.getId().toString().equals(jzProjects.get(0).getCustomerId().toString())).collect(Collectors.toList());
                 record.setCustomerName(jzCustomers.size() > 0 ? jzCustomers.get(0).getName() : "");
             }
@@ -57,14 +55,27 @@ public class JzBidExamServiceImpl extends ServiceImpl<JzBidExamMapper, JzBidExam
 
     @Override
     public boolean saveInfo(JzBidExam jzBidExam) {
-        JzBid jzBid = iJzBidService.getById(jzBidExam.getBidBuy());
+        JzBidBuy jzBidBuy = jzBidBuyService.getById(jzBidExam.getBidBuy());
-        jzBidExam.setProjectId(jzBid.getProjectId());
+        jzBidExam.setProjectId(jzBidBuy.getProjectId());
         DateTime beginOfDay = DateUtil.beginOfDay(new Date());
         DateTime endOfDay = DateUtil.endOfDay(new Date());
         List<JzBidExam> list = this.list(Wrappers.<JzBidExam>lambdaQuery().ge(JzBidExam::getCreateTime, beginOfDay)
                 .le(JzBidExam::getCreateTime, endOfDay));
         int count = list.size() + 1;
-        jzBidExam.setCode("标书审查-" + DateUtil.format(new Date(), "yyyyHHmm")  + "-" + count);
+        jzBidExam.setCode(jzBidBuy.getCode());
+        jzBidExam.setCreateTime(new Date());
+        jzBidExam.setExamCode("标书审查-" + DateUtil.format(new Date(), "yyyyMMdd")  + "-" + count);
+        jzBidExam.setInviteCompanyName(jzBidBuy.getInviteCompanyName());
+        jzBidExam.setBidCompanyName(jzBidBuy.getBidCompanyName());
+        jzBidExam.setCreateBy(jzBidBuy.getCreateBy());
+        jzBidExam.setAmount(jzBidBuy.getAmount());
+        jzBidExam.setSource(jzBidBuy.getSource());
+        jzBidExam.setBidTime(jzBidBuy.getBidTime());
+        jzBidExam.setBuyBidTime(jzBidBuy.getBuyBidTime());
+        jzBidExam.setType(jzBidBuy.getType());
+        jzBidExam.setBidAddress(jzBidBuy.getBidAddress());
+        jzBidExam.setDepositRequired(jzBidBuy.getDepositRequired());
+        jzBidExam.setDepositAmount(jzBidBuy.getDepositAmount());
         return this.save(jzBidExam);
     }
 }

src/main/java/com/zhgd/xmgl/modules/jz/service/impl/JzBidResultServiceImpl.java

@@ -43,6 +43,7 @@ public class JzBidResultServiceImpl extends ServiceImpl<JzBidResultMapper, JzBid
             List<JzProject> jzProjects = jzProjectList.stream().filter(j -> j.getId().toString().equals(record.getProjectId().toString())).collect(Collectors.toList());
             if (jzProjects.size() > 0) {
                 record.setProjectName(jzProjects.get(0).getName());
+                record.setProjectSn(jzProjects.get(0).getProjectSn());
                 List<JzCustomer> jzCustomers = jzCustomerList.stream().filter(j -> j.getId().toString().equals(jzProjects.get(0).getCustomerId().toString())).collect(Collectors.toList());
                 record.setCustomerName(jzCustomers.size() > 0 ? jzCustomers.get(0).getName() : "");
             }
@@ -54,6 +55,9 @@ public class JzBidResultServiceImpl extends ServiceImpl<JzBidResultMapper, JzBid
     public boolean saveInfo(JzBidResult jzBidResult) {
         JzBidExam jzBidExam = jzBidExamService.getById(jzBidResult.getBidExamId());
         jzBidResult.setProjectId(jzBidExam.getProjectId());
+        jzBidResult.setBidTime(jzBidExam.getBidTime());
+        jzBidResult.setOpenBidTime(jzBidExam.getOpenBidTime());
+        jzBidResult.setCode(jzBidExam.getCode());
         return this.save(jzBidResult);
     }
 }

src/main/java/com/zhgd/xmgl/modules/jz/service/impl/JzProjectServiceImpl.java

@@ -41,6 +41,14 @@ public class JzProjectServiceImpl extends ServiceImpl<JzProjectMapper, JzProject
         return pageList;
     }
 
+    @Override
+    public JzProject queryById(String id) {
+        JzProject jzProject = this.getById(id);
+        JzCustomer jzCustomer = jzCustomerService.getById(jzProject.getCustomerId());
+        jzProject.setCustomerName(jzCustomer.getName());
+        return jzProject;
+    }
+
     @Override
     public boolean saveInfo(JzProject jzProject) {
         String uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase();

src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java

@@ -393,7 +393,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                     .antMatchers("/xmgl/costBudget/flowSave").permitAll()
                     .antMatchers("/xmgl/costContractSettlement/flowSave").permitAll()
                     .antMatchers("/xmgl/progressPanoramaNodePlan/flowEdit").permitAll()
-
+                    .antMatchers("/xmgl/jzBid/flowSave").permitAll()
                     .antMatchers(HttpMethod.OPTIONS, "/**").anonymous()
                     .anyRequest().authenticated()       // 剩下所有的验证都需要验证.
                     .and()