修改添加补证、废证

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

@@ -144,13 +144,13 @@ public class FailedCardApi {
                 JSONObject jsonObject = (JSONObject) o;
                 String name = ((JSONObject) o).getString("name");
 
-                Long result = failedCardService.selectSpecialCard(((JSONObject) o).getString("cardId"));
+                String result = failedCardService.selectSpecialCard(((JSONObject) o).getString("cardId"));
                 Map<String, Object> idMap;
                 //判断是否是特殊证件
-                if (result != 0 ) {
+                if (result != null && result != "") {
                     idMap = failedCardService.selectDataById(jsonObject.getString("cardId"));
                 } else {
-                    idMap = failedCardService.selectCountIdByCardId(formateAcceptNo(jsonObject.getString("cardId")));
+                    idMap = failedCardService.selectCountIdByCardId(jsonObject.getString("cardId"));
                 }
                 int initiator = 5;
                 failedCardService.insertFailedCard(jsonObject.getString("failedCardReasonId"), idMap.get("ACCEPT_NO").toString(), idMap.get("TASK_ID").toString(), String.valueOf(initiator), jsonObject.getString("note"), idMap.get("WORK_GROUP").toString(), name);
@@ -252,10 +252,10 @@ public class FailedCardApi {
             String workGroup = ((JSONObject) o).getString("workGroup");
             String note = jsonObject.getString("note");
             String failedCardReasonId = jsonObject.getString("failedCardReasonId");
-            Long result = failedCardService.selectSpecialCard(((JSONObject) o).getString("cardId"));
+            String result = failedCardService.selectSpecialCard(((JSONObject) o).getString("cardId"));
             Map<String, Object> idMap;
             //判断是否是特殊证件
-            if (result != 0 ) {
+            if (result != null && result != "" ) {
                 idMap = failedCardService.selectDataById(jsonObject.getString("cardId"));
             } else {
                 idMap = failedCardService.selectCountIdByCardId(jsonObject.getString("cardId"));

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

@@ -148,10 +148,10 @@ public interface FailedCardMapper {
     /**
      * 根据身份证号查询是否是特证
      */
-    @Select("select SPECIAL_CARD_ID from special_card \n" +
+    @Select("select SPECIAL_CARD_ID,SPECIAL_CARD_ID SPECIAL_CARD from special_card \n" +
             "left join prod_card_t@PRODYD_LINK ON PROD_CARD_T.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO\n" +
             " WHERE PROD_CARD_T.ID_NO = #{id} or PROD_CARD_T.ACCEPT_NO=#{id}")
-    public Long selectSpecialCard(String id);
+    public List<Map<String,Object>> selectSpecialCard(String id);
 
 
     /**

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

@@ -38,7 +38,7 @@ public interface FailedCardService {
 
     public boolean updateFailedCardState(FailedCardEntity failedCardEntity);
 
-    public Long selectSpecialCard(String id);
+    public String selectSpecialCard(String id);
 
     public Map<String,Object> selectDataById(String id);
 

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

@@ -11,6 +11,7 @@ import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -128,9 +129,14 @@ public class FailedCardServiceImpl implements FailedCardService {
     }
 
     @Override
-    public Long selectSpecialCard(String id) {
-        Long result = failedCardMapper.selectSpecialCard(id);
-        return result;
+    public String selectSpecialCard(String id) {
+        List <Map <String, Object>> list=failedCardMapper.selectSpecialCard(id);
+        if(list.size()>0){
+            return list.get(0).get("SPECIAL_CARD_ID").toString();
+        }else {
+            return null;
+        }
+
     }
 
     @Override