新需求变更

purchase-common/src/main/java/com/ozs/common/constant/Constants.java

@@ -157,6 +157,9 @@ public class Constants {
     // 項目类型(审核)
     public static final String SYS_PROJECT_TYPE = "sys_project_type";
 
+    // 预算科目
+    public static final String SYS_BUDGET_ACCOUNT = "budget_account";
+
     // 采购服务站
     public static final String PURCHASE_SERVICES = "purchase_services";
 

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

@@ -74,13 +74,15 @@ public class PlanQuarter {
     private String purchaseServices;
     @TableField(exist = false)
     private String purchaseServicesStr;
-    ///**
-    // * 采购方式 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)
-    // */
-    //@NotNull(message = "采购方式不能为空")
-    //private String purchaseMode;
-    //@TableField(exist = false)
-    //private String purchaseModeStr;
+    /**
+     * 机关业务指导处(科)
+     */
+    private String organDivision;
+    /**
+     * 预算科目
+     */
+    private String budgetAccount;
+
     /**
      * 计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）
      */

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

@@ -54,11 +54,7 @@ public class PlanYears {
      */
     @NotNull(message = "概算金额不能为空")
     private BigDecimal evaluation;
-    /**
-     * 是否为超限额计划(0:未超额，1:超额)
-     */
-    @NotNull(message = "是否为超限额计划不能为空")
-    private String isExcess;
+
     /**
      * 采购服务站
      */
@@ -66,13 +62,15 @@ public class PlanYears {
     private String purchaseServices;
     @TableField(exist = false)
     private String purchaseServicesStr;
-    ///**
-    // * 采购方式 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)
-    // */
-    //@NotNull(message = "采购方式不能为空")
-    //private String purchaseMode;
-    //@TableField(exist = false)
-    //private String purchaseModeStr;
+    /**
+     * 机关业务指导处(科)
+     */
+    private String organDivision;
+    /**
+     * 预算科目
+     */
+    private String budgetAccount;
+
     /**
      * 计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）
      */

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

@@ -64,12 +64,6 @@ public class PlanQuarterStandardVo extends PageVo {
     @ApiModelProperty(value = "概算金额")
     private BigDecimal evaluation;
 
-    ///**
-    // * 是否为超限额计划(0:未超额，1:超额)
-    // */
-    //@ApiModelProperty(value = "是否为超限额计划(0:未超额，1:超额)")
-    //private String isExcess;
-
     /**
      * 采购服务站
      */
@@ -77,13 +71,14 @@ public class PlanQuarterStandardVo extends PageVo {
     @ApiModelProperty(value = "采购服务站")
     private String purchaseServices;
 
-    ///**
-    // * 采购方式 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)
-    // */
-    //@Excel(name = "采购方式")
-    //@ApiModelProperty(value = "采购方式 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)")
-    //private String purchaseMode;
-
+    /**
+     * 机关业务指导处(科)
+     */
+    private String organDivision;
+    /**
+     * 预算科目
+     */
+    private String budgetAccount;
     /**
      * 计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）
      */

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

@@ -60,12 +60,6 @@ public class PlanYearsStandardVo extends PageVo {
     @ApiModelProperty(value = "概算金额")
     private BigDecimal evaluation;
 
-    ///**
-    // * 是否为超限额计划(0:未超额，1:超额)
-    // */
-    //@ApiModelProperty(value = "是否为超限额计划(0:未超额，1:超额)")
-    //private String isExcess;
-
     /**
      * 采购服务站
      */
@@ -73,12 +67,14 @@ public class PlanYearsStandardVo extends PageVo {
     @ApiModelProperty(value = "采购服务站")
     private String purchaseServices;
 
-    ///**
-    // * 采购方式 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)
-    // */
-    //@Excel(name = "采购方式")
-    //@ApiModelProperty(value = "采购方式 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)")
-    //private String purchaseMode;
+    /**
+     * 机关业务指导处(科)
+     */
+    private String organDivision;
+    /**
+     * 预算科目
+     */
+    private String budgetAccount;
 
     /**
      * 计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）

purchase-system/src/main/java/com/ozs/plan/doman/vo/responseVo/PlanQuarterResponseVo.java

@@ -53,22 +53,20 @@ public class PlanQuarterResponseVo implements Serializable {
      */
     @Excel(name = "概算金额（万元）")
     private BigDecimal evaluation;
-    ///**
-    // * 是否为超限额计划(0:未超额，1:超额)
-    // */
-    //private String isExcess;
     /**
      * 采购服务站
      */
     @Excel(name = "采购服务站")
     private String purchaseServices;
     private String purchaseServicesStr;
-    ///**
-    // * 采购方式 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)
-    // */
-    //private String purchaseMode;
-    //@Excel(name = "采购方式")
-    //private String purchaseModeStr;
+    /**
+     * 机关业务指导处(科)
+     */
+    private String organDivision;
+    /**
+     * 预算科目
+     */
+    private String budgetAccount;
     /**
      * 计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）
      */

purchase-system/src/main/java/com/ozs/plan/doman/vo/responseVo/PlanYearsResponseVo.java

@@ -52,10 +52,6 @@ public class PlanYearsResponseVo implements Serializable {
      */
     @Excel(name = "概算金额（万元）")
     private BigDecimal evaluation;
-    ///**
-    // * 是否为超限额计划(0:未超额，1:超额)
-    // */
-    //private String isExcess;
     /**
      * 采购服务站
      */
@@ -63,12 +59,14 @@ public class PlanYearsResponseVo implements Serializable {
     private String purchaseServices;
 
     private String purchaseServicesStr;
-    ///**
-    // * 采购方式 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)
-    // */
-    //private String purchaseMode;
-    //@Excel(name = "采购方式")
-    //private String purchaseModeStr;
+    /**
+     * 机关业务指导处(科)
+     */
+    private String organDivision;
+    /**
+     * 预算科目
+     */
+    private String budgetAccount;
     /**
      * 计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）
      */

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

@@ -272,7 +272,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
             e.printStackTrace();
         }
         quarters.setUpdateTime(now);
-        planQuarterMapper.updateInfoById(quarters);
+        planQuarterMapper.updateById(quarters);
         List<SysFileRef> sysFileRefs = quarterStandardVo.getSysFileRefs();
         if (!ObjectUtils.isEmpty(sysFileRefs)) {
             // 删关联

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

@@ -225,7 +225,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             e.printStackTrace();
         }
         //判断是否为超额计划
-        ofYears.setIsExcess(deptService.isExcessOrNo(ofYears.getProjectType(), ofYears.getEvaluation(), Long.valueOf(ofYears.getPurchaseDeptId())));
         ofYears.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
         ofYears.setCreateTime(new Date());
         planYearsMapper.insertPlanYears(ofYears);
@@ -297,7 +296,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             e.printStackTrace();
         }
         ofYears.setUpdateTime(new Date());
-        planYearsMapper.updateInfoById(ofYears);
+        planYearsMapper.updateById(ofYears);
         List<SysFileRef> sysFileRefs = yearsStandardVo.getSysFileRefs();
         if (!ObjectUtils.isEmpty(sysFileRefs)) {
             // 删关联

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

@@ -212,6 +212,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
         HashMap<String, String> projectTypesAdMap = new LinkedHashMap<>();
         HashMap<String, String> projectStatusMap = new LinkedHashMap<>();
         HashMap<String, String> projectAttributes = new LinkedHashMap<>();
+        HashMap<String, String> budgetAccountMap = new LinkedHashMap<>();
 
         //项目审核状态
         for (ProjectStatus value : ProjectStatus.values()) {
@@ -222,21 +223,27 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
         for (SysDictData dictData : data1) {
             projectAttributes.put(dictData.getDictLabel(), dictData.getDictValue());
         }
+        //项目类型(计划添加)
+        List<SysDictData> data3 = dictDataMapper.selectDictDataByType(Constants.SYS_PROJECT_TYPE_AD);
+        for (SysDictData dictData : data3) {
+            projectTypesAdMap.put(dictData.getDictLabel(), dictData.getDictValue());
+        }
         //项目类型(计划审核)
         List<SysDictData> data2 = dictDataMapper.selectDictDataByType(Constants.SYS_PROJECT_TYPE);
         for (SysDictData dictData : data2) {
             projectTypesMap.put(dictData.getDictLabel(), dictData.getDictValue());
         }
-        //项目类型(计划添加)
-        List<SysDictData> data3 = dictDataMapper.selectDictDataByType(Constants.SYS_PROJECT_TYPE_AD);
-        for (SysDictData dictData : data2) {
-            projectTypesAdMap.put(dictData.getDictLabel(), dictData.getDictValue());
+        //预算科目
+        List<SysDictData> data4 = dictDataMapper.selectDictDataByType(Constants.SYS_BUDGET_ACCOUNT);
+        for (SysDictData dictData : data4) {
+            budgetAccountMap.put(dictData.getDictLabel(), dictData.getDictValue());
         }
 
         hashMap.put("projectTypes", projectTypesMap);
         hashMap.put("projectTypesAds", projectTypesAdMap);
         hashMap.put("projectStatus", projectStatusMap);
         hashMap.put("projectAttributes", projectAttributes);
+        hashMap.put("budgetAccount", budgetAccountMap);
         return hashMap;
     }
 }

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

@@ -177,13 +177,15 @@
             keyProperty="planPracticalId">
         insert into plan_practical (purchase_dept_id, plan_year_id, project_name, project_type, demand_overview,
                                     evaluation,
-                                    purchase_services, plan_demand_sub_time, plan_purchase_finish_time,
+                                    purchase_services, organ_division, budget_account, plan_demand_sub_time,
+                                    plan_purchase_finish_time,
                                     plan_deliver_time, project_attr, adjust_reason, remarks, project_status,
                                     created, create_time, del_flay, plan_type, send_letter)
         values (#{purchaseDeptId}, #{planYearId}, #{projectName}, #{projectType}, #{demandOverview}, #{evaluation},
-                #{purchaseServices}, #{planDemandSubTime}, #{planPurchaseFinishTime},
-                #{planDeliverTime},
-                #{projectAttr}, #{adjustReason}, #{remarks}, #{projectStatus}, #{created}, #{createTime}, 0, 0, 0)
+                #{purchaseServices}, #{organDivision}, #{budgetAccount}, #{planDemandSubTime},
+                #{planPurchaseFinishTime},
+                #{planDeliverTime}, #{projectAttr}, #{adjustReason}, #{remarks}, #{projectStatus},
+                #{created}, #{createTime}, 0, 0, 0)
     </insert>
 
     <!--	计划删除-->

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

@@ -135,13 +135,15 @@
 	<insert id="insertPlanYears" parameterType="com.ozs.plan.doman.PlanYears" useGeneratedKeys="true"
 			keyProperty="planYearId">
 		insert into plan_years (purchase_dept_id, project_name, project_type, demand_overview, evaluation,
-								purchase_services, plan_demand_sub_time, plan_purchase_finish_time,
+								purchase_services, organ_division, budget_account, plan_demand_sub_time,
+								plan_purchase_finish_time,
 								plan_deliver_time, project_attr, adjust_reason, remarks, project_status,
 								created, create_time, del_flay, send_letter)
 		values (#{purchaseDeptId}, #{projectName}, #{projectType}, #{demandOverview}, #{evaluation},
-				#{purchaseServices}, #{planDemandSubTime}, #{planPurchaseFinishTime},
-				#{planDeliverTime},
-				#{projectAttr}, #{adjustReason}, #{remarks}, #{projectStatus}, #{created}, #{createTime}, 0, 0)
+				#{purchaseServices}, #{organDivision}, #{budgetAccount}, #{planDemandSubTime},
+				#{planPurchaseFinishTime},
+				#{planDeliverTime}, #{projectAttr}, #{adjustReason}, #{remarks}, #{projectStatus},
+				#{created}, #{createTime}, 0, 0)
 	</insert>
 
 	<!--	计划删除-->