补充修改

src/main/java/com/yxproject/start/api/ReportApi.java

@@ -41,12 +41,12 @@ public class ReportApi {
      * @return
      */
     @RequestMapping("queryDataAuditingReport")
-    public List<Map<String, Object>> queryDataAuditingReport(@RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate, @RequestParam(value = "policeName") String policeName, @RequestParam(value = "policeCode") String policeCode, HttpServletRequest requ) {
+    public List<Map<String, Object>> queryDataAuditingReport(@RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate, @RequestParam(value = "policeName") String policeName, @RequestParam(value = "policeCode") String policeCode,@RequestParam(value = "typeCode") String typeCode, HttpServletRequest requ) {
         String remoteAddr = requ.getRemoteAddr();
         MDC.put("ip", remoteAddr);
         List<Map<String, Object>> mapList = new ArrayList<>();
         try {
-            mapList = dataAuditingService.selectDataAuditingReport(replaceDate(startDate), replaceDate(endDate), policeName, policeCode);
+            mapList = dataAuditingService.selectDataAuditingReport(replaceDate(startDate), replaceDate(endDate), policeName, policeCode,typeCode);
         } catch (Exception e) {
             logger.error("开始时间：" + startDate + "结束时间：" + endDate + "公安机关名称：" + policeName + "公安机关代码：" + policeCode);
             logger.error("Exception 查询数据核验报表异常", e);

src/main/java/com/yxproject/start/api/TaskListApi.java

@@ -694,18 +694,6 @@ public class TaskListApi {
         return state;
     }
 
-    /**
-     * 查询提交人上传的余证详情
-     *
-     * @param date 提交日期
-     * @param name 提交人姓名
-     * @return
-     */
-    @RequestMapping("queryRemainderCardInfo")
-    public List<Map<String, Object>> queryRemainderCardInfo(@RequestParam("date") String date, @RequestParam("name") String name) {
-        return taskListService.selectRemainderCardInfo(replaceDate(date), name);
-    }
-
     /**
      * 去除字符串中中线
      *

src/main/java/com/yxproject/start/mapper/DataAuditingMapper.java

@@ -53,5 +53,5 @@ public interface DataAuditingMapper {
             "group by nvl(GAJG_DM.GAJG_MC,'000000000'),DATA_AUDITING.POLICE_SUBSTATION, to_char(DATA_AUDITING.SUBMIT_DATE,'yyyyMMdd'), CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID\n" +
             "order by DATA_AUDITING.POLICE_SUBSTATION" +
             "</script>")
-    public List<Map<String, Object>> selectDataAuditingReport(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("policeName") String policeName, @Param("policeCode") String policeCode);
+    public List<Map<String, Object>> selectDataAuditingReport(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("policeName") String policeName, @Param("policeCode") String policeCode,@Param("typeCode")String typeCode);
 }

src/main/java/com/yxproject/start/mapper/TaskListMapper.java

@@ -1583,10 +1583,10 @@ public interface TaskListMapper {
             "left join PROD_CARD_T@prodyd_link on SPECIAL_CARD.ACCEPT_NO = prod_card_t.ACCEPT_NO " +
             "left join task on task.task_id =SPECIAL_CARD.task_id " +
             "left join TASK_STATE_DIC ON TASK_STATE_DIC.TASK_STATE_ID = task.TASK_STATE_ID\n" +
-            "where to_char(SPECIAL_CARD.FILL_IN_DATE,'yyyyMMdd') = #{date} \n" +
+            "where to_char(SPECIAL_CARD.FILL_IN_DATE,'yyyyMMdd') = ${date} \n" +
             "and SPECIAL_CARD.SPECIAL_TYPE=1 and SPECIAL_CARD.INITIATOR =#{name} " +
             "order by SPECIAL_CARD.accept_no")
-    public List<Map<String, Object>> selectRemainderCardInfo(String date, String name);
+    public List<Map<String, Object>> selectRemainderCardInfo(@Param("date")String date, @Param("name")String name);
 
     @Update("update failed_card set work_group = ${workGroup} where failed_card_ID = ${taskId}")
     public boolean updateFailedCardWorkGroup(@Param("taskId")String taskId,@Param("workGroup") long workGroup);

src/main/java/com/yxproject/start/service/DataAuditingService.java

@@ -13,5 +13,4 @@ import java.util.Map;
 public interface DataAuditingService {
     public boolean saveDataAuditingList(List<DataAuditingEntity> dataAuditingEntityList);
     public List<Map<String,Object>> selectDataAuditingList(String groupNo);
-    public List<Map<String,Object>> selectDataAuditingReport(String startDate,String endDate,String policeName,String policeCode);
-}
+    public List<Map<String,Object>> selectDataAuditingReport(String startDate,String endDate,String policeName,String policeCode,String typeCode);}

src/main/java/com/yxproject/start/service/impl/DataAuditingServiceImpl.java

@@ -36,7 +36,7 @@ public class DataAuditingServiceImpl implements DataAuditingService {
     }
 
     @Override
-    public List<Map<String, Object>> selectDataAuditingReport(String startDate, String endDate, String policeName, String policeCode) {
+    public List<Map<String, Object>> selectDataAuditingReport(String startDate, String endDate, String policeName, String policeCode,String typeCode) {
         if ("".equals(policeName)) {
             policeName = null;
         } else {
@@ -47,7 +47,7 @@ public class DataAuditingServiceImpl implements DataAuditingService {
         } else {
             policeCode = "'" + policeCode + "%'";
         }
-        List<Map<String, Object>> maps = dataAuditingMapper.selectDataAuditingReport("'" + startDate + "'", "'" + endDate + "'", policeName, policeCode);
+        List<Map<String, Object>> maps = dataAuditingMapper.selectDataAuditingReport("'" + startDate + "'", "'" + endDate + "'", policeName, policeCode,typeCode);
         Map<String, Object> sumMap = new LinkedHashMap<>();
         int validCount = 0;
         int invalidCount = 0;