修改推送平仓凭证

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -57,7 +57,6 @@ import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetai
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
 import com.yxt.anrui.fin.api.finpaymentrecord.*;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
-import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill;
 import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
 import com.yxt.anrui.fin.biz.finmanufacturerbank.FinManufacturerBankService;
@@ -70,12 +69,9 @@ import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailedjr.FinUncollectedR
 import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService;
 import com.yxt.anrui.fin.biz.kingdee.voucher.VoucherService;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
-import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
 import com.yxt.anrui.portal.api.flow.FlowableFeign;
 import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
 import com.yxt.anrui.portal.api.sysmapping.SysMappingFeign;
-import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo;
-import com.yxt.anrui.portal.api.sysmapping.SysMappingListInfoQuery;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@@ -115,7 +111,6 @@ import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -1669,7 +1664,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             voucherResultDetailDtoJF.setSubjectNo("1009.03");
             SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
             voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode());
-            String key = dictCommonFeign.selectKeyByValue(finPaymentrecord.getReceiveBank()).getData();
+            String key = dictCommonFeign.selectKeyByValue(finPaymentrecord.getReceiveBank(),"bank").getData();
             voucherResultDetailDtoJF.setBank(key);
             voucherResultDetailDtoJF.setDebit(finPaymentrecord.getCost().toString());
             voucherResultDetailDtos.add(voucherResultDetailDtoJF);
@@ -1715,7 +1710,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 voucherResultDetailDtoJF.setSubjectNo("1009.03");
                 SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
                 voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode());
-                String key = dictCommonFeign.selectKeyByValue(finPaymentrecord.getReceiveBank()).getData();
+                String key = dictCommonFeign.selectKeyByValue(finPaymentrecord.getReceiveBank(),"bank").getData();
                 voucherResultDetailDtoJF.setBank(key);
                 voucherResultDetailDtoJF.setDebit(finPaymentrecord.getCost().toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoJF);
@@ -1730,7 +1725,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 voucherResultDetailDtoJF.setSubjectNo("2111");
                 SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
                 voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode());
-                String key = dictCommonFeign.selectKeyByValue(finPaymentrecord.getReceiveBank()).getData();
+                String key = dictCommonFeign.selectKeyByValue(finPaymentrecord.getReceiveBank(),"bank").getData();
                 voucherResultDetailDtoJF.setBank(key);
                 voucherResultDetailDtoJF.setDebit(exePayPriceTotal.add(payAccount).toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoJF);

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonFeign.java

@@ -83,8 +83,8 @@ public interface DictCommonFeign {
     @ApiOperation("根据数据字典类型和值查询")
     ResultBean<DictCommonVo> selectByDictTypeAndDictValue(@RequestParam("dictType") String dictType,@RequestParam("dictValue") String dictValue);
 
-    @GetMapping("/selectKeyByValue")
+    @GetMapping("/selectKeyByValueAndDictType")
     @ResponseBody
     @ApiOperation("根据数据字典value查询key")
-    ResultBean<String> selectKeyByValue(@RequestParam("dictValue") String dictValue);
+    ResultBean<String> selectKeyByValue(@RequestParam("dictValue") String dictValue,@RequestParam("dictType") String dictType);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonFeignFallback.java

@@ -76,7 +76,7 @@ public class DictCommonFeignFallback implements DictCommonFeign {
     }
 
     @Override
-    public ResultBean<String> selectKeyByValue(String dictValue) {
+    public ResultBean<String> selectKeyByValue(String dictValue, String dictType) {
         return null;
     }
 

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.java

@@ -70,6 +70,6 @@ public interface DictCommonMapper extends BaseMapper<DictCommon> {
 
     DictCommonVo selectByDictTypeAndDictValue(@Param("dictType")String dictType, @Param("dictValue")String dictValue);
 
-    @Select("select dictKey from dict_common where dictValue = #{dictValue}")
-    String selectKeyByValue(String dictValue);
+    @Select("select dictKey from dict_common where dictValue = #{dictValue} and dictType = #{dictType}")
+    String selectKeyByValue(@Param("dictValue")String dictValue, @Param("dictType")String dictType);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonRest.java

@@ -169,7 +169,7 @@ public class DictCommonRest implements DictCommonFeign {
     }
 
     @Override
-    public ResultBean<String> selectKeyByValue(String dictValue) {
-        return dictCommonService.selectKeyByValue(dictValue);
+    public ResultBean<String> selectKeyByValue(String dictValue, String dictType) {
+        return dictCommonService.selectKeyByValue(dictValue,dictType);
     }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonService.java

@@ -97,9 +97,9 @@ public class DictCommonService extends MybatisBaseService<DictCommonMapper, Dict
         return rb;
     }
 
-    public ResultBean<String> selectKeyByValue(String dictValue) {
+    public ResultBean<String> selectKeyByValue(String dictValue, String dictType) {
         ResultBean rb = ResultBean.fireFail();
-        String dictKey = baseMapper.selectKeyByValue(dictValue);
+        String dictKey = baseMapper.selectKeyByValue(dictValue,dictType);
         return rb.success().setData(dictKey);
     }
 }