修复查询历史交接单信息中单位名称不显示本地受理字样

删除本地受理的个人邮寄证在生成xml时包头中dwmc中的北京市公安局前缀

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

@@ -225,8 +225,8 @@ public class ExportXMLApi {
         Element DWDM = PACKAGEHEAD.addElement("DWDM");
         DWDM.setText(filesEntity.getDwdm());
         Element DWMC = PACKAGEHEAD.addElement("DWMC");
-        // 判断是否为异地首申普和异地首申邮 如果是则需要在单位名称上添加【北京市公安局】
-        if (preproPersonEntities.get(0).getCardTypeId() == 10 || preproPersonEntities.get(0).getCardTypeId() == 11) {
+        // 判断是否为异地首申普 如果是则需要在单位名称上添加【北京市公安局】 异地首申邮寄不用加
+        if (preproPersonEntities.get(0).getCardTypeId() == 10) {
             DWMC.setText("北京市公安局" + filesEntity.getDwmc());
         } else {
             DWMC.setText(filesEntity.getDwmc());

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

@@ -3,6 +3,7 @@ package com.yxproject.start.api;
 import com.yxproject.start.entity.DetailReceiptListEntity;
 import com.yxproject.start.entity.ReceiptListEntity;
 import com.yxproject.start.service.ReceiptService;
+import com.yxproject.start.utils.YdssUtils;
 import net.sf.json.JSON;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -160,6 +161,8 @@ public class ReceiptApi {
                         ReceiptListEntity receiptListEntity=new ReceiptListEntity();
                         Long card_type=Long.valueOf((BigDecimal) receiptListDate.get(i).get("CARD_TYPE") + "");
                         receiptListEntity.setCardTypeId(card_type);
+                        String slh = receiptListDate.get(i).get("UPLOAD_NO").toString();
+                        boolean ydss = YdssUtils.personIsYdss(slh);
                         //个人邮寄证，单位代码保存为北京市公安局
                         if(card_type == 9){
                             receiptListEntity.setPoliceCode("110001580800");
@@ -170,16 +173,18 @@ public class ReceiptApi {
                         //个人邮寄分局代码使用110001名称使异地个人邮寄
                         //普通证通过制证包派出所单位代码获取分局
                         receiptListEntity.setFjdm(receiptListDate.get(0).get("FJDM").toString());
-                        String fjmc=null;
+                        String fjmc;
                         if (card_type == 9) {
                             receiptListEntity.setFjdm("110001");
                             fjmc = "北京市公安局";
+                            if (ydss) receiptListEntity.setCardTypeId(11L);
                         } else if (card_type == 5) {
                             fjmc=receiptListDate.get(0).get("FJMC").toString()+"(港澳)";
                         } else if (card_type == 7) {
                             fjmc=receiptListDate.get(0).get("FJMC").toString()+"(台湾)";
                         }else {
                             fjmc=receiptListDate.get(0).get("FJMC").toString();
+                            if (ydss) receiptListEntity.setCardTypeId(10L);
                         }
                         if ("null".equals(receiptListDate.get(i).get("OLD_CARD_TYPE") + "")){
 
@@ -322,6 +327,12 @@ public class ReceiptApi {
                         //todo 校验大批证中是否存在邮寄证
                         receiptListEntity.setQrCode(acceptNo);//封签编号
                         receiptListEntity.setCardTypeId(Long.valueOf(cardType));//制证类型
+                        boolean ydss = YdssUtils.personIsYdss(uploadNo);
+                        if (ydss) {
+                            if (receiptListEntity.getCardTypeId() == 9) receiptListEntity.setCardTypeId(11L);
+                            if (receiptListEntity.getCardTypeId() == 8) receiptListEntity.setCardTypeId(10L);
+
+                        }
                         if ("null".equals(oldCardType)){
 
                         }else{
@@ -334,6 +345,7 @@ public class ReceiptApi {
                         //普通证通过制证包派出所单位代码获取分局
                         switch (cardType){
                             case "9":
+                            case "11":
                                 receiptListEntity.setPoliceCode("110001580800");
                                 receiptListEntity.setFjdm("110001");
                                 break;
@@ -425,6 +437,12 @@ public class ReceiptApi {
                     case "9":
                         resultMap.get(i).put("FJMC", "异地速递");
                         break;
+                    case "10":
+                        resultMap.get(i).put("FJMC", "异地证(本市系统)普");
+                        break;
+                    case "11":
+                        resultMap.get(i).put("FJMC", "异地证(本市系统)邮");
+                        break;
                 }
             }
 
@@ -468,6 +486,12 @@ public class ReceiptApi {
                 case "9":
                     resultMap.get(i).put("FJMC", "异地速递");
                     break;
+                case "10":
+                    resultMap.get(i).put("FJMC", "异地证(本市系统)普");
+                    break;
+                case "11":
+                    resultMap.get(i).put("FJMC", "异地证(本市系统)邮");
+                    break;
             }
             //判断是否是特证
             if (groupNo.length() == 10) {//受理号长度为10

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

@@ -128,9 +128,6 @@ public class ImportXmlServiceImpl implements ImportXmlService {
      * @return true 是异地首申
      */
     protected boolean personIsYdss(String jmsfzslh) {
-        System.out.println("11111111111");
-        System.out.println(jmsfzslh);
-        System.out.println("22222222222");
         return jmsfzslh.charAt(jmsfzslh.length() - 5) == '9';
     }
 }

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

@@ -152,8 +152,8 @@ public class PersonPostServiceImpl implements PersonPostService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean cancelPostByAcceptNo(String uploadNo, String remarks, String name) {
-//        personPostMapper.cancelPostByAcceptNo(uploadNo, remarks, name);
-//        personPostMapper.addNote(uploadNo, remarks);
+        personPostMapper.cancelPostByAcceptNo(uploadNo, remarks, name);
+        personPostMapper.addNote(uploadNo, remarks);
         System.out.println("cancelPostByAcceptNo: " + uploadNo + " | " + remarks + " | " + name);
         System.out.println("addNote: " + uploadNo + " | " + remarks);
         return true;

src/main/java/com/yxproject/start/utils/YdssUtils.java

+package com.yxproject.start.utils;
+
+public class YdssUtils {
+
+    /**
+     * 从受理号判断是否为异地首申 受理号倒数第5位为9
+     * @param jmsfzslh 受理号
+     * @return true 是异地首申
+     */
+    public static boolean personIsYdss(String jmsfzslh) {
+        return jmsfzslh.charAt(jmsfzslh.length() - 5) == '9';
+    }
+}

src/main/resources/mapper/config/mybatis-config.xml

@@ -6,6 +6,6 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
     <settings>
         <setting name="mapUnderscoreToCamelCase" value="true"/>
         <setting name="callSettersOnNulls" value="true"/>
-<!--        <setting name="logImpl" value="STDOUT_LOGGING" />-->
+        <setting name="logImpl" value="STDOUT_LOGGING" />
     </settings>
 </configuration>
\ No newline at end of file