Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/purchase

purchase-admin/src/main/java/com/ozs/web/controller/home/HomeNoticeController.java

@@ -25,6 +25,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -89,4 +92,40 @@ public class HomeNoticeController extends BaseController {
         }
         return planYearsService.projectDetails(yearsStandardVo);
     }
+
+    /**
+     * 查询不同类型的公告
+     */
+    @PreAuthorize("@ss.hasPermi('home:homeNotice:getNoticesByType')")
+    @Log(title = "查询公告", businessType = BusinessType.QUERY)
+    @PostMapping("getNoticesByType")
+    @ApiOperation("查询不同类型的公告")
+    public AjaxResult getNoticesByType(@RequestBody HomeNoticeVo homeNoticeVo) {
+        LambdaQueryWrapper<HomeNotice> lw = new LambdaQueryWrapper<>();
+        if (!ObjectUtils.isEmpty(homeNoticeVo.getNoticeName())) {
+            lw.like(HomeNotice::getNoticeName, "%" + homeNoticeVo.getNoticeName() + "%");
+        }
+        if (!ObjectUtils.isEmpty(homeNoticeVo.getAnnouncementClassification())) {
+            lw.eq(HomeNotice::getAnnouncementClassification, homeNoticeVo.getAnnouncementClassification());
+        }
+        if (!ObjectUtils.isEmpty(homeNoticeVo.getBeginTime())) {
+            lw.ge(HomeNotice::getNoticeTime, homeNoticeVo.getBeginTime());
+        }
+        if (!ObjectUtils.isEmpty(homeNoticeVo.getEndTime())) {
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            SimpleDateFormat dateFormatT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
+            Date parse = null;
+            try {
+                parse = dateFormatT.parse((dateFormat.format(homeNoticeVo.getEndTime()) + " 23:59:59:999"));
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            lw.le(HomeNotice::getNoticeTime, parse);
+        }
+
+        List<HomeNotice> noticeList = homeNoticeService.list(lw);
+        return AjaxResult.success(noticeList);
+    }
+
+
 }

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

@@ -62,11 +62,11 @@ public class BaseExpertServiceImpl extends ServiceImpl<BaseExpertMapper, BaseExp
                 Integer i = baseExpertMapper.insertBaseUnitInformation(baseUnitInformation);
             }
         }
-        // 区域list转字符串
-        if (StringUtils.isNotNull(baseExpertVo.getLocalAreaList())) {
-            String stringFromList = String.join(",", baseExpertVo.getLocalAreaList());
-            baseExpertVo.setLocalArea(stringFromList);
-        }
+        //// 区域list转字符串
+        //if (StringUtils.isNotNull(baseExpertVo.getLocalAreaList())) {
+        //    String stringFromList = String.join(",", baseExpertVo.getLocalAreaList());
+        //    baseExpertVo.setLocalArea(stringFromList);
+        //}
         return baseExpertMapper.insertExpert(baseExpertVo);
     }
 

purchase-system/src/main/java/com/ozs/home/domain/vo/HomeNoticeVo.java

@@ -1,6 +1,7 @@
 package com.ozs.home.domain.vo;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.vo.PageVo;
 import lombok.Data;
 
@@ -14,12 +15,27 @@ public class HomeNoticeVo extends PageVo {
     /** 首页分类（0需求单位首页1采购管理部门首页2采购部首页） */
     private String homepageClassification;
 
-    /** 公告分类（0采购公告1中标公告2流标公告） */
+    /**
+     * 公告分类（0采购公告1中标公告2流标公告）
+     */
     private String announcementClassification;
 
-    /** 公告名称 */
+    /**
+     * 公告名称
+     */
     private String noticeName;
 
-    /** 公告时间 */
+    /**
+     * 公告时间
+     */
     private Date noticeTime;
+
+    /**
+     * 查询参数开始时间和结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date beginTime;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+
 }

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

@@ -457,6 +457,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
             for (SysFileRef ref : sysFileRefs) {
                 ref.setRedId(demand.getDemandId());
                 ref.setType(SysFileRefEnum.PM_DEMAND.getType());
+                ref.setId(null);
                 sysFileRefMapper.insert(ref);
             }
         }

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

@@ -280,7 +280,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             e.printStackTrace();
         }
         //判断是否为超额计划
-        ofYears.setIsExcess(isExcessOrNo(ofYears.getProjectType(), ofYears.getEvaluation()));
+        //ofYears.setIsExcess(isExcessOrNo(ofYears.getProjectType(), ofYears.getEvaluation()));
         ofYears.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
         ofYears.setCreateTime(new Date());
         planYearsMapper.insertPlanYears(ofYears);
@@ -351,7 +351,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         } catch (Exception e) {
             e.printStackTrace();
         }
-        ofYears.setIsExcess(isExcessOrNo(ofYears.getProjectType(), ofYears.getEvaluation()));
+        //ofYears.setIsExcess(isExcessOrNo(ofYears.getProjectType(), ofYears.getEvaluation()));
         ofYears.setUpdateTime(new Date());
         planYearsMapper.updateInfoById(ofYears);
         List<SysFileRef> sysFileRefs = yearsStandardVo.getSysFileRefs();
@@ -429,7 +429,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     }
                     ofYear.setProjectAttr(builder.toString());
                     ofYear.setPurchaseServices(purchaseServices.get(ofYear.getPurchaseServices()));
-                    ofYear.setIsExcess(isExcessOrNo(ofYear.getProjectType(), ofYear.getEvaluation()));
+                    //ofYear.setIsExcess(isExcessOrNo(ofYear.getProjectType(), ofYear.getEvaluation()));
                     ofYear.setCreated(String.valueOf(loginUser.getUserId()));
                     ofYear.setCreateTime(new Date());
                     planYearsMapper.insertPlanYears(ofYear);
@@ -1267,31 +1267,31 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         return quarterRes;
     }
 
-    //判断是否为超额计划
-    public String isExcessOrNo(String projectType, BigDecimal evaluation) {
-        BigDecimal threshold = new BigDecimal(0);
-        //获取各个项目类型设定的概算金额阈值
-        List<SysDictData> data = dictTypeService.selectDictDataByType("sys_over_limit_threshold");
-        HashMap<String, String> thresholdMap = new LinkedHashMap<>();
-        //各个类型的概算金额阈值
-        for (SysDictData dictData : data) {
-            //    类型----阈值
-            thresholdMap.put(dictData.getDictLabel(), dictData.getDictValue());
-        }
-        //项目类型
-        for (ProjectTypes value : ProjectTypes.values()) {
-            if (projectType.equals(value.getCode())) {
-                threshold = BigDecimal.valueOf(Long.parseLong(thresholdMap.get(value.getInfo())));
-            }
-            break;
-        }
-        if (evaluation.compareTo(threshold) == 1) {
-            //是超额计划
-            return ("1");
-        } else {
-            return ("0");
-        }
-    }
+    ////判断是否为超额计划
+    //public String isExcessOrNo(String projectType, BigDecimal evaluation) {
+    //    BigDecimal threshold = new BigDecimal(0);
+    //    //获取各个项目类型设定的概算金额阈值
+    //    List<SysDictData> data = dictTypeService.selectDictDataByType("sys_over_limit_threshold");
+    //    HashMap<String, String> thresholdMap = new LinkedHashMap<>();
+    //    //各个类型的概算金额阈值
+    //    for (SysDictData dictData : data) {
+    //        //    类型----阈值
+    //        thresholdMap.put(dictData.getDictLabel(), dictData.getDictValue());
+    //    }
+    //    //项目类型
+    //    for (ProjectTypes value : ProjectTypes.values()) {
+    //        if (projectType.equals(value.getCode())) {
+    //            threshold = BigDecimal.valueOf(Long.parseLong(thresholdMap.get(value.getInfo())));
+    //        }
+    //        break;
+    //    }
+    //    if (evaluation.compareTo(threshold) == 1) {
+    //        //是超额计划
+    //        return ("1");
+    //    } else {
+    //        return ("0");
+    //    }
+    //}
 
     //字段赋值对应的名称
     public List<PlanYearsResponseVo> changeTo(List<PlanYears> planYears) {
@@ -1416,5 +1416,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
 
         return "";
     }
+    //判断是否为超额计划
+
 
 }