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

purchase-admin/src/main/java/com/ozs/web/controller/pm/PmDemandController.java

@@ -71,16 +71,20 @@ public class PmDemandController extends BaseController {
     @ApiOperation(value = "需求建档", notes = "必传demandId,根据项目类型必传pmDemandEngineeringResponseVo(3：工程类)、pmDemandEquipResponseVo(0：装备类)、pmDemandMaterialsResponseVo(1：物资类)、pmDemandServeResponseVo(2：服务类)其中之一")
     @PostMapping("/bookBuilding")
     public AjaxResult bookBuilding(@RequestBody PmBookBuildingReqVo pmBookBuildingReqVo, HttpServletRequest request) {
-        if(pmBookBuildingReqVo.getDemandId() == null){
-            return AjaxResult.error("demandId不能为空");
-        }
-        PmDemand pmDemand = pmDemandService.getById(pmBookBuildingReqVo.getDemandId());
-        if(ObjectUtils.isEmpty(pmDemand)){
-            return error("demandId参数错误");
+        try {
+            if (pmBookBuildingReqVo.getDemandId() == null) {
+                return AjaxResult.error("demandId不能为空");
+            }
+            PmDemand pmDemand = pmDemandService.getById(pmBookBuildingReqVo.getDemandId());
+            if (ObjectUtils.isEmpty(pmDemand)) {
+                return error("demandId参数错误");
+            }
+            LoginUser loginUser = tokenService.getLoginUser(request);
+            pmBookBuildingReqVo.setUpdateBy(String.valueOf(loginUser.getUserId()));
+            return toAjax(pmDemandService.bookBuilding(pmBookBuildingReqVo));
+        } catch (Exception e) {
+            return error(e.getMessage());
         }
-        LoginUser loginUser = tokenService.getLoginUser(request);
-        pmBookBuildingReqVo.setUpdateBy(String.valueOf(loginUser.getUserId()));
-        return toAjax(pmDemandService.bookBuilding(pmBookBuildingReqVo));
     }
 
     @ApiOperation(value = "提交采购需求", notes = "必传demandId,其他字段不传")

purchase-admin/src/main/java/com/ozs/web/controller/pm/PmPurchaseExecutionController.java

@@ -17,12 +17,16 @@ import com.ozs.common.enums.PmProjectStatus;
 import com.ozs.common.enums.SysFileRefEnum;
 import com.ozs.common.utils.RandomUtil;
 import com.ozs.common.utils.StringUtils;
+import com.ozs.pm.doman.PmBidOpening;
 import com.ozs.pm.doman.PmBidWinning;
 import com.ozs.pm.doman.PmDemand;
+import com.ozs.pm.doman.PmDemandExpertRef;
 import com.ozs.pm.doman.vo.requestVo.*;
 import com.ozs.pm.doman.vo.responseVo.PmDemandResVo;
 import com.ozs.pm.service.IPmDemandService;
+import com.ozs.pm.service.PmBidOpeningService;
 import com.ozs.pm.service.PmBidWinningService;
+import com.ozs.pm.service.PmDemandExpertRefService;
 import com.ozs.system.domain.SysFileRef;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -54,8 +58,10 @@ public class PmPurchaseExecutionController extends BaseController {
     private BaseAgencyService baseAgencyService;
     @Autowired
     private BaseExpertService baseExpertService;
-
-
+    @Autowired
+    private PmDemandExpertRefService pmDemandExpertRefService;
+    @Autowired
+    private PmBidOpeningService pmBidOpeningService;
     /**
      * 采购执行查询列表
      */
@@ -302,7 +308,22 @@ public class PmPurchaseExecutionController extends BaseController {
         }
     }
 
-    @ApiOperation(value = "中标情况填制",notes = "采购需求ID必传")
+    /**
+     * 中标基本情况填制-开标信息下拉列表
+     */
+    @ApiOperation(value = "中标基本情况填制-开标信息下拉列表", notes = "必传选需求ID")
+    @PostMapping("/getPullDownBidOpeningList")
+    public AjaxResult getPullDownBidOpeningList(@NotEmpty(message = "需求ID不能为空")
+                                        @RequestParam(value = "demandId", required = true) Long demandId) {
+        LambdaQueryWrapper<PmBidOpening> pmBidOpeningLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        pmBidOpeningLambdaQueryWrapper.eq(PmBidOpening::getDemandId,demandId)
+                .orderByDesc(PmBidOpening::getScore)
+        ;
+        List<PmBidOpening> pmBidOpeningList = pmBidOpeningService.list(pmBidOpeningLambdaQueryWrapper);
+        return success(pmBidOpeningList);
+    }
+
+    @ApiOperation(value = "中标基本情况填制-中标情况填制提交",notes = "采购需求ID必传")
     @PostMapping("/insertPmBidWinning")
     public AjaxResult insertPmBidWinning(@NotEmpty(message = "数据为空")
                                                   @RequestBody PmBidWinningReqVo pmBidWinningReqVo) {
@@ -321,7 +342,7 @@ public class PmPurchaseExecutionController extends BaseController {
       }
     }
 
-    @ApiOperation(value = "更换中标人",notes = "采购需求ID必传")
+    @ApiOperation(value = "中标基本情况填制-更换中标人提交",notes = "采购需求ID必传")
     @PostMapping("/updatePmBidWinning")
     public AjaxResult updatePmBidWinning(@NotEmpty(message = "数据为空")
                                          @RequestBody PmBidWinningReqVo pmBidWinningReqVo) {
@@ -431,4 +452,48 @@ public class PmPurchaseExecutionController extends BaseController {
         }
         return success(pmDemandService.selectPmDemandByDemandId(pmDemandReqVo.getDemandId(),pmDemandReqVo.getDetailType()));
     }
+
+    /**
+     * 专家信息查看详情列表
+     */
+    @ApiOperation(value = "专家信息查看详情列表", notes = "必传需求ID和选取时间(yyyy-MM-dd)")
+    @PostMapping("/getBaseExpertList")
+    public AjaxResult getBaseExpertList(@NotEmpty(message = "需求ID不能为空")
+                                            @RequestParam(value = "demandId", required = true) Long demandId,
+                                         @NotEmpty(message = "选取时间不能为空")
+                                            @RequestParam(value = "accessTime", required = true) String accessTime) {
+        LambdaQueryWrapper<PmDemandExpertRef> pmDemandExpertRefLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        pmDemandExpertRefLambdaQueryWrapper.eq(PmDemandExpertRef::getDemandId,demandId);
+        pmDemandExpertRefLambdaQueryWrapper.eq(PmDemandExpertRef::getAccessTime,accessTime);
+        List<PmDemandExpertRef> pmDemandExpertRefList = pmDemandExpertRefService.list(pmDemandExpertRefLambdaQueryWrapper);
+        List<BaseExpert> list = new ArrayList<>();
+        if(!ObjectUtils.isEmpty(pmDemandExpertRefList)) {
+            for(PmDemandExpertRef pmDemandExpertRef : pmDemandExpertRefList) {
+                BaseExpert baseExpert = baseExpertService.getById(pmDemandExpertRef.getExpertId());
+                if(baseExpert != null){
+                    list.add(baseExpert);
+                }
+            }
+        }
+
+        return success(list);
+    }
+
+  /**
+     * 开标信息查看详情列表
+     */
+    @ApiOperation(value = "开标信息查看详情列表", notes = "必传选需求ID和开标时间(yyyy-MM-dd)")
+    @PostMapping("/getBidOpeningList")
+    public AjaxResult getBidOpeningList(@NotEmpty(message = "需求ID不能为空")
+                                        @RequestParam(value = "demandId", required = true) Long demandId,
+                                        @NotEmpty(message = "开标时间不能为空")
+                                        @RequestParam(value = "openBidTime", required = true) String openBidTime) {
+        LambdaQueryWrapper<PmBidOpening> pmBidOpeningLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        pmBidOpeningLambdaQueryWrapper.eq(PmBidOpening::getDemandId,demandId)
+        .eq(PmBidOpening::getOpenBidTime,openBidTime).orderByDesc(PmBidOpening::getScore)
+        ;
+        List<PmBidOpening> pmBidOpeningList = pmBidOpeningService.list(pmBidOpeningLambdaQueryWrapper);
+        return success(pmBidOpeningList);
+    }
+
 }

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

@@ -9,6 +9,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.joda.time.DateTime;
 
+import java.util.Date;
+
 @Data
 @TableName("base_expert")
 public class BaseExpert extends BaseDto {
@@ -111,4 +113,32 @@ public class BaseExpert extends BaseDto {
     @ApiModelProperty(value = "身份证号")
     @TableField("id_number")
     private String idNumber;
+
+    /**
+     * 创建人
+     */
+    @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 Date updateTime;
 }

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

@@ -23,7 +23,7 @@ public class BaseSupplier {
     private Integer id;
 
     @NotBlank(message = "供应商名称不能为空")
-    @ApiModelProperty(value = "供应商名称不能为空")
+    @ApiModelProperty(value = "供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 

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

@@ -102,4 +102,28 @@ public class BaseExpertVo extends PageVo {
      */
     @ApiModelProperty(value = "身份证号")
     private String idNumber;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String created;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updated;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
 }

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

@@ -10,6 +10,7 @@ import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.core.domain.entity.SysDictData;
 import com.ozs.common.core.domain.model.LoginUser;
+import com.ozs.common.enums.PmProjectStatus;
 import com.ozs.common.enums.ProjectStatus;
 import com.ozs.common.enums.ProjectTypes;
 import com.ozs.common.enums.SysFileRefEnum;
@@ -24,6 +25,8 @@ import com.ozs.plan.doman.vo.requestVo.ProvisionalPlanVo;
 import com.ozs.plan.mapper.PlanYearsMapper;
 import com.ozs.plan.mapper.ProvisionalPlanMapper;
 import com.ozs.plan.service.ProvisionalPlanService;
+import com.ozs.pm.doman.PmDemand;
+import com.ozs.pm.mapper.PmDemandMapper;
 import com.ozs.system.domain.SysFileInfo;
 import com.ozs.system.domain.SysFileRef;
 import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;
@@ -56,6 +59,8 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
     private SysFileRefMapper sysFileRefMapper;
     @Autowired
     private SysFileService fileService;
+    @Autowired
+    private PmDemandMapper pmDemandMapper;
 
     @Override
     public int deleteProvisionalPlanById(Integer planYearId) {
@@ -226,11 +231,30 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
         ProvisionalPlan byId = provisionalPlanMapper.seletById(provisionalPlanVo.getPlanPracticalId());
         if (ObjectUtils.isEmpty(byId.getPlanYearId())) {
             PlanYears ofYears = new PlanYears();
-            BeanUtils.copyProperties(provisionalPlanVo, ofYears);
+            BeanUtils.copyProperties(byId, ofYears);
             planYearsMapper.insertPlanYears(ofYears);
             Long planYearId = ofYears.getPlanYearId();
             byId.setPlanYearId(ofYears.getPlanYearId().intValue());
         }
+        PmDemand demand = new PmDemand();
+        BeanUtils.copyProperties(byId, demand);
+        demand.setPlanId(Long.valueOf(byId.getPlanPracticalId()));
+        //同步到项目管理状态为需求待填制
+        demand.setProjectStatus(Long.valueOf(PmProjectStatus.DEMAND_WAIT_FILL.getCode()));
+        demand.setCreateTime(new Date());
+        pmDemandMapper.insert(demand);
+        //计划附件也进行同步---查询年度计划附件后复制一份改为项目需求附件
+        LambdaQueryWrapper<SysFileRef> sysFileRefLp = new LambdaQueryWrapper<>();
+        sysFileRefLp.eq(SysFileRef::getType, SysFileRefEnum.PLAN_YEAR.getType());
+        sysFileRefLp.eq(SysFileRef::getRedId, byId.getPlanYearId());
+        List<SysFileRef> sysFileRefs = sysFileRefMapper.selectList(sysFileRefLp);
+        if (!ObjectUtils.isEmpty(sysFileRefs)) {
+            for (SysFileRef ref : sysFileRefs) {
+                ref.setRedId(demand.getDemandId());
+                ref.setType(SysFileRefEnum.PM_DEMAND.getType());
+                sysFileRefMapper.insert(ref);
+            }
+        }
         byId.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
         return review(provisionalPlanVo, byId);
     }

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

@@ -1,7 +1,7 @@
 package com.ozs.pm.doman;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
+
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -60,7 +60,7 @@ public class PmDemand implements Serializable {
     /** 概算金额(万元（保留小数点后两位） */
     @ApiModelProperty("概算金额(万元（保留小数点后两位）")
     @TableField("EVALUATION")
-    private BigDecimal evaluation;
+    private Double evaluation;
 
     /** 是否为超限额计划(0:未超额，1:超额) */
     @ApiModelProperty("是否为超限额计划(0:未超额，1:超额)")

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

@@ -60,7 +60,7 @@ public class PmDemandEngineering implements Serializable {
 
     @ApiModelProperty("工程建设计划文号")
     @TableField("PROJECT_CONSTRUCTION_PLAN_NUMBER")
-    private Double projectConstructionPlanNumber;
+    private String projectConstructionPlanNumber;
 
 
     @ApiModelProperty("任务书批复规模(㎡)")

purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmBidWinningReqVo.java

@@ -59,9 +59,9 @@ public class PmBidWinningReqVo implements Serializable {
     private Date updateTime;
 
     /**
-     * 中标单位信息列表
+     * 中标单位信息ID列表
      */
-    @ApiModelProperty("中标单位信息列表")
+    @ApiModelProperty("中标单位信息ID列表")
     private List<Long> pmBidOpeningIdList;
 
     /**

purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmDemandEngineeringReqVo.java

@@ -10,7 +10,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
+
 import java.util.List;
 
 /**
@@ -54,12 +54,12 @@ public class PmDemandEngineeringReqVo extends BaseEntity
     /** 工程建设计划文号 */
     @Excel(name = "工程建设计划文号")
     @ApiModelProperty("工程建设计划文号")
-    private BigDecimal projectConstructionPlanNumber;
+    private String projectConstructionPlanNumber;
 
     /** 任务书批复规模(㎡)*/
     @Excel(name = "任务书批复规模(㎡)")
     @ApiModelProperty("任务书批复规模(㎡)")
-    private BigDecimal tassignmentApprovalScale;
+    private Double tassignmentApprovalScale;
 
     /** 任务书批复投资 */
     @Excel(name = "任务书批复投资")
@@ -79,12 +79,12 @@ public class PmDemandEngineeringReqVo extends BaseEntity
     /** 采购项目规模(㎡) */
     @Excel(name = "采购项目规模(㎡)")
     @ApiModelProperty("采购项目规模(㎡)")
-    private BigDecimal procurementProjectScale;
+    private Double procurementProjectScale;
 
     /** 采购项目投资(万元) */
     @Excel(name = "采购项目投资(万元)")
     @ApiModelProperty("采购项目投资(万元)")
-    private BigDecimal procurementProjectInvestment;
+    private Double procurementProjectInvestment;
 
     /** 联系人 */
     @Excel(name = "联系人")
@@ -135,7 +135,7 @@ public class PmDemandEngineeringReqVo extends BaseEntity
     /** 最高限价 */
     @Excel(name = "最高限价")
     @ApiModelProperty("最高限价")
-    private BigDecimal ceilingPrice;
+    private Double ceilingPrice;
 
     /** 采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源） */
     @Excel(name = "采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")

purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmDemandEquipReqVo.java

@@ -11,7 +11,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
+
 import java.util.Date;
 import java.util.List;
 
@@ -61,17 +61,17 @@ public class PmDemandEquipReqVo extends BaseEntity
     /** 采购数量 */
     @Excel(name = "采购数量")
     @ApiModelProperty("采购数量")
-    private BigDecimal procurementQuantity;
+    private Double procurementQuantity;
 
     /** 单价(元) */
     @Excel(name = "单价(元)")
     @ApiModelProperty("单价(元)")
-    private BigDecimal price;
+    private Double price;
 
     /** 预算金额(万元) */
     @Excel(name = "预算金额(万元)")
     @ApiModelProperty("预算金额(万元)")
-    private BigDecimal budgetAmount;
+    private Double budgetAmount;
 
     /** 需求提报时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")

purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmDemandMaterialsReqVo.java

@@ -11,7 +11,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
+
 import java.util.Date;
 import java.util.List;
 
@@ -74,21 +74,21 @@ public class PmDemandMaterialsReqVo extends BaseEntity {
      */
     @Excel(name = "采购数量")
     @ApiModelProperty("采购数量")
-    private BigDecimal procurementQuantity;
+    private Double procurementQuantity;
 
     /**
      * 单价(元)
      */
     @Excel(name = "单价(元)")
     @ApiModelProperty("单价(元)")
-    private BigDecimal price;
+    private Double price;
 
     /**
      * 预算金额(万元)
      */
     @Excel(name = "预算金额(万元)")
     @ApiModelProperty("预算金额(万元)")
-    private BigDecimal budgetAmount;
+    private Double budgetAmount;
 
     /**
      * 需求提报时间
@@ -120,6 +120,6 @@ public class PmDemandMaterialsReqVo extends BaseEntity {
     /**
      * 上传附件
      */
-    @ApiModelProperty("上传附件")
+    @ApiModelProperty("上传附件列表")
     private List<SysFileRef> sysFileRefs;
 }

purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmDemandServeReqVo.java

@@ -10,7 +10,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
+
 import java.util.List;
 
 /**
@@ -54,17 +54,17 @@ public class PmDemandServeReqVo extends BaseEntity
     /** 采购数量 */
     @Excel(name = "采购数量")
     @ApiModelProperty("采购数量")
-    private BigDecimal procurementQuantity;
+    private Double procurementQuantity;
 
     /** 单价(元) */
     @Excel(name = "单价(元)")
     @ApiModelProperty("单价(元)")
-    private BigDecimal price;
+    private Double price;
 
     /** 预算金额(万元) */
     @Excel(name = "预算金额(万元)")
     @ApiModelProperty("预算金额(万元)")
-    private BigDecimal budgetAmount;
+    private Double budgetAmount;
 
     /** 交货期限 */
     @Excel(name = "交货期限")

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

@@ -9,7 +9,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
+
 import java.util.HashMap;
 
 /**
@@ -28,6 +28,7 @@ public class PmDemandEngineeringResVo extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 主键 */
+    @ApiModelProperty("主键")
     private Long demandEngineeringId;
 
     /** 需求ID */
@@ -53,12 +54,12 @@ public class PmDemandEngineeringResVo extends BaseEntity
     /** 工程建设计划文号 */
     @Excel(name = "工程建设计划文号")
     @ApiModelProperty("工程建设计划文号")
-    private BigDecimal projectConstructionPlanNumber;
+    private String projectConstructionPlanNumber;
 
     /** 任务书批复规模(㎡)*/
     @Excel(name = "任务书批复规模(㎡)")
     @ApiModelProperty("任务书批复规模(㎡)")
-    private BigDecimal tassignmentApprovalScale;
+    private Double tassignmentApprovalScale;
 
     /** 任务书批复投资 */
     @Excel(name = "任务书批复投资")
@@ -78,12 +79,12 @@ public class PmDemandEngineeringResVo extends BaseEntity
     /** 采购项目规模(㎡) */
     @Excel(name = "采购项目规模(㎡)")
     @ApiModelProperty("采购项目规模(㎡)")
-    private BigDecimal procurementProjectScale;
+    private Double procurementProjectScale;
 
     /** 采购项目投资(万元) */
     @Excel(name = "采购项目投资(万元)")
     @ApiModelProperty("采购项目投资(万元)")
-    private BigDecimal procurementProjectInvestment;
+    private Double procurementProjectInvestment;
 
     /** 联系人 */
     @Excel(name = "联系人")
@@ -134,7 +135,7 @@ public class PmDemandEngineeringResVo extends BaseEntity
     /** 最高限价 */
     @Excel(name = "最高限价")
     @ApiModelProperty("最高限价")
-    private BigDecimal ceilingPrice;
+    private Double ceilingPrice;
 
     /** 采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源） */
     @Excel(name = "采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")

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

@@ -10,7 +10,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
+
 import java.util.Date;
 import java.util.HashMap;
 
@@ -30,6 +30,7 @@ public class PmDemandEquipResVo extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 主键 */
+    @ApiModelProperty("主键")
     private Long demandEquipId;
 
     /** 需求ID */
@@ -60,17 +61,17 @@ public class PmDemandEquipResVo extends BaseEntity
     /** 采购数量 */
     @Excel(name = "采购数量")
     @ApiModelProperty("采购数量")
-    private BigDecimal procurementQuantity;
+    private Double procurementQuantity;
 
     /** 单价(元) */
     @Excel(name = "单价(元)")
     @ApiModelProperty("单价(元)")
-    private BigDecimal price;
+    private Double price;
 
     /** 预算金额(万元) */
     @Excel(name = "预算金额(万元)")
     @ApiModelProperty("预算金额(万元)")
-    private BigDecimal budgetAmount;
+    private Double budgetAmount;
 
     /** 需求提报时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")

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

@@ -10,7 +10,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
+
 import java.util.Date;
 import java.util.HashMap;
 
@@ -31,6 +31,7 @@ public class PmDemandMaterialsResVo extends BaseEntity {
     /**
      * 主键
      */
+    @ApiModelProperty("主键")
     private Long demandMaterialsId;
 
     /**
@@ -73,21 +74,21 @@ public class PmDemandMaterialsResVo extends BaseEntity {
      */
     @Excel(name = "采购数量")
     @ApiModelProperty("采购数量")
-    private BigDecimal procurementQuantity;
+    private Double procurementQuantity;
 
     /**
      * 单价(元)
      */
     @Excel(name = "单价(元)")
     @ApiModelProperty("单价(元)")
-    private BigDecimal price;
+    private Double price;
 
     /**
      * 预算金额(万元)
      */
     @Excel(name = "预算金额(万元)")
     @ApiModelProperty("预算金额(万元)")
-    private BigDecimal budgetAmount;
+    private Double budgetAmount;
 
     /**
      * 需求提报时间

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

@@ -10,7 +10,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
+
 import java.util.Date;
 import java.util.HashMap;
 
@@ -30,6 +30,7 @@ public class PmDemandResVo extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 主键 */
+    @ApiModelProperty("主键")
     private Long demandId;
 
     /** 计划ID */
@@ -70,7 +71,7 @@ public class PmDemandResVo extends BaseEntity
     /** 概算金额(万元（保留小数点后两位） */
     @Excel(name = "概算金额(万元 保留小数点后两位")
     @ApiModelProperty("概算金额(万元（保留小数点后两位）")
-    private BigDecimal evaluation;
+    private Double evaluation;
 
     /** 是否为超限额计划(0:未超额，1:超额) */
     @Excel(name = "是否为超限额计划(0:未超额，1:超额)")

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

@@ -9,7 +9,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
+
 import java.util.HashMap;
 
 /**
@@ -28,6 +28,7 @@ public class PmDemandServeResVo extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 主键 */
+    @ApiModelProperty("主键")
     private Long demandServeId;
 
     /** 需求ID */
@@ -53,17 +54,17 @@ public class PmDemandServeResVo extends BaseEntity
     /** 采购数量 */
     @Excel(name = "采购数量")
     @ApiModelProperty("采购数量")
-    private BigDecimal procurementQuantity;
+    private Double procurementQuantity;
 
     /** 单价(元) */
     @Excel(name = "单价(元)")
     @ApiModelProperty("单价(元)")
-    private BigDecimal price;
+    private Double price;
 
     /** 预算金额(万元) */
     @Excel(name = "预算金额(万元)")
     @ApiModelProperty("预算金额(万元)")
-    private BigDecimal budgetAmount;
+    private Double budgetAmount;
 
     /** 交货期限 */
     @Excel(name = "交货期限")

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

@@ -27,6 +27,7 @@ public class PmReleaseAnnouncementResVo implements Serializable {
     private static final long serialVersionUID = 403614463746791218L;
 
     @TableId(value = "ID", type = IdType.AUTO)
+    @ApiModelProperty("主键")
     private Long id;
 
 

purchase-system/src/main/java/com/ozs/pm/mapper/PmDemandMapper.java

@@ -17,37 +17,6 @@ import java.util.List;
  */
 public interface PmDemandMapper extends BaseMapper<PmDemand>
 {
-    /**
-     * 查询采购需求
-     * 
-     * @param demandId 采购需求主键
-     * @return 采购需求
-     */
-    public PmDemand selectPmDemandByDemandId(Long demandId);
-
-    /**
-     * 查询采购需求列表
-     * 
-     * @param pmDemand 采购需求
-     * @return 采购需求集合
-     */
-    public List<PmDemand> selectPmDemandList(PmDemand pmDemand);
-
-    /**
-     * 新增采购需求
-     * 
-     * @param pmDemand 采购需求
-     * @return 结果
-     */
-    public int insertPmDemand(PmDemand pmDemand);
-
-    /**
-     * 修改采购需求
-     * 
-     * @param pmDemand 采购需求
-     * @return 结果
-     */
-    public int updatePmDemand(PmDemand pmDemand);
 
     /**
      * 通过需求ID列表，查询采购执行列表 sunhh

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

@@ -45,7 +45,7 @@ public interface IPmDemandService extends IService<PmDemand>
      * @param pmBookBuildingReqVo 需求建档
      * @return 结果
      */
-    boolean bookBuilding(PmBookBuildingReqVo pmBookBuildingReqVo);
+    boolean bookBuilding(PmBookBuildingReqVo pmBookBuildingReqVo) throws Exception;
 
     /**
      * 查看流程图

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

@@ -94,8 +94,6 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
     @Autowired
     private PmProjectConstructionService pmProjectConstructionService;
-    @Autowired
-    private PmDemandMapper demandMapper;
 
     @Autowired
     private BaseNoticeTypeService baseNoticeTypeService;
@@ -519,12 +517,14 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean bookBuilding(PmBookBuildingReqVo vo) {
+    public boolean bookBuilding(PmBookBuildingReqVo vo) throws Exception {
         PmDemand pmDemand = this.getById(vo.getDemandId());
         String projectType = pmDemand.getProjectType();
         if(ProjectTypes.EQUIPMENTTYPE.getCode().equals(projectType)){ //装备类
             PmDemandEquipReqVo pmDemandEquipReqVo =  vo.getPmDemandEquipReqVo();
-
+            if(ObjectUtils.isEmpty(pmDemandEquipReqVo)){
+                throw new Exception("该需求是装备类的，pmDemandEquipReqVo不能为空");
+            }
             LambdaQueryWrapper<PmDemandEquip> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(PmDemandEquip::getDemandId,vo.getDemandId());
             PmDemandEquip pmDemandEquip = iPmDemandEquipService.getOne(lambdaQueryWrapper);
@@ -550,7 +550,9 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
         } else if(ProjectTypes.MATERIALTYPE.getCode().equals(projectType)) { //物资类
             PmDemandMaterialsReqVo pmDemandMaterialsReqVo =  vo.getPmDemandMaterialsReqVo();
-
+            if(ObjectUtils.isEmpty(pmDemandMaterialsReqVo)){
+                throw new Exception("该需求是物资类的，pmDemandMaterialsReqVo不能为空");
+            }
             LambdaQueryWrapper<PmDemandMaterials> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(PmDemandMaterials::getDemandId,vo.getDemandId());
             PmDemandMaterials pmDemandMaterials = iPmDemandMaterialsService.getOne(lambdaQueryWrapper);
@@ -576,7 +578,9 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
         } else if(ProjectTypes.SERVICESTYPE.getCode().equals(projectType)) { //服务类
             PmDemandServeReqVo pmDemandServeReqVo =  vo.getPmDemandServeReqVo();
-
+            if(ObjectUtils.isEmpty(pmDemandServeReqVo)){
+                throw new Exception("该需求是服务类的，pmDemandServeReqVo不能为空");
+            }
             LambdaQueryWrapper<PmDemandServe> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(PmDemandServe::getDemandId,vo.getDemandId());
             PmDemandServe pmDemandServe = iPmDemandServeService.getOne(lambdaQueryWrapper);
@@ -601,7 +605,9 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
         } else if(ProjectTypes.PLANTOEXAMINETYPE.getCode().equals(projectType)) { //工程类
             PmDemandEngineeringReqVo pmDemandEngineeringReqVo =  vo.getPmDemandEngineeringReqVo();
-
+            if(ObjectUtils.isEmpty(pmDemandEngineeringReqVo)){
+                throw new Exception("该需求是工程类的，pmDemandEngineeringReqVo不能为空");
+            }
             LambdaQueryWrapper<PmDemandEngineering> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(PmDemandEngineering::getDemandId,vo.getDemandId());
             PmDemandEngineering pmDemandEngineering = iPmDemandEngineeringService.getOne(lambdaQueryWrapper);
@@ -1550,7 +1556,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
     public AjaxResult getListByStatus(String projectStatus) {
         LambdaQueryWrapper<PmDemand> lw = new LambdaQueryWrapper<PmDemand>();
         lw.eq(PmDemand::getProjectStatus, projectStatus);
-        List<PmDemand> demandList = demandMapper.selectList(lw);
+        List<PmDemand> demandList = this.baseMapper.selectList(lw);
         //数据转换
         List<PmDemandResVo> pmDemandResponseVoList = new ArrayList<>();
         if (!ObjectUtils.isEmpty(demandList) && demandList.size() > 0) {

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

@@ -188,10 +188,10 @@
         update plan_practical
         <set>
             <if test="refuseReason != null and refuseReason != ''">
-                refuse_reason=#{refuseReason},
+                refuse_reason = #{refuseReason},
             </if>
             <if test="projectStatus != null and projectStatus != ''">
-                project_status=#{projectStatus}
+                project_status = #{projectStatus}
             </if>
         </set>
         where plan_practical_id = #{planPracticalId}