BFLOWS/bflows-bandi-be
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved conflicts while syncing with master

Browse Source
This commit is contained in:
rajesh
2025-01-07 12:18:47 +05:30
parent 880296a5b4 16c3a7e389
commit ce09338d17
2 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationAmendmentScheduler.java
View File

@@ -3,6 +3,28 @@ package net.gepafin.tendermanagement.scheduler;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import net.gepafin.tendermanagement.dao.ApplicationAmendmentRequestDao; import net.gepafin.tendermanagement.dao.ApplicationAmendmentRequestDao;
import net.gepafin.tendermanagement.dao.NotificationDao; import net.gepafin.tendermanagement.dao.NotificationDao;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import net.gepafin.tendermanagement.entities.ApplicationEntity;
import net.gepafin.tendermanagement.entities.AssignedApplicationsEntity;
import net.gepafin.tendermanagement.enums.*;
import net.gepafin.tendermanagement.repositories.ApplicationEvaluationRepository;
import net.gepafin.tendermanagement.repositories.ApplicationRepository;
import net.gepafin.tendermanagement.repositories.AssignedApplicationsRepository;
import net.gepafin.tendermanagement.service.ApplicationService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import jakarta.servlet.http.HttpServletRequest;
import net.gepafin.tendermanagement.dao.ApplicationAmendmentRequestDao;
import net.gepafin.tendermanagement.entities.ApplicationAmendmentRequestEntity; import net.gepafin.tendermanagement.entities.ApplicationAmendmentRequestEntity;
import net.gepafin.tendermanagement.entities.ApplicationEntity; import net.gepafin.tendermanagement.entities.ApplicationEntity;
import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity; import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity;

29
src/main/resources/db/changelog/db.changelog-1.0.0.xml
View File

@@ -1981,19 +1981,20 @@
<sqlFile dbms="postgresql" <sqlFile dbms="postgresql"
path="db/dump/update_system_email_template_for_updating_amendment_mail_notification_mail_04_12_2024_1.sql"/> path="db/dump/update_system_email_template_for_updating_amendment_mail_notification_mail_04_12_2024_1.sql"/>
</changeSet> </changeSet>
<!-- <changeSet id="19-12-2024_1" author="Nisha Kashyap">-->
<!-- <addColumn tableName="USER_WITH_COMPANY">--> <changeSet id="19-12-2024_4" author="Nisha Kashyap">
<!-- <column name="contact_name" type="VARCHAR(255)"/>--> <addColumn tableName="USER_WITH_COMPANY">
<!-- <column name="contact_email" type="VARCHAR(255)"/>--> <column name="contact_name" type="VARCHAR(255)"/>
<!-- <column name="PEC" type="VARCHAR(255)"/>--> <column name="contact_email" type="VARCHAR(255)"/>
<!-- <column name="EMAIL" type="VARCHAR(255)"/>--> <column name="PEC" type="VARCHAR(255)"/>
<!-- <column name="JSON" type="TEXT"/>--> <column name="EMAIL" type="VARCHAR(255)"/>
<!-- </addColumn>--> <column name="JSON" type="TEXT"/>
<!-- <dropColumn tableName="COMPANY" columnName="contact_name"/>--> </addColumn>
<!-- <dropColumn tableName="COMPANY" columnName="contact_email"/>--> <dropColumn tableName="COMPANY" columnName="contact_name"/>
<!-- <dropColumn tableName="COMPANY" columnName="PEC"/>--> <dropColumn tableName="COMPANY" columnName="contact_email"/>
<!-- <dropColumn tableName="COMPANY" columnName="EMAIL"/>--> <dropColumn tableName="COMPANY" columnName="PEC"/>
<!--</changeSet>--> <dropColumn tableName="COMPANY" columnName="EMAIL"/>
</changeSet>
<changeSet id="04-12-2024_3" author="Piyush"> <changeSet id="04-12-2024_3" author="Piyush">
<addColumn tableName="hub"> <addColumn tableName="hub">
@@ -2053,7 +2054,7 @@
</addColumn> </addColumn>
</changeSet> </changeSet>
<changeSet id="19-12-2024_1" author="Nisha kashyap"> <changeSet id="19-12-2024_1" author="Nisha Kashyap">
<!-- Insert data for Intructor manager role --> <!-- Insert data for Intructor manager role -->
<insert tableName="role"> <insert tableName="role">
<column name="role_name" value="instructor manager"/> <column name="role_name" value="instructor manager"/>