Merge remote-tracking branch 'origin/master'

purchase-admin/src/main/java/com/ozs/web/controller/plan/ProvisionalPlanController.java

@@ -0,0 +1,97 @@
+package com.ozs.web.controller.plan;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ozs.common.annotation.Log;
+import com.ozs.common.constant.ModularConstans;
+import com.ozs.common.core.controller.BaseController;
+import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.core.domain.model.LoginUser;
+import com.ozs.common.enums.BusinessType;
+import com.ozs.common.utils.StringUtils;
+import com.ozs.framework.web.service.TokenService;
+import com.ozs.plan.doman.ProvisionalPlan;
+import com.ozs.plan.doman.vo.requestVo.ProvisionalPlanVo;
+import com.ozs.plan.service.ProvisionalPlanService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+
+/**
+ * 临时计划
+ *
+ * @author sunhh
+ */
+@Api(tags = "临时计划")
+@RestController
+@RequestMapping("/plan/provisionalPlan")
+public class ProvisionalPlanController extends BaseController {
+
+    @Autowired
+    private ProvisionalPlanService provisionalPlanService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    @ApiOperation(value = "新增临时计划")
+    @PostMapping("/insertProvisionalPlan")
+    @PreAuthorize("@ss.hasPermi('base:provisionalPlan:insertProvisionalPlan')")
+    @Log(title = ModularConstans.policy, businessType = BusinessType.INSERT)
+    public AjaxResult insertProvisionalPlan(@RequestBody ProvisionalPlan provisionalPlan, HttpServletRequest request) {
+        //获取采购单位
+        LoginUser loginUser = tokenService.getLoginUser(request);
+        provisionalPlan.setPurchaseDeptId(loginUser.getDeptId());
+        provisionalPlan.setCreated(String.valueOf(loginUser.getUserId()));
+        provisionalPlan.setCreateTime(new Date());
+        // planType计划类型（0：季度计划，1：临时计划）
+        provisionalPlan.setPlanType("1");
+        return toAjax(provisionalPlanService.save(provisionalPlan));
+    }
+
+    @ApiOperation(value = "删除临时计划", notes = "必传 plan_year_id")
+    @PostMapping("/deleteProvisionalPlan")
+    public AjaxResult deleteProvisionalPlan(@RequestBody ProvisionalPlan provisionalPlan) {
+        if (StringUtils.isNull(provisionalPlan) || StringUtils.isNull(provisionalPlan.getPlanYearId())) {
+            return error("专家库id不能为空");
+        }
+        return toAjax(provisionalPlanService.removeById(provisionalPlan.getPlanYearId()));
+    }
+
+    @ApiOperation(value = "修改临时计划", notes = "必传 plan_year_id 及修改数据")
+    @PostMapping("/updateProvisionalPlan")
+    public AjaxResult updateProvisionalPlan(@RequestBody ProvisionalPlan provisionalPlan) {
+        if (StringUtils.isNull(provisionalPlan) || StringUtils.isNull(provisionalPlan.getPlanYearId())) {
+            return error("专家库id和修改数据不能为空");
+        }
+        return toAjax(provisionalPlanService.updateById(provisionalPlan));
+    }
+
+    @ApiOperation(value = "查询临时计划")
+    @PostMapping("/selectProvisionalPlan")
+    public AjaxResult selectProvisionalPlan(@RequestBody ProvisionalPlanVo provisionalPlanVo) {
+        LambdaQueryWrapper<ProvisionalPlan> lw = new LambdaQueryWrapper<ProvisionalPlan>();
+        // planType计划类型（0：季度计划，1：临时计划）
+        lw.eq(ProvisionalPlan::getPlanType, "1");
+        if (!StringUtils.isBlank(provisionalPlanVo.getProjectName())) {
+            lw.like(ProvisionalPlan::getProjectName, provisionalPlanVo.getProjectName());
+        }
+        if (!StringUtils.isBlank(provisionalPlanVo.getPurchaseServices())) {
+            lw.eq(ProvisionalPlan::getPurchaseServices, provisionalPlanVo.getPurchaseServices());
+        }
+        if (!ObjectUtils.isEmpty(provisionalPlanVo.getProjectStatus())) {
+            lw.eq(ProvisionalPlan::getProjectStatus, provisionalPlanVo.getProjectStatus());
+        }
+        IPage<ProvisionalPlan> page = provisionalPlanService.page(new Page<ProvisionalPlan>(provisionalPlanVo.getPageNum(), provisionalPlanVo.getPageSize()), lw);
+        return success(page);
+    }
+}

purchase-admin/src/main/java/com/ozs/web/controller/system/SysProcurementStandardController.java

@@ -1,12 +1,17 @@
 package com.ozs.web.controller.system;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ozs.common.core.domain.R;
 import com.ozs.common.core.domain.entity.SysProcurementStandard;
+import com.ozs.common.core.domain.entity.SysRole;
+import com.ozs.plan.doman.MonthlyReconciliation;
 import com.ozs.system.domain.vo.requestVo.SysProcurementStandardVo;
 import com.ozs.system.service.SysProcurementStandardService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -54,9 +59,13 @@ public class SysProcurementStandardController {
     public R<String> update(@RequestBody List<SysProcurementStandardVo> sysProcurementStandardVoList) {
         boolean isSuccess = false;
         SysProcurementStandard sysProcurementStandard = new SysProcurementStandard();
+        LambdaQueryWrapper<SysProcurementStandard> lw = new LambdaQueryWrapper<>();
         for (SysProcurementStandardVo sysProcurementStandardVo : sysProcurementStandardVoList) {
             BeanUtils.copyProperties(sysProcurementStandardVo, sysProcurementStandard);
-            isSuccess = sysProcurementStandardService.updateById(sysProcurementStandard);
+            if(sysProcurementStandard.getProcurementStandardId()>-1L){
+                lw.eq(SysProcurementStandard::getProcurementStandardId,sysProcurementStandard.getProcurementStandardId());
+            }
+            isSuccess = sysProcurementStandardService.update(sysProcurementStandard,lw);
             if (!isSuccess) {
                 return R.fail();
             }

purchase-common/src/main/java/com/ozs/common/core/domain/entity/SysDictData.java

@@ -72,7 +72,7 @@ public class SysDictData extends BaseEntity
         this.dictSort = dictSort;
     }
 
-    @NotBlank(message = "字典标签不能为空")
+//    @NotBlank(message = "字典标签不能为空")
     @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
     public String getDictLabel()
     {
@@ -84,7 +84,7 @@ public class SysDictData extends BaseEntity
         this.dictLabel = dictLabel;
     }
 
-    @NotBlank(message = "字典键值不能为空")
+//    @NotBlank(message = "字典键值不能为空")
     @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
     public String getDictValue()
     {
@@ -96,7 +96,7 @@ public class SysDictData extends BaseEntity
         this.dictValue = dictValue;
     }
 
-    @NotBlank(message = "字典类型不能为空")
+//    @NotBlank(message = "字典类型不能为空")
     @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
     public String getDictType()
     {

purchase-common/src/main/java/com/ozs/common/enums/ConstructionDrawing.java

@@ -0,0 +1,27 @@
+package com.ozs.common.enums;
+
+/**
+ * 是否为超限额计划
+ *
+ * @author buzhanyi
+ */
+public enum ConstructionDrawing {
+    NO_COMPLETE("0", "未完成"),
+    COMPLETE("1", "完成");
+
+    private final String code;
+    private final String info;
+
+    ConstructionDrawing(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+}

purchase-common/src/main/java/com/ozs/common/enums/EngineeringContractingMode.java

@@ -0,0 +1,28 @@
+package com.ozs.common.enums;
+
+/**
+ * 工程类项目类别
+ *
+ * @author buzhanyi
+ */
+public enum EngineeringContractingMode {
+    EPC("1", "工程总承包"),
+    HCC("2", "施工总承包"),
+    PC("3", "专业承包");
+
+    private final String code;
+    private final String info;
+
+    EngineeringContractingMode(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+}

purchase-common/src/main/java/com/ozs/common/enums/EngineeringProjectCategory.java

@@ -0,0 +1,31 @@
+package com.ozs.common.enums;
+
+/**
+ * 工程类项目类别
+ *
+ * @author buzhanyi
+ */
+public enum EngineeringProjectCategory {
+    RECONNAISSANCE("1", "勘察"),
+    DEVISE("2", "设计"),
+    CONSTRUCTION("3", "施工"),
+    SUPERVISION("4", "监理"),
+    CONSULT("5", "咨询"),
+    MATERIAL("6", "设备材料");
+
+    private final String code;
+    private final String info;
+
+    EngineeringProjectCategory(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+}

purchase-common/src/main/java/com/ozs/common/enums/IsExcess.java

@@ -0,0 +1,27 @@
+package com.ozs.common.enums;
+
+/**
+ * 是否为超限额计划
+ *
+ * @author buzhanyi
+ */
+public enum IsExcess {
+    NO_EXCESS("0", "未超额"),
+    EXCESS("1", "超额");
+
+    private final String code;
+    private final String info;
+
+    IsExcess(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+}

purchase-common/src/main/java/com/ozs/common/enums/PmProjectStatus.java

@@ -0,0 +1,35 @@
+package com.ozs.common.enums;
+
+/**
+ * 项目审核状态
+ *
+ * @author buzhanyi
+ */
+public enum PmProjectStatus {
+    DEMAND_WAIT_FILL("4", "需求待填制"),
+    DEMAND_WAIT_COMMIT("5", "需求待提交"),
+    TASK_WAIT_RELEASE("6", "任务待下达"),
+    TASK_RELEASED("7", "任务已下达"),
+    BID_INFO_WAIT_FILL("8", "中标信息待填制"),
+    BID_INFO_FILLED("9", "中标信息已填制"),
+    CONTRACT_WAIT_FILL("10", "合同待填制"),
+    CONTRACT_FILLED("11", "合同已填制"),
+    UNDER_CONSTRUCTION("12", "项目建设中"),
+    COMPLETION_CONSTRUCTION("13", "项目建设完成");
+
+    private final String code;
+    private final String info;
+
+    PmProjectStatus(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+}

purchase-common/src/main/java/com/ozs/common/enums/ProcurementMethodSuggest.java

@@ -0,0 +1,30 @@
+package com.ozs.common.enums;
+
+/**
+ * 采购方式建议
+ *
+ * @author buzhanyi
+ */
+public enum ProcurementMethodSuggest {
+    OPEN_BIDDING("1", "公开招标"),
+    SELECTED_BIDDING("2", "邀请招标"),
+    COMPETITIVE_NEGOTIATION("3", "竞争性谈判"),
+    ENQUIRY("4", "询价"),
+    SINGLE_SOURCE ("5", "单一来源");
+
+    private final String code;
+    private final String info;
+
+    ProcurementMethodSuggest(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+}

purchase-common/src/main/java/com/ozs/common/enums/WarnStatus.java

@@ -0,0 +1,27 @@
+package com.ozs.common.enums;
+
+/**
+ * 预警状态
+ *
+ * @author buzhanyi
+ */
+public enum WarnStatus {
+    NORMAL ("0", "正常"),
+    WARNING("1", "预警");
+
+    private final String code;
+    private final String info;
+
+    WarnStatus(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+}

purchase-system/src/main/java/com/ozs/base/domain/BaseSupplier.java

@@ -11,7 +11,7 @@ import javax.validation.constraints.NotBlank;
  */
 @Data
 public class BaseSupplier {
-    private int id;
+    private Integer id;
     // 供应商名称
     @NotBlank(message = "供应商名称不能为空")
     private String supplierName;

purchase-system/src/main/java/com/ozs/base/domain/vo/BaseExpertVo.java

@@ -1,11 +1,8 @@
 package com.ozs.base.domain.vo;
 
 import com.ozs.common.vo.PageVo;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 @Data
 public class BaseExpertVo extends PageVo {

purchase-system/src/main/java/com/ozs/plan/doman/ProvisionalPlan.java

@@ -0,0 +1,110 @@
+package com.ozs.plan.doman;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ozs.common.vo.PageVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@TableName("plan_practical")
+public class ProvisionalPlan {
+
+    @ApiModelProperty(value = "主键ID")
+    @TableField("plan_year_id")
+    private Long planYearId;
+
+    @NotNull(message = "采购单位不能为空")
+    @ApiModelProperty(value = "采购单位（登录账号的单位）")
+    @TableField("purchase_dept_id")
+    private Long purchaseDeptId;
+
+    @NotNull(message = "项目名称不能为空")
+    @ApiModelProperty(value = "项目名称")
+    @TableField("project_name")
+    private String projectName;
+
+    @ApiModelProperty(value = "项目类型（0：装备类；1：物资类；2：服务类；3：工程类）")
+    @TableField("project_type")
+    private String projectType;
+
+    @ApiModelProperty(value = "需求概况")
+    @TableField("demand_overview")
+    private String demandOverview;
+
+    @ApiModelProperty(value = "概算金额(万元（保留小数点后两位）")
+    @TableField("evaluation")
+    private BigDecimal evaluation;
+
+    @ApiModelProperty(value = "是否为超限额计划(0:未超额，1:超额)")
+    @TableField("is_excess")
+    private String isExcess;
+
+    @ApiModelProperty(value = "采购服务站")
+    @TableField("purchase_services")
+    private String purchaseServices;
+
+    @ApiModelProperty(value = "采购方式  (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)")
+    @TableField("purchase_mode")
+    private String purchaseMode;
+
+    @ApiModelProperty(value = "计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）")
+    @TableField("plan_demand_sub_time")
+    private Date planDemandSubTime;
+
+    @ApiModelProperty(value = "计划完成采购时间--->公示中标结果的日期，即填制中标信息的日期（具体到月）")
+    @TableField("plan_purchase_finish_time")
+    private Date planPurchaseFinishTime;
+
+    @ApiModelProperty(value = "计划交付时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期")
+    @TableField("plan_deliver_time")
+    private Date planDeliverTime;
+
+    @ApiModelProperty(value = "项目属性（0:应急应战项目， 1:重大规划任务项目， 2:规划任务项目， 3:一般项目）")
+    @TableField("project_attr")
+    private String projectAttr;
+
+    @ApiModelProperty(value = "计划调整情况及理由--->如计划需要变更，在填写申请修改时需填写调整情况及理由，审核单位审核通过后显示该信息")
+    @TableField("adjust_reason")
+    private String adjustReason;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remarks")
+    private String remarks;
+
+    @ApiModelProperty(value = "项目状态(0:计划待提交，1:计划待审核，2:计划已退回，3:计划已审核)")
+    @TableField("project_status")
+    private String projectStatus;
+
+    @ApiModelProperty(value = "退回原因")
+    @TableField("refuse_reason")
+    private String refuseReason;
+
+    @ApiModelProperty(value = "0：正常，1：已删除")
+    @TableField("del_flay")
+    private String delFlay;
+
+    @ApiModelProperty(value = "计划类型（0：季度计划，1：临时计划）")
+    @TableField("plan_type")
+    private String planType;
+
+    @ApiModelProperty(value = "创建者")
+    @TableField("created")
+    private String created;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改者")
+    @TableField("updated")
+    private String updated;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("update_time")
+    private String updateTime;
+}

purchase-system/src/main/java/com/ozs/plan/doman/vo/requestVo/ProvisionalPlanVo.java

@@ -0,0 +1,84 @@
+package com.ozs.plan.doman.vo.requestVo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ozs.common.vo.PageVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class ProvisionalPlanVo extends PageVo {
+    @ApiModelProperty(value = "主键ID")
+    private Long planYearId;
+
+    @NotNull(message = "采购单位不能为空")
+    @ApiModelProperty(value = "采购单位（登录账号的单位）")
+    private Long purchaseDeptId;
+
+    @NotNull(message = "项目名称不能为空")
+    @ApiModelProperty(value = "项目名称")
+    private String projectName;
+
+    @ApiModelProperty(value = "项目类型（0：装备类；1：物资类；2：服务类；3：工程类）")
+    private String projectType;
+
+    @ApiModelProperty(value = "需求概况")
+    private String demandOverview;
+
+    @ApiModelProperty(value = "概算金额(万元（保留小数点后两位）")
+    private BigDecimal evaluation;
+
+    @ApiModelProperty(value = "是否为超限额计划(0:未超额，1:超额)")
+    private String isExcess;
+
+    @ApiModelProperty(value = "采购服务站")
+    private String purchaseServices;
+
+    @ApiModelProperty(value = "采购方式  (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)")
+    private String purchaseMode;
+
+    @ApiModelProperty(value = "计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）")
+    private Date planDemandSubTime;
+
+    @ApiModelProperty(value = "计划完成采购时间--->公示中标结果的日期，即填制中标信息的日期（具体到月）")
+    private Date planPurchaseFinishTime;
+
+    @ApiModelProperty(value = "计划交付时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期")
+    private Date planDeliverTime;
+
+    @ApiModelProperty(value = "项目属性（0:应急应战项目， 1:重大规划任务项目， 2:规划任务项目， 3:一般项目）")
+    private String projectAttr;
+
+    @ApiModelProperty(value = "计划调整情况及理由--->如计划需要变更，在填写申请修改时需填写调整情况及理由，审核单位审核通过后显示该信息")
+    private String adjustReason;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+    @ApiModelProperty(value = "项目状态(0:计划待提交，1:计划待审核，2:计划已退回，3:计划已审核)")
+    private String projectStatus;
+
+    @ApiModelProperty(value = "退回原因")
+    private String refuseReason;
+
+    @ApiModelProperty(value = "0：正常，1：已删除")
+    private String delFlay;
+
+    @ApiModelProperty(value = "计划类型（0：季度计划，1：临时计划）")
+    private String planType;
+
+    @ApiModelProperty(value = "创建者")
+    private String created;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改者")
+    private String updated;
+
+    @ApiModelProperty(value = "修改时间")
+    private String updateTime;
+}

purchase-system/src/main/java/com/ozs/plan/mapper/ProvisionalPlanMapper.java

@@ -0,0 +1,10 @@
+package com.ozs.plan.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ozs.base.domain.BaseExpert;
+import com.ozs.plan.doman.ProvisionalPlan;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ProvisionalPlanMapper extends BaseMapper<ProvisionalPlan> {
+}

purchase-system/src/main/java/com/ozs/plan/service/ProvisionalPlanService.java

@@ -0,0 +1,8 @@
+package com.ozs.plan.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ozs.base.domain.BaseExpert;
+import com.ozs.plan.doman.ProvisionalPlan;
+
+public interface ProvisionalPlanService extends IService<ProvisionalPlan> {
+}

purchase-system/src/main/java/com/ozs/plan/service/impl/ProvisionalPlanServiceImpl.java

@@ -0,0 +1,11 @@
+package com.ozs.plan.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ozs.plan.doman.ProvisionalPlan;
+import com.ozs.plan.mapper.ProvisionalPlanMapper;
+import com.ozs.plan.service.ProvisionalPlanService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMapper, ProvisionalPlan> implements ProvisionalPlanService {
+}

purchase-system/src/main/java/com/ozs/pm/doman/PmDemandEngineering.java

@@ -73,11 +73,11 @@ public class PmDemandEngineering extends BaseEntity
 
     /** 联系人 */
     @Excel(name = "联系人")
-    private BigDecimal linkman;
+    private String linkman;
 
     /** 电话 */
     @Excel(name = "电话")
-    private BigDecimal phone;
+    private String phone;
 
     /** 项目类别 */
     @Excel(name = "项目类别")
@@ -93,7 +93,7 @@ public class PmDemandEngineering extends BaseEntity
 
     /** 设计单位 */
     @Excel(name = "设计单位")
-    private BigDecimal designUnit;
+    private String designUnit;
 
     /** 最高限价 */
     @Excel(name = "最高限价")
@@ -115,13 +115,4 @@ public class PmDemandEngineering extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
-    /** 项目附件 */
-    @Excel(name = "项目附件")
-    private String projectFiles;
-
-    /** 逻辑删除字段--->（0：正常，1：已删除） */
-    @Excel(name = "逻辑删除字段--->", readConverterExp = "0=：正常，1：已删除")
-    private Integer isDelete;
-
-
 }

purchase-system/src/main/java/com/ozs/pm/doman/PmDemandEquip.java

@@ -74,13 +74,4 @@ public class PmDemandEquip extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
-    /** 项目附件 */
-    @Excel(name = "项目附件")
-    private String projectFiles;
-
-    /** 逻辑删除字段--->（0：正常，1：已删除） */
-    @Excel(name = "逻辑删除字段--->", readConverterExp = "0=：正常，1：已删除")
-    private Integer isDelete;
-
-
 }

purchase-system/src/main/java/com/ozs/pm/doman/PmDemandMaterials.java

@@ -97,16 +97,5 @@ public class PmDemandMaterials extends BaseEntity {
     @Excel(name = "备注")
     private String remarks;
 
-    /**
-     * 项目附件
-     */
-    @Excel(name = "项目附件")
-    private String projectFiles;
-
-    /**
-     * 逻辑删除字段--->（0：正常，1：已删除）
-     */
-    @Excel(name = "逻辑删除字段--->", readConverterExp = "0=：正常，1：已删除")
-    private Integer isDelete;
 
 }

purchase-system/src/main/java/com/ozs/pm/doman/PmDemandServe.java

@@ -71,12 +71,4 @@ public class PmDemandServe extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
-    /** 项目附件 */
-    @Excel(name = "项目附件")
-    private String projectFiles;
-
-    /** 逻辑删除字段--->（0：正常，1：已删除） */
-    @Excel(name = "逻辑删除字段--->", readConverterExp = "0=：正常，1：已删除")
-    private Integer isDelete;
-
 }

purchase-system/src/main/java/com/ozs/pm/doman/vo/responseVo/PmDemandEngineeringResponseVo.java

@@ -3,6 +3,7 @@ package com.ozs.pm.doman.vo.responseVo;
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -30,99 +31,135 @@ public class PmDemandEngineeringResponseVo extends BaseEntity
 
     /** 需求ID */
     @Excel(name = "需求ID")
+    @ApiModelProperty("需求ID")
     private Long demandId;
 
     /** 工程项目名称 */
     @Excel(name = "工程项目名称")
+    @ApiModelProperty("工程项目名称")
     private String engineeringName;
 
     /** 建设地点 */
     @Excel(name = "建设地点")
+    @ApiModelProperty("建设地点")
     private String constructionLocation;
 
     /** 设计任务书批复文号 */
     @Excel(name = "设计任务书批复文号")
+    @ApiModelProperty("设计任务书批复文号")
     private String designAssignmenApprovalNumber;
 
     /** 工程建设计划文号 */
     @Excel(name = "工程建设计划文号")
+    @ApiModelProperty("工程建设计划文号")
     private BigDecimal projectConstructionPlanNumber;
 
-    /** 任务书批复规模(㎡): */
-    @Excel(name = "任务书批复规模(㎡):")
+    /** 任务书批复规模(㎡)*/
+    @Excel(name = "任务书批复规模(㎡)")
+    @ApiModelProperty("任务书批复规模(㎡)")
     private BigDecimal tassignmentApprovalScale;
 
     /** 任务书批复投资 */
     @Excel(name = "任务书批复投资")
+    @ApiModelProperty("任务书批复投资")
     private String tassignmentApprovalInvestmen;
 
     /** 规划许可文号 */
     @Excel(name = "规划许可文号")
+    @ApiModelProperty("规划许可文号")
     private String planningLicenseNumber;
 
     /** 密级处理 */
     @Excel(name = "密级处理")
+    @ApiModelProperty("密级处理")
     private String classifiedTreatment;
 
     /** 采购项目规模(㎡) */
     @Excel(name = "采购项目规模(㎡)")
+    @ApiModelProperty("采购项目规模(㎡)")
     private BigDecimal procurementProjectScale;
 
     /** 采购项目投资(万元) */
     @Excel(name = "采购项目投资(万元)")
+    @ApiModelProperty("采购项目投资(万元)")
     private BigDecimal procurementProjectInvestment;
 
     /** 联系人 */
     @Excel(name = "联系人")
-    private BigDecimal linkman;
+    @ApiModelProperty("联系人")
+    private String linkman;
 
     /** 电话 */
     @Excel(name = "电话")
-    private BigDecimal phone;
+    @ApiModelProperty("电话")
+    private String phone;
 
-    /** 项目类别 */
-    @Excel(name = "项目类别")
+    /** 项目类别（1勘察，2设计, 3施工，4监理，5咨询，6设备材料） */
+    @Excel(name = "项目类别（1勘察，2设计, 3施工，4监理，5咨询，6设备材料）")
+    @ApiModelProperty("项目类别（1勘察，2设计, 3施工，4监理，5咨询，6设备材料）")
     private String projectCategory;
 
-    /** 承包方式 */
-    @Excel(name = "承包方式")
+    /** 项目类别名（1勘察，2设计, 3施工，4监理，5咨询，6设备材料） */
+    @Excel(name = "项目类别名（1勘察，2设计, 3施工，4监理，5咨询，6设备材料）")
+    @ApiModelProperty("项目类别名（1勘察，2设计, 3施工，4监理，5咨询，6设备材料）")
+    private String projectCategoryName;
+
+    /** 承包方式（1工程总承包，2施工总承包，3专业承包） */
+    @Excel(name = "承包方式（1工程总承包，2施工总承包，3专业承包）")
+    @ApiModelProperty("承包方式（1工程总承包，2施工总承包，3专业承包）")
     private String contractingMode;
 
+
+    /** 承包方式名（1工程总承包，2施工总承包，3专业承包） */
+    @Excel(name = "承包方式名（1工程总承包，2施工总承包，3专业承包）")
+    @ApiModelProperty("承包方式名（1工程总承包，2施工总承包，3专业承包）")
+    private String contractingModeName;
+
     /** 施工图是否完成(0未完成，1完成) */
     @Excel(name = "施工图是否完成(0未完成，1完成)")
+    @ApiModelProperty("施工图是否完成(0未完成，1完成)")
     private String constructionDrawing;
 
+    /** 施工图是否完成名(0未完成，1完成) */
+    @Excel(name = "施工图是否完成名(0未完成，1完成)")
+    @ApiModelProperty("施工图是否完成名(0未完成，1完成)")
+    private String constructionDrawingName;
+
     /** 设计单位 */
     @Excel(name = "设计单位")
-    private BigDecimal designUnit;
+    @ApiModelProperty("设计单位")
+    private String designUnit;
 
     /** 最高限价 */
     @Excel(name = "最高限价")
+    @ApiModelProperty("最高限价")
     private BigDecimal ceilingPrice;
 
-    /** 采购方式建议 */
-    @Excel(name = "采购方式建议")
+    /** 采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源） */
+    @Excel(name = "采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
+    @ApiModelProperty("采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
     private String procurementMethodSuggest;
 
+    /** 采购方式建议名 */
+    @Excel(name = "采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
+    @ApiModelProperty("采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
+    private String procurementMethodSuggestName;
+
     /** 投标(报价)人资质等级要求 */
     @Excel(name = "投标(报价)人资质等级要求")
+    @ApiModelProperty("投标(报价)人资质等级要求")
     private String qualificationLevelRequirement;
 
     /** 供应商 */
     @Excel(name = "供应商")
+    @ApiModelProperty("供应商")
     private Long supplierId;
 
     /** 备注 */
     @Excel(name = "备注")
+    @ApiModelProperty("备注")
     private String remarks;
 
-    /** 项目附件 */
-    @Excel(name = "项目附件")
-    private String projectFiles;
-
-    /** 逻辑删除字段--->（0：正常，1：已删除） */
-    @Excel(name = "逻辑删除字段--->", readConverterExp = "0=：正常，1：已删除")
-    private Integer isDelete;
 
 
 }

purchase-system/src/main/java/com/ozs/pm/doman/vo/responseVo/PmDemandEquipResponseVo.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -32,56 +33,63 @@ public class PmDemandEquipResponseVo extends BaseEntity
 
     /** 需求ID */
     @Excel(name = "需求ID")
+    @ApiModelProperty("需求ID")
     private Long demandId;
 
     /** 物资类别及品种名称 */
     @Excel(name = "物资类别及品种名称")
+    @ApiModelProperty("物资类别及品种名称")
     private String typeAndName;
 
     /** 规格型号长*宽*高 */
     @Excel(name = "规格型号长*宽*高")
+    @ApiModelProperty("规格型号长*宽*高")
     private String specification;
 
-    /** 质量技术标准(技术参数): */
-    @Excel(name = "质量技术标准(技术参数):")
+    /** 质量技术标准(技术参数)*/
+    @Excel(name = "质量技术标准(技术参数)")
+    @ApiModelProperty("质量技术标准(技术参数)\"")
     private String qualityTechnicalStandard;
 
     /** 计量单位 */
     @Excel(name = "计量单位")
+    @ApiModelProperty("计量单位")
     private String measurementUnit;
 
     /** 采购数量 */
     @Excel(name = "采购数量")
+    @ApiModelProperty("采购数量")
     private BigDecimal procurementQuantity;
 
     /** 单价(元) */
     @Excel(name = "单价(元)")
+    @ApiModelProperty("单价(元)")
     private BigDecimal price;
 
     /** 预算金额(万元) */
     @Excel(name = "预算金额(万元)")
+    @ApiModelProperty("预算金额(万元)")
     private BigDecimal budgetAmount;
 
     /** 需求提报时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "需求提报时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("需求提报时间 yyyy-MM-dd")
     private Date demandCommitTime;
 
     /** 采购方式建议 */
-    @Excel(name = "采购方式建议")
+    @Excel(name = "采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
+    @ApiModelProperty("采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
     private String procurementMethodSuggest;
 
+    /** 采购方式建议名 */
+    @Excel(name = "采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
+    @ApiModelProperty("采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
+    private String procurementMethodSuggestName;
+
     /** 备注 */
     @Excel(name = "备注")
+    @ApiModelProperty("备注")
     private String remarks;
 
-    /** 项目附件 */
-    @Excel(name = "项目附件")
-    private String projectFiles;
-
-    /** 逻辑删除字段--->（0：正常，1：已删除） */
-    @Excel(name = "逻辑删除字段--->", readConverterExp = "0=：正常，1：已删除")
-    private Integer isDelete;
-
-
 }

purchase-system/src/main/java/com/ozs/pm/doman/vo/responseVo/PmDemandMaterialsResponseVo.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -35,48 +36,56 @@ public class PmDemandMaterialsResponseVo extends BaseEntity {
      * 需求ID
      */
     @Excel(name = "需求ID")
+    @ApiModelProperty("需求ID")
     private Long demandId;
 
     /**
      * 物资类别及品种名称
      */
     @Excel(name = "物资类别及品种名称")
+    @ApiModelProperty("物资类别及品种名称")
     private String typeAndName;
 
     /**
      * 规格型号长*宽*高
      */
     @Excel(name = "规格型号长*宽*高")
+    @ApiModelProperty("规格型号长*宽*高")
     private String specification;
 
     /**
-     * 质量技术标准(技术参数):
+     * 质量技术标准(技术参数)
      */
-    @Excel(name = "质量技术标准(技术参数):")
+    @Excel(name = "质量技术标准(技术参数)")
+    @ApiModelProperty("质量技术标准(技术参数)")
     private String qualityTechnicalStandard;
 
     /**
      * 计量单位
      */
     @Excel(name = "计量单位")
+    @ApiModelProperty("计量单位")
     private String measurementUnit;
 
     /**
      * 采购数量
      */
     @Excel(name = "采购数量")
+    @ApiModelProperty("采购数量")
     private BigDecimal procurementQuantity;
 
     /**
      * 单价(元)
      */
     @Excel(name = "单价(元)")
+    @ApiModelProperty("单价(元)")
     private BigDecimal price;
 
     /**
      * 预算金额(万元)
      */
     @Excel(name = "预算金额(万元)")
+    @ApiModelProperty("预算金额(万元)")
     private BigDecimal budgetAmount;
 
     /**
@@ -84,30 +93,26 @@ public class PmDemandMaterialsResponseVo extends BaseEntity {
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "需求提报时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("需求提报时间")
     private Date demandCommitTime;
 
     /**
      * 采购方式建议
      */
-    @Excel(name = "采购方式建议")
+    @Excel(name = "采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
+    @ApiModelProperty("采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
     private String procurementMethodSuggest;
 
+    /** 采购方式建议名 */
+    @Excel(name = "采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
+    @ApiModelProperty("采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
+    private String procurementMethodSuggestName;
+
     /**
      * 备注
      */
     @Excel(name = "备注")
+    @ApiModelProperty("备注")
     private String remarks;
 
-    /**
-     * 项目附件
-     */
-    @Excel(name = "项目附件")
-    private String projectFiles;
-
-    /**
-     * 逻辑删除字段--->（0：正常，1：已删除）
-     */
-    @Excel(name = "逻辑删除字段--->", readConverterExp = "0=：正常，1：已删除")
-    private Integer isDelete;
-
 }

purchase-system/src/main/java/com/ozs/pm/doman/vo/responseVo/PmDemandResponseVo.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -32,111 +33,184 @@ public class PmDemandResponseVo extends BaseEntity
 
     /** 计划ID */
     @Excel(name = "计划ID")
+    @ApiModelProperty("计划ID")
     private Long planId;
 
     /** 采购单位（登录账号的单位） */
-    @Excel(name = "采购单位", readConverterExp = "登=录账号的单位")
+    @Excel(name = "采购单位（登录账号的单位）")
+    @ApiModelProperty("采购单位")
     private Long purchaseDeptId;
 
+    /** 采购单位（登录账号的单位名称） */
+    @ApiModelProperty("采购单位（登录账号的单位名称）")
+    private String purchaseDeptName;
+
+
     /** 项目名称 */
     @Excel(name = "项目名称")
+    @ApiModelProperty("项目名称")
     private String projectName;
 
     /** 项目类型（0：装备类；1：物资类；2：服务类；3：工程类） */
-    @Excel(name = "项目类型", readConverterExp = "0=：装备类；1：物资类；2：服务类；3：工程类")
+    @Excel(name = "项目类型（0：装备类；1：物资类；2：服务类；3：工程类）")
+    @ApiModelProperty("项目类型（0：装备类；1：物资类；2：服务类；3：工程类）")
     private String projectType;
 
+    /** 项目类型名（0：装备类；1：物资类；2：服务类；3：工程类） */
+    @Excel(name = "项目类型名（0：装备类；1：物资类；2：服务类；3：工程类）")
+    @ApiModelProperty("项目类型名（0：装备类；1：物资类；2：服务类；3：工程类）")
+    private String projectTypeName;
+
     /** 需求概况 */
     @Excel(name = "需求概况")
+    @ApiModelProperty("需求概况")
     private String demandOverview;
 
     /** 概算金额(万元（保留小数点后两位） */
-    @Excel(name = "概算金额(万元", readConverterExp = "保=留小数点后两位")
+    @Excel(name = "概算金额(万元 保留小数点后两位")
+    @ApiModelProperty("概算金额(万元（保留小数点后两位）")
     private BigDecimal evaluation;
 
     /** 是否为超限额计划(0:未超额，1:超额) */
     @Excel(name = "是否为超限额计划(0:未超额，1:超额)")
+    @ApiModelProperty("是否为超限额计划(0:未超额，1:超额)")
     private Integer isExcess;
 
+    /** "是否为超限额计划名(0:未超额，1:超额) */
+    @Excel(name = "是否为超限额计划名(0:未超额，1:超额)")
+    @ApiModelProperty("是否为超限额计划名(0:未超额，1:超额)")
+    private String isExcessName;
+
     /** 采购服务站 */
     @Excel(name = "采购服务站")
+    @ApiModelProperty("采购服务站")
     private String purchaseServices;
 
+    /** 采购服务站名 */
+    @Excel(name = "采购服务站名")
+    @ApiModelProperty("采购服务站名")
+    private String purchaseServicesName;
+
     /** 采购方式  (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价) */
     @Excel(name = "采购方式  (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)")
+    @ApiModelProperty("采购方式 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)")
     private String purchaseMode;
 
-    /** 计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月） */
-    @Excel(name = "计划提报需求时间--->需求单位成功提报采购需求的日期", readConverterExp = "具=体到月")
+    /** 采购方式名  (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价) */
+    @Excel(name = "采购方式名  (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)")
+    @ApiModelProperty("采购方式名 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)")
+    private String purchaseModeName;
+
+    /** 计划提报需求时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "计划提报需求时间")
+    @ApiModelProperty("计划提报需求时间")
     private Date planDemandSubTime;
 
-    /** 计划完成采购时间--->公示中标结果的日期，即填制中标信息的日期（具体到月） */
-    @Excel(name = "计划完成采购时间--->公示中标结果的日期，即填制中标信息的日期", readConverterExp = "具=体到月")
+    /** 计划完成采购时间*/
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "计划完成采购时间")
+    @ApiModelProperty("计划完成采购时间")
     private Date planPurchaseFinishTime;
 
-    /** 计划交付时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期 */
+    /** 计划交付时间- */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "计划交付时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "计划交付时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("计划交付时间")
     private Date planDeliverTime;
 
     /** 项目属性（0:应急应战项目， 1:重大规划任务项目， 2:规划任务项目， 3:一般项目） */
     @Excel(name = "项目属性", readConverterExp = "0=:应急应战项目，,1=:重大规划任务项目，,2=:规划任务项目，,3=:一般项目")
+    @ApiModelProperty("项目属性 0=:应急应战项目，,1=:重大规划任务项目，,2=:规划任务项目，,3=:一般项目")
     private String projectAttr;
 
-    /** 计划调整情况及理由--->如计划需要变更，在填写申请修改时需填写调整情况及理由，审核单位审核通过后显示该信息 */
-    @Excel(name = "计划调整情况及理由--->如计划需要变更，在填写申请修改时需填写调整情况及理由，审核单位审核通过后显示该信息")
+    /** 项目属性名（0:应急应战项目， 1:重大规划任务项目， 2:规划任务项目， 3:一般项目） */
+    @Excel(name = "项目属性名", readConverterExp = "0=:应急应战项目，,1=:重大规划任务项目，,2=:规划任务项目，,3=:一般项目")
+    @ApiModelProperty("项目属性名 0=:应急应战项目，,1=:重大规划任务项目，,2=:规划任务项目，,3=:一般项目")
+    private String projectAttrName;
+
+    /** 计划调整情况及理由*/
+    @Excel(name = "计划调整情况及理由")
+    @ApiModelProperty("计划调整情况及理由")
     private String adjustReason;
 
     /** 备注 */
     @Excel(name = "备注")
+    @ApiModelProperty("备注")
     private String remarks;
 
     /** 实际提报需求时间--->需求单位成功提报采购需求的日期（具体到日） */
-    @Excel(name = "实际提报需求时间--->需求单位成功提报采购需求的日期", readConverterExp = "具=体到日")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "实际提报需求时间--->需求单位成功提报采购需求的日期（具体到日）")
+    @ApiModelProperty("实际提报需求时间--->需求单位成功提报采购需求的日期（具体到日）")
     private Date realDemandCommitTime;
 
     /** 实际完成采购时间--->公示中标结果的日期，即填制中标信息的日期（具体到日） */
-    @Excel(name = "实际完成采购时间--->公示中标结果的日期，即填制中标信息的日期", readConverterExp = "具=体到日")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "实际完成采购时间--->公示中标结果的日期，即填制中标信息的日期（具体到日）")
+    @ApiModelProperty("项目名称")
     private Date realPurchaseFinishTime;
 
     /** 实际交付（实施）时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期 */
-    @Excel(name = "实际交付", readConverterExp = "实=施")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "实际交付（实施）时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期 ")
+    @ApiModelProperty("实际交付（实施）时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期 ")
     private Date realDeliverTime;
 
     /** 审核时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("审核时间")
     private Date auditTime;
 
     /** 预警状态(0:正常，1:预警) */
     @Excel(name = "预警状态(0:正常，1:预警)")
+    @ApiModelProperty("预警状态(0:正常，1:预警)")
     private String warnStatus;
 
+    /** 预警状态名(0:正常，1:预警) */
+    @Excel(name = "预警状态名(0:正常，1:预警)")
+    @ApiModelProperty("预警状态名(0:正常，1:预警)")
+    private String warnStatusName;
+
     /** 项目状态(4:需求待填制，5:需求待提交，6:需求待审核，7:任务待下达，8:任务已下达，9:中标信息待填制，10:中标信息已填制，11:合同待填制，12:合同已填制，13:项目建设中，14:项目建设完成) */
     @Excel(name = "项目状态(4:需求待填制，5:需求待提交，6:需求待审核，7:任务待下达，8:任务已下达，9:中标信息待填制，10:中标信息已填制，11:合同待填制，12:合同已填制，13:项目建设中，14:项目建设完成)")
+    @ApiModelProperty("项目状态(4:需求待填制，5:需求待提交，6:需求待审核，7:任务待下达，8:任务已下达，9:中标信息待填制，10:中标信息已填制，11:合同待填制，12:合同已填制，13:项目建设中，14:项目建设完成)")
     private Long projectStatus;
 
+    /** 项目状态名称 */
+    @Excel(name = "项目状态名称")
+    @ApiModelProperty("项目状态名称")
+    private String projectStatusName;
+
     /** 退回原因 */
     @Excel(name = "退回原因")
+    @ApiModelProperty("退回原因")
     private String refuseReason;
 
     /** 滞后原因 */
     @Excel(name = "滞后原因")
+    @ApiModelProperty("滞后原因")
     private String delayReason;
 
     /** 调整建议 */
     @Excel(name = "调整建议")
+    @ApiModelProperty("调整建议")
     private String adjustAdvice;
 
     /** 采购需求工程类对象 */
+    @ApiModelProperty("采购需求工程类对象")
     private PmDemandEngineeringResponseVo pmDemandEngineeringResponseVo;
 
     /** 采购需求装备类对象 */
+    @ApiModelProperty("采购需求装备类对象")
     private PmDemandEquipResponseVo pmDemandEquipResponseVo;
 
     /** 采购需求物资类对象 */
+    @ApiModelProperty("采购需求物资类对象")
     private PmDemandMaterialsResponseVo pmDemandMaterialsResponseVo;
 
     /** 采购需求服务类对象 */
+    @ApiModelProperty("采购需求服务类对象")
     private PmDemandServeResponseVo pmDemandServeResponseVo;
 }

purchase-system/src/main/java/com/ozs/pm/doman/vo/responseVo/PmDemandServeResponseVo.java

@@ -3,6 +3,7 @@ package com.ozs.pm.doman.vo.responseVo;
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -30,54 +31,69 @@ public class PmDemandServeResponseVo extends BaseEntity
 
     /** 需求ID */
     @Excel(name = "需求ID")
+    @ApiModelProperty("需求ID")
     private Long demandId;
 
     /** 服务项目名称 */
     @Excel(name = "服务项目名称")
+    @ApiModelProperty("服务项目名称")
     private String serviceName;
 
     /** 技术服务要求 */
     @Excel(name = "技术服务要求")
+    @ApiModelProperty("技术服务要求")
     private String technicalServiceRequirement;
 
     /** 计量单位 */
     @Excel(name = "计量单位")
+    @ApiModelProperty("计量单位")
     private String measurementUnit;
 
     /** 采购数量 */
     @Excel(name = "采购数量")
+    @ApiModelProperty("采购数量")
     private BigDecimal procurementQuantity;
 
     /** 单价(元) */
     @Excel(name = "单价(元)")
+    @ApiModelProperty("单价(元)")
     private BigDecimal price;
 
     /** 预算金额(万元) */
     @Excel(name = "预算金额(万元)")
+    @ApiModelProperty("预算金额(万元)")
     private BigDecimal budgetAmount;
 
     /** 交货期限 */
     @Excel(name = "交货期限")
+    @ApiModelProperty("交货期限")
     private String deliveryTimeLimit;
 
-    /** 采购方式建议 */
-    @Excel(name = "采购方式建议")
+    /** 采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源） */
+    @Excel(name = "采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
+    @ApiModelProperty("采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
     private String procurementMethodSuggest;
 
+    /** 采购方式建议名 */
+    @Excel(name = "采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
+    @ApiModelProperty("采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
+    private String procurementMethodSuggestName;
+
     /** 供应商 */
     @Excel(name = "供应商")
+    @ApiModelProperty("供应商")
     private Long supplierId;
 
+    /** 供应商名 */
+    @Excel(name = "供应商名")
+    @ApiModelProperty("供应商名")
+    private String supplierName;
+
+
     /** 备注 */
     @Excel(name = "备注")
+    @ApiModelProperty("备注")
     private String remarks;
 
-    /** 项目附件 */
-    @Excel(name = "项目附件")
-    private String projectFiles;
-
-    /** 逻辑删除字段--->（0：正常，1：已删除） */
-    @Excel(name = "逻辑删除字段--->", readConverterExp = "0=：正常，1：已删除")
-    private Integer isDelete;
 
 }

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -2,13 +2,18 @@ package com.ozs.pm.service.impl;
 
 import java.util.*;
 
+import com.ozs.common.enums.*;
 import com.ozs.common.utils.DateUtils;
+import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
-import com.ozs.pm.doman.PmDemand;
+import com.ozs.pm.doman.*;
 import com.ozs.pm.doman.vo.requestVo.PmRequestVo;
-import com.ozs.pm.doman.vo.responseVo.PmDemandResponseVo;
+import com.ozs.pm.doman.vo.responseVo.*;
 import com.ozs.pm.mapper.PmDemandMapper;
-import com.ozs.pm.service.IPmDemandService;
+import com.ozs.pm.service.*;
+import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;
+import com.ozs.system.service.ISysDeptService;
+import com.ozs.system.service.ISysDictDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -24,6 +29,19 @@ public class PmDemandServiceImpl implements IPmDemandService
 {
     @Autowired
     private PmDemandMapper pmDemandMapper;
+    @Autowired
+    private IPmDemandServeService iPmDemandServeService;
+    @Autowired
+    private IPmDemandMaterialsService iPmDemandMaterialsService;
+    @Autowired
+    private IPmDemandEquipService iPmDemandEquipService;
+    @Autowired
+    private IPmDemandEngineeringService iPmDemandEngineeringService;
+    @Autowired
+    private ISysDeptService deptService;
+
+    @Autowired
+    private ISysDictDataService dictDataService;
 
     /**
      * 查询采购需求
@@ -39,6 +57,100 @@ public class PmDemandServiceImpl implements IPmDemandService
             PmDemandResponseVo vo = new PmDemandResponseVo();
             BeanUtils.copyProperties(pmDemand, vo);
 
+            SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(vo.getPurchaseDeptId()).get("sysDept");
+            if(sysDeptResponseVo != null){
+                vo.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
+            }
+
+            String purchaseServicesName = dictDataService.selectDictLabel("purchase_services",vo.getPurchaseServices());
+            if(StringUtils.isNotEmpty(purchaseServicesName)){
+                vo.setPurchaseServicesName(purchaseServicesName);
+            }
+
+            //项目类型
+            for (ProjectTypes value : ProjectTypes.values()) {
+                if (vo.getProjectType() != null && vo.getProjectType().equals(value.getCode())) {
+                    vo.setProjectTypeName(value.getInfo());
+                    break;
+                }
+            }
+            //是否为超限额计划
+            for (IsExcess value : IsExcess.values()) {
+                if (vo.getIsExcess() != null && vo.getIsExcess().equals(value.getCode())) {
+                    vo.setIsExcessName(value.getInfo());
+                    break;
+                }
+            }
+
+            //采购方式
+            for (PlanPurchaseMode value : PlanPurchaseMode.values()) {
+                if (vo.getPurchaseMode() != null && vo.getPurchaseMode().equals(value.getCode())) {
+                    vo.setPurchaseModeName(value.getInfo());
+                    break;
+                }
+            }
+            //项目属性
+            for (ProjectAttribute value : ProjectAttribute.values()) {
+                if (vo.getProjectAttr() != null && vo.getProjectAttr().equals(value.getCode())) {
+                    vo.setProjectAttrName(value.getInfo());
+                    break;
+                }
+            }
+            //预警状态
+            for (WarnStatus value : WarnStatus.values()) {
+                if (vo.getWarnStatus() != null && vo.getWarnStatus().equals(value.getCode())) {
+                    vo.setWarnStatusName(value.getInfo());
+                    break;
+                }
+            }
+
+            //项目状态
+            for (PmProjectStatus value : PmProjectStatus.values()) {
+                if (vo.getProjectStatus() != null && vo.getProjectStatus().equals(value.getCode())) {
+                    vo.setProjectStatusName(value.getInfo());
+                    break;
+                }
+            }
+
+
+            if(ProjectTypes.EQUIPMENTTYPE.getCode().equals(vo.getProjectType())){//装备类
+                PmDemandEquip obj = new PmDemandEquip();
+                obj.setDemandId(demandId);
+                List<PmDemandEquip> list = iPmDemandEquipService.selectPmDemandEquipList(obj);
+                if(list !=null && list.size() > 0){
+                    PmDemandEquipResponseVo responseVo = new PmDemandEquipResponseVo();
+                    BeanUtils.copyProperties(list.get(0),responseVo);
+                    vo.setPmDemandEquipResponseVo(responseVo);
+                }
+            } else if(ProjectTypes.MATERIALTYPE.getCode().equals(vo.getProjectType())){ //物资类
+                PmDemandMaterials obj = new PmDemandMaterials();
+                obj.setDemandId(demandId);
+                List<PmDemandMaterials> list = iPmDemandMaterialsService.selectPmDemandMaterialsList(obj);
+                if(list !=null && list.size() > 0){
+                    PmDemandMaterialsResponseVo responseVo = new PmDemandMaterialsResponseVo();
+                    BeanUtils.copyProperties(list.get(0),responseVo);
+                    vo.setPmDemandMaterialsResponseVo(responseVo);
+                }
+            } else if(ProjectTypes.SERVICESTYPE.getCode().equals(vo.getProjectType())){//服务类
+                PmDemandServe obj = new PmDemandServe();
+                obj.setDemandId(demandId);
+                List<PmDemandServe> list = iPmDemandServeService.selectPmDemandServeList(obj);
+                if(list !=null && list.size() > 0){
+                    PmDemandServeResponseVo responseVo = new PmDemandServeResponseVo();
+                    BeanUtils.copyProperties(list.get(0),responseVo);
+                    vo.setPmDemandServeResponseVo(responseVo);
+                }
+            } else if(ProjectTypes.PLANTOEXAMINETYPE.getCode().equals(vo.getProjectType())){//工程类
+                PmDemandEngineering obj = new PmDemandEngineering();
+                obj.setDemandId(demandId);
+                List<PmDemandEngineering> list = iPmDemandEngineeringService.selectPmDemandEngineeringList(obj);
+                if(list !=null && list.size() > 0){
+                    PmDemandEngineeringResponseVo responseVo = new PmDemandEngineeringResponseVo();
+                    BeanUtils.copyProperties(list.get(0),responseVo);
+                    vo.setPmDemandEngineeringResponseVo(responseVo);
+                }
+            }
+
             return vo;
         } else {
             return null;

purchase-system/src/main/resources/mapper/plan/ProvisionalPlan.xml

@@ -0,0 +1,30 @@
+<?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.ozs.plan.mapper.ProvisionalPlanMapper">
+	<resultMap type="com.ozs.plan.doman.PlanYears" id="PlanYearsResult">
+		<id property="plan_year_id" column="planYearId"/>
+		<result property="purchase_dept_id" column="purchaseDeptId"/>
+		<result property="project_name" column="projectName"/>
+		<result property="project_type" column="projectType"/>
+		<result property="demand_overview" column="demandOverview"/>
+		<result property="evaluation" column="evaluation"/>
+		<result property="is_excess" column="isExcess"/>
+		<result property="purchase_services" column="purchaseServices"/>
+		<result property="purchase_mode" column="purchaseMode"/>
+		<result property="plan_demand_sub_time" column="planDemandSubTime"/>
+		<result property="plan_purchase_finish_time" column="planPurchaseFinishTime"/>
+		<result property="plan_deliver_time" column="planDeliverTime"/>
+		<result property="project_attr" column="projectAtt"/>
+		<result property="adjust_reason" column="adjustReason"/>
+		<result property="remarks" column="remarks"/>
+		<result property="project_status" column="projectStatus"/>
+		<result property="created" column="created"/>
+		<result property="create_time" column="createTime"/>
+		<result property="updated" column="updated"/>
+		<result property="update_time" column="updateTime"/>
+		<result property="refuse_reason" column="refuseReason"/>
+		<result property="del_flay" column="delFlay"/>
+	</resultMap>
+</mapper>

purchase-system/src/main/resources/mapper/pm/PmDemandEquipMapper.xml

@@ -17,7 +17,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="demandCommitTime"    column="demand_commit_time"    />
         <result property="procurementMethodSuggest"    column="procurement_method_suggest"    />
         <result property="remarks"    column="remarks"    />
-        <result property="projectFiles"    column="project_files"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -25,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectPmDemandEquipVo">
-        select demand_equip_id, demand_id, type_and_name, specification, quality_technical_standard, measurement_unit, procurement_quantity, price, budget_amount, demand_commit_time, procurement_method_suggest, remarks, project_files, create_by, create_time, update_by, update_time from pm_demand_equip
+        select demand_equip_id, demand_id, type_and_name, specification, quality_technical_standard, measurement_unit, procurement_quantity, price, budget_amount, demand_commit_time, procurement_method_suggest, remarks, create_by, create_time, update_by, update_time from pm_demand_equip
     </sql>
 
     <select id="selectPmDemandEquipList" parameterType="com.ozs.pm.doman.PmDemandEquip" resultMap="PmDemandEquipResult">
@@ -42,7 +41,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="demandCommitTime != null "> and demand_commit_time = #{demandCommitTime}</if>
             <if test="procurementMethodSuggest != null  and procurementMethodSuggest != ''"> and procurement_method_suggest = #{procurementMethodSuggest}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
-            <if test="projectFiles != null  and projectFiles != ''"> and project_files = #{projectFiles}</if>
         </where>
     </select>
     
@@ -65,7 +63,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="demandCommitTime != null">demand_commit_time,</if>
             <if test="procurementMethodSuggest != null">procurement_method_suggest,</if>
             <if test="remarks != null">remarks,</if>
-            <if test="projectFiles != null">project_files,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -83,7 +80,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="demandCommitTime != null">#{demandCommitTime},</if>
             <if test="procurementMethodSuggest != null">#{procurementMethodSuggest},</if>
             <if test="remarks != null">#{remarks},</if>
-            <if test="projectFiles != null">#{projectFiles},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -105,7 +101,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="demandCommitTime != null">demand_commit_time = #{demandCommitTime},</if>
             <if test="procurementMethodSuggest != null">procurement_method_suggest = #{procurementMethodSuggest},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
-            <if test="projectFiles != null">project_files = #{projectFiles},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>

purchase-system/src/main/resources/mapper/pm/PmDemandMapper.xml

@@ -75,7 +75,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and
                 (demand_commit_time <= #{params.endDate} or purchase_finish_time <= #{params.endDate} or deliver_time <= #{params.endDate})
             </if>
-            <if test="projectFiles != null  and projectFiles != ''"> and project_files = #{projectFiles}</if>
         </where>
     </select>
     

purchase-system/src/main/resources/mapper/pm/PmDemandMaterialsMapper.xml

@@ -17,7 +17,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="demandCommitTime"    column="demand_commit_time"    />
         <result property="procurementMethodSuggest"    column="procurement_method_suggest"    />
         <result property="remarks"    column="remarks"    />
-        <result property="projectFiles"    column="project_files"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -25,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectPmDemandMaterialsVo">
-        select demand_materials_id, demand_id, type_and_name, specification, quality_technical_standard, measurement_unit, procurement_quantity, price, budget_amount, demand_commit_time, procurement_method_suggest, remarks, project_files, create_by, create_time, update_by, update_time from pm_demand_materials
+        select demand_materials_id, demand_id, type_and_name, specification, quality_technical_standard, measurement_unit, procurement_quantity, price, budget_amount, demand_commit_time, procurement_method_suggest, remarks, create_by, create_time, update_by, update_time from pm_demand_materials
     </sql>
 
     <select id="selectPmDemandMaterialsList" parameterType="com.ozs.pm.doman.PmDemandMaterials" resultMap="PmDemandMaterialsResult">
@@ -42,7 +41,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="demandCommitTime != null "> and demand_commit_time = #{demandCommitTime}</if>
             <if test="procurementMethodSuggest != null  and procurementMethodSuggest != ''"> and procurement_method_suggest = #{procurementMethodSuggest}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
-            <if test="projectFiles != null  and projectFiles != ''"> and project_files = #{projectFiles}</if>
 
         </where>
     </select>
@@ -66,7 +64,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="demandCommitTime != null">demand_commit_time,</if>
             <if test="procurementMethodSuggest != null">procurement_method_suggest,</if>
             <if test="remarks != null">remarks,</if>
-            <if test="projectFiles != null">project_files,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -84,7 +81,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="demandCommitTime != null">#{demandCommitTime},</if>
             <if test="procurementMethodSuggest != null">#{procurementMethodSuggest},</if>
             <if test="remarks != null">#{remarks},</if>
-            <if test="projectFiles != null">#{projectFiles},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -106,7 +102,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="demandCommitTime != null">demand_commit_time = #{demandCommitTime},</if>
             <if test="procurementMethodSuggest != null">procurement_method_suggest = #{procurementMethodSuggest},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
-            <if test="projectFiles != null">project_files = #{projectFiles},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>

purchase-system/src/main/resources/mapper/pm/PmDemandServeMapper.xml

@@ -17,7 +17,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="procurementMethodSuggest"    column="procurement_method_suggest"    />
         <result property="supplierId"    column="supplier_id"    />
         <result property="remarks"    column="remarks"    />
-        <result property="projectFiles"    column="project_files"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -25,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectPmDemandServeVo">
-        select demand_serve_id, demand_id, service_name, technical_service_requirement, measurement_unit, procurement_quantity, price, budget_amount, delivery_time_limit, procurement_method_suggest, supplier_id, remarks, project_files, create_by, create_time, update_by, update_time from pm_demand_serve
+        select demand_serve_id, demand_id, service_name, technical_service_requirement, measurement_unit, procurement_quantity, price, budget_amount, delivery_time_limit, procurement_method_suggest, supplier_id, remarks, create_by, create_time, update_by, update_time from pm_demand_serve
     </sql>
 
     <select id="selectPmDemandServeList" parameterType="com.ozs.pm.doman.PmDemandServe" resultMap="PmDemandServeResult">
@@ -42,7 +41,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="procurementMethodSuggest != null  and procurementMethodSuggest != ''"> and procurement_method_suggest = #{procurementMethodSuggest}</if>
             <if test="supplierId != null "> and supplier_id = #{supplierId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
-            <if test="projectFiles != null  and projectFiles != ''"> and project_files = #{projectFiles}</if>
         </where>
     </select>
     
@@ -65,7 +63,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="procurementMethodSuggest != null">procurement_method_suggest,</if>
             <if test="supplierId != null">supplier_id,</if>
             <if test="remarks != null">remarks,</if>
-            <if test="projectFiles != null">project_files,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -83,7 +80,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="procurementMethodSuggest != null">#{procurementMethodSuggest},</if>
             <if test="supplierId != null">#{supplierId},</if>
             <if test="remarks != null">#{remarks},</if>
-            <if test="projectFiles != null">#{projectFiles},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -105,7 +101,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="procurementMethodSuggest != null">procurement_method_suggest = #{procurementMethodSuggest},</if>
             <if test="supplierId != null">supplier_id = #{supplierId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
-            <if test="projectFiles != null">project_files = #{projectFiles},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>