Merge remote-tracking branch 'origin/master'

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

@@ -253,25 +253,20 @@ public class PlanQuarterController extends BaseController {
     public AjaxResult upLoadPlanFile(@RequestBody PlanQuarterStandardVo quarterStandardVo) {
         return quarterService.upLoadPlanFile(quarterStandardVo);
     }
-    //
-    //@ApiOperation(value = "下载计划关联文件")
-    //@PostMapping("/downLoadPlanFile")
-    //public AjaxResult downLoadPlanFile(@RequestBody PlanQuarterStandardVo quarterStandardVo) {
-    //    return quarterService.downLoadPlanFile(quarterStandardVo);
-    //}
 
-    @ApiOperation(value = "导入季度计划数据")
-    @PostMapping("/importData")
-    @PreAuthorize("@ss.hasPermi('plan:quarter:importData')")
-    @Log(title = ModularConstans.planQuarter, businessType = BusinessType.INSERT)
-    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
-        ExcelUtil<PlanQuarterStandardVo> util = new ExcelUtil<>(PlanQuarterStandardVo.class);
-        List<PlanQuarterStandardVo> quarter = util.importExcel(file.getInputStream());
-        //获取采购单位-
-        LoginUser loginUser = getLoginUser();
-        String message = quarterService.importPlanQuarter(quarter, updateSupport, loginUser);
-        return success(message);
-    }
+    //季度计划不能自己创建
+    //@ApiOperation(value = "导入季度计划数据")
+    //@PostMapping("/importData")
+    //@PreAuthorize("@ss.hasPermi('plan:quarter:importData')")
+    //@Log(title = ModularConstans.planQuarter, businessType = BusinessType.INSERT)
+    //public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
+    //    ExcelUtil<PlanQuarterStandardVo> util = new ExcelUtil<>(PlanQuarterStandardVo.class);
+    //    List<PlanQuarterStandardVo> quarter = util.importExcel(file.getInputStream());
+    //    //获取采购单位-
+    //    LoginUser loginUser = getLoginUser();
+    //    String message = quarterService.importPlanQuarter(quarter, updateSupport, loginUser);
+    //    return success(message);
+    //}
 
     @ApiOperation("模板下载")
     @GetMapping("/downloaExcel")

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

@@ -16,6 +16,7 @@ import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.framework.web.service.TokenService;
 import com.ozs.plan.doman.ProvisionalPlan;
 import com.ozs.plan.doman.vo.requestVo.ProvisionalPlanVo;
+import com.ozs.plan.doman.vo.responseVo.ProvisionalPlanResVo;
 import com.ozs.plan.service.ProvisionalPlanService;
 import com.ozs.plan.service.impl.ProvisionalPlanServiceImpl;
 import com.ozs.system.domain.SysFileRef;
@@ -145,7 +146,7 @@ public class ProvisionalPlanController extends BaseController {
     @PreAuthorize("@ss.hasPermi('plan:provisionalPlan:selectProvisionalPlanAudit')")
     @Log(title = ModularConstans.provisionalPlan, businessType = BusinessType.QUERY)
     public AjaxResult selectProvisionalPlanAudit(@RequestBody ProvisionalPlanVo vo, HttpServletRequest request) {
-        List<ProvisionalPlan> provisionalPlanList = new ArrayList<>();
+        List<ProvisionalPlanResVo> provisionalPlanList = new ArrayList<>();
         if (StringUtils.isNull(vo)
                 || StringUtils.isNull(vo.getPageNum())
                 || StringUtils.isNull(vo.getPageSize())) {
@@ -199,8 +200,8 @@ public class ProvisionalPlanController extends BaseController {
     @Log(title = ModularConstans.provisionalPlan, businessType = BusinessType.EXPORT)
     public void exportProvisionalPlan(HttpServletResponse response, @RequestBody ProvisionalPlanVo provisionalPlanVo, HttpServletRequest request) throws Exception {
         LoginUser loginUser = tokenService.getLoginUser(request);
-        List<ProvisionalPlan> list = provisionalPlanService.selectProvisionalPlanExport(provisionalPlanVo, loginUser);
-        ExcelUtil<ProvisionalPlan> util = new ExcelUtil<>(ProvisionalPlan.class);
+        List<ProvisionalPlanResVo> list = provisionalPlanService.selectProvisionalPlanExport(provisionalPlanVo, loginUser);
+        ExcelUtil<ProvisionalPlanResVo> util = new ExcelUtil<>(ProvisionalPlanResVo.class);
         util.exportExcel(response, list, "临时计划数据");
     }
 

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

@@ -85,19 +85,19 @@ public class ProvisionalPlan {
     private String budgetAccount;
     @TableField(exist = false)
     private String budgetAccountStr;
-    @Excel(name = "计划提报需求时间", dateFormat = "yyyy-MM-dd")
+    @Excel(name = "计划提报需求时间", dateFormat = "yyyy-MM")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）")
     @TableField("plan_demand_sub_time")
     private Date planDemandSubTime;
 
-    @Excel(name = "计划完成采购时间", dateFormat = "yyyy-MM-dd")
+    @Excel(name = "计划完成采购时间", dateFormat = "yyyy-MM")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "计划完成采购时间--->公示中标结果的日期，即填制中标信息的日期（具体到月）")
     @TableField("plan_purchase_finish_time")
     private Date planPurchaseFinishTime;
 
-    @Excel(name = "计划交付（实施）时间", dateFormat = "yyyy-MM-dd")
+    @Excel(name = "计划交付（实施）时间", dateFormat = "yyyy-MM")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "计划交付时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期")
     @TableField("plan_deliver_time")
@@ -111,13 +111,11 @@ public class ProvisionalPlan {
     @TableField(exist = false)
     private String projectAttrStr;
 
-    @Excel(name = "计划调整情况及理由")
     @ApiModelProperty(value = "计划调整情况及理由--->如计划需要变更，在填写申请修改时需填写调整情况及理由，审核单位审核通过后显示该信息")
     @TableField("adjust_reason")
     private String adjustReason;
 
     @Excel(name = "备注")
-    @ApiModelProperty(value = "备注")
     @TableField("remarks")
     private String remarks;
 

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

@@ -140,6 +140,7 @@ public class PlanQuarterStandardVo extends PageVo {
     /**
      * 计划调整情况及理由--->如计划需要变更，在填写申请修改时需填写调整情况及理由，审核单位审核通过后显示
      */
+    @Excel(name = "计划调整情况及理由")
     private String adjustReason;
 
     /**

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

@@ -63,30 +63,28 @@ public class PlanQuarterResponseVo implements Serializable {
      * 机关业务指导处(科)
      */
     private String organDivision;
-    @Excel(name = "机关业务指导处(科)")
     private String organDivisionStr;
     /**
      * 预算科目
      */
     private String budgetAccount;
-    @Excel(name = "预算科目")
     private String budgetAccountStr;
     /**
      * 计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）
      */
-    @Excel(name = "提报需求时间", dateFormat = "yyyy-MM")
+    @Excel(name = "计划提报需求时间", dateFormat = "yyyy-MM")
     @JsonFormat(pattern = "yyyy-MM")
     private Date planDemandSubTime;
     /**
      * 计划完成采购时间--->公示中标结果的日期，即填制中标信息的日期（具体到月）
      */
-    @Excel(name = "完成采购时间", dateFormat = "yyyy-MM")
+    @Excel(name = "计划完成采购时间", dateFormat = "yyyy-MM")
     @JsonFormat(pattern = "yyyy-MM")
     private Date planPurchaseFinishTime;
     /**
      * 计划交付时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期
      */
-    @Excel(name = "交付（实施）时间", dateFormat = "yyyy-MM")
+    @Excel(name = "计划交付（实施）时间", dateFormat = "yyyy-MM")
     @JsonFormat(pattern = "yyyy-MM")
     private Date planDeliverTime;
     /**
@@ -114,6 +112,7 @@ public class PlanQuarterResponseVo implements Serializable {
      * 项目状态--->包括计划待提交、计划待审核、计划已退回、计划已审核
      * (0:计划待提交，1:计划待审核，2:计划已退回，3:计划已审核)
      */
+    @Excel(name = "项目状态")
     private String projectStatus;
 
     /**

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

@@ -1,7 +1,6 @@
 package com.ozs.plan.doman.vo.responseVo;
 
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
 import com.ozs.system.domain.SysFileInfo;

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

@@ -0,0 +1,103 @@
+package com.ozs.plan.doman.vo.responseVo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ozs.common.annotation.Excel;
+import com.ozs.system.domain.SysFileRef;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class ProvisionalPlanResVo implements Serializable {
+
+    private Long planPracticalId;
+
+    private Long planYearId;
+
+    private String purchaseDeptId;
+
+    @Excel(name = "采购单位")
+    private String purchaseDeptName;
+
+    @Excel(name = "项目名称")
+    private String projectName;
+
+    private String projectType;
+    @Excel(name = "项目类型")
+    private String projectTypeStr;
+
+    @Excel(name = "需求概况")
+    private String demandOverview;
+
+    @Excel(name = "概算金额（万元）")
+    private BigDecimal evaluation;
+
+    private String isExcess;
+
+    private String purchaseServices;
+    @Excel(name = "采购服务站")
+    private String purchaseServicesStr;
+    /**
+     * 机关业务指导处(科)
+     */
+    private String organDivision;
+    private String organDivisionStr;
+    /**
+     * 预算科目
+     */
+    private String budgetAccount;
+    private String budgetAccountStr;
+    @Excel(name = "计划提报需求时间", dateFormat = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date planDemandSubTime;
+
+    @Excel(name = "计划完成采购时间", dateFormat = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date planPurchaseFinishTime;
+
+    @Excel(name = "计划交付（实施）时间", dateFormat = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date planDeliverTime;
+
+    private String projectAttr;
+    @Excel(name = "项目属性")
+    private String projectAttrStr;
+
+    @Excel(name = "计划调整情况及理由")
+    private String adjustReason;
+
+    @Excel(name = "备注")
+    private String remarks;
+
+    private String projectStatus;
+    @Excel(name = "项目状态")
+    private String projectStatusStr;
+    private String refuseReason;
+
+    private String delFlay;
+
+    private String planType;
+
+    private String created;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    private String updated;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 上传附件
+     */
+    List<SysFileRef> sysFileRefs;
+
+    /**
+     * 是否显示审核按钮 （true:显示，false：不显示）
+     */
+    private Boolean flag;
+}

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

@@ -136,14 +136,6 @@ public interface PlanQuarterService extends IService<PlanQuarter> {
      */
     AjaxResult upLoadPlanFile(PlanQuarterStandardVo quarterStandardVo);
 
-    /**
-     * 下载计划关联文件
-     *
-     * @param quarterStandardVo 季度计划
-     * @return 结果
-     */
-    AjaxResult downLoadPlanFile(PlanQuarterStandardVo quarterStandardVo);
-
     /**
      * 查询审核分页
      */

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

@@ -7,6 +7,7 @@ import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.plan.doman.ProvisionalPlan;
 import com.ozs.plan.doman.vo.requestVo.ProvisionalPlanVo;
+import com.ozs.plan.doman.vo.responseVo.ProvisionalPlanResVo;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -19,7 +20,7 @@ public interface ProvisionalPlanService extends IService<ProvisionalPlan> {
 
     String importProvisionalPlan(List<ProvisionalPlan> provisionalPlans, boolean updateSupport, LoginUser loginUser);
 
-    List<ProvisionalPlan> selectProvisionalPlanExport(ProvisionalPlanVo provisionalPlanVo, LoginUser loginUser);
+    List<ProvisionalPlanResVo> selectProvisionalPlanExport(ProvisionalPlanVo provisionalPlanVo, LoginUser loginUser);
 
     int commitProvisionalPlan(ProvisionalPlanVo provisionalPlanVo);
 

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

@@ -559,12 +559,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         return AjaxResult.success();
     }
 
-    @Override
-    public AjaxResult downLoadPlanFile(PlanQuarterStandardVo quarterStandardVo) {
-
-        return AjaxResult.success();
-    }
-
     @Override
     public List<PlanQuarter> queryPage(PlanQuarterStandardVo vo) {
         List<PlanQuarter> query = planQuarterMapper.query(vo);

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

@@ -345,6 +345,16 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     @Transactional
     @Override
     public String importPlanYears(List<PlanYearsStandardVo> planYears, boolean isUpdateSupport, LoginUser loginUser) {
+        //获取字典数据
+        HashMap<String, HashMap<String, String>> planEnums = dictTypeService.getAboutEnums();
+        //项目属性
+        HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
+        //项目类型
+        HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
+        //预算科目
+        HashMap<String, String> budgetAccountMap = planEnums.get("budgetAccount");
+        //采购服务站
+        HashMap<String, String> purchaseServicesMap = planEnums.get("purchaseServices");
         if (StringUtils.isNull(planYears) || planYears.size() == 0) {
             throw new ServiceException("导入年度计划数据不能为空！");
         }
@@ -355,9 +365,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             ofYears.setPurchaseDeptName(yearsStandardVo.getPurchaseDeptId());
             plans.add(ofYears);
         }
-        HashMap<String, HashMap<String, String>> planEnums = dictTypeService.getAboutEnums();
-        HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
-        HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
 
         int successNum = 0;
         int failureNum = 0;
@@ -378,6 +385,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                         failureMsg.append("*" + failureNum + "*采购单位“" + ofYear.getPurchaseDeptName() + "”不存在");
                     }
                     ofYear.setProjectType(projectTypesMap.get(ofYear.getProjectType()));
+                    ofYear.setPurchaseServices(purchaseServicesMap.get(ofYear.getPurchaseServices()));
+                    ofYear.setBudgetAccount(budgetAccountMap.get(ofYear.getBudgetAccount()));
                     ofYear.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
                     //项目属性是多选字段
                     StringBuilder builder = new StringBuilder();

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

@@ -13,6 +13,7 @@ import com.ozs.common.enums.PmProjectStatus;
 import com.ozs.common.enums.ProjectStatus;
 import com.ozs.common.enums.SysFileRefEnum;
 import com.ozs.common.exception.ServiceException;
+import com.ozs.common.utils.DateUtils;
 import com.ozs.common.utils.PageUtils;
 import com.ozs.common.utils.SecurityUtils;
 import com.ozs.common.utils.StringUtils;
@@ -21,6 +22,7 @@ import com.ozs.plan.doman.PlanYears;
 import com.ozs.plan.doman.ProvisionalPlan;
 import com.ozs.plan.doman.vo.requestVo.PlanQuarterStandardVo;
 import com.ozs.plan.doman.vo.requestVo.ProvisionalPlanVo;
+import com.ozs.plan.doman.vo.responseVo.ProvisionalPlanResVo;
 import com.ozs.plan.mapper.PlanYearsMapper;
 import com.ozs.plan.mapper.ProvisionalPlanMapper;
 import com.ozs.plan.service.PlanQuarterService;
@@ -179,9 +181,9 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
     }
 
     @Override
-    public List<ProvisionalPlan> selectProvisionalPlanExport(ProvisionalPlanVo vo, LoginUser loginUser) {
+    public List<ProvisionalPlanResVo> selectProvisionalPlanExport(ProvisionalPlanVo vo, LoginUser loginUser) {
         List<ProvisionalPlan> list = new ArrayList<>();
-        List<ProvisionalPlan> provisionalPlanList = new ArrayList<>();
+        List<ProvisionalPlanResVo> provisionalPlanList = new ArrayList<>();
         try {
             int num = 1;
             int size = 200;
@@ -209,7 +211,11 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                     lw.ge(ProvisionalPlan::getPlanDemandSubTime, vo.getBeginTime());
                 }
                 if (!ObjectUtils.isEmpty(vo.getEndTime())) {
-                    lw.le(ProvisionalPlan::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(ProvisionalPlan::getPlanDemandSubTime, parse);
                 }
 
                 Page<ProvisionalPlan> page = provisionalPlanMapper.selectPage(new Page<ProvisionalPlan>(num, size, false), lw);
@@ -271,7 +277,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
 
     @Override
     public AjaxResult selectProvisionalPlan(ProvisionalPlanVo vo, HttpServletRequest request, LoginUser loginUser) {
-        List<ProvisionalPlan> provisionalPlanList = new ArrayList<>();
+        List<ProvisionalPlanResVo> provisionalPlanList = new ArrayList<>();
         try {
             LambdaQueryWrapper<ProvisionalPlan> lw = new LambdaQueryWrapper<>();
             lw.eq(ProvisionalPlan::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
@@ -320,7 +326,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
 
     @Override
     public AjaxResult selectProvisionalPlanAudit(ProvisionalPlanVo vo, HttpServletRequest request, LoginUser loginUser) {
-        List<ProvisionalPlan> provisionalPlanList = new ArrayList<>();
+        List<ProvisionalPlanResVo> provisionalPlanList = new ArrayList<>();
         try {
             LambdaQueryWrapper<ProvisionalPlan> lw = new LambdaQueryWrapper<>();
             lw.eq(ProvisionalPlan::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
@@ -580,7 +586,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
     }
 
     //字段赋值对应的名称
-    public List<ProvisionalPlan> changeTo(List<ProvisionalPlan> provisionalPlans) {
+    public List<ProvisionalPlanResVo> changeTo(List<ProvisionalPlan> provisionalPlans) {
         //获取字典数据
         HashMap<String, HashMap<String, String>> planEnums = dictTypeService.getAboutEnums();
         //项目属性
@@ -594,8 +600,9 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
         //采购服务站
         HashMap<String, String> purchaseServicesMap = planEnums.get("purchaseServices");
 
-        List<ProvisionalPlan> list = new ArrayList<ProvisionalPlan>();
+        List<ProvisionalPlanResVo> list = new ArrayList<ProvisionalPlanResVo>();
         for (ProvisionalPlan provisionalPlan : provisionalPlans) {
+            ProvisionalPlanResVo provisionalPlanResVo = new ProvisionalPlanResVo();
             if (provisionalPlan.getPurchaseDeptId() != null) {
                 SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(Long.valueOf(provisionalPlan.getPurchaseDeptId())).get("sysDept");
                 provisionalPlan.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
@@ -680,7 +687,9 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                     }
                 }
             }
-            list.add(provisionalPlan);
+
+            BeanUtils.copyProperties(provisionalPlan, provisionalPlanResVo);
+            list.add(provisionalPlanResVo);
         }
         return list;
     }