diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/repository/CaseRepository.java b/server/src/main/java/com/aisino/iles/lawenforcement/repository/CaseRepository.java index 4b393a5..5aaf0b6 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/repository/CaseRepository.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/repository/CaseRepository.java @@ -15,6 +15,7 @@ import java.util.Optional; public interface CaseRepository extends BaseRepo { Optional findByEnforcementInfoEnforcementId(String enforcementId); + @Query("select new com.aisino.iles.lawenforcement.model.dto.EnforceCheckDto(concat(year(e.fillingDate),'-',month(e.fillingDate)), cast(count(1) as long))" + " from Case e where e.fillingDate >= :start and e.fillingDate <= :end group by concat(year(e.fillingDate),'-',month(e.fillingDate))") List caseGroupByMonth(LocalDate start, LocalDate end); diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/repository/CheckItemRepository.java b/server/src/main/java/com/aisino/iles/lawenforcement/repository/CheckItemRepository.java index be54658..ee9720e 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/repository/CheckItemRepository.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/repository/CheckItemRepository.java @@ -9,6 +9,7 @@ import java.util.List; @Repository public interface CheckItemRepository extends BaseRepo { + List findByItemIdIn(String[] ids); List findByEnabled(Boolean enable); diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/repository/ChecklistRepository.java b/server/src/main/java/com/aisino/iles/lawenforcement/repository/ChecklistRepository.java index e7ada6f..41ee2c8 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/repository/ChecklistRepository.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/repository/ChecklistRepository.java @@ -6,4 +6,5 @@ import org.springframework.stereotype.Repository; @Repository public interface ChecklistRepository extends BaseRepo { + } diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/CaseService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/CaseService.java index e386f05..d1cf909 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/CaseService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/CaseService.java @@ -538,8 +538,6 @@ public class CaseService { } } - - @PublishDataChange(action = DataChangeAction.SAVE) @Transactional public List discuss(Case c) { diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/CheckItemService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/CheckItemService.java index e455925..ccc494a 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/CheckItemService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/CheckItemService.java @@ -32,7 +32,6 @@ public class CheckItemService { } - /** * 保存检查项信息 * diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/ChecklistService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/ChecklistService.java index 7869dec..6d00f93 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/ChecklistService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/ChecklistService.java @@ -31,6 +31,7 @@ public class ChecklistService { this.checklistRepo = checklistRepo; } + /** * 保存检查表信息 *