手工认证页面和导出添加认证状态字段

dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java

@@ -13,6 +13,7 @@ import com.dxhy.common.util.CustomCellWriteHandler;
 import com.dxhy.common.util.ExceptionUtil;
 import com.dxhy.common.util.StringHelper;
 import com.dxhy.common.utils.DateUtils;
+import com.dxhy.common.utils.R;
 import com.dxhy.core.entity.TDxExcelExportlog;
 import com.dxhy.core.feign.IFeginWebsocket;
 import com.dxhy.core.rabbitmq.Sender;
@@ -22,7 +23,8 @@ import com.dxhy.core.service.singletable.IExcelExportlogService;
 import com.dxhy.core.util.JsonResponseUtils;
 import com.dxhy.oss.service.FileService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.ResponseEntity;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -161,6 +163,8 @@ public class ManualAthensThread extends BaseThread {
                 String imageNumber = prams.getString("imageNumber");
                 String postingTimeEnd = prams.getString("postingTimeEnd");
                 String postingTimeStart = prams.getString("postingTimeStart");
+                String kpksrq =  prams.getString("kpksrq");
+                String kpjsrq =  prams.getString("kpjsrq");
 
                 List<String> companyCodes = companyCodeArray.toJavaList(String.class);
                 // 参数转换为需要的形式
@@ -192,11 +196,11 @@ public class ManualAthensThread extends BaseThread {
                 if (cjjsyf != null && !"".equals(cjjsyf)) {
                     pramsMap.put("cjjsyf", DateUtils.getNight(DateUtils.strToDate(cjjsyf)));
                 }
-                if (prams.get("kpksrq") != null && !"".equals(prams.get("kpksrq"))) {
-                    pramsMap.put("kpksrq",prams.getString("kpksrq"));
+                if (!StringUtils.isBlank(kpksrq)) {
+                    pramsMap.put("kpksrq", DateUtils.getMorning(DateUtils.strToDate(kpksrq)));
                 }
-                if (prams.get("kpjsrq") != null && !"".equals(prams.get("kpjsrq"))) {
-                    pramsMap.put("kpjsrq",prams.getString("kpjsrq"));
+                if (!StringUtils.isBlank(kpjsrq)) {
+                    pramsMap.put("kpjsrq", DateUtils.getNight(DateUtils.strToDate(kpjsrq)));
                 }
                 if (prams.get("skssq") != null && !"".equals(prams.get("skssq")) && "1".equals(prams.get("rzzt"))) {
                     pramsMap.put("skssq", prams.get("skssq").toString().replace("-", ""));

dxhy-core/src/main/resources/mapper/FpZhMapper.xml

@@ -557,7 +557,7 @@
         WHERE t.invoice_date between #{kpksrq} and #{kpjsrq}
         and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08'))
         and t.rzh_yesorno = '0'
-        and t.auth_status in('0','5','6')
+        and t.auth_status in('0', '2', '3', '5', '6')
         and t.export_mark = '0'
         and t.inaccount_status = '1'
         and t.company = #{company}
@@ -612,6 +612,15 @@
         <if test="bzr != null and bzr != '' and bzr != 'null'">
             and t.bzr like concat('%',#{bzr},'%')
         </if>
+        <if test="rzzt == '0'.toString()">
+            and t.auth_status = #{rzzt}
+        </if>
+        <if test="rzzt == '1'.toString()">
+            and (t.auth_status = '2' or t.auth_status = '3')
+        </if>
+        <if test="rzzt == '2'.toString()">
+            and t.auth_status = '5'
+        </if>
         <if test="suspendStatus != null and suspendStatus != '' and suspendStatus != 'null' and suspendStatus != '99' and suspendStatus == '1'.toString()">
             and t.suspend_status = '1'
         </if>