Merge remote-tracking branch 'origin/master'

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

@@ -1,12 +1,12 @@
 package com.ozs.web.controller.plan;
 
-import com.github.pagehelper.PageInfo;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.constant.ModularConstans;
 import com.ozs.common.core.controller.BaseController;
 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.SysFileRefEnum;
 import com.ozs.common.exception.ServiceException;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.file.FileUtils;
@@ -17,13 +17,16 @@ import com.ozs.plan.doman.vo.requestVo.ProvisionalPlanVo;
 import com.ozs.plan.service.PlanQuarterService;
 import com.ozs.plan.service.ProvisionalPlanService;
 import com.ozs.plan.service.impl.PlanQuarterServiceImpl;
+import com.ozs.system.domain.SysFileRef;
 import com.ozs.system.service.ISysDeptService;
+import com.ozs.system.service.SysFileRefService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -63,6 +66,8 @@ public class ProvisionalPlanController extends BaseController {
     private ISysDeptService iSysDeptService;
     @Autowired
     private PlanQuarterServiceImpl planQuarterServiceImpl;
+    @Autowired
+    private SysFileRefService sysFileRefService;
 
     @ApiOperation(value = "新增临时计划")
     @PostMapping("/insertProvisionalPlan")
@@ -79,6 +84,18 @@ public class ProvisionalPlanController extends BaseController {
         // 项目状态(0:计划待提交，1:计划待审核，2:计划已退回，3:计划已审核)
         provisionalPlan.setProjectStatus("0");
         provisionalPlan.setIsExcess(iSysDeptService.isExcessOrNo(provisionalPlan.getProjectType(), provisionalPlan.getEvaluation(), Long.valueOf(provisionalPlan.getPurchaseDeptId())));
+        List<SysFileRef> sysFileRefs = provisionalPlan.getSysFileRefs();
+        if (!ObjectUtils.isEmpty(sysFileRefs)) {
+            for (SysFileRef ref : sysFileRefs) {
+                ref.setRedId(provisionalPlan.getPlanPracticalId());
+                ref.setType(SysFileRefEnum.PLAN_TEMPORARY.getType());
+                ref.setCreated(provisionalPlan.getCreated());
+                ref.setCreateTime(new Date());
+                ref.setUpdated(provisionalPlan.getCreated());
+                ref.setUpdateTime(new Date());
+                sysFileRefService.save(ref);
+            }
+        }
         return toAjax(provisionalPlanService.save(provisionalPlan));
     }
 

purchase-admin/src/main/resources/application.yml

@@ -10,5 +10,5 @@ server:
 # Spring配置
 spring:
   profiles:
-#    active: druid,test
-    active: prod
+    active: druid,test
+#    active: prod

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

@@ -22,9 +22,9 @@ public enum SysFileRefEnum {
     PM_BID_FAILURE_FILE(11, "流标文件"),
     PM_BID_CALL_QEUSTION_FILE(12, "质疑文件"),
     PM_BID_WINNING_NOTIFICATION(13, "中标通知书"),
-    PM_CONTRACT_INFO (14, "合同信息附件"),
-    PM_PROJECT_CONSTRUCTION (15, "建设文档附件")
-    ;
+    PM_CONTRACT_INFO(14, "合同信息附件"),
+    PM_PROJECT_CONSTRUCTION(15, "建设文档附件"),
+    PLAN_TEMPORARY_EXAMINE(16, "季度计划审核文件");
 
     private Integer type;
     private String info;

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

@@ -150,6 +150,7 @@ public class PlanYears {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
+
     /**
      * 逻辑删除字段--->（0：正常，1：已删除）
      */

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

@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
+import com.ozs.system.domain.SysFileRef;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @TableName("plan_practical")
@@ -17,11 +19,11 @@ public class ProvisionalPlan {
 
     @ApiModelProperty(value = "主键ID")
     @TableField("plan_practical_id")
-    private Integer planPracticalId;
+    private Long planPracticalId;
 
     @ApiModelProperty(value = "年度计划ID")
     @TableField("plan_year_id")
-    private Integer planYearId;
+    private Long planYearId;
 
     @NotNull(message = "采购单位不能为空")
     @ApiModelProperty(value = "采购单位（登录账号的单位）")
@@ -143,4 +145,11 @@ public class ProvisionalPlan {
     @ApiModelProperty(value = "修改时间")
     @TableField("update_time")
     private Date updateTime;
+
+    /**
+     * 上传附件
+     */
+    @ApiModelProperty(value = "附件关联")
+    @TableField(exist = false)
+    List<SysFileRef> sysFileRefs;
 }

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

@@ -28,7 +28,7 @@ public class ProvisionalPlanVo extends PageVo {
     List<SysFileInfo> fileInfos;
 
     @ApiModelProperty(value = "主键ID")
-    private Integer planPracticalId;
+    private Long planPracticalId;
 
     @ApiModelProperty(value = "年度计划ID")
     private Long planYearId;

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

@@ -454,8 +454,8 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         demandService.updateDemandWarnStatus(demand.getDemandId());
         //计划附件也进行同步---查询年度计划附件后复制一份改为项目需求附件
         LambdaQueryWrapper<SysFileRef> sysFileRefLp = new LambdaQueryWrapper<>();
-        sysFileRefLp.eq(SysFileRef::getType, SysFileRefEnum.PLAN_YEAR.getType());
-        sysFileRefLp.eq(SysFileRef::getRedId, vo.getPlanYearId());
+        sysFileRefLp.eq(SysFileRef::getType, SysFileRefEnum.PLAN_TEMPORARY.getType());
+        sysFileRefLp.eq(SysFileRef::getRedId, vo.getPlanPracticalId());
         List<SysFileRef> sysFileRefs = sysFileRefMapper.selectList(sysFileRefLp);
         if (!ObjectUtils.isEmpty(sysFileRefs)) {
             for (SysFileRef ref : sysFileRefs) {
@@ -481,7 +481,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         if (!ObjectUtils.isEmpty(sysFileRefs)) {
             for (SysFileRef ref : sysFileRefs) {
                 ref.setRedId(vo.getPlanPracticalId());
-                ref.setType(SysFileRefEnum.PLAN_TEMPORARY.getType());
+                ref.setType(SysFileRefEnum.PLAN_TEMPORARY_EXAMINE.getType());
                 ref.setCreated(vo.getUpdated());
                 ref.setCreateTime(new Date());
                 ref.setUpdated(vo.getUpdated());

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

@@ -491,7 +491,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             pmDemandMapper.insert(demand);
             log.info("预警状态更新：demandID：{}", demand.getDemandId());
             demandService.updateDemandWarnStatus(demand.getDemandId());
-            //计划附件进行同步---查询年度计划附件后复制一份改为项目需求附���
+            //计划附件进行同步---查询年度计划附件后分别添加项目需求附件和季度附���
             LambdaQueryWrapper<SysFileRef> sysFileRefLp = new LambdaQueryWrapper<>();
             sysFileRefLp.eq(SysFileRef::getType, SysFileRefEnum.PLAN_YEAR.getType());
             sysFileRefLp.eq(SysFileRef::getRedId, vo.getPlanYearId());
@@ -499,7 +499,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             if (!ObjectUtils.isEmpty(sysFileRefs)) {
                 for (SysFileRef ref : sysFileRefs) {
                     ref.setRedId(quarters.getPlanPracticalId());
-                    ref.setType(SysFileRefEnum.PLAN_YEAR_EXAMINE.getType());
+                    ref.setType(SysFileRefEnum.PLAN_TEMPORARY.getType());
                     ref.setId(null);
                     sysFileRefMapper.insert(ref);
                 }

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

@@ -2,6 +2,7 @@ package com.ozs.plan.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
@@ -20,6 +21,7 @@ import com.ozs.common.exception.ServiceException;
 import com.ozs.common.utils.PageUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
+import com.ozs.plan.doman.MonthlyReconciliation;
 import com.ozs.plan.doman.PlanYears;
 import com.ozs.plan.doman.ProvisionalPlan;
 import com.ozs.plan.doman.vo.requestVo.ProvisionalPlanVo;
@@ -39,6 +41,7 @@ import com.ozs.system.service.ISysDictTypeService;
 import com.ozs.system.service.SysFileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletRequest;
@@ -75,7 +78,25 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
     }
 
     @Override
+    @Transactional
     public int updateProvisionalPlanById(ProvisionalPlanVo provisionalPlan) {
+        List<SysFileRef> sysFileRefs = provisionalPlan.getSysFileRefs();
+        if (!ObjectUtils.isEmpty(sysFileRefs)) {
+            // 删关联
+            LambdaQueryWrapper<SysFileRef> lw = new LambdaQueryWrapper<>();
+            lw.eq(SysFileRef::getRedId, provisionalPlan.getPlanPracticalId());
+            lw .eq(SysFileRef::getType, SysFileRefEnum.PLAN_TEMPORARY.getType());
+            sysFileRefMapper.delete(lw);
+            for (SysFileRef ref : sysFileRefs) {
+                ref.setRedId(provisionalPlan.getPlanPracticalId());
+                ref.setType(SysFileRefEnum.PLAN_TEMPORARY.getType());
+                ref.setCreated(provisionalPlan.getCreated());
+                ref.setCreateTime(new Date());
+                ref.setUpdated(provisionalPlan.getCreated());
+                ref.setUpdateTime(new Date());
+                sysFileRefMapper.insert(ref);
+            }
+        }
         return provisionalPlanMapper.updateProvisionalPlanById(provisionalPlan);
     }
 

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

@@ -378,6 +378,9 @@ public class SysDeptServiceImpl implements ISysDeptService
         List<SysProcurementStandard> sysProcurementStandardsList = sysProcurementStandardMapper.selectList(queryWrapper);
         if (!ObjectUtils.isEmpty(sysProcurementStandardsList)) {
             BigDecimal maximum = sysProcurementStandardsList.get(0).getMaximum();
+            if (ObjectUtils.isEmpty(maximum)) {
+                return "0";
+            }
             if (evaluation.compareTo(maximum) == 1) {
                 //是超额计划
                 result = "1";