新需求变更

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

@@ -52,6 +52,16 @@ public class PmBookBuilding implements Serializable {
     @TableField("DEMAND_COMMIT_TIME")
     private Date demandCommitTime;
 
+    /** 项目类型（0：装备类；1：物资类；2：服务类；3：工程类） */
+    @ApiModelProperty("项目类型（0：装备类；1：物资类；2：服务类；3：工程类）")
+    @TableField("PROJECT_TYPE")
+    private String projectType;
+
+    /** 采购方式  (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价) */
+    @ApiModelProperty("采购方式  (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)")
+    @TableField("PURCHASE_MODE")
+    private String purchaseMode;
+
     @ApiModelProperty("联系人")
     @TableField("CONTACTS")
     private String contacts;

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

@@ -58,8 +58,8 @@ public class PmDemand implements Serializable {
     @TableField("DEMAND_OVERVIEW")
     private String demandOverview;
 
-    /** 概算金额(万元（保留小数点后两位） */
-    @ApiModelProperty("概算金额(万元（保留小数点后两位）")
+    /** 预算金额(万元（保留小数点后两位） */
+    @ApiModelProperty("预算金额(万元（保留小数点后两位）")
     @TableField("EVALUATION")
     private Double evaluation;
 

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

@@ -40,6 +40,14 @@ public class PmBookBuildingReqVo
     @ApiModelProperty("需求提报时间")
     private Date demandCommitTime;
 
+    /** 项目类型（0：装备类；1：物资类；2：服务类；3：工程类） */
+    @ApiModelProperty("项目类型（0：装备类；1：物资类；2：服务类；3：工程类）")
+    private String projectType;
+
+    /** 采购方式  (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价) */
+    @ApiModelProperty("采购方式  (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)")
+    private String purchaseMode;
+
     @ApiModelProperty("联系人")
     private String contacts;
 

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

@@ -37,6 +37,13 @@ public class PmBookBuildingResVo
     @ApiModelProperty("需求提报时间")
     private Date demandCommitTime;
 
+    /** 项目类型（0：装备类；1：物资类；2：服务类；3：工程类） */
+    @ApiModelProperty("项目类型（0：装备类；1：物资类；2：服务类；3：工程类）")
+    private String projectType;
+
+    /** 采购方式  (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价) */
+    @ApiModelProperty("采购方式  (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)")
+    private String purchaseMode;
 
     @ApiModelProperty("联系人")
     private String contacts;

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

@@ -69,9 +69,9 @@ public class PmDemandResVo extends BaseEntity
     @ApiModelProperty("需求概况")
     private String demandOverview;
 
-    /** 概算金额(万元（保留小数点后两位） */
-    @Excel(name = "概算金额(万元 保留小数点后两位")
-    @ApiModelProperty("概算金额(万元（保留小数点后两位）")
+    /** 预算金额(万元（保留小数点后两位） */
+    @Excel(name = "预算金额(万元 保留小数点后两位")
+    @ApiModelProperty("预算金额(万元（保留小数点后两位）")
     private Double evaluation;
 
     /** 是否为超限额计划(0:未超额，1:超额) */

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

@@ -27,7 +27,9 @@ import com.ozs.common.utils.SecurityUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
 import com.ozs.home.domain.vo.HomeToDoQueryResVo;
+import com.ozs.plan.doman.ProvisionalPlan;
 import com.ozs.plan.doman.vo.responseVo.PlanQuarterResponseVo;
+import com.ozs.plan.mapper.ProvisionalPlanMapper;
 import com.ozs.plan.service.PlanYearsService;
 import com.ozs.pm.doman.*;
 
@@ -129,6 +131,8 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
     private SysProcurementStandardService sysProcurementStandardService;
     @Autowired
     private PmAuditDeptRefService pmAuditDeptRefService;
+    @Autowired
+    private ProvisionalPlanMapper provisionalPlanMapper;
 
     /**
      * 查询采购需求
@@ -147,6 +151,11 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
                 BeanUtils.copyProperties(pmDemand, vo);
 
+                //project_type,evaluation 从原来计划里取
+                ProvisionalPlan provisionalPlan = provisionalPlanMapper.seletById(pmDemand.getPlanId());
+                vo.setProjectType(provisionalPlan.getProjectType());
+                vo.setEvaluation(provisionalPlan.getEvaluation().doubleValue());
+
                 SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(vo.getPurchaseDeptId()).get("sysDept");
                 if (sysDeptResponseVo != null) {
                     vo.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
@@ -169,12 +178,11 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                 }
 
                 //项目类型
-                for (ProjectTypes value : ProjectTypes.values()) {
-                    if (vo.getProjectType() != null && vo.getProjectType().equals(value.getCode())) {
-                        vo.setProjectTypeName(value.getInfo());
-                        break;
-                    }
+                String projectTypeName = dictDataService.selectDictLabel("sys_project_typeAd", vo.getProjectType());
+                if (StringUtils.isNotEmpty(projectTypeName)) {
+                    vo.setProjectTypeName(projectTypeName);
                 }
+
                 //是否为超限额计划
                 for (IsExcess value : IsExcess.values()) {
                     if (vo.getIsExcess() != null && vo.getIsExcess().equals(value.getCode())) {
@@ -213,6 +221,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                     }
                 }
 
+
             } else if ("2".equals(detailType)) { //需求建档
 
                 //采购需求审核文件
@@ -524,10 +533,15 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             List<SysFileRef> sysFileRefs = vo.getSysFileRefs();
             uploadFile(pmBookBuilding.getId(), SysFileRefEnum.PM_BOOK_BUILDING.getType(), sysFileRefs, vo.getUpdateBy());
 
-            pmDemand.setProjectStatus(PmProjectStatus.DEMAND_WAIT_COMMIT.getCode());
-            pmDemand.setUpdateBy(vo.getUpdateBy());
-            pmDemand.setUpdateTime(DateUtils.getNowDate());
-            return this.updateById(pmDemand);
+            PmDemand pmDemandUpdate = new PmDemand();
+            pmDemandUpdate.setDemandId(pmDemand.getDemandId());
+            pmDemandUpdate.setProjectStatus(PmProjectStatus.DEMAND_WAIT_COMMIT.getCode());
+            pmDemandUpdate.setEvaluation(vo.getBudgetAmount());
+            pmDemandUpdate.setProjectType(vo.getProjectType());
+            pmDemandUpdate.setPurchaseMode(vo.getPurchaseMode());
+            pmDemandUpdate.setUpdateBy(vo.getUpdateBy());
+            pmDemandUpdate.setUpdateTime(DateUtils.getNowDate());
+            return this.updateById(pmDemandUpdate);
         } else {
             return false;
         }