fix-维权抚慰加上创建时间

src/main/java/com/biutag/supervision/pojo/param/RpcApplyQueryParam.java

@@ -32,4 +32,7 @@ public class RpcApplyQueryParam extends BasePage {
     private String rpcStatus;
 
     private String code;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private List<Date> crtTime;
 }

src/main/java/com/biutag/supervision/pojo/vo/RpcApplyVo.java

@@ -125,4 +125,8 @@ public class RpcApplyVo {
     private String changeMandate;
 
     private String jysm;
+
+    // 发生时间
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime crtTime;
 }

src/main/java/com/biutag/supervision/service/DataMailService.java

@@ -56,7 +56,6 @@ public class DataMailService extends ServiceImpl<DataPetitionComplaintMapper, Da
         countryQueryWrapper.between("create_time", beginTime, endTime);
         Long countryMail = dataPetitionComplaintMapper.selectCount(countryQueryWrapper);
 
-
         // 公安部信访
         QueryWrapper<DataPetitionComplaint> policeQueryWrapper = new QueryWrapper<>();
         policeQueryWrapper.eq("problem_sources_code", 22);
@@ -64,13 +63,15 @@ public class DataMailService extends ServiceImpl<DataPetitionComplaintMapper, Da
         Long policeMail = dataPetitionComplaintMapper.selectCount(policeQueryWrapper);
 
         // 12337
-        long mail12337 = negativeService.count(new LambdaQueryWrapper<Negative>().between(Negative::getCrtTime, beginTime, endTime).eq(Negative::getProblemSourcesCode, ProblemSourcesEnum.XF12337.getValue()));
+        QueryWrapper<DataPetition12337> queryWrapper12337 = new QueryWrapper<>();
-        // 局长信箱
+        queryWrapper12337.between("discover_time", beginTime, endTime);
-//        long mailCount =
+        Long mail12337 = dataPetition12337Mapper.selectCount(queryWrapper12337);
-//                negativeService.count(new LambdaQueryWrapper<Negative>().between(Negative::getCrtTime, beginTime, endTime).eq(Negative::getProblemSourcesCode, ProblemSourcesEnum.JZXX.getValue()));
-
-        long mailCount = mailMapper.selectMailDataCount(beginTime,endTime);
 
+        // 局长信箱
+        QueryWrapper<Mail> mailQueryWrapper = new QueryWrapper<>();
+        mailQueryWrapper.ne("mail_state", VALID_SIGN);
+        mailQueryWrapper.between("create_time", beginTime, endTime);
+        Long mailCount = mailMapper.selectCount(mailQueryWrapper);
 
         temp.setCountryMail(countryMail);
         temp.setPoliceMail(policeMail);

src/main/java/com/biutag/supervision/service/RpcApplyService.java

@@ -86,6 +86,9 @@ public class RpcApplyService extends ServiceImpl<RpcApplyMapper, RpcApply> {
         if (queryParam.getHappenTime() != null && queryParam.getHappenTime().size() == 2) {
             queryWrapper.between("a.happen_time", queryParam.getHappenTime().get(0), queryParam.getHappenTime().get(1));
         }
+        if (queryParam.getCrtTime() != null && queryParam.getCrtTime().size() == 2) {
+            queryWrapper.between("a.crt_time", queryParam.getCrtTime().get(0), queryParam.getCrtTime().get(1));
+        }
         if(StrUtil.isNotBlank(queryParam.getCode())){
             queryWrapper.eq("a.verified","2");
         }
@@ -123,6 +126,9 @@ public class RpcApplyService extends ServiceImpl<RpcApplyMapper, RpcApply> {
         if (queryParam.getHappenTime() != null && queryParam.getHappenTime().size() == 2) {
             queryWrapper.between("a.happen_time", queryParam.getHappenTime().get(0), queryParam.getHappenTime().get(1));
         }
+        if (queryParam.getCrtTime() != null && queryParam.getCrtTime().size() == 2) {
+            queryWrapper.between("a.crt_time", queryParam.getCrtTime().get(0), queryParam.getCrtTime().get(1));
+        }
         if(StrUtil.isNotBlank(queryParam.getCode())){
             queryWrapper.eq("a.verified","2");
         }

src/main/resources/mapper/RpcApplyMapper.xml

@@ -27,7 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             rap.id as personId,
             a.rpc_status as rpcStatus,
             a.rpc_id as rpcId,
-            a.case_name as caseName
+            a.case_name as caseName,
+            a.crt_time as crtTime
         from rpc_apply_person rap
                  LEFT JOIN rpc_apply a on rap.rpc_id = a.rpc_id
             ${ew.getCustomSqlSegment}