ems制证量数据导出的excel统计中 普证和邮寄证添加异地首申的统计（修正 合并异地首申到普通异地证中）

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

@@ -650,7 +650,7 @@ public class PersonPostApi {
     /**
      * 创建报表
      */
-    private void exportUploadInfoExcel(HttpServletRequest request, HttpServletResponse response, List<Map<String,Object>> records,String name) throws Exception {
+    private void exportUploadInfoExcel(HttpServletRequest request, HttpServletResponse response, List<Map<String,Object>> records,String name) {
         String remoteAddr = request.getRemoteAddr();
         MDC.put("ip", remoteAddr);
         try {

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

@@ -182,7 +182,7 @@ public interface PersonPostMapper {
     PersonPostEntity findPersonalDataByAcceptNo(String acceptNo);
 
     @Select("select dataa.*,datab.typeid,datab.cstr from(\n" +
-            "select  cd.COUNTYNAME,fi.DWDM DWDM,fi.dwmc,pp.CARD_TYPE_ID aa,count(pp.CARD_TYPE_ID) dd \n" +
+            "select  cd.COUNTYNAME,fi.DWDM DWDM,case WHEN SUBSTR(fi.DWMC, 1, 3) = '北京市' THEN SUBSTR(fi.DWMC, 7) ELSE fi.DWMC END as dwmc,0 aa,count(pp.CARD_TYPE_ID) dd \n" +
             "from prepro_person pp\n" +
             "left join files fi\n" +
             "on pp.FILE_ID=fi.id \n" +
@@ -190,12 +190,12 @@ public interface PersonPostMapper {
             "on substr(dwdm,0,6)=cd.COUNTY_CODE\n" +
             "where pp.YXQQSRQ BETWEEN #{strDate} AND #{endDate}\n" +
             "and pp.CARD_TYPE_ID in (0,10)\n" +
-            "group by cd.COUNTYNAME,fi.DWDM,fi.dwmc,pp.CARD_TYPE_ID " +
+            "group by cd.COUNTYNAME,fi.DWDM,case WHEN SUBSTR(fi.DWMC, 1, 3) = '北京市' THEN SUBSTR(fi.DWMC, 7) ELSE fi.DWMC END " +
             "order by fi.DWDM \n" +
             ") dataa\n" +
             "left join\n" +
             "(\n" +
-            "select  cd.COUNTYNAME,fi.DWDM DWDM,fi.dwmc,pp.CARD_TYPE_ID typeid,count(pp.CARD_TYPE_ID) cstr \n" +
+            "select  cd.COUNTYNAME,fi.DWDM DWDM,case WHEN SUBSTR(fi.DWMC, 1, 3) = '北京市' THEN SUBSTR(fi.DWMC, 7) ELSE fi.DWMC END as dwmc,9 typeid,count(pp.CARD_TYPE_ID) cstr \n" +
             "from prepro_person pp\n" +
             "left join files fi\n" +
             "on pp.FILE_ID=fi.id \n" +
@@ -203,8 +203,8 @@ public interface PersonPostMapper {
             "on substr(dwdm,0,6)=cd.COUNTY_CODE\n" +
             "where pp.YXQQSRQ BETWEEN #{strDate} AND #{endDate}\n" +
             "and pp.CARD_TYPE_ID in (9,11)\n" +
-            "group by cd.COUNTYNAME,fi.DWDM,fi.dwmc,pp.CARD_TYPE_ID   ) datab\n" +
-            "on dataa.DWDM=datab.DWDM")
+            "group by cd.COUNTYNAME,fi.DWDM,case WHEN SUBSTR(fi.DWMC, 1, 3) = '北京市' THEN SUBSTR(fi.DWMC, 7) ELSE fi.DWMC END   ) datab\n" +
+            "on dataa.DWMC=datab.DWMC")
     List<Map<String,Object>> downloadUploadInfo(@Param("strDate") String strDate, @Param("endDate") String endDate);
 
 //    @Select("SELECT "

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

@@ -173,6 +173,7 @@ public class PersonPostServiceImpl implements PersonPostService {
         List<Map<String, Object>> list = personPostMapper.downloadUploadInfo(strDate, endDate);
         return list;
     }
+
     @Override
     public int findWaybillNumber(String fileID) {
         int mum = personPostMapper.findWaybillNumber(fileID);