报告归档-盒号提示-根据报告号的年份进行查询

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/controller/CwProjectReportArchiveController.java

@@ -326,8 +326,8 @@ public class CwProjectReportArchiveController {
 
     @ApiOperation(value = "查询最新盒号和报告文号")
     @GetMapping("/getFileBoxNumber")
-    public ResponseEntity<CwProjectReportArchiveDTO> getFileBoxNumber(@RequestParam String reportType) throws Exception{
-        CwProjectReportArchiveDTO dto = cwProjectReportArchiveService.findByReportType(reportType);
+    public ResponseEntity<CwProjectReportArchiveDTO> getFileBoxNumber(@RequestParam String reportType,@RequestParam String year) throws Exception{
+        CwProjectReportArchiveDTO dto = cwProjectReportArchiveService.findByReportType(reportType,year);
         return ResponseEntity.ok(dto);
     }
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/mapper/CwProjectReportArchiveMapper.java

@@ -95,7 +95,7 @@ public interface CwProjectReportArchiveMapper extends BaseMapper<CwProjectReport
      * @return
      */
     @InterceptorIgnore(tenantLine = "true")
-    CwProjectReportArchiveDTO findByReportType(@Param("reportType")String reportType);
+    CwProjectReportArchiveDTO findByReportType(@Param("reportType")String reportType,@Param("year")String year);
 
 
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/mapper/xml/CwProjectReportArchiveMapper.xml

@@ -787,7 +787,7 @@
             left join sys_user su on su.id = a.create_by_id and su.del_flag = '0'
         where cw_prnl.report_no
             like concat('%',#{reportType},'%')
-            and cw_prnl.report_no LIKE concat('%', YEAR(CURDATE()), '%')
+            and cw_prnl.report_no LIKE concat('%[',#{year}, ']%')
             and a.number is not null
             and a.del_flag = '0'
             and a.status = '5'

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/service/CwProjectReportArchiveService.java

@@ -46,6 +46,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -804,9 +805,12 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
      * @param reportType
      * @return
      */
-    public CwProjectReportArchiveDTO findByReportType(String reportType) {
+    public CwProjectReportArchiveDTO findByReportType(String reportType,String year) {
+        if(StringUtils.isBlank(year)){
+            year = String.valueOf(LocalDate.now().getYear());
+        }
         if (StringUtils.isNotBlank(reportType)){
-            CwProjectReportArchiveDTO cwProjectReportArchiveDTO = cwProjectReportArchiveMapper.findByReportType(reportType);
+            CwProjectReportArchiveDTO cwProjectReportArchiveDTO = cwProjectReportArchiveMapper.findByReportType(reportType,year);
                 return cwProjectReportArchiveDTO;
         }
         return null;