Browse Source

修改比例异常问题

wks 1 year ago
parent
commit
6c3a8d37fc

+ 15 - 10
src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementServiceImpl.java

@@ -522,6 +522,11 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
             LocalDate startDate = agreement.getStartDate();
             LocalDate endDate = agreement.getEndDate();
             LocalDate now = LocalDate.now();
+
+            if (now.isEqual(startDate)) {
+                agreement.setIsValid("1");
+            }
+
             if (now.isAfter(startDate) && now.isBefore(endDate)) {
                 agreement.setIsValid("1");
             } else {
@@ -568,7 +573,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
                 //是否有效
                 .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getValidStatus()), PtlAgreement::getValidStatus,
                         ptlAgreementPageVo.getValidStatus())
-                .eq(PtlAgreement::getIsExternal,"0")
+                .eq(PtlAgreement::getIsExternal, "0")
                 // 供应商类型
                 .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getCompaniesType()), PtlAgreement::getCompaniesType,
                         ptlAgreementPageVo.getCompaniesType())
@@ -694,9 +699,9 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         // 修改协议序号
         List<PtlAgreement> updateList = new ArrayList<>();
         List<PtlAgreement> list = ptlAgreementMapper.selectList(new QueryWrapper<PtlAgreement>()
-                        .ge("serial_number", ptlAgreement.getSerialNumber())
-                        .ne("id", agreementId)
-                        .eq("is_external", ptlAgreement.getIsExternal()));
+                .ge("serial_number", ptlAgreement.getSerialNumber())
+                .ne("id", agreementId)
+                .eq("is_external", ptlAgreement.getIsExternal()));
         if (list != null && list.size() > 0) {
             int newSerialNumber = ptlAgreement.getSerialNumber();
             for (PtlAgreement ptlAgreement1 : list) {
@@ -903,13 +908,13 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     }
 
     /**
-     *  @version
-     *  @author: whp
-     *  @Date: 2024/07/23
-     *  @Description: 查询审核的所有协议  协议名称拼接
+     * @version
+     * @author: whp
+     * @Date: 2024/07/23
+     * @Description: 查询审核的所有协议  协议名称拼接
      */
     public List<PtlAgreement> findCheckAgreementListNew(PtlAgreement ptlAgreement) {
-        List<PtlAgreement> list =baseMapper.findCheckAgreementListNew(ptlAgreement);
+        List<PtlAgreement> list = baseMapper.findCheckAgreementListNew(ptlAgreement);
         return list;
     }
 
@@ -989,7 +994,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     public HttpResult getAgreementCopy(PtlAgreementVo ptlAgreementVo) {
         PtlAgreement ptlAgreement = baseMapper.selectById(ptlAgreementVo.getId());
         PtlAgreement newPtlAgreement = new PtlAgreement();
-        BeanUtils.copyProperties(ptlAgreement, newPtlAgreement,"id","agreementCode");
+        BeanUtils.copyProperties(ptlAgreement, newPtlAgreement, "id", "agreementCode");
         newPtlAgreement.setPartnerCompaniesId(ptlAgreement.getPartnerCompaniesId());
         newPtlAgreement.generateTheProtocolCode();
         save(newPtlAgreement);