Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/purchase

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

@@ -15,6 +15,8 @@ import com.ozs.plan.doman.vo.requestVo.MonthlyReconciliationPageReqVo;
 import com.ozs.plan.service.MonthlyReconciliationService;
 import com.ozs.system.domain.SysFileInfo;
 import com.ozs.system.domain.SysFileRef;
+import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;
+import com.ozs.system.service.ISysDeptService;
 import com.ozs.system.service.SysFileRefService;
 import com.ozs.system.service.SysFileService;
 import io.swagger.annotations.Api;
@@ -27,12 +29,13 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotEmpty;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 
 @RestController
 @RequestMapping("/monthly/reconciliation")
-@Api( tags = ModularConstans.monthly)
+@Api(tags = ModularConstans.monthly)
 public class MonthlyReconciliationController extends BaseController {
 
 
@@ -42,6 +45,8 @@ public class MonthlyReconciliationController extends BaseController {
     private SysFileRefService sysFileRefService;
     @Autowired
     private SysFileService sysFileService;
+    @Autowired
+    private ISysDeptService iSysDeptService;
 
     @ApiOperation(value = "分页查询月度对表")
     @PostMapping("/page")
@@ -50,14 +55,14 @@ public class MonthlyReconciliationController extends BaseController {
     public AjaxResult page(@NotEmpty(message = "数据为空")
                            @RequestBody MonthlyReconciliationPageReqVo vo) {
         LambdaQueryWrapper<MonthlyReconciliation> lw = new LambdaQueryWrapper<>();
-        if(!StringUtils.isBlank(vo.getProjectName())){
-            lw.like(MonthlyReconciliation::getProjectName,vo.getProjectName());
+        if (!StringUtils.isBlank(vo.getProjectName())) {
+            lw.like(MonthlyReconciliation::getProjectName, vo.getProjectName());
         }
-        if(!ObjectUtils.isEmpty(vo.getProjectStatus())){
-            lw.eq(MonthlyReconciliation::getProjectStatus,vo.getProjectStatus());
+        if (!ObjectUtils.isEmpty(vo.getProjectStatus())) {
+            lw.eq(MonthlyReconciliation::getProjectStatus, vo.getProjectStatus());
         }
-        if(!StringUtils.isBlank(vo.getPurchaseServices())){
-            lw.eq(MonthlyReconciliation::getPurchaseServices,vo.getPurchaseServices());
+        if (!StringUtils.isBlank(vo.getPurchaseServices())) {
+            lw.eq(MonthlyReconciliation::getPurchaseServices, vo.getPurchaseServices());
         }
 //        if(!ObjectUtils.isEmpty(vo.getStartTime())){
 //            lw.ge(BaseNotice::getReleaseTime,vo.getStartTime());
@@ -66,7 +71,16 @@ public class MonthlyReconciliationController extends BaseController {
 //            lw.le(BaseNotice::getReleaseTime,vo.getEntTime());
 //        }
         IPage<MonthlyReconciliation> page = monthlyReconciliationService.page(new Page<>(vo.getPageNum(), vo.getPageSize()), lw);
-
+        if (!ObjectUtils.isEmpty(page.getRecords())) {
+            page.setRecords(page.getRecords().stream().map(dto -> {
+                Map<String, Object> stringObjectMap = iSysDeptService.selectDeptById(dto.getPurchaseDeptId());
+                if (!ObjectUtils.isEmpty(stringObjectMap)) {
+                    SysDeptResponseVo sysDept = (SysDeptResponseVo) stringObjectMap.get("sysDept");
+                    dto.setPurchaseDeptName(sysDept.getDeptName());
+                }
+                return dto;
+            }).collect(Collectors.toList()));
+        }
         return success(page);
 
     }
@@ -81,16 +95,21 @@ public class MonthlyReconciliationController extends BaseController {
                                       Long id) {
         MonthlyReconciliation vo = monthlyReconciliationService.getById(id);
 
-        if(!ObjectUtils.isEmpty(vo)){
-            LambdaQueryWrapper<SysFileRef> lw =new LambdaQueryWrapper();
+        if (!ObjectUtils.isEmpty(vo)) {
+            LambdaQueryWrapper<SysFileRef> lw = new LambdaQueryWrapper();
             lw.eq(SysFileRef::getType, SysFileRefEnum.PLAN_TEMPORARY.getType());
-            lw.eq(SysFileRef::getRedId,vo.getPlanId());
+            lw.eq(SysFileRef::getRedId, vo.getPlanId());
             List<SysFileRef> list = sysFileRefService.list(lw);
-            if(!ObjectUtils.isEmpty(list)){
-                LambdaQueryWrapper<SysFileInfo> l =new LambdaQueryWrapper();
+            if (!ObjectUtils.isEmpty(list)) {
+                LambdaQueryWrapper<SysFileInfo> l = new LambdaQueryWrapper();
                 l.in(SysFileInfo::getFileId, list.stream().map(SysFileRef::getFileId).collect(Collectors.toList()));
                 vo.setFileList(sysFileService.list(l));
             }
+            Map<String, Object> stringObjectMap = iSysDeptService.selectDeptById(vo.getPurchaseDeptId());
+            if (!ObjectUtils.isEmpty(stringObjectMap)) {
+                SysDeptResponseVo sysDept = (SysDeptResponseVo) stringObjectMap.get("sysDept");
+                vo.setPurchaseDeptName(sysDept.getDeptName());
+            }
         }
 
         return success(vo);

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

@@ -41,6 +41,14 @@ public class PlanYearsController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation(value = "审核单位查询年度计划")
+    @PostMapping("/examineList")
+    public TableDataInfo examineList(@RequestBody PlanYearsStandardVo yearsStandardVo) {
+        startPage();
+        List<PlanYears> list = planYearsService.selectPlanYearsExamineList(yearsStandardVo);
+        return getDataTable(list);
+    }
+
     @ApiOperation(value = "创建年度计划")
     @PostMapping("/add")
     public AjaxResult add(@RequestBody PlanYearsStandardVo yearsStandardVo, HttpServletRequest request) {
@@ -89,6 +97,12 @@ public class PlanYearsController extends BaseController {
         return planYearsService.reviewReturn(yearsStandardVo);
     }
 
+    @ApiOperation(value = "申请修改年度计划")
+    @PostMapping("/appUpdate")
+    public AjaxResult appUpdate(@RequestBody PlanYearsStandardVo yearsStandardVo) {
+        return planYearsService.reviewReturn(yearsStandardVo);
+    }
+
     @ApiOperation(value = "导入年度计划数据")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {

purchase-admin/src/main/resources/application.yml

@@ -10,4 +10,4 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: druid,dev
+    active: druid,test

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

@@ -48,6 +48,7 @@ public class BaseEntity implements Serializable
 
     /** 备注 */
     @ApiModelProperty("备注")
+    @TableField(exist = false)
     private String remark;
 
     /** 请求参数 */

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

@@ -1,7 +1,11 @@
 package com.ozs.plan.doman;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.core.domain.BaseEntity;
 import com.ozs.system.domain.SysFileInfo;
@@ -26,7 +30,11 @@ public class MonthlyReconciliation extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /*实际完成采购时间是指采购执行管理中，点击填制中标信息，弹出框中，填写的中标时间
+    * 实际提报时间就是指采购需求管理中"提交"的时间*/
+
     /** 主键 */
+    @TableId(type = IdType.AUTO)
     private Long demandId;
 
     /** 计划ID */
@@ -34,9 +42,14 @@ public class MonthlyReconciliation extends BaseEntity
     private Long planId;
 
     /** 采购单位（登录账号的单位） */
-    @Excel(name = "采购单位", readConverterExp = "登=录账号的单位")
+    @Excel(name = "采购单位Id", readConverterExp = "登=录账号的单位")
     private Long purchaseDeptId;
 
+    /** 采购单位（登录账号的单位） */
+    @Excel(name = "采购单位", readConverterExp = "登=录账号的单位")
+    @TableField(exist = false)
+    private String purchaseDeptName;
+
     /** 项目名称 */
     @Excel(name = "项目名称")
     private String projectName;
@@ -129,5 +142,8 @@ public class MonthlyReconciliation extends BaseEntity
 
     /** 附件 */
     @Excel(name = "附件")
+    @TableField(exist = false)
     private List<SysFileInfo> fileList;
+
+
 }

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

@@ -24,8 +24,10 @@ public class PlanYears extends BaseEntity {
      * 采购单位（登录账号的单位）
      */
     @NotNull(message = "采购单位不能为空")
-    @Excel(name = "采购单位")
     private Long purchaseDeptId;
+
+    @Excel(name = "采购单位")
+    private String purchaseDeptName;
     /**
      * 项目名称
      */

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

@@ -23,6 +23,14 @@ public interface PlanYearsMapper {
      */
     public List<PlanYears> selectPlanYearsList(PlanYears planYears);
 
+    /**
+     * 查询年度计划记录集合(审核单位)
+     *
+     * @param planYears 年度计划请求对象
+     * @return 年度计划记录集合
+     */
+    public List<PlanYears> selectPlanYearsExamineList(PlanYears planYears);
+
     /**
      * 创建年度计划
      *

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

@@ -23,6 +23,14 @@ public interface PlanYearsService {
      */
     public List<PlanYears> selectPlanYearsList(PlanYearsStandardVo vo);
 
+    /**
+     * 查询年度计划记录集合
+     *
+     * @param vo 年度计划请求对象
+     * @return 年度计划记录集合
+     */
+    public List<PlanYears> selectPlanYearsExamineList(PlanYearsStandardVo vo);
+
     /**
      * 创建年度计划
      *
@@ -92,4 +100,12 @@ public interface PlanYearsService {
      * @return 结果
      */
     public AjaxResult reviewReturn(PlanYearsStandardVo yearsStandardVo);
+
+    /**
+     * 申请修改年度计划
+     *
+     * @param yearsStandardVo 需要审核的年度计划
+     * @return 结果
+     */
+    public AjaxResult appUpdate(PlanYearsStandardVo yearsStandardVo);
 }

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

@@ -8,12 +8,13 @@ import com.ozs.common.enums.ProjectTypes;
 import com.ozs.common.exception.ServiceException;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
-import com.ozs.common.utils.bean.BeanValidators;
 import com.ozs.plan.doman.PlanYears;
 import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
 import com.ozs.plan.doman.vo.responseVo.PlanYearsResponseVo;
 import com.ozs.plan.mapper.PlanYearsMapper;
 import com.ozs.plan.service.PlanYearsService;
+import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;
+import com.ozs.system.service.ISysDeptService;
 import com.ozs.system.service.ISysDictTypeService;
 import com.ozs.system.service.impl.SysUserServiceImpl;
 import org.slf4j.Logger;
@@ -42,6 +43,8 @@ public class PlanYearsServiceImpl implements PlanYearsService {
     protected Validator validator;
     @Autowired
     private ISysDictTypeService dictTypeService;
+    @Autowired
+    private ISysDeptService deptService;
 
     @Override
     public List<PlanYears> selectPlanYearsList(PlanYearsStandardVo vo) {
@@ -50,6 +53,27 @@ public class PlanYearsServiceImpl implements PlanYearsService {
         try {
             BeanUtils.copyProperties(vo, ofYears);
             planYears = planYearsMapper.selectPlanYearsList(ofYears);
+            for (PlanYears planYear : planYears) {
+                SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(planYear.getPurchaseDeptId()).get("sysDept");
+                planYear.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return planYears;
+    }
+
+    @Override
+    public List<PlanYears> selectPlanYearsExamineList(PlanYearsStandardVo vo) {
+        PlanYears ofYears = new PlanYears();
+        List<PlanYears> planYears = new ArrayList<>();
+        try {
+            BeanUtils.copyProperties(vo, ofYears);
+            planYears = planYearsMapper.selectPlanYearsExamineList(ofYears);
+            for (PlanYears planYear : planYears) {
+                SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(planYear.getPurchaseDeptId()).get("sysDept");
+                planYear.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -125,6 +149,7 @@ public class PlanYearsServiceImpl implements PlanYearsService {
         HashMap<String, String> planPurchaseModesMap = planEnums.get("PlanPurchaseModes");
         HashMap<String, String> projectAttributes = planEnums.get("ProjectAttributes");
         HashMap<String, String> purchaseServices = planEnums.get("purchaseServices");
+        //deptService.se
         int successNum = 0;
         int failureNum = 0;
         StringBuilder successMsg = new StringBuilder();
@@ -139,9 +164,17 @@ public class PlanYearsServiceImpl implements PlanYearsService {
                     ofYear.setProjectType(projectTypesMap.get(ofYear.getProjectType()));
                     ofYear.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
                     ofYear.setPurchaseMode(planPurchaseModesMap.get(ofYear.getPurchaseMode()));
-                    ofYear.setProjectAtt(projectAttributes.get(ofYear.getProjectAtt()));
+                    //项目属性是多选字段
+                    String[] split = ofYear.getProjectAtt().split("，");
+                    StringBuilder builder = new StringBuilder();
+                    if (split.length > 1) {
+                        for (String s : split) {
+                            builder.append(projectAttributes.get(s) + "，");
+                        }
+                    }
+                    ofYear.setProjectAtt(builder.toString());
                     ofYear.setPurchaseServices(purchaseServices.get(ofYear.getPurchaseServices()));
-                    ofYear.setCreateBy(String.valueOf(loginUser.getUserId()));
+                    ofYear.setCreated(String.valueOf(loginUser.getUserId()));
                     ofYear.setCreateTime(new Date());
                     //采购单位
                     planYearsMapper.insertPlanYears(ofYear);
@@ -150,7 +183,6 @@ public class PlanYearsServiceImpl implements PlanYearsService {
                     //} else if (isUpdateSupport) {
                     //    PlanYears years = plan.get(0);
                     //    BeanValidators.validateWithException(validator, ofYear);
-                    //    years.setCreateBy(operName);
                     //    years.setCreateTime(new Date());
                     //    years.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
                     //    planYearsMapper.updateById(years);
@@ -232,6 +264,19 @@ public class PlanYearsServiceImpl implements PlanYearsService {
         return AjaxResult.success();
     }
 
+    @Override
+    public AjaxResult appUpdate(PlanYearsStandardVo vo) {
+        PlanYears ofYears = new PlanYears();
+        BeanUtils.copyProperties(vo, ofYears);
+        //申请后会成为未提交的状态，可以进行修改
+        ofYears.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
+        int review = planYearsMapper.review(ofYears);
+        if (review != 1) {
+            return AjaxResult.error("项目状态数据异常");
+        }
+        return AjaxResult.success();
+    }
+
     //判断是否为超额计划
     public String isExcessOrNo(String projectType, BigDecimal evaluation) {
         BigDecimal threshold = new BigDecimal(0);

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,14 @@ package com.ozs.pm.service.impl;
 
 import java.util.*;
 
+import com.ozs.common.enums.ProjectTypes;
 import com.ozs.common.utils.DateUtils;
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -24,6 +25,14 @@ 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;
 
     /**
      * 查询采购需求
@@ -39,6 +48,44 @@ public class PmDemandServiceImpl implements IPmDemandService
             PmDemandResponseVo vo = new PmDemandResponseVo();
             BeanUtils.copyProperties(pmDemand, vo);
 
+            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/PlanYearsMapper.xml

@@ -75,6 +75,35 @@
 		order by create_time desc
 	</select>
 
+	<select id="selectPlanYearsExamineList" parameterType="com.ozs.plan.doman.PlanYears" resultMap="PlanYearsResult">
+		select * from plan_years
+		<where>
+			<if test="projectName != null and projectName != ''">
+				AND project_name like concat('%', #{projectName}, '%')
+			</if>
+			<if test="purchaseServices != null and purchaseServices != ''">
+				AND purchase_services = #{purchaseServices}
+			</if>
+			<if test="isExcess != null and isExcess != ''">
+				AND is_excess = #{isExcess}
+			</if>
+			<if test="projectStatus == null or projectStatus ==''">
+				AND project_status in (1,3)
+			</if>
+			<if test="projectStatus != null and projectStatus != ''">
+				AND project_status = #{projectStatus}
+			</if>
+			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+				and date_format(plan_demand_sub_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+			</if>
+			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+				and date_format(plan_demand_sub_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+			</if>
+			and del_flay=0
+		</where>
+		order by create_time desc
+	</select>
+
 	<select id="countProjectName" resultType="com.ozs.plan.doman.PlanYears" parameterType="java.lang.String">
 		select *
 		from plan_years

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>