修改进项首页数据与点击数据不一致问题

dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java

@@ -241,19 +241,20 @@ public class ExtIndexController extends AbstractController {
 
         log.info("任务提醒入参为{}",pramsMap);
         log.info("首页-任务提醒,params {}", pramsMap);
-        pramsMap.put("dbName", getUserInfo().getDbName());
+
-        List<String> taxno = getTaxno();
+
-        if (taxno != null && taxno.size() > 0) {
+        try {
-            pramsMap.put("taxno", taxno);
             Map<String, Object> map = new HashMap<>(16);
             List<ExtIndexInvoiceTaskRemindingModel> listVO = indexStatisticsService.getInvoiceTaskReminding(pramsMap);
             for (ExtIndexInvoiceTaskRemindingModel vo : listVO) {
                 map.put(vo.getWarningType(), vo.getCountNum());
             }
             return ResponseEntity.ok(R.ok().put("data", map));
-        } else {
+        }catch (Exception e) {
             return ResponseEntity.ok(R.ok().put("data",""));
         }
+
+
     }
 
     /**

dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml

@@ -1636,13 +1636,8 @@
         'ycfpWarning' warningType
         from
         t_dx_record_invoice
-        where gf_tax_no in
+        where  gf_tax_no = #{paramsData.gfsh}
-        <if test="paramsData.taxno != null">
+          and (comp_code = #{paramsData.companyCode} or comp_code = '' or comp_code is null)
-            <foreach item="item" index="index" collection="paramsData.taxno" open="(" separator=","
-                     close=")">
-                #{item}
-            </foreach>
-        </if>
         and invoice_status != 0
         and invoice_type in ('01','03','08','14','31')
         and company = #{paramsData.company}
@@ -1679,14 +1674,8 @@
         'rzhyc' warningType
         from
         t_dx_record_invoice
-        where
+        where gf_tax_no = #{paramsData.gfsh}
-        gf_tax_no in
+        and (comp_code = #{paramsData.companyCode} or comp_code = '' or comp_code is null)
-        <if test="paramsData.taxno != null">
-            <foreach item="item" index="index" collection="paramsData.taxno" open="(" separator=","
-                     close=")">
-                #{item}
-            </foreach>
-        </if>
         and invoice_status != '0'
         and (rzh_yesorno = '1' or rzh_yesorno = '2')
         and invoice_type in ('01','03','08','14','31')
@@ -1702,20 +1691,12 @@
         'qshyc' warningType
         from
         t_dx_record_invoice
-        where
+        where   gf_tax_no = #{paramsData.gfsh}
-        gf_tax_no in
+        and (comp_code = #{paramsData.companyCode} or comp_code = '' or comp_code is null)
-        <if test="paramsData.taxno != null">
-            <foreach item="item" index="index" collection="paramsData.taxno" open="(" separator=","
-                     close=")">
-                #{item}
-            </foreach>
-        </if>
         and invoice_status != '0'
         and qs_status = '1'
         and invoice_type in ('01','03','08','14','31')
-
         and company = #{paramsData.company}
-
         and invoice_date between #{paramsData.kpksrq} and #{paramsData.kpjsrq}
     </select>
 <!--&#45;&#45;         and date_format(qs_date,'%Y-%m') = date_format(now(),'%Y-%m')-->