Merge remote-tracking branch 'origin/homePage' into release

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

@@ -7,6 +7,7 @@ import java.util.*;
 
 import javax.annotation.Resource;
 
+import com.dxhy.common.utils.DateUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -241,19 +242,31 @@ 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) {
-            pramsMap.put("taxno", taxno);
+
+
+        try {
+            if (pramsMap.get("kpksrq") != null && !"".equals(pramsMap.get("kpksrq"))) {
+                pramsMap.put("kpksrq", DateUtils.getMorning(DateUtils.strToDate(pramsMap.get("kpksrq").toString())));
+            } else {
+                throw new RuntimeException("开票开始日期不能为空！");
+            }
+            if (pramsMap.get("kpjsrq") != null && !"".equals(pramsMap.get("kpjsrq"))) {
+                pramsMap.put("kpjsrq", DateUtils.getNight(DateUtils.strToDate(pramsMap.get("kpjsrq").toString())));
+            } else {
+                throw new RuntimeException("开票开始日期不能为空！");
+            }
             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 {
-            return ResponseEntity.ok(R.ok().put("data", ""));
+        }catch (Exception e) {
+            log.error("首页任务提醒错误信息 :{}",e);
+            return ResponseEntity.ok(R.ok().put("data",""));
         }
+
+
     }
 
     /**

dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml

@@ -222,10 +222,10 @@
         <if test="qszt != null and qszt != '' and qszt != 'null' ">
             and t.qs_status = #{qszt}
         </if>
-        <if test="rzzt != null and rzzt != '' and rzzt != 'null'  and rzzt != '3'">
+        <if test="rzzt != null and rzzt != '' and rzzt != 'null'  and rzzt != 3">
             and t.rzh_yesorno = #{rzzt}
         </if>
-        <if test="rzzt != null and rzzt == '3'">
+        <if test="rzzt != null and rzzt == 3">
             and (t.rzh_yesorno = '2' OR t.rzh_yesorno = '1')
         </if>
         <if test="xfmc != null and xfmc != '' and xfmc != 'null' ">

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

@@ -1622,11 +1622,7 @@
         and period_add(tdtc.current_tax_period, 1) >= date_format (date_add(invoice_date, interval 360
         day), '%Y%m')
         and date_format(invoice_date, '%Y%m%d') >= tdtc.select_start_date
-        AND t.gf_tax_no IN
-        <foreach collection="paramsData.taxno" index="index" item="item" open="(" separator=","
-                 close=")">
-            #{item}
-        </foreach>
+        AND t.gf_tax_no = #{paramsData.gfsh}
     </select>
     <!-- 异常发票 -->
     <select id="getInvoiceTaskRemindingYc" resultMap="indexInvoiceTaskRemindingMap"
@@ -1636,13 +1632,8 @@
         'ycfpWarning' warningType
         from
         t_dx_record_invoice
-        where gf_tax_no in
-        <if test="paramsData.taxno != null">
-            <foreach item="item" index="index" collection="paramsData.taxno" open="(" separator=","
-                     close=")">
-                #{item}
-            </foreach>
-        </if>
+        where  gf_tax_no = #{paramsData.gfsh}
+          and (comp_code = #{paramsData.companyCode} or comp_code = '' or comp_code is null)
         and invoice_status != 0
         and invoice_type in ('01','03','08','14','31')
         and company = #{paramsData.company}
@@ -1657,14 +1648,7 @@
         'ptkndWarning' warningType
         from
         t_dx_record_invoice
-        where
-        gf_tax_no in
-        <if test="paramsData.taxno != null">
-            <foreach item="item" index="index" collection="paramsData.taxno" open="(" separator=","
-                     close=")">
-                #{item}
-            </foreach>
-        </if>
+        where gf_tax_no = #{paramsData.gfsh}
         and qs_status = '1'
         and invoice_type in ('04','10','11','32','186')
         and date_format(invoice_date,'%Y') = #{paramsData.billingYear}
@@ -1679,14 +1663,8 @@
         'rzhyc' warningType
         from
         t_dx_record_invoice
-        where
-        gf_tax_no in
-        <if test="paramsData.taxno != null">
-            <foreach item="item" index="index" collection="paramsData.taxno" open="(" separator=","
-                     close=")">
-                #{item}
-            </foreach>
-        </if>
+        where gf_tax_no = #{paramsData.gfsh}
+        and (comp_code = #{paramsData.companyCode} or comp_code = '' or comp_code is null)
         and invoice_status != '0'
         and (rzh_yesorno = '1' or rzh_yesorno = '2')
         and invoice_type in ('01','03','08','14','31')
@@ -1702,20 +1680,12 @@
         'qshyc' warningType
         from
         t_dx_record_invoice
-        where
-        gf_tax_no in
-        <if test="paramsData.taxno != null">
-            <foreach item="item" index="index" collection="paramsData.taxno" open="(" separator=","
-                     close=")">
-                #{item}
-            </foreach>
-        </if>
+        where   gf_tax_no = #{paramsData.gfsh}
+        and (comp_code = #{paramsData.companyCode} or comp_code = '' or comp_code is null)
         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')-->