修改 bug

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java

@@ -396,8 +396,10 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
         BeanUtils.copyProperties(req, project);
         String playCardStart = req.getPlayCardStart();
         String playCardEnd = req.getPlayCardEnd();
-        String punchRange = playCardStart + "," + playCardEnd;
+        if (StringUtils.isNotBlank(playCardStart) && StringUtils.isNotBlank(playCardEnd)) {
-        project.setPunchRange(punchRange);
+            String punchRange = playCardStart + "," + playCardEnd;
+            project.setPunchRange(punchRange);
+        }
         // 数据校验
         validEntityBeforeSave(project, true);
         if (this.lambdaQuery().eq(BusProject::getProjectName, req.getProjectName()).count() > 0) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/service/impl/XzdPostBidAnalysisServiceImpl.java

@@ -1,7 +1,10 @@
 package org.dromara.xzd.biddingManagement.postAnalysis.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.domain.event.ProcessDeleteEvent;
 import org.dromara.common.core.domain.event.ProcessEvent;
@@ -9,27 +12,20 @@ import org.dromara.common.core.domain.event.ProcessTaskEvent;
 import org.dromara.common.core.enums.BusinessStatusEnum;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
 import org.dromara.common.utils.BatchNumberGenerator;
-import org.dromara.project.domain.BusProject;
 import org.dromara.project.domain.dto.project.BusProjectCreateReq;
 import org.dromara.project.service.IBusProjectService;
 import org.dromara.system.domain.SysDept;
 import org.dromara.system.domain.vo.SysDeptVo;
 import org.dromara.system.mapper.SysDeptMapper;
-import org.dromara.system.service.ISysDeptService;
 import org.dromara.system.service.impl.SysOssServiceImpl;
 import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdBidPreProject;
 import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdBqlxProjectInfo;
 import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdBidPreProjectVo;
 import org.dromara.xzd.biddingManagement.biaoqianlixiang.mapper.XzdBidPreProjectMapper;
 import org.dromara.xzd.biddingManagement.biaoqianlixiang.service.IXzdBqlxProjectInfoService;
-import org.dromara.xzd.biddingManagement.biddingDocumentList.domain.XzdBiddingDocument;
 import org.dromara.xzd.biddingManagement.postAnalysis.domain.XzdBhfxDwpm;
 import org.dromara.xzd.biddingManagement.postAnalysis.domain.XzdPostBidAnalysis;
 import org.dromara.xzd.biddingManagement.postAnalysis.domain.bo.XzdBhfxDwpmBo;
@@ -39,22 +35,19 @@ import org.dromara.xzd.biddingManagement.postAnalysis.domain.vo.XzdPostBidAnalys
 import org.dromara.xzd.biddingManagement.postAnalysis.mapper.XzdPostBidAnalysisMapper;
 import org.dromara.xzd.biddingManagement.postAnalysis.service.IXzdBhfxDwpmService;
 import org.dromara.xzd.biddingManagement.postAnalysis.service.IXzdPostBidAnalysisService;
-import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.XzdSubcontract;
 import org.dromara.xzd.domain.XzdProject;
 import org.dromara.xzd.domain.XzdProjectProfile;
-import org.dromara.xzd.domain.bo.XzdProjectProfileBo;
-import org.dromara.xzd.domain.vo.XzdProjectTypeVo;
 import org.dromara.xzd.enums.ZxdEnum;
 import org.dromara.xzd.service.IXzdProjectProfileService;
 import org.dromara.xzd.service.IXzdProjectService;
-import org.dromara.xzd.settlement.domain.vo.XzdJsCgJungonVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 /**
@@ -98,7 +91,7 @@ public class XzdPostBidAnalysisServiceImpl extends ServiceImpl<XzdPostBidAnalysi
      * @return 标后分析
      */
     @Override
-    public XzdPostBidAnalysisVo queryById(Long id){
+    public XzdPostBidAnalysisVo queryById(Long id) {
         XzdPostBidAnalysisVo vo = baseMapper.selectVoById(id);
         List<XzdBhfxDwpm> xzdBhfxDwpms = xzdBhfxDwpmService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdBhfxDwpm>().eq(XzdBhfxDwpm::getMasterId, id).orderByAsc(XzdBhfxDwpm::getRanking));
         vo.setPm(MapstructUtils.convert(xzdBhfxDwpms, XzdBhfxDwpmVo.class));
@@ -124,11 +117,11 @@ public class XzdPostBidAnalysisServiceImpl extends ServiceImpl<XzdPostBidAnalysi
 
     private void getName(XzdPostBidAnalysisVo xzdPostBidAnalysisVo) {
 
-        if (xzdPostBidAnalysisVo != null){
+        if (xzdPostBidAnalysisVo != null) {
             String projectName = xzdPostBidAnalysisVo.getProjectName();
-            if (StringUtils.isNotBlank(projectName)){
+            if (StringUtils.isNotBlank(projectName)) {
                 XzdBidPreProjectVo xzdBidPreProjectVo = xzdBidPreProjectMapper.selectVoById(Long.parseLong(projectName));
-                if (xzdBidPreProjectVo != null){
+                if (xzdBidPreProjectVo != null) {
                     xzdPostBidAnalysisVo.setProjectNames(xzdBidPreProjectVo.getProjectName());
                 }
             }
@@ -188,8 +181,8 @@ public class XzdPostBidAnalysisServiceImpl extends ServiceImpl<XzdPostBidAnalysi
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         List<XzdBhfxDwpmBo> pm = bo.getPm();
-        if(pm != null && pm.size() > 0){
+        if (pm != null && pm.size() > 0) {
-            pm.forEach(temp ->{
+            pm.forEach(temp -> {
                 temp.setMasterId(add.getId());
             });
             xzdBhfxDwpmService.saveBatch(MapstructUtils.convert(pm, XzdBhfxDwpm.class));
@@ -215,8 +208,8 @@ public class XzdPostBidAnalysisServiceImpl extends ServiceImpl<XzdPostBidAnalysi
         validEntityBeforeSave(update);
         List<XzdBhfxDwpmBo> pm = bo.getPm();
         xzdBhfxDwpmService.getBaseMapper().delete(new LambdaQueryWrapper<XzdBhfxDwpm>().eq(XzdBhfxDwpm::getMasterId, update.getId()));
-        if(pm != null && pm.size() > 0){
+        if (pm != null && pm.size() > 0) {
-            pm.forEach(temp ->{
+            pm.forEach(temp -> {
                 temp.setMasterId(update.getId());
             });
             xzdBhfxDwpmService.saveBatch(MapstructUtils.convert(pm, XzdBhfxDwpm.class));
@@ -228,7 +221,7 @@ public class XzdPostBidAnalysisServiceImpl extends ServiceImpl<XzdPostBidAnalysi
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(XzdPostBidAnalysis entity){
+    private void validEntityBeforeSave(XzdPostBidAnalysis entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -242,16 +235,16 @@ public class XzdPostBidAnalysisServiceImpl extends ServiceImpl<XzdPostBidAnalysi
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
 
         }
 
         List<Long> deleteIds = new ArrayList<>();
         for (Long id : ids) {
             XzdPostBidAnalysisVo vo = baseMapper.selectVoById(id);
-            if (vo != null){
+            if (vo != null) {
                 //删除附件
-                if (vo.getFileId()!= null && !vo.getFileId().isEmpty()){
+                if (vo.getFileId() != null && !vo.getFileId().isEmpty()) {
                     List<Long> list = Arrays.stream(vo.getFileId().split(",")).map(Long::valueOf).toList();
                     deleteIds.addAll(list);
                 }
@@ -280,7 +273,7 @@ public class XzdPostBidAnalysisServiceImpl extends ServiceImpl<XzdPostBidAnalysi
             return;
         }
 //        审核通过并且中标则转换项目数据
-        if (processEvent.getStatus().equals(BusinessStatusEnum.FINISH.getStatus()) && ZxdEnum.SFZB_F.getTypeValue().equals(vo.getBiddingResult())){
+        if (processEvent.getStatus().equals(BusinessStatusEnum.FINISH.getStatus()) && ZxdEnum.SFZB_F.getTypeValue().equals(vo.getBiddingResult())) {
 //           查询顶层下的公司id 理论只有一个
             List<SysDeptVo> sysDeptVos = sysDeptMapper.selectDeptList(new LambdaQueryWrapper<SysDept>().eq(SysDept::getDelFlag, "0").eq(SysDept::getParentId, "100"));
 //          查询投标管理中的项目信息
@@ -299,7 +292,7 @@ public class XzdPostBidAnalysisServiceImpl extends ServiceImpl<XzdPostBidAnalysi
             xzdProject.setDefaultFinancialOrganization(sysDeptVos.getFirst().getDeptId());
             xzdProject.setSsgs(sysDeptVos.getFirst().getDeptId());
             xzdProject.setConstructionUnit(xzdBidPreProjectVo.getProjectTypeId());
-            if (xzdBqlxProjectInfo != null){
+            if (xzdBqlxProjectInfo != null) {
                 xzdProject.setConstructionUnit(xzdBqlxProjectInfo.getConstructionUnit());
             }
             xzdProjectService.save(xzdProject);
@@ -318,7 +311,10 @@ public class XzdPostBidAnalysisServiceImpl extends ServiceImpl<XzdPostBidAnalysi
             project.setDeptIds(xzdProject.getManagementOrganization());
             project.setProjectName(xzdProject.getProjectName());
             project.setShortName(xzdProject.getProjectAbbreviation());
-            project.setOnStreamTime(String.valueOf(xzdProject.getActualStartDate()));
+            LocalDate actualStartDate = xzdProject.getActualStartDate();
+            if (actualStartDate != null) {
+                project.setOnStreamTime(actualStartDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+            }
             // 获取项目概括
             XzdProjectProfile projectProfile = xzdProjectProfileService.lambdaQuery()
                 .eq(XzdProjectProfile::getXzdProjectId, xzdProject.getId())
@@ -333,7 +329,6 @@ public class XzdPostBidAnalysisServiceImpl extends ServiceImpl<XzdPostBidAnalysi
         }
 
 
-
         vo.setAuditStatus(processEvent.getStatus());
         this.updateById(vo);
     }