ecology
/
ebu_ecology_dev1
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

ASC 精品酒业 凭证相关接口问题修复

dev
weilin.zhu 2023-07-20 16:45:26 +08:00
parent d54194caf3
commit 194042f5e9
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/weaver/weilin/zhu/asc/workflow/VoucherPushAction.java
View File

@ -1,7 +1,6 @@
package weaver.weilin.zhu.asc.workflow; package weaver.weilin.zhu.asc.workflow;
import aiyh.utils.Util; import aiyh.utils.Util;
import aiyh.utils.httpUtil.HttpArgsType;
import aiyh.utils.httpUtil.ResponeVo; import aiyh.utils.httpUtil.ResponeVo;
import aiyh.utils.httpUtil.util.HttpUtils; import aiyh.utils.httpUtil.util.HttpUtils;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
@ -12,6 +11,7 @@ import weaver.weilin.zhu.common.util.CommonUtil;
import weaver.weilin.zhu.common.voucher.action.CusActionPostInterface; import weaver.weilin.zhu.common.voucher.action.CusActionPostInterface;
import weaver.weilin.zhu.common.voucher.action.ResultMessageUtil; import weaver.weilin.zhu.common.voucher.action.ResultMessageUtil;
import javax.ws.rs.core.MediaType;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -58,7 +58,7 @@ public class VoucherPushAction implements CusActionPostInterface {
String requestURL = Util.null2String(Prop.getPropValue("AscVoucher", "url")); String requestURL = Util.null2String(Prop.getPropValue("AscVoucher", "url"));
Map<String,String> headerMap = new HashMap<>(); Map<String,String> headerMap = new HashMap<>();
headerMap.put("Content-Type", HttpArgsType.APPLICATION_JSON); headerMap.put("Content-Type", MediaType.APPLICATION_JSON);
HttpUtils httpUtils = new HttpUtils(); HttpUtils httpUtils = new HttpUtils();
@ -111,7 +111,7 @@ public class VoucherPushAction implements CusActionPostInterface {
CommonUtil commonUtil = new CommonUtil(); CommonUtil commonUtil = new CommonUtil();
logger.info("日志信息:[" + JSONObject.toJSONString(logMap) + "]"); logger.info("日志信息:[" + logMap.toString() + "]");
commonUtil.insertNewDataToMode(modeid,"uf_interface_log",logMap); commonUtil.insertNewDataToMode(modeid,"uf_interface_log",logMap);

4
src/main/java/weaver/weilin/zhu/xyzq/scheduled/entity/SyncConfigDetailDao.java
View File

@ -1,7 +1,7 @@
package weaver.weilin.zhu.xyzq.scheduled.entity; package weaver.weilin.zhu.xyzq.scheduled.entity;
import aiyh.utils.entity.FieldViewInfo;
import lombok.Data; import lombok.Data;
import weaver.weilin.zhu.common.util.FieldDetailInfo;
/** /**
* 兴业证券 * 兴业证券
@ -15,7 +15,7 @@ public class SyncConfigDetailDao {
/** /**
* 建模模块字段信息 * 建模模块字段信息
*/ */
private FieldViewInfo modeField; private FieldDetailInfo modeField;
/** /**
* 接口字段名称 * 接口字段名称

1
src/main/java/weaver/weilin/zhu/xyzq/scheduled/sqlmapper/OrganizationSyncSqlMapper.java
View File

@ -36,6 +36,7 @@ public interface OrganizationSyncSqlMapper {
id = @Id(value = Integer.class,methodId = 2) id = @Id(value = Integer.class,methodId = 2)
) )
}) })
@CaseConversion(value = false)
SyncConfigDao getConfigurationByKeyId(@ParamMapper("keyId") int keyId); SyncConfigDao getConfigurationByKeyId(@ParamMapper("keyId") int keyId);
/** /**

2
src/main/java/weaver/zwl/common/ToolUtilNew.java
View File

@ -431,7 +431,7 @@ public class ToolUtilNew extends ToolUtil{
public static String getModeTableById(int modeId){ public static String getModeTableById(int modeId){
RecordSet rs = new RecordSet(); RecordSet rs = new RecordSet();
if(rs.executeQuery("select wb.tablename from modeInfo m inner join workflow_bill wb on m.formid = wb.id where m.id = ?") && rs.next()){ if(rs.executeQuery("select wb.tablename from modeInfo m inner join workflow_bill wb on m.formid = wb.id where m.id = ?",modeId) && rs.next()){
return Util.null2String(rs.getString(1)); return Util.null2String(rs.getString(1));
} }
return ""; return "";