bug修改

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/xzd/BaohanJob.java

@@ -53,16 +53,19 @@ public class BaohanJob {
         }
         log.info("保证金缴纳审批日期到期定时任务执行成功");
     }
+
+
+
     @Scheduled(cron = "0 0 8 1/1 * ?")
     public void chengbaohetongbaohanJob() {
         log.info("承包合同保函日期到期定时任务开始执行");
 //        查询保证金当天到期的数据
-        List<XzdGuaranteeInfo> xzdGuaranteeInfos = xzdGuaranteeInfoMapper.selectList(new LambdaQueryWrapper<XzdGuaranteeInfo>().eq(XzdGuaranteeInfo::getDueDate, LocalDate.now()));
+        List<XzdGuaranteeInfo> xzdGuaranteeInfos = xzdGuaranteeInfoMapper.selectList(new LambdaQueryWrapper<XzdGuaranteeInfo>().eq(XzdGuaranteeInfo::getDueDate, LocalDate.now().plusMonths(1)));
 //组装发送数据
         for (XzdGuaranteeInfo xzdGuaranteeInfo : xzdGuaranteeInfos) {
             SseMessageDto sseMessageDto = new SseMessageDto();
             sseMessageDto.setUserIds(List.of(xzdGuaranteeInfo.getCreateBy()));
-            sseMessageDto.setMessage(xzdGuaranteeInfo.getDocumentNumber()+" "+"保函日期到期");
+            sseMessageDto.setMessage(xzdGuaranteeInfo.getDocumentNumber()+" "+"承包合同保函日期还有一个月到期");
             SseMessageUtils.publishMessage(sseMessageDto);
         }
     }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/domain/vo/XzdGuaranteeInfoVo.java

@@ -97,6 +97,13 @@ public class XzdGuaranteeInfoVo implements Serializable {
     @ExcelProperty(value = "申请人")
     private String applicant;
 
+    /**
+     * 合同状态
+     */
+    @ExcelProperty(value = "合同状态")
+    private String htzt;
+
+
 
     /**
      * 工程项目

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/service/impl/XzdGuaranteeInfoServiceImpl.java

@@ -19,6 +19,9 @@ import org.dromara.common.utils.BatchNumberGenerator;
 import org.dromara.system.service.impl.SysOssServiceImpl;
 import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdBidPreProject;
 import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdBidPreProjectVo;
+import org.dromara.xzd.contractManagement.fenbaohetongbiangg.domain.XzdSubcontractChange;
+import org.dromara.xzd.deposit.backletter.domain.XzdGuaranteeChangeInfo;
+import org.dromara.xzd.deposit.backletter.mapper.XzdGuaranteeChangeInfoMapper;
 import org.dromara.xzd.deposit.contractBackletter.domain.XzdGuaranteeInfo;
 import org.dromara.xzd.deposit.contractBackletter.domain.bo.XzdGuaranteeInfoBo;
 import org.dromara.xzd.deposit.contractBackletter.domain.vo.XzdGuaranteeInfoVo;
@@ -27,10 +30,12 @@ import org.dromara.xzd.deposit.contractBackletter.service.IXzdGuaranteeInfoServi
 import org.dromara.xzd.deposit.earnestMoney.domain.XzdDepositApplication;
 import org.dromara.xzd.domain.dto.QuerCorrespondentDto;
 import org.dromara.xzd.domain.vo.XzdSupplierInfoVo;
+import org.dromara.xzd.enums.ZxdEnum;
 import org.dromara.xzd.service.IXzdCorrespondentList;
 import org.dromara.xzd.service.impl.XzdSupplierInfoServiceImpl;
 import org.dromara.xzd.utilS.AreaUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 
@@ -55,15 +60,11 @@ public class XzdGuaranteeInfoServiceImpl extends ServiceImpl<XzdGuaranteeInfoMap
 
     private final XzdGuaranteeInfoMapper baseMapper;
 
-
-    private final AreaUtil areaUtil;
-
-
     @Autowired
-    private XzdSupplierInfoServiceImpl xzdSupplierInfoService;
+    @Lazy
+    private  XzdGuaranteeChangeInfoMapper xzdGuaranteeChangeInfoMapper;
+
 
-    @Autowired
-    private IXzdCorrespondentList iXzdCorrespondentList;
 
 
     private final SysOssServiceImpl sysOssService;
@@ -87,22 +88,11 @@ public class XzdGuaranteeInfoServiceImpl extends ServiceImpl<XzdGuaranteeInfoMap
 
     private void setValue(List<XzdGuaranteeInfoVo> infos) {
         for (XzdGuaranteeInfoVo info : infos) {
-            //申请机构(供应商信息列表)
+            //            阶段状态
-            XzdSupplierInfoVo xzdSupplierInfoVot = xzdSupplierInfoService.queryById(info.getApplicationOrganization());
+            info.setHtzt(ZxdEnum.HETONGZTYS.getTypeValue());
-            if (xzdSupplierInfoVot != null){
+            Long l = xzdGuaranteeChangeInfoMapper.selectCount(new LambdaQueryWrapper<XzdGuaranteeChangeInfo>().eq(XzdGuaranteeChangeInfo::getContractGuaranteeId, info.getId()));
-                info.setApplicationOrganizationName(xzdSupplierInfoVot.getUnitName());
+            if (l > 0) {
-            }
+                info.setHtzt(ZxdEnum.HETONGZTBG.getTypeValue());
-            //乙方单位(供应商信息列表)
-            XzdSupplierInfoVo xzdSupplierInfoVo = xzdSupplierInfoService.queryById(info.getPartyBUnit());
-            if (xzdSupplierInfoVo != null){
-                info.setPartyBUnitName(xzdSupplierInfoVo.getUnitName());
-            }
-            //甲方单位(客户信息列表)
-            R<QuerCorrespondentDto> byid = iXzdCorrespondentList.getCustomerByid(info.getPartyAUnit());
-            if (byid!=null){
-                if (byid.getData().getXzdCustomerinformation() != null){
-                    info.setPartyAUnitName(byid.getData().getXzdCustomerinformation().getUnitName());
-                }
             }
 
         }
@@ -120,7 +110,7 @@ public class XzdGuaranteeInfoServiceImpl extends ServiceImpl<XzdGuaranteeInfoMap
         LambdaQueryWrapper<XzdGuaranteeInfo> lqw = buildQueryWrapper(bo);
         Page<XzdGuaranteeInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
 
-//        setValue(result.getRecords());
+        setValue(result.getRecords());
         return TableDataInfo.build(result);
     }