update

core/src/main/java/com/mooctest/crowd/domain/dao/QualificationDao.java

@@ -18,4 +18,6 @@ public interface QualificationDao extends PagingAndSortingRepository<Qualificati
 
     Optional<QualificationPO> findById(Long id);
 
+    List<QualificationPO> findByUserIdAndIsDeleted(Long userId, int isDeleted);
+
 }

core/src/main/java/com/mooctest/crowd/domain/model/QualificationPO.java

@@ -32,4 +32,7 @@ public class QualificationPO {
     @Column(name="Q_U_ID")
     private Long userId;
 
+    @Column(name = "Q_DELETED")
+    private int isDeleted;
+
 }

site/src/main/java/com/mooctest/crowd/site/controller/PersonalDataController.java

@@ -40,4 +40,9 @@ public class PersonalDataController {
     public QualificationDTO updateQualification(@PathVariable("id") long id, @PathVariable("userId") long userId,@RequestBody QualificationVO qualificationVO){
         return  personalDataService.updateQualification(id,userId,qualificationVO);
     }
+
+    @RequestMapping(value = "/deletequalification/{id:\\d+}/{userId:\\d+}", method = RequestMethod.DELETE)
+    public QualificationDTO deleteQualification(@PathVariable("id") long id, @PathVariable("userId") long userId){
+        return  personalDataService.deleteQualification(id,userId);
+    }
 }

site/src/main/java/com/mooctest/crowd/site/data/vo/QualificationVO.java

@@ -15,4 +15,5 @@ public class QualificationVO{
     private Date time;
     private Long userId;
 
+
 }

site/src/main/java/com/mooctest/crowd/site/mediator/ViewMediator.java

@@ -78,4 +78,6 @@ public interface ViewMediator {
     QualificationDTO addQualification(long userId,QualificationVO qualificationVO);
 
     QualificationDTO updateQualification(long id,long userId,QualificationVO qualificationVO);
+
+    QualificationDTO deleteQualification(long id,long userId);
 }

site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -786,7 +786,7 @@ public class WebMediatorImpl implements ViewMediator {
     public QualificationDTO getQualification(long userId) {
         QualificationDTO qualificationDTO=new QualificationDTO();
         List<QualificationVO> qualificationVOList = new ArrayList<>();
-        qualificationDao.findByUserId(userId).forEach(qualificationPO ->{
+        qualificationDao.findByUserIdAndIsDeleted(userId,DeletedStatus.isNotDeleted).forEach(qualificationPO ->{
             QualificationVO qualificationVO = new QualificationVO();
             qualificationVO.setId(qualificationPO.getId());
             qualificationVO.setName(qualificationPO.getName());
@@ -809,7 +809,6 @@ public class WebMediatorImpl implements ViewMediator {
         qualificationPO.setTime(qualificationVO.getTime());
         qualificationPO.setUserId(userId);
         qualificationDao.save(qualificationPO);
-        this.getQualification(userId);
         return this.getQualification(userId);
     }
 
@@ -821,7 +820,14 @@ public class WebMediatorImpl implements ViewMediator {
         qualificationPO.get().setLicensingAuthority(qualificationVO.getLicensingAuthority());
         qualificationPO.get().setTime(qualificationVO.getTime());
         qualificationDao.save(qualificationPO.get());
-        this.getQualification(userId);
+        return this.getQualification(userId);
+    }
+
+    @Override
+    public QualificationDTO deleteQualification(long id, long userId) {
+        Optional<QualificationPO> qualificationPO=qualificationDao.findById(id);
+        qualificationPO.get().setIsDeleted(1);
+        qualificationDao.save(qualificationPO.get());
         return this.getQualification(userId);
     }
 

site/src/main/java/com/mooctest/crowd/site/service/PersonalDataService.java

@@ -16,4 +16,6 @@ public interface PersonalDataService {
     QualificationDTO addQualification(long userId,QualificationVO qualificationVO);
 
     QualificationDTO updateQualification(long id,long userId,QualificationVO qualificationVO);
+
+    QualificationDTO deleteQualification(long id,long userId);
 }

site/src/main/java/com/mooctest/crowd/site/service/impl/PersonalDataServiceImpl.java

@@ -39,4 +39,9 @@ public class PersonalDataServiceImpl implements PersonalDataService {
     public QualificationDTO updateQualification(long id, long userId,QualificationVO qualificationVO) {
         return viewMediator.updateQualification(id,userId,qualificationVO);
     }
+
+    @Override
+    public QualificationDTO deleteQualification(long id, long userId) {
+        return viewMediator.deleteQualification(id,userId);
+    }
 }