ariesy 解决测试环境bug

dxhy-base/src/main/java/com/dxhy/base/controller/BaseTDxTaxCurrentController.java

@@ -88,10 +88,13 @@ public class BaseTDxTaxCurrentController extends AbstractController {
     @PostMapping("/qyxxlb")
     @SysLog("调用企业税务信息查询接口")
     public ResponseEntity<?> listTaxCurrent(@RequestBody Map<String, Object> map) {
+        List<String> gfshList = new ArrayList<>();
         String gfsh = (String)map.get("gfsh");
 
         if(map.get("gfsh") == null || "".equals(map.get("gfsh")) || "99".equals(map.get("gfsh").toString())){
-            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
+
+        }else{
+            gfshList.add(gfsh);
         }
 
         String xydj = (String)map.get("xydj");
@@ -103,10 +106,7 @@ public class BaseTDxTaxCurrentController extends AbstractController {
         Map<String, Object> pramsMap = new HashMap<>(16);
         pramsMap.put("dbName", getUserInfo().getDbName());
         pramsMap.put("limit", map.get("limit"));
-        List<String> gfshList = new ArrayList<>();
-        if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) {
-            gfshList.add(gfsh);
-        }
+
         pramsMap.put("gfsh", gfshList);
         if (!StringHelper.isBlank(xydj)) {
             if (!"99".equals(xydj)) {

dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java

@@ -380,6 +380,8 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
                 vo.setAuthStatus(dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, vo.getAuthStatus()));
                 vo.setCxrzStatus(dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, vo.getCxrzStatus()));
                 vo.setBdkStatus(dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, vo.getBdkStatus()));
+                vo.setImageId(vo.getImageId());
+                log.info("vo.getImageId() = {}",vo.getImageId());
 
                 if ("1".equals(vo.getInAccountStatus())){
                     vo.setInAccountStatus("已入账");

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

@@ -414,12 +414,6 @@
                 test="authenticationPeople != null and authenticationPeople != '' and authenticationPeople != 'null'">
             and t.gx_user_name like concat(#{authenticationPeople},'%')
         </if>
-        <if test="deptId != null and deptId != '' and deptId != 'null' and deptId != '99' ">
-            and t.dept_id = #{deptId}
-        </if>
-        <if test="deptId == ''">
-            and t.dept_id is null
-        </if>
         <if test="currentPeriod != null and currentPeriod != '' and currentPeriod != 'null'">
             and t.rzh_belong_date = #{currentPeriod}
         </if>

dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportCustomsCkServiceImpl.java

@@ -3,10 +3,12 @@ package com.dxhy.domestic.service.ckzrz.impl;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
 import java.util.*;
 
 import javax.annotation.Resource;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -45,6 +47,7 @@ import cn.hutool.core.codec.Base64;
  */
 @SuppressWarnings("AlibabaMethodTooLong")
 @Service
+@Slf4j
 public class DomesticExportCustomsCkServiceImpl extends ServiceImpl<DomesticExportCustomsDao, TdxExportCustoms>
     implements DomesticExportCustomsCkService {
 
@@ -559,6 +562,11 @@ public class DomesticExportCustomsCkServiceImpl extends ServiceImpl<DomesticExpo
                 if (map.get("rzhDate") != null) {
                     map.put("rzhDate", map.get("rzhDate"));
                 }
+                if (map.get("postingTme") != null) {
+                    LocalDateTime dateTime = LocalDateTime.parse(map.get("postingTme").toString());
+                    log.info("postingTme={}",dateTime);
+                    map.put("postingTme", dateTime);
+                }
 
                 // 字典值转换
                 String dataSources = (String)map.get("dataSources");

dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java

@@ -16,6 +16,7 @@ import com.dxhy.common.util.*;
 import com.dxhy.common.utils.DateUtils;
 import com.dxhy.common.utils.R;
 import com.dxhy.common.vo.Business;
+import com.dxhy.common.vo.Tax;
 import com.dxhy.common.vo.UserInfo;
 import com.dxhy.oss.service.FileService;
 import com.dxhy.sign.entity.QsExcelEntity;
@@ -599,7 +600,10 @@ public class SignFpqsController extends AbstractController {
         data.put("dbName", getUserInfo().getDbName());
 
         if(pramsMap.get("gfsh") == null || "".equals(pramsMap.get("gfsh"))){
-            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
+            List<Tax> list = new ArrayList();
+            data.put("orgList", list);
+        }else{
+            data.put("orgList", getUserInfo().getOrg());
         }
         String gfsh = (String) pramsMap.get("gfsh");
         data.put("gfsh", gfsh);
@@ -621,7 +625,7 @@ public class SignFpqsController extends AbstractController {
         data.put("settlementNo", pramsMap.get("settlementNo"));
         data.put("settlementStatus", pramsMap.get("settlementStatus"));
         data.put("gxStatus", pramsMap.get("gxStatus"));
-        data.put("orgList", getUserInfo().getOrg());
+
         String company = (String)pramsMap.get("company");
         String menuId = (String)pramsMap.get("menuId");
         data.put("company", company);

dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java

@@ -1724,6 +1724,7 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
         // List<DictdetaModel> qsztModels = dictdetaServcice.selectDictdeta("qsStatus");
         String qsStatus = tDxInvoice.getQsStatus();
         String qsType = tDxInvoice.getQsType();
+        Date qsDate = tDxInvoice.getQsDate();
         Date invoiceDate = tDxInvoice.getInvoiceDate();
 
         QsjgQueryVO qsjg = new QsjgQueryVO();
@@ -1738,6 +1739,9 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
 
         qsjg.setDelState(!FpqsjgEnum.YQS.getQsjgDm().equals(qsStatus));
         qsjg.setQsStatus2(qsStatus);
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        String date = df.format(qsDate);
+        qsjg.setQsDate(date);
         qsjg.setUserName(tDxInvoice.getUserName());
 
         /* if (QsfsEnum.APPQS.getQsfsDm().equals(qsType)) {