Merge remote-tracking branch 'origin/0803-add_column' into 0803-add_column

dxhy-base/src/main/java/com/dxhy/base/dao/BaseTDxRecordInvoiceDao.java

@@ -125,6 +125,15 @@ public interface BaseTDxRecordInvoiceDao extends BaseMapper<BaseTDxRecordInvoice
      */
     List<BaseTDxDkCount> selectDksh(Map<String, Object> pramsMap);
 
+    /**
+     * 获取已经抵扣统计的税号
+     *
+     * @param pramsMap
+     *            请求参数
+     * @return 返回结果
+     */
+    List<BaseTDxDkCount> selectDksh2(Map<String, Object> pramsMap);
+
     /**
      * 查询勾选未确认,发送认证的发票
      *

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

@@ -107,8 +107,8 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
 
                 List<String> gfshList1 = new ArrayList<>();
                 Map<String,Object> map = new HashMap<>();
-                map.put("gfsh",new ArrayList<>().add(gfsh));
-                List<BaseTDxDkCount> curList = baseTDxRecordInvoiceDao.selectDksh(map);
+                map.put("gfsh",gfsh);
+                List<BaseTDxDkCount> curList = baseTDxRecordInvoiceDao.selectDksh2(map);
                 log.info("认证查询列表-返回的所属期列表为:{}",curList);
                 for (BaseTDxDkCount cur : curList) {
                     String skssq = cur.getSkssq();

dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java

@@ -81,8 +81,8 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
             List<String> gfshList1 = new ArrayList<>();
             if (StringUtils.isNotBlank(gfsh)) {
                 Map<String,Object> map = new HashMap<>();
-                map.put("gfsh",new ArrayList<>().add(gfsh));
-                List<BaseTDxDkCount> curList = super.baseMapper.selectDksh(map);
+                map.put("gfsh",gfsh);
+                List<BaseTDxDkCount> curList = super.baseMapper.selectDksh2(map);
                 for (BaseTDxDkCount cur : curList) {
                     String skssq = cur.getSkssq();
                     String year = skssq.substring(0, 4);

dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml

@@ -79,12 +79,7 @@
         and t.export_mark = '0'
         and t.auth_status in ('2','3','4')
         and t.company = #{company}
-        <if test="sign != '88'">
-            and t.gf_tax_no in
-            <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
+        and t.gf_tax_no = #{gfsh}
 
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
             and (t.comp_code in

dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml

@@ -60,6 +60,17 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="selectDksh2" parameterType="java.util.Map"
+            resultType="com.dxhy.base.entity.BaseTDxDkCount">
+        select t.current_tax_period skssq,t.taxno taxno,d.tj_status tjStatus,tj_date tjDate from
+        t_dx_tax_current
+        t,t_dx_dk_count d
+        where t.taxno=d.taxno
+        and t.current_tax_period=d.skssq
+        and t.taxno = #{gfsh}
+    </select>
+
     <select id="selectSggxcx" parameterType="java.util.Map"
             resultMap="SggxcxResultMap" databaseId="mysql">
         select t.invoice_type,t.dept_id,t.dept_name,t.comp_code,t.bzr