Merge branches '0531L' and 'test' of http://192.168.12.182/invoice/pt into test

dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java

@@ -72,6 +72,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                     orgList.add(t.getTaxno());
                 }
             }
+            log.info("orgList======>{}",orgList);
 
             if (gfshList.size() == 0) {
                 // 未从getUserInfo()获取到购方税号信息
@@ -124,11 +125,9 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                     for (int i = 0; i < pageList.size(); i++) {
                         pageList.get(i).setSelect(false);
                         String taxno = pageList.get(i).getGfsh();
-//                        if (orgList.contains(taxno) && "1".equals(pageList.get(i).getRzzt())) {
-//                            pageList.get(i).setSelect(true);
-//                        }
-                        if ("0".equals(pageList.get(i).getRzzt())) {
+                        if (orgList.contains(taxno) && "1".equals(pageList.get(i).getRzzt())) {
                             pageList.get(i).setSelect(true);
+                            log.info("rzzt和orgList设置成true");
                         }
                         String skssq = pageList.get(i).getSkssq();
                         QueryWrapper<BaseTDxTaxCurrent> queryWrapper = new QueryWrapper<>();
@@ -138,6 +137,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                             if (!taxCurrent.getCurrentTaxPeriod().equals(skssq)
                                 || !"1".equals(pageList.get(i).getRzzt())) {
                                 pageList.get(i).setSelect(false);
+                                log.info("skssq设置为false");
                             }
                         }
 
@@ -155,6 +155,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                         if (!"0".equals(pageList.get(i).getCxrzStatus())
                             && !"5".equals(pageList.get(i).getCxrzStatus())) {
                             pageList.get(i).setSelect(false);
+                            log.info("撤销认证状态设置false");
                         }
                         String sign = (String) pramsMap.get("sign");
                         if (!"88".equals(sign)){
@@ -166,6 +167,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
 
                         if ("1".equals(pageList.get(i).getOutStatus()) || "2".equals(pageList.get(i).getOutStatus())) {
                             pageList.get(i).setSelect(false);
+                            log.info("转出状态设置false");
                         }
 
                         // 字典转换