damdt -commit code

src/main/java/com/viettel/campaign/mapper/CampaignCompleteCodeMapper.java

@@ -27,6 +27,7 @@ public class CampaignCompleteCodeMapper extends BaseMapper<CampaignCompleteCode,
             dto.setCompanySiteId(entity.getCompanySiteId());
             dto.setIsLock(entity.getIsLock());
             dto.setDurationLock(entity.getDurationLock());
+            dto.setChanel(entity.getChanel());
         }
 
         return dto;
@@ -54,6 +55,7 @@ public class CampaignCompleteCodeMapper extends BaseMapper<CampaignCompleteCode,
             entity.setCompanySiteId(dtoBean.getCompanySiteId());
             entity.setIsLock(dtoBean.getIsLock());
             entity.setDurationLock(dtoBean.getDurationLock());
+            entity.setChanel(dtoBean.getChanel());
         }
 
         return entity;

src/main/java/com/viettel/campaign/model/CampaignCompleteCode.java

@@ -6,6 +6,7 @@ import lombok.Setter;
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Entity
@@ -44,7 +45,6 @@ public class CampaignCompleteCode implements Serializable {
     @Column(name = "CREATE_AT")
     @Temporal(TemporalType.TIMESTAMP)
     private Date createAt;
-    @Transient
     @Column(name = "CAMPAIGN_TYPE")
     private String campaignType;
     @Column(name = "IS_FINISH")
@@ -55,4 +55,7 @@ public class CampaignCompleteCode implements Serializable {
     private Short isLock;
     @Column(name = "DURATION_LOCK")
     private Long durationLock;
+    @Column(name = "CHANEL")
+    private BigDecimal chanel;
+
 }

src/main/java/com/viettel/campaign/repository/impl/CampaignCompleteCodeRepositoryIpml.java

@@ -2,14 +2,17 @@ package com.viettel.campaign.repository.impl;
 
 import com.viettel.campaign.model.CampaignCompleteCode;
 import com.viettel.campaign.repository.CampaignCompleteCodeRepository;
+import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.utils.HibernateUtil;
 import com.viettel.campaign.utils.SQLBuilder;
 import com.viettel.campaign.web.dto.CampaignCompleteCodeDTO;
+import com.viettel.campaign.web.dto.ResultDTO;
 import org.hibernate.Query;
 import org.hibernate.SQLQuery;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.transform.Transformers;
+import org.hibernate.type.BigDecimalType;
 import org.hibernate.type.LongType;
 import org.hibernate.type.ShortType;
 import org.hibernate.type.StringType;
@@ -21,6 +24,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.persistence.EntityManager;
 import java.util.ArrayList;
@@ -43,7 +47,7 @@ public class CampaignCompleteCodeRepositoryIpml implements CampaignCompleteCodeR
 //        } catch (Exception e) {
 //
 //        }
-        return  null;
+        return null;
     }
 
     @Override
@@ -69,7 +73,7 @@ public class CampaignCompleteCodeRepositoryIpml implements CampaignCompleteCodeR
             query.addScalar("chanel", new ShortType());
             query.addScalar("description", new StringType());
             query.addScalar("status", new ShortType());
-
+            query.addScalar("chanel", new BigDecimalType());
 
             query.setResultTransformer(Transformers.aliasToBean(CampaignCompleteCodeDTO.class));
 
@@ -113,8 +117,18 @@ public class CampaignCompleteCodeRepositoryIpml implements CampaignCompleteCodeR
     }
 
     @Override
-    public void deleteById(Long aLong) {
-
+    @Transactional
+    public void deleteById(Long id) {
+        ResultDTO result = new ResultDTO();
+        try {
+            // update Status = 0 cho cái ID truyền vào
+            CampaignCompleteCode entity = entityManager.find(CampaignCompleteCode.class, id);
+            // set giá trị Status = 0 --> tương đương với inactive
+            entity.setStatus(new Short("0"));
+            entityManager.merge(entity);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
     }
 
     @Override

src/main/java/com/viettel/campaign/utils/Constants.java

@@ -28,7 +28,7 @@ public class Constants {
         Long ACTIVE = 1L;
         Long INACTIVE = 0L;
 
-        String ACTIVE_STR = "Trang thai ket noi(Khong thanh cong)";
-        String INACTIVE_STR = "Trang thai khao sat";
+        String ACTIVE_STR = "Trạng thái kêt nối(Không thành công)";
+        String INACTIVE_STR = "Trạng thái khảo sát";
     }
 }

src/main/java/com/viettel/campaign/web/dto/CampaignCompleteCodeDTO.java

@@ -3,6 +3,7 @@ package com.viettel.campaign.web.dto;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Getter
@@ -26,4 +27,5 @@ public class CampaignCompleteCodeDTO extends BaseDTO {
     private Long companySiteId;
     private Short isLock;
     private Long durationLock;
+    private BigDecimal chanel;
 }