|
@@ -522,6 +522,11 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
|
|
|
LocalDate startDate = agreement.getStartDate();
|
|
LocalDate startDate = agreement.getStartDate();
|
|
|
LocalDate endDate = agreement.getEndDate();
|
|
LocalDate endDate = agreement.getEndDate();
|
|
|
LocalDate now = LocalDate.now();
|
|
LocalDate now = LocalDate.now();
|
|
|
|
|
+
|
|
|
|
|
+ if (now.isEqual(startDate)) {
|
|
|
|
|
+ agreement.setIsValid("1");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if (now.isAfter(startDate) && now.isBefore(endDate)) {
|
|
if (now.isAfter(startDate) && now.isBefore(endDate)) {
|
|
|
agreement.setIsValid("1");
|
|
agreement.setIsValid("1");
|
|
|
} else {
|
|
} else {
|
|
@@ -568,7 +573,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
|
|
|
//是否有效
|
|
//是否有效
|
|
|
.eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getValidStatus()), PtlAgreement::getValidStatus,
|
|
.eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getValidStatus()), PtlAgreement::getValidStatus,
|
|
|
ptlAgreementPageVo.getValidStatus())
|
|
ptlAgreementPageVo.getValidStatus())
|
|
|
- .eq(PtlAgreement::getIsExternal,"0")
|
|
|
|
|
|
|
+ .eq(PtlAgreement::getIsExternal, "0")
|
|
|
// 供应商类型
|
|
// 供应商类型
|
|
|
.eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getCompaniesType()), PtlAgreement::getCompaniesType,
|
|
.eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getCompaniesType()), PtlAgreement::getCompaniesType,
|
|
|
ptlAgreementPageVo.getCompaniesType())
|
|
ptlAgreementPageVo.getCompaniesType())
|
|
@@ -694,9 +699,9 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
|
|
|
// 修改协议序号
|
|
// 修改协议序号
|
|
|
List<PtlAgreement> updateList = new ArrayList<>();
|
|
List<PtlAgreement> updateList = new ArrayList<>();
|
|
|
List<PtlAgreement> list = ptlAgreementMapper.selectList(new QueryWrapper<PtlAgreement>()
|
|
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) {
|
|
if (list != null && list.size() > 0) {
|
|
|
int newSerialNumber = ptlAgreement.getSerialNumber();
|
|
int newSerialNumber = ptlAgreement.getSerialNumber();
|
|
|
for (PtlAgreement ptlAgreement1 : list) {
|
|
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) {
|
|
public List<PtlAgreement> findCheckAgreementListNew(PtlAgreement ptlAgreement) {
|
|
|
- List<PtlAgreement> list =baseMapper.findCheckAgreementListNew(ptlAgreement);
|
|
|
|
|
|
|
+ List<PtlAgreement> list = baseMapper.findCheckAgreementListNew(ptlAgreement);
|
|
|
return list;
|
|
return list;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -989,7 +994,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
|
|
|
public HttpResult getAgreementCopy(PtlAgreementVo ptlAgreementVo) {
|
|
public HttpResult getAgreementCopy(PtlAgreementVo ptlAgreementVo) {
|
|
|
PtlAgreement ptlAgreement = baseMapper.selectById(ptlAgreementVo.getId());
|
|
PtlAgreement ptlAgreement = baseMapper.selectById(ptlAgreementVo.getId());
|
|
|
PtlAgreement newPtlAgreement = new PtlAgreement();
|
|
PtlAgreement newPtlAgreement = new PtlAgreement();
|
|
|
- BeanUtils.copyProperties(ptlAgreement, newPtlAgreement,"id","agreementCode");
|
|
|
|
|
|
|
+ BeanUtils.copyProperties(ptlAgreement, newPtlAgreement, "id", "agreementCode");
|
|
|
newPtlAgreement.setPartnerCompaniesId(ptlAgreement.getPartnerCompaniesId());
|
|
newPtlAgreement.setPartnerCompaniesId(ptlAgreement.getPartnerCompaniesId());
|
|
|
newPtlAgreement.generateTheProtocolCode();
|
|
newPtlAgreement.generateTheProtocolCode();
|
|
|
save(newPtlAgreement);
|
|
save(newPtlAgreement);
|