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

dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java

@@ -117,4 +117,6 @@ public class BaseReceiptInvoiceView implements Serializable {
     private String certDate;
 
     private String outBelongDate;
+    //转出来源 1 sap
+    private String outResource;
 }

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

@@ -26,6 +26,7 @@
         <result column="tax_amount" property="taxAmount"/>
         <result column="rzh_date" property="certDate"/>
         <result column="invoice_type" property="invoiceType"/>
+        <result column="out_resource" property="outResource"/>
 
     </resultMap>
 
@@ -90,7 +91,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         , b.gf_tax_no,b.gf_name,b.xf_name,b.invoice_date,b.invoice_status,b.invoice_amount,b.tax_amount
-        , b.rzh_date,b.invoice_type
+        , b.rzh_date,b.invoice_type,b.out_resource
         FROM t_dx_record_invoice_out a
         LEFT JOIN t_dx_record_invoice b ON a.uuid = b.uuid
         <where>

dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java

@@ -261,6 +261,7 @@ public class EmailMaintainController extends AbstractController  {
         if(StringUtils.isEmpty(userCode)){
             return ResponseEntity.ok(R.error("数据不能为空！"));
         }
+        DynamicContextHolder.push(DbConstant.BASICS_READ);
         String userName = emailMaintainService.getUserName(userCode);
         if(StringUtils.isNotEmpty(userName)){
             JSONObject json = new JSONObject();

dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.dxhy.common.constant.DbConstant;
 import com.dxhy.common.datasource.config.DynamicContextHolder;
+import com.dxhy.common.utils.Base64Encoding;
 import com.dxhy.core.dao.mailGather.EmailMaintainDao;
 import com.dxhy.core.model.mailGather.EmailMaintainVo;
 import com.dxhy.core.service.mailGather.EmailMaintainService;
@@ -54,6 +55,7 @@ public class EmailMaintainServiceImpl implements EmailMaintainService {
             for (int i = 0; i < emailMaintainVos.size(); i++) {
                 EmailMaintainVo emailMaintainVo = emailMaintainVos.get(i);
                 emailMaintainVo.setXh(i + 1 + "");
+                emailMaintainVo.setEmailPassword(Base64Encoding.decodeToString(emailMaintainVo.getEmailPassword()));
             }
         }
         PageInfo<EmailMaintainVo> pageInfo = new PageInfo<>(emailMaintainVos);

dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java

@@ -475,5 +475,6 @@ public class BaseTDxRecordInvoice implements Serializable {
      * g公司id
      */
     private String compCode;
+    private String outResource;
 
 }

dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java

@@ -120,6 +120,8 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutDao,
             condRecord.setId(record.getId());
             // 转出状态
             condRecord.setOutStatus(condVO.getOutStatus());
+            //表示转出来源是sap
+            condRecord.setOutResource("1");
             // 转出原因
             condRecord.setOutReason(condVO.getOutReason());
             // 备注

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

@@ -45,8 +45,9 @@ public class VouncherSyncController {
         String companyCode = map.get("companyCode");
         //开始日期
         String startTime= map.get("startTime");
+        String endTime = map.get("endTime");
         //结束日期
-        String month=map.get("endTime");
+        String month=map.get("monat");
         //GJAHR  nian
         String gjahr=map.get("gjahr");
 
@@ -67,6 +68,7 @@ public class VouncherSyncController {
         requestMap.put("GJAHR",gjahr);
         requestMap.put("MONAT",month);
         requestMap.put("ZDATEF",startTime);
+        requestMap.put("ZDATET",endTime);
         requestMap.put("ZFLAG",ifAll);
         object.setZDATA(JSONObject.toJSONString(requestMap));
         JSONObject request = new JSONObject();