Merge branch 'report-detail' into 'DEV'

add target public







See merge request !58

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/dao/TargetDao.java

@@ -5,7 +5,9 @@ import cn.iselab.mooctest.site.models.App;
 import cn.iselab.mooctest.site.web.data.TargetVO;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.data.repository.query.Param;
 
 import javax.transaction.Transactional;
 
@@ -15,5 +17,6 @@ import javax.transaction.Transactional;
 @Transactional
 public interface TargetDao extends PagingAndSortingRepository<App,Long>{
 
-    Page<App> findByOwnerId(long ownerId, Pageable pageable);
+    @Query("SELECT a from App a WHERE a.ownerId=:ownerId OR a.visible= 1")
+    Page<App> findByOwnerId(@Param("ownerId")long ownerId, Pageable pageable);
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/wrapper/TargetKibugVOWrapper.java

@@ -52,6 +52,7 @@ public class TargetKibugVOWrapper extends BaseWrapper<TargetKibugVO,Application>
         app.setSubsiteId(targetKibugVO.getSubsiteId());
         app.setStatus(targetKibugVO.getStatus());
         app.setOwnerId(targetKibugVO.getOwnerId());
+        app.setUrl(targetKibugVO.getUrl());
         return  app;
     }
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/TargetLogicImpl.java

@@ -72,7 +72,7 @@ public class TargetLogicImpl implements TargetLogic{
         Application application=targetKibugVOWrapper.unwrap(vo);
         app=appService.uploadCase(app);
         application.setUploadedCaseId(app.getId());
-        targetService.createTargetKibug(application);
+        applicationService.createApp(application);
         return app.getId();
     }
 }