新需求变更

purchase-admin/src/main/java/com/ozs/web/controller/base/BaseAgencyController.java

@@ -18,8 +18,6 @@ import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysDictData;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.enums.PmProjectStatus;
-import com.ozs.common.enums.ProjectAttribute;
-import com.ozs.common.enums.ProjectStatus;
 import com.ozs.plan.doman.MonthlyReconciliation;
 import com.ozs.plan.service.MonthlyReconciliationService;
 import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;

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

@@ -9,6 +9,7 @@ import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.enums.DataIsDelete;
+import com.ozs.common.utils.DateUtils;
 import com.ozs.common.utils.PageUtils;
 import com.ozs.common.utils.file.FileUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
@@ -80,9 +81,6 @@ public class PlanQuarterController extends BaseController {
             if (!ObjectUtils.isEmpty(vo.getPurchaseServices())) {
                 lw.eq(PlanQuarter::getPurchaseServices, vo.getPurchaseServices());
             }
-            if (!ObjectUtils.isEmpty(vo.getIsExcess())) {
-                lw.eq(PlanQuarter::getIsExcess, vo.getIsExcess());
-            }
             if (!ObjectUtils.isEmpty(vo.getProjectStatus())) {
                 lw.eq(PlanQuarter::getProjectStatus, vo.getProjectStatus());
             }
@@ -90,9 +88,10 @@ public class PlanQuarterController extends BaseController {
                 lw.ge(PlanQuarter::getPlanDemandSubTime, vo.getBeginTime());
             }
             if (!ObjectUtils.isEmpty(vo.getEndTime())) {
-                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                Date ofMonth = DateUtils.getLastDayOfMonth(vo.getEndTime());
                 SimpleDateFormat dateFormatT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
-                Date parse = dateFormatT.parse(dateFormat.format(vo.getEndTime()) + " 23:59:59:999");
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                Date parse = dateFormatT.parse(dateFormat.format(ofMonth) + " 23:59:59:999");
                 lw.le(PlanQuarter::getPlanDemandSubTime, parse);
             }
             lw.orderBy(true, false, PlanQuarter::getCreateTime);

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

@@ -13,6 +13,7 @@ import com.ozs.common.enums.DataIsDelete;
 import com.ozs.common.exception.ServiceException;
 import com.ozs.common.exception.base.BaseException;
 import com.ozs.common.core.domain.entity.SysProcurementStandard;
+import com.ozs.common.utils.DateUtils;
 import com.ozs.common.utils.PageUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.file.FileUtils;
@@ -36,6 +37,7 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
@@ -65,7 +67,7 @@ public class PlanYearsController extends BaseController {
 
     @ApiOperation(value = "查询年度计划")
     @PostMapping("/list")
-    @PreAuthorize("@ss.hasPermi('plan:planYears:list')")
+    //@PreAuthorize("@ss.hasPermi('plan:planYears:list')")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.QUERY)
     public AjaxResult list(@RequestBody PlanYearsStandardVo vo, HttpServletRequest request) {
         List<PlanYearsResponseVo> planYearsList = new ArrayList<>();
@@ -81,9 +83,6 @@ public class PlanYearsController extends BaseController {
             if (!ObjectUtils.isEmpty(vo.getPurchaseServices())) {
                 lw.eq(PlanYears::getPurchaseServices, vo.getPurchaseServices());
             }
-            if (!ObjectUtils.isEmpty(vo.getIsExcess())) {
-                lw.eq(PlanYears::getIsExcess, vo.getIsExcess());
-            }
             if (!ObjectUtils.isEmpty(vo.getProjectStatus())) {
                 lw.eq(PlanYears::getProjectStatus, vo.getProjectStatus());
             }
@@ -91,9 +90,10 @@ public class PlanYearsController extends BaseController {
                 lw.ge(PlanYears::getPlanDemandSubTime, vo.getBeginTime());
             }
             if (!ObjectUtils.isEmpty(vo.getEndTime())) {
-                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                Date ofMonth = DateUtils.getLastDayOfMonth(vo.getEndTime());
                 SimpleDateFormat dateFormatT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
-                Date parse = dateFormatT.parse(dateFormat.format(vo.getEndTime()) + " 23:59:59:999");
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                Date parse = dateFormatT.parse(dateFormat.format(ofMonth) + " 23:59:59:999");
                 lw.le(PlanYears::getPlanDemandSubTime, parse);
             }
             lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());

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

@@ -152,7 +152,9 @@ public class Constants {
     // 項目屬性
     public static final String SYS_PROJECT_ATTR = "sys_project_attr";
 
-    // 項目类型
+    // 項目类型(添加)
+    public static final String SYS_PROJECT_TYPE_AD = "sys_project_type_ad";
+    // 項目类型(审核)
     public static final String SYS_PROJECT_TYPE = "sys_project_type";
 
     // 采购服务站

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

@@ -6,10 +6,10 @@ package com.ozs.common.enums;
  * @author buzhanyi
  */
 public enum ProjectAttribute {
-    emergency("0", "应急应战项目"),
+    emergency("0", "重点采购项目"),
     majorPlan("1", "重大规划任务项目"),
     plan("2", "规划任务项目"),
-    commonly("3", "一般项目");
+    commonly("3", "一般采购项目");
 
     private final String code;
     private final String info;

purchase-common/src/main/java/com/ozs/common/utils/DateUtils.java

@@ -8,6 +8,7 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.util.Calendar;
 import java.util.Date;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
@@ -178,10 +179,27 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 增加 LocalDate ==> Date
      */
-    public static Date toDate(LocalDate temporalAccessor)
-    {
+    public static Date toDate(LocalDate temporalAccessor) {
         LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0));
         ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
         return Date.from(zdt.toInstant());
     }
+
+
+    /**
+     * 获取某个月的最后一天
+     */
+    public static Date getLastDayOfMonth(Date date) throws ParseException {
+        // 获取当月的天数（需完善）
+        SimpleDateFormat dateFormatT = new SimpleDateFormat("yyyy-MM-dd");
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.MONTH, 1);//月增加1天
+        calendar.add(Calendar.DAY_OF_MONTH, -1);//日期倒数一日,既得到本月最后一天
+        Date voucherDate = calendar.getTime();
+        System.out.println(dateFormatT.format(voucherDate));
+        System.out.println(dateFormatT.format(voucherDate).substring(8));
+        return voucherDate;
+    }
+
 }

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

@@ -62,11 +62,11 @@ public class PlanQuarter {
      */
     @NotNull(message = "概算金额不能为空")
     private BigDecimal evaluation;
-    /**
-     * 是否为超限额计划(0:未超额，1:超额)
-     */
-    @NotNull(message = "是否为超限额计划不能为空")
-    private String isExcess;
+    ///**
+    // * 是否为超限额计划(0:未超额，1:超额)
+    // */
+    //@NotNull(message = "是否为超限额计划不能为空")
+    //private String isExcess;
     /**
      * 采购服务站
      */
@@ -74,33 +74,33 @@ 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;
+    ///**
+    // * 采购方式 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)
+    // */
+    //@NotNull(message = "采购方式不能为空")
+    //private String purchaseMode;
+    //@TableField(exist = false)
+    //private String purchaseModeStr;
     /**
      * 计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）
      */
     @NotNull(message = "计划提报需求时间不能为空")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date planDemandSubTime;
     /**
      * 计划完成采购时间--->公示中标结果的日期，即填制中标信息的日期（具体到月）
      */
     @NotNull(message = "计划完成采购时间不能为空")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date planPurchaseFinishTime;
     /**
      * 计划交付时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期
      */
     @NotNull(message = "计划交付时间不能为空")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date planDeliverTime;
     /**
-     * 项目属性--->应急应战项目、重大规划任务项目、规划任务项目或一般项目
+     * 项目属性--->重点采购项目、重大规划任务项目、规划任务项目或一般采购项目
      */
     @NotNull(message = "项目属性不能为空")
     private String projectAttr;
@@ -173,10 +173,10 @@ public class PlanQuarter {
     /**
      * 查询参数开始时间和结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     @TableField(exist = false)
     private Date beginTime;
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     @TableField(exist = false)
     private Date endTime;
 

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

@@ -66,33 +66,33 @@ 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;
+    ///**
+    // * 采购方式 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)
+    // */
+    //@NotNull(message = "采购方式不能为空")
+    //private String purchaseMode;
+    //@TableField(exist = false)
+    //private String purchaseModeStr;
     /**
      * 计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）
      */
     @NotNull(message = "计划提报需求时间不能为空")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date planDemandSubTime;
     /**
      * 计划完成采购时间--->公示中标结果的日期，即填制中标信息的日期（具体到月）
      */
     @NotNull(message = "计划完成采购时间不能为空")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date planPurchaseFinishTime;
     /**
      * 计划交付时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期
      */
     @NotNull(message = "计划交付时间不能为空")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date planDeliverTime;
     /**
-     * 项目属性--->应急应战项目、重大规划任务项目、规划任务项目或一般项目
+     * 项目属性--->重点采购项目、重大规划任务项目、规划任务项目或一般采购项目
      */
     @NotNull(message = "项目属性不能为空")
     private String projectAttr;
@@ -168,10 +168,10 @@ public class PlanYears {
     /**
      * 查询参数开始时间和结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     @TableField(exist = false)
     private Date beginTime;
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     @TableField(exist = false)
     private Date endTime;
 

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

@@ -64,11 +64,11 @@ public class PlanQuarterStandardVo extends PageVo {
     @ApiModelProperty(value = "概算金额")
     private BigDecimal evaluation;
 
-    /**
-     * 是否为超限额计划(0:未超额，1:超额)
-     */
-    @ApiModelProperty(value = "是否为超限额计划(0:未超额，1:超额)")
-    private String isExcess;
+    ///**
+    // * 是否为超限额计划(0:未超额，1:超额)
+    // */
+    //@ApiModelProperty(value = "是否为超限额计划(0:未超额，1:超额)")
+    //private String isExcess;
 
     /**
      * 采购服务站
@@ -77,35 +77,35 @@ 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;
+    ///**
+    // * 采购方式 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)
+    // */
+    //@Excel(name = "采购方式")
+    //@ApiModelProperty(value = "采购方式 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)")
+    //private String purchaseMode;
 
     /**
      * 计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）
      */
-    @Excel(name = "计划提报需求时间", dateFormat = "yyyy-MM-dd")
+    @Excel(name = "计划提报需求时间", dateFormat = "yyyy-MM")
     @ApiModelProperty(value = "计划提报需求时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date planDemandSubTime;
 
     /**
      * 计划完成采购时间--->公示中标结果的日期，即填制中标信息的日期（具体到月）
      */
-    @Excel(name = "计划完成采购时间", dateFormat = "yyyy-MM-dd")
+    @Excel(name = "计划完成采购时间", dateFormat = "yyyy-MM")
     @ApiModelProperty(value = "计划完成采购时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date planPurchaseFinishTime;
 
     /**
      * 计划交付时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期
      */
-    @Excel(name = "计划交付（实施）时间", dateFormat = "yyyy-MM-dd")
+    @Excel(name = "计划交付（实施）时间", dateFormat = "yyyy-MM")
     @ApiModelProperty(value = "计划交付时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date planDeliverTime;
 
     /**
@@ -165,9 +165,9 @@ public class PlanQuarterStandardVo extends PageVo {
     /**
      * 查询参数开始时间和结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date beginTime;
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date endTime;
 
 }

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

@@ -60,11 +60,11 @@ public class PlanYearsStandardVo extends PageVo {
     @ApiModelProperty(value = "概算金额")
     private BigDecimal evaluation;
 
-    /**
-     * 是否为超限额计划(0:未超额，1:超额)
-     */
-    @ApiModelProperty(value = "是否为超限额计划(0:未超额，1:超额)")
-    private String isExcess;
+    ///**
+    // * 是否为超限额计划(0:未超额，1:超额)
+    // */
+    //@ApiModelProperty(value = "是否为超限额计划(0:未超额，1:超额)")
+    //private String isExcess;
 
     /**
      * 采购服务站
@@ -73,35 +73,35 @@ 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;
+    ///**
+    // * 采购方式 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)
+    // */
+    //@Excel(name = "采购方式")
+    //@ApiModelProperty(value = "采购方式 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)")
+    //private String purchaseMode;
 
     /**
      * 计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）
      */
-    @Excel(name = "计划提报需求时间", dateFormat = "yyyy-MM-dd")
+    @Excel(name = "计划提报需求时间", dateFormat = "yyyy-MM")
     @ApiModelProperty(value = "计划提报需求时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date planDemandSubTime;
 
     /**
      * 计划完成采购时间--->公示中标结果的日期，即填制中标信息的日期（具体到月）
      */
-    @Excel(name = "计划完成采购时间", dateFormat = "yyyy-MM-dd")
+    @Excel(name = "计划完成采购时间", dateFormat = "yyyy-MM")
     @ApiModelProperty(value = "计划完成采购时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date planPurchaseFinishTime;
 
     /**
      * 计划交付时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期
      */
-    @Excel(name = "计划交付（实施）时间", dateFormat = "yyyy-MM-dd")
+    @Excel(name = "计划交付（实施）时间", dateFormat = "yyyy-MM")
     @ApiModelProperty(value = "计划交付时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date planDeliverTime;
 
     /**
@@ -159,9 +159,9 @@ public class PlanYearsStandardVo extends PageVo {
     /**
      * 查询参数开始时间和结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date beginTime;
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date endTime;
 
     /** 查看详情的类型 */

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

@@ -53,42 +53,42 @@ public class PlanQuarterResponseVo implements Serializable {
      */
     @Excel(name = "概算金额（万元）")
     private BigDecimal evaluation;
-    /**
-     * 是否为超限额计划(0:未超额，1:超额)
-     */
-    private String isExcess;
+    ///**
+    // * 是否为超限额计划(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;
+    ///**
+    // * 采购方式 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)
+    // */
+    //private String purchaseMode;
+    //@Excel(name = "采购方式")
+    //private String purchaseModeStr;
     /**
      * 计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）
      */
-    @Excel(name = "提报需求时间", dateFormat = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "提报需求时间", dateFormat = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date planDemandSubTime;
     /**
      * 计划完成采购时间--->公示中标结果的日期，即填制中标信息的日期（具体到月）
      */
-    @Excel(name = "完成采购时间", dateFormat = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "完成采购时间", dateFormat = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date planPurchaseFinishTime;
     /**
      * 计划交付时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期
      */
-    @Excel(name = "交付（实施）时间", dateFormat = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "交付（实施）时间", dateFormat = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date planDeliverTime;
     /**
-     * 项目属性--->应急应战项目、重大规划任务项目、规划任务项目或一般项目
+     * 项目属性--->重点采购项目、重大规划任务项目、规划任务项目或一般采购项目
      */
     private String projectAttr;
     @Excel(name = "项目属性")

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

@@ -52,10 +52,10 @@ public class PlanYearsResponseVo implements Serializable {
      */
     @Excel(name = "概算金额（万元）")
     private BigDecimal evaluation;
-    /**
-     * 是否为超限额计划(0:未超额，1:超额)
-     */
-    private String isExcess;
+    ///**
+    // * 是否为超限额计划(0:未超额，1:超额)
+    // */
+    //private String isExcess;
     /**
      * 采购服务站
      */
@@ -63,32 +63,32 @@ public class PlanYearsResponseVo implements Serializable {
     private String purchaseServices;
 
     private String purchaseServicesStr;
-    /**
-     * 采购方式 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)
-     */
-    private String purchaseMode;
-    @Excel(name = "采购方式")
-    private String purchaseModeStr;
+    ///**
+    // * 采购方式 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)
+    // */
+    //private String purchaseMode;
+    //@Excel(name = "采购方式")
+    //private String purchaseModeStr;
     /**
      * 计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）
      */
-    @Excel(name = "计划提报需求时间", dateFormat = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "计划提报需求时间", dateFormat = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date planDemandSubTime;
     /**
      * 计划完成采购时间--->公示中标结果的日期，即填制中标信息的日期（具体到月）
      */
-    @Excel(name = "计划完成采购时间", dateFormat = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "计划完成采购时间", dateFormat = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date planPurchaseFinishTime;
     /**
      * 计划交付时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期
      */
-    @Excel(name = "计划交付（实施）时间", dateFormat = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "计划交付（实施）时间", dateFormat = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date planDeliverTime;
     /**
-     * 项目属性--->应急应战项目、重大规划任务项目、规划任务项目或一般项目
+     * 项目属性--->项目属性--->重点采购项目、重大规划任务项目、规划任务项目或一般采购项目
      */
     private String projectAttr;
     @Excel(name = "项目属性")

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

@@ -16,6 +16,7 @@ import com.ozs.common.enums.ProjectStatus;
 import com.ozs.common.enums.QuarterEnum;
 import com.ozs.common.enums.SysFileRefEnum;
 import com.ozs.common.exception.ServiceException;
+import com.ozs.common.utils.DateUtils;
 import com.ozs.common.utils.SecurityUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
@@ -55,6 +56,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -113,9 +115,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                 if (!ObjectUtils.isEmpty(vo.getPurchaseServices())) {
                     lw.eq(PlanQuarter::getPurchaseServices, vo.getPurchaseServices());
                 }
-                if (!ObjectUtils.isEmpty(vo.getIsExcess())) {
-                    lw.eq(PlanQuarter::getIsExcess, vo.getIsExcess());
-                }
                 if (!ObjectUtils.isEmpty(vo.getProjectStatus())) {
                     lw.eq(PlanQuarter::getProjectStatus, vo.getProjectStatus());
                 }
@@ -123,7 +122,11 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                     lw.ge(PlanQuarter::getPlanDemandSubTime, vo.getBeginTime());
                 }
                 if (!ObjectUtils.isEmpty(vo.getEndTime())) {
-                    lw.le(PlanQuarter::getPlanDemandSubTime, vo.getEndTime());
+                    Date ofMonth = DateUtils.getLastDayOfMonth(vo.getEndTime());
+                    SimpleDateFormat dateFormatT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
+                    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                    Date parse = dateFormatT.parse(dateFormat.format(ofMonth) + " 23:59:59:999");
+                    lw.le(PlanQuarter::getPlanDemandSubTime, parse);
                 }
                 lw.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
                 Page<PlanQuarter> page = planQuarterMapper.selectPage(new Page<>(num, size, false), lw);
@@ -157,9 +160,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                 if (!ObjectUtils.isEmpty(vo.getPurchaseServices())) {
                     lw.eq(PlanQuarter::getPurchaseServices, vo.getPurchaseServices());
                 }
-                if (!ObjectUtils.isEmpty(vo.getIsExcess())) {
-                    lw.eq(PlanQuarter::getIsExcess, vo.getIsExcess());
-                }
                 if (!ObjectUtils.isEmpty(vo.getProjectStatus())) {
                     lw.eq(PlanQuarter::getProjectStatus, vo.getProjectStatus());
                 } else {
@@ -169,7 +169,11 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                     lw.ge(PlanQuarter::getPlanDemandSubTime, vo.getBeginTime());
                 }
                 if (!ObjectUtils.isEmpty(vo.getEndTime())) {
-                    lw.le(PlanQuarter::getPlanDemandSubTime, vo.getEndTime());
+                    Date ofMonth = DateUtils.getLastDayOfMonth(vo.getEndTime());
+                    SimpleDateFormat dateFormatT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
+                    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                    Date parse = dateFormatT.parse(dateFormat.format(ofMonth) + " 23:59:59:999");
+                    lw.le(PlanQuarter::getPlanDemandSubTime, parse);
                 }
                 lw.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
                 Page<PlanQuarter> page = planQuarterMapper.selectPage(new Page<PlanQuarter>(num, size, false), lw);
@@ -191,17 +195,12 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
             return AjaxResult.error("该项目名称已经存在");
         }
         //默认未超额
-        if (ObjectUtils.isEmpty(quarterStandardVo.getIsExcess())) {
-            quarterStandardVo.setIsExcess("0");
-        }
         PlanQuarter quarters = new PlanQuarter();
         try {
             BeanUtils.copyProperties(quarterStandardVo, quarters);
         } catch (Exception e) {
             e.printStackTrace();
         }
-        //判断是否为超额计划
-        //quarters.setIsExcess(deptService.isExcessOrNo(quarters.getProjectType(), quarters.getEvaluation(), Long.valueOf(quarters.getPurchaseDeptId())));
         quarters.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
         quarters.setCreateTime(new Date());
         planQuarterMapper.insertPlanQuarter(quarters);
@@ -266,17 +265,12 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         if (planQuarterMapper.countProjectNameOther(quarterStandardVo.getProjectName(), String.valueOf(quarterStandardVo.getPlanPracticalId())) > 0) {
             return AjaxResult.error("该项目名称已经存在");
         }
-        //默认未超额
-        if (ObjectUtils.isEmpty(quarterStandardVo.getIsExcess())) {
-            quarterStandardVo.setIsExcess("0");
-        }
         PlanQuarter quarters = new PlanQuarter();
         try {
             BeanUtils.copyProperties(quarterStandardVo, quarters);
         } catch (Exception e) {
             e.printStackTrace();
         }
-        //quarters.setIsExcess(deptService.isExcessOrNo(quarters.getProjectType(), quarters.getEvaluation(), Long.valueOf(quarters.getPurchaseDeptId())));
         quarters.setUpdateTime(now);
         planQuarterMapper.updateInfoById(quarters);
         List<SysFileRef> sysFileRefs = quarterStandardVo.getSysFileRefs();
@@ -313,7 +307,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         }
         HashMap<String, HashMap<String, String>> planEnums = dictTypeService.getAboutEnums();
         HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
-        HashMap<String, String> planPurchaseModesMap = planEnums.get("planPurchaseModes");
         HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
 
         int successNum = 0;
@@ -336,7 +329,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                     }
                     planQuarter.setProjectType(projectTypesMap.get(planQuarter.getProjectType()));
                     planQuarter.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
-                    planQuarter.setPurchaseMode(planPurchaseModesMap.get(planQuarter.getPurchaseMode()));
                     //项目属性是多选字段
                     StringBuilder builder = new StringBuilder();
                     if (planQuarter.getProjectAttr().contains(",")) {
@@ -352,7 +344,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                         builder.append(projectAttributes.get(planQuarter.getProjectAttr()));
                     }
                     planQuarter.setProjectAttr(builder.toString());
-                    planQuarter.setIsExcess(deptService.isExcessOrNo(planQuarter.getProjectType(), planQuarter.getEvaluation(), Long.valueOf(planQuarter.getPurchaseDeptId())));
                     planQuarter.setCreated(String.valueOf(loginUser.getUserId()));
                     planQuarter.setCreateTime(new Date());
                     planQuarterMapper.insertPlanQuarter(planQuarter);
@@ -445,11 +436,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
     public AjaxResult realReviewTo(PlanQuarterStandardVo vo, boolean flay) {
         Date now = new Date();
         //季度计划审核通过后同步到年度计划和项目管理
-        PlanQuarter quarters = new PlanQuarter();
         PlanQuarter byId = planQuarterMapper.getById(vo.getPlanPracticalId());
-        PlanYears ofYears = new PlanYears();
-        BeanUtils.copyProperties(byId, ofYears);
-        ofYears.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
         //上传审核文件并赋予计划审核通过
         List<SysFileRef> sysFileRefuses = vo.getSysFileRefs();
         if (!ObjectUtils.isEmpty(sysFileRefuses)) {
@@ -464,13 +451,10 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
             }
         }
         if (flay) {
-            planYearsMapper.insertPlanYears(ofYears);
-            quarters.setPlanYearId(ofYears.getPlanYearId());
             //同步到项目管理
             PmDemand demand = new PmDemand();
             BeanUtils.copyProperties(byId, demand);
             demand.setEvaluation(byId.getEvaluation().doubleValue());
-            demand.setIsExcess(Integer.parseInt(byId.getIsExcess()));
             demand.setPlanId(byId.getPlanPracticalId());
             demand.setPurchaseDeptId(Long.valueOf(byId.getPurchaseDeptId()));
             //同步到项目管理状态为需求待填制
@@ -494,19 +478,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                     ref.setUpdateTime(now);
                     sysFileRefMapper.insert(ref);
                 }
-                for (SysFileRef ref : sysFileRefs) {
-                    ref.setRedId(ofYears.getPlanYearId());
-                    ref.setType(SysFileRefEnum.PLAN_YEAR.getType());
-                    ref.setId(null);
-                    ref.setCreated(vo.getUpdated());
-                    ref.setCreateTime(now);
-                    ref.setUpdated(vo.getUpdated());
-                    ref.setUpdateTime(now);
-                    sysFileRefMapper.insert(ref);
-                }
             }
-
-            planQuarterMapper.updateById(quarters);
             //赋予项目状态已审核
             vo.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
             return review(vo);
@@ -659,7 +631,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         //获取字典数据
         HashMap<String, HashMap<String, String>> planEnums = dictTypeService.getAboutEnums();
         HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
-        HashMap<String, String> planPurchaseModesMap = planEnums.get("planPurchaseModes");
         HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
         List<PlanQuarterResponseVo> list = new ArrayList<PlanQuarterResponseVo>();
         for (PlanQuarter planQuarter : planQuarters) {
@@ -673,12 +644,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                     break;
                 }
             }
-            for (Map.Entry<String, String> entry : planPurchaseModesMap.entrySet()) {
-                if (planQuarter.getPurchaseMode().equals(entry.getValue())) {
-                    planQuarter.setPurchaseModeStr(entry.getKey());
-                    break;
-                }
-            }
             //项目属性是拼接的
             if (!ObjectUtils.isEmpty(planQuarter.getProjectAttr())) {
                 if (planQuarter.getProjectAttr().length() > 1) {

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

@@ -14,6 +14,7 @@ import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.common.enums.*;
 import com.ozs.common.exception.ServiceException;
+import com.ozs.common.utils.DateUtils;
 import com.ozs.common.utils.SecurityUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
@@ -139,9 +140,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 if (!ObjectUtils.isEmpty(vo.getPurchaseServices())) {
                     lw.eq(PlanYears::getPurchaseServices, vo.getPurchaseServices());
                 }
-                if (!ObjectUtils.isEmpty(vo.getIsExcess())) {
-                    lw.eq(PlanYears::getIsExcess, vo.getIsExcess());
-                }
                 if (!ObjectUtils.isEmpty(vo.getProjectStatus())) {
                     lw.eq(PlanYears::getProjectStatus, vo.getProjectStatus());
                 }
@@ -149,7 +147,11 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     lw.ge(PlanYears::getPlanDemandSubTime, vo.getBeginTime());
                 }
                 if (!ObjectUtils.isEmpty(vo.getEndTime())) {
-                    lw.le(PlanYears::getPlanDemandSubTime, vo.getEndTime());
+                    Date ofMonth = DateUtils.getLastDayOfMonth(vo.getEndTime());
+                    SimpleDateFormat dateFormatT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
+                    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                    Date parse = dateFormatT.parse(dateFormat.format(ofMonth) + " 23:59:59:999");
+                    lw.le(PlanYears::getPlanDemandSubTime, parse);
                 }
                 lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
                 Page<PlanYears> page = planYearsMapper.selectPage(new Page<PlanYears>(num, size, false), lw);
@@ -182,9 +184,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 if (!ObjectUtils.isEmpty(vo.getPurchaseServices())) {
                     lw.eq(PlanYears::getPurchaseServices, vo.getPurchaseServices());
                 }
-                if (!ObjectUtils.isEmpty(vo.getIsExcess())) {
-                    lw.eq(PlanYears::getIsExcess, vo.getIsExcess());
-                }
                 if (!ObjectUtils.isEmpty(vo.getProjectStatus())) {
                     lw.eq(PlanYears::getProjectStatus, vo.getProjectStatus());
                 } else {
@@ -194,7 +193,11 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     lw.ge(PlanYears::getPlanDemandSubTime, vo.getBeginTime());
                 }
                 if (!ObjectUtils.isEmpty(vo.getEndTime())) {
-                    lw.le(PlanYears::getPlanDemandSubTime, vo.getEndTime());
+                    Date ofMonth = DateUtils.getLastDayOfMonth(vo.getEndTime());
+                    SimpleDateFormat dateFormatT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
+                    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                    Date parse = dateFormatT.parse(dateFormat.format(ofMonth) + " 23:59:59:999");
+                    lw.le(PlanYears::getPlanDemandSubTime, parse);
                 }
                 lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete);
                 Page<PlanYears> page = planYearsMapper.selectPage(new Page<PlanYears>(num, size, false), lw);
@@ -215,10 +218,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         if (planYearsMapper.countProjectName(yearsStandardVo.getProjectName()) > 0) {
             return AjaxResult.error("该项目名称已经存在");
         }
-        //默认未超额
-        if (ObjectUtils.isEmpty(yearsStandardVo.getIsExcess())) {
-            yearsStandardVo.setIsExcess("0");
-        }
         PlanYears ofYears = new PlanYears();
         try {
             BeanUtils.copyProperties(yearsStandardVo, ofYears);
@@ -226,7 +225,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             e.printStackTrace();
         }
         //判断是否为超额计划
-        //ofYears.setIsExcess(deptService.isExcessOrNo(ofYears.getProjectType(), ofYears.getEvaluation(), Long.valueOf(ofYears.getPurchaseDeptId())));
+        ofYears.setIsExcess(deptService.isExcessOrNo(ofYears.getProjectType(), ofYears.getEvaluation(), Long.valueOf(ofYears.getPurchaseDeptId())));
         ofYears.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
         ofYears.setCreateTime(new Date());
         planYearsMapper.insertPlanYears(ofYears);
@@ -291,17 +290,12 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         if (planYearsMapper.countProjectNameOther(yearsStandardVo.getProjectName(), String.valueOf(yearsStandardVo.getPlanYearId())) > 0) {
             return AjaxResult.error("该项目名称已经存在");
         }
-        //默认未超额
-        if (ObjectUtils.isEmpty(yearsStandardVo.getIsExcess())) {
-            yearsStandardVo.setIsExcess("0");
-        }
         PlanYears ofYears = new PlanYears();
         try {
             BeanUtils.copyProperties(yearsStandardVo, ofYears);
         } catch (Exception e) {
             e.printStackTrace();
         }
-        //ofYears.setIsExcess(deptService.isExcessOrNo(ofYears.getProjectType(), ofYears.getEvaluation(), Long.valueOf(ofYears.getPurchaseDeptId())));
         ofYears.setUpdateTime(new Date());
         planYearsMapper.updateInfoById(ofYears);
         List<SysFileRef> sysFileRefs = yearsStandardVo.getSysFileRefs();
@@ -366,7 +360,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         }
         HashMap<String, HashMap<String, String>> planEnums = dictTypeService.getAboutEnums();
         HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
-        HashMap<String, String> planPurchaseModesMap = planEnums.get("planPurchaseModes");
         HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
 
         int successNum = 0;
@@ -389,7 +382,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     }
                     ofYear.setProjectType(projectTypesMap.get(ofYear.getProjectType()));
                     ofYear.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
-                    ofYear.setPurchaseMode(planPurchaseModesMap.get(ofYear.getPurchaseMode()));
                     //项目属性是多选字段
                     StringBuilder builder = new StringBuilder();
                     if (ofYear.getProjectAttr().contains(",")) {
@@ -405,7 +397,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                         builder.append(projectAttributes.get(ofYear.getProjectAttr()));
                     }
                     ofYear.setProjectAttr(builder.toString());
-                    ofYear.setIsExcess(deptService.isExcessOrNo(ofYear.getProjectType(), ofYear.getEvaluation(), Long.valueOf(ofYear.getPurchaseDeptId())));
                     ofYear.setCreated(String.valueOf(loginUser.getUserId()));
                     ofYear.setCreateTime(new Date());
                     planYearsMapper.insertPlanYears(ofYear);
@@ -498,13 +489,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     @Transactional
     public AjaxResult realReviewTo(PlanYearsStandardVo vo, boolean flay) {
         Date now = new Date();
-        //年度计划审核通过后同步到季度计划和项目管理
-        PlanQuarter quarters = new PlanQuarter();
-        PmDemand demand = new PmDemand();
+        //年度计划审核通过后同步到项目管理
         PlanYears byId = planYearsMapper.getById(vo.getPlanYearId());
-        BeanUtils.copyProperties(byId, quarters);
-        BeanUtils.copyProperties(byId, demand);
-        quarters.setPlanType(0);
         //上传审核文件
         List<SysFileRef> sysFileRefuses = vo.getSysFileRefs();
         if (!ObjectUtils.isEmpty(sysFileRefuses)) {
@@ -519,48 +505,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             }
         }
         if (flay) {
-            //同步季度计划
-            quarters.setPlanYearId(byId.getPlanYearId());
-            quarters.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
-            quarters.setCreateTime(now);
-            planQuarterMapper.insertPlanQuarter(quarters);
-            //同步到项目管理状态为需求待填制
-            demand.setPlanId(quarters.getPlanPracticalId());
-            demand.setEvaluation(byId.getEvaluation().doubleValue());
-            demand.setIsExcess(Integer.parseInt(byId.getIsExcess()));
-            demand.setProjectStatus(PmProjectStatus.DEMAND_WAIT_FILL.getCode());
-            demand.setPurchaseDeptId(Long.valueOf(byId.getPurchaseDeptId()));
-            demand.setCreateTime(now);
-            pmDemandMapper.insert(demand);
-            log.info("预警状态更新：demandID：{}", demand.getDemandId());
-            demandService.updateDemandWarnStatus(demand.getDemandId());
-            //计划附件进行同步---查询年度计划附件后分别添加项目需求附件和季度附件
-            LambdaQueryWrapper<SysFileRef> sysFileRefLp = new LambdaQueryWrapper<>();
-            sysFileRefLp.eq(SysFileRef::getRedId, vo.getPlanYearId());
-            sysFileRefLp.in(SysFileRef::getType, Arrays.asList(SysFileRefEnum.PLAN_YEAR.getType(), SysFileRefEnum.PLAN_YEAR_EXAMINE.getType()));
-            List<SysFileRef> sysFileRefs = sysFileRefMapper.selectList(sysFileRefLp);
-            if (!ObjectUtils.isEmpty(sysFileRefs)) {
-                for (SysFileRef ref : sysFileRefs) {
-                    ref.setRedId(quarters.getPlanPracticalId());
-                    ref.setType(SysFileRefEnum.PLAN_TEMPORARY.getType());
-                    ref.setId(null);
-                    ref.setCreated(vo.getUpdated());
-                    ref.setCreateTime(now);
-                    ref.setUpdated(vo.getUpdated());
-                    ref.setUpdateTime(now);
-                    sysFileRefMapper.insert(ref);
-                }
-                for (SysFileRef ref : sysFileRefs) {
-                    ref.setRedId(demand.getDemandId());
-                    ref.setType(SysFileRefEnum.PM_DEMAND.getType());
-                    ref.setId(null);
-                    ref.setCreated(vo.getUpdated());
-                    ref.setCreateTime(now);
-                    ref.setUpdated(vo.getUpdated());
-                    ref.setUpdateTime(now);
-                    sysFileRefMapper.insert(ref);
-                }
-            }
             //赋予项目状态已审核
             vo.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
             return review(vo);
@@ -1054,20 +998,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                         break;
                     }
                 }
-                //是否为超限额计划
-                for (IsExcess value : IsExcess.values()) {
-                    if (vo.getIsExcess() != null && vo.getIsExcess().equals(value.getCode())) {
-                        vo.setIsExcessName(value.getInfo());
-                        break;
-                    }
-                }
-                //采购方式
-                for (PlanPurchaseMode value : PlanPurchaseMode.values()) {
-                    if (vo.getPurchaseMode() != null && vo.getPurchaseMode().equals(value.getCode())) {
-                        vo.setPurchaseModeName(value.getInfo());
-                        break;
-                    }
-                }
                 //项目属性
                 for (ProjectAttribute value : ProjectAttribute.values()) {
                     if (vo.getProjectAttr() != null && vo.getProjectAttr().equals(value.getCode())) {
@@ -1390,12 +1320,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     break;
                 }
             }
-            for (Map.Entry<String, String> entry : planPurchaseModesMap.entrySet()) {
-                if (planYear.getPurchaseMode().equals(entry.getValue())) {
-                    planYear.setPurchaseModeStr(entry.getKey());
-                    break;
-                }
-            }
             //项目属性是拼接的
             if (!ObjectUtils.isEmpty(planYear.getProjectAttr())) {
                 if (planYear.getProjectAttr().length() > 1) {

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

@@ -10,14 +10,11 @@ import com.ozs.base.domain.BasePolicy;
 import com.ozs.common.constant.Constants;
 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.entity.SysRole;
 import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.common.enums.DataIsDelete;
 import com.ozs.common.enums.PmProjectStatus;
 import com.ozs.common.enums.ProjectStatus;
-import com.ozs.common.enums.ProjectTypes;
 import com.ozs.common.enums.SysFileRefEnum;
 import com.ozs.common.exception.ServiceException;
 import com.ozs.common.utils.PageUtils;
@@ -118,9 +115,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
         // 字典项
         HashMap<String, HashMap<String, String>> planEnums = dictTypeService.getAboutEnums();
         HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
-        HashMap<String, String> planPurchaseModesMap = planEnums.get("planPurchaseModes");
         HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
-        // HashMap<String, String> purchaseServices = planEnums.get("purchaseServices");
 
         int successNum = 0;
         int failureNum = 0;
@@ -140,7 +135,6 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                     }
                     ofProvisionalPlan.setProjectType(projectTypesMap.get(ofProvisionalPlan.getProjectType()));
                     ofProvisionalPlan.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
-                    ofProvisionalPlan.setPurchaseMode(planPurchaseModesMap.get(ofProvisionalPlan.getPurchaseMode()));
                     //项目属性是多选字段
                     StringBuilder builder = new StringBuilder();
                     if (ofProvisionalPlan.getProjectAttr().contains(",")) {
@@ -563,9 +557,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
     public ProvisionalPlan changeToProvisionalPlan(ProvisionalPlan provisionalPlan) {
         HashMap<String, HashMap<String, String>> planEnums = dictTypeService.getAboutEnums();
         HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
-        HashMap<String, String> planPurchaseModesMap = planEnums.get("planPurchaseModes");
         HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
-        HashMap<String, String> purchaseServices = planEnums.get("purchaseServices");
         if (provisionalPlan.getPurchaseDeptId() != null) {
             SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(Long.valueOf(provisionalPlan.getPurchaseDeptId())).get("sysDept");
             provisionalPlan.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
@@ -576,12 +568,6 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                 break;
             }
         }
-        for (Map.Entry<String, String> entry : planPurchaseModesMap.entrySet()) {
-            if (provisionalPlan.getPurchaseMode() != null && provisionalPlan.getPurchaseMode().equals(entry.getValue())) {
-                provisionalPlan.setPurchaseModeStr(entry.getKey());
-                break;
-            }
-        }
         //项目属性是拼接的
         if (provisionalPlan.getProjectAttr().length() > 1) {
             StringBuilder builder = new StringBuilder();
@@ -631,12 +617,6 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                     break;
                 }
             }
-            for (Map.Entry<String, String> entry : planPurchaseModesMap.entrySet()) {
-                if (provisionalPlan.getPurchaseMode() != null && provisionalPlan.getPurchaseMode().equals(entry.getValue())) {
-                    provisionalPlan.setPurchaseModeStr(entry.getKey());
-                    break;
-                }
-            }
             //项目属性是拼接的
             if (provisionalPlan.getProjectAttr().length() > 1) {
                 StringBuilder builder = new StringBuilder();

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

@@ -178,7 +178,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                 }
 
                 //项目类型
-                String projectTypeName = dictDataService.selectDictLabel("sys_project_typeAd", vo.getProjectType());
+                String projectTypeName = dictDataService.selectDictLabel("sys_project_type", vo.getProjectType());
                 if (StringUtils.isNotEmpty(projectTypeName)) {
                     vo.setProjectTypeName(projectTypeName);
                 }

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

@@ -9,9 +9,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ozs.common.core.domain.entity.SysDictData;
 import com.ozs.common.core.domain.entity.SysProcurementStandard;
-import com.ozs.common.enums.ProjectTypes;
 import com.ozs.common.exception.base.BaseException;
 import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;
 import com.ozs.system.mapper.SysDeptMapper;

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

@@ -209,32 +209,33 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
     public HashMap<String, HashMap<String, String>> getAboutEnums() {
         HashMap<String, HashMap<String, String>> hashMap = new HashMap<>();
         HashMap<String, String> projectTypesMap = new LinkedHashMap<>();
+        HashMap<String, String> projectTypesAdMap = new LinkedHashMap<>();
         HashMap<String, String> projectStatusMap = new LinkedHashMap<>();
-        HashMap<String, String> planPurchaseModesMap = new LinkedHashMap<>();
         HashMap<String, String> projectAttributes = new LinkedHashMap<>();
 
         //项目审核状态
         for (ProjectStatus value : ProjectStatus.values()) {
             projectStatusMap.put(value.getInfo(), value.getCode());
         }
-        //采购方式
-        for (PlanPurchaseMode value : PlanPurchaseMode.values()) {
-            planPurchaseModesMap.put(value.getInfo(), value.getCode());
-        }
         //项目属性
         List<SysDictData> data1 = dictDataMapper.selectDictDataByType(Constants.SYS_PROJECT_ATTR);
         for (SysDictData dictData : data1) {
             projectAttributes.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());
+        }
 
         hashMap.put("projectTypes", projectTypesMap);
+        hashMap.put("projectTypesAds", projectTypesAdMap);
         hashMap.put("projectStatus", projectStatusMap);
-        hashMap.put("planPurchaseModes", planPurchaseModesMap);
         hashMap.put("projectAttributes", projectAttributes);
         return hashMap;
     }

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

@@ -40,9 +40,7 @@
             project_type=#{projectType},
             demand_overview=#{demandOverview},
             evaluation=#{evaluation},
-            is_excess=#{isExcess},
             purchase_services=#{purchaseServices},
-            purchase_mode=#{purchaseMode},
             plan_demand_sub_time=#{planDemandSubTime},
             plan_purchase_finish_time=#{planPurchaseFinishTime},
             plan_deliver_time=#{planDeliverTime},
@@ -156,9 +154,6 @@
             <if test="purchaseServices != null and purchaseServices != ''">
                 AND p.purchase_services = #{purchaseServices}
             </if>
-            <if test="isExcess != null and isExcess != ''">
-                AND p.is_excess = #{isExcess}
-            </if>
             <if test="projectStatus == null or projectStatus ==''">
                 AND p.project_status in (1,3)
             </if>
@@ -166,10 +161,10 @@
                 AND p.project_status = #{projectStatus}
             </if>
             <if test="beginTime != null "><!-- 开始时间检索 -->
-                and date_format(p.plan_demand_sub_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
+                and date_format(p.plan_demand_sub_time,'%y%m') &gt;= date_format(#{beginTime},'%y%m')
             </if>
             <if test="endTime != null "><!-- 结束时间检索 -->
-                and date_format(p.plan_demand_sub_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+                and date_format(p.plan_demand_sub_time,'%y%m') &lt;= date_format(#{endTime},'%y%m')
             </if>
             and p.del_flay=0
         </where>
@@ -182,13 +177,11 @@
             keyProperty="planPracticalId">
         insert into plan_practical (purchase_dept_id, plan_year_id, project_name, project_type, demand_overview,
                                     evaluation,
-                                    is_excess,
-                                    purchase_services, purchase_mode, plan_demand_sub_time, plan_purchase_finish_time,
+                                    purchase_services, 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},
-                #{isExcess},
-                #{purchaseServices}, #{purchaseMode}, #{planDemandSubTime}, #{planPurchaseFinishTime},
+                #{purchaseServices}, #{planDemandSubTime}, #{planPurchaseFinishTime},
                 #{planDeliverTime},
                 #{projectAttr}, #{adjustReason}, #{remarks}, #{projectStatus}, #{created}, #{createTime}, 0, 0, 0)
     </insert>

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

@@ -38,9 +38,7 @@
 			project_type=#{projectType},
 			demand_overview=#{demandOverview},
 			evaluation=#{evaluation},
-			is_excess=#{isExcess},
 			purchase_services=#{purchaseServices},
-			purchase_mode=#{purchaseMode},
 			plan_demand_sub_time=#{planDemandSubTime},
 			plan_purchase_finish_time=#{planPurchaseFinishTime},
 			plan_deliver_time=#{planDeliverTime},
@@ -115,9 +113,6 @@
 			<if test="purchaseServices != null and purchaseServices != ''">
 				AND p.purchase_services = #{purchaseServices}
 			</if>
-			<if test="isExcess != null and isExcess != ''">
-				AND p.is_excess = #{isExcess}
-			</if>
 			<if test="projectStatus == null or projectStatus ==''">
 				AND p.project_status in (1,3)
 			</if>
@@ -125,10 +120,10 @@
 				AND p.project_status = #{projectStatus}
 			</if>
 			<if test="beginTime != null "><!-- 开始时间检索 -->
-				and date_format(p.plan_demand_sub_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
+				and date_format(p.plan_demand_sub_time,'%y%m') &gt;= date_format(#{beginTime},'%y%m')
 			</if>
 			<if test="endTime != null "><!-- 结束时间检索 -->
-				and date_format(p.plan_demand_sub_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+				and date_format(p.plan_demand_sub_time,'%y%m') &lt;= date_format(#{endTime},'%y%m')
 			</if>
 			and p.del_flay=0
 		</where>
@@ -139,12 +134,12 @@
 	<!--	创建计划信息-->
 	<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, is_excess,
-								purchase_services, purchase_mode, plan_demand_sub_time, plan_purchase_finish_time,
+		insert into plan_years (purchase_dept_id, project_name, project_type, demand_overview, evaluation,
+								purchase_services, 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}, #{isExcess},
-				#{purchaseServices}, #{purchaseMode}, #{planDemandSubTime}, #{planPurchaseFinishTime},
+		values (#{purchaseDeptId}, #{projectName}, #{projectType}, #{demandOverview}, #{evaluation},
+				#{purchaseServices}, #{planDemandSubTime}, #{planPurchaseFinishTime},
 				#{planDeliverTime},
 				#{projectAttr}, #{adjustReason}, #{remarks}, #{projectStatus}, #{created}, #{createTime}, 0, 0)
 	</insert>