diff --git a/src/main/java/weaver/weilin/zhu/asc/workflow/VoucherPushAction.java b/src/main/java/weaver/weilin/zhu/asc/workflow/VoucherPushAction.java index 31d6f7d..0f30b6a 100644 --- a/src/main/java/weaver/weilin/zhu/asc/workflow/VoucherPushAction.java +++ b/src/main/java/weaver/weilin/zhu/asc/workflow/VoucherPushAction.java @@ -1,7 +1,6 @@ package weaver.weilin.zhu.asc.workflow; import aiyh.utils.Util; -import aiyh.utils.httpUtil.HttpArgsType; import aiyh.utils.httpUtil.ResponeVo; import aiyh.utils.httpUtil.util.HttpUtils; 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.ResultMessageUtil; +import javax.ws.rs.core.MediaType; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -58,7 +58,7 @@ public class VoucherPushAction implements CusActionPostInterface { String requestURL = Util.null2String(Prop.getPropValue("AscVoucher", "url")); Map headerMap = new HashMap<>(); - headerMap.put("Content-Type", HttpArgsType.APPLICATION_JSON); + headerMap.put("Content-Type", MediaType.APPLICATION_JSON); HttpUtils httpUtils = new HttpUtils(); @@ -111,7 +111,7 @@ public class VoucherPushAction implements CusActionPostInterface { CommonUtil commonUtil = new CommonUtil(); - logger.info("日志信息:[" + JSONObject.toJSONString(logMap) + "]"); + logger.info("日志信息:[" + logMap.toString() + "]"); commonUtil.insertNewDataToMode(modeid,"uf_interface_log",logMap); diff --git a/src/main/java/weaver/weilin/zhu/xyzq/scheduled/entity/SyncConfigDetailDao.java b/src/main/java/weaver/weilin/zhu/xyzq/scheduled/entity/SyncConfigDetailDao.java index 0a8a8ba..5468761 100644 --- a/src/main/java/weaver/weilin/zhu/xyzq/scheduled/entity/SyncConfigDetailDao.java +++ b/src/main/java/weaver/weilin/zhu/xyzq/scheduled/entity/SyncConfigDetailDao.java @@ -1,7 +1,7 @@ package weaver.weilin.zhu.xyzq.scheduled.entity; -import aiyh.utils.entity.FieldViewInfo; import lombok.Data; +import weaver.weilin.zhu.common.util.FieldDetailInfo; /** * 兴业证券 @@ -15,7 +15,7 @@ public class SyncConfigDetailDao { /** * 建模模块字段信息 */ - private FieldViewInfo modeField; + private FieldDetailInfo modeField; /** * 接口字段名称 diff --git a/src/main/java/weaver/weilin/zhu/xyzq/scheduled/sqlmapper/OrganizationSyncSqlMapper.java b/src/main/java/weaver/weilin/zhu/xyzq/scheduled/sqlmapper/OrganizationSyncSqlMapper.java index c48721b..dd969ee 100644 --- a/src/main/java/weaver/weilin/zhu/xyzq/scheduled/sqlmapper/OrganizationSyncSqlMapper.java +++ b/src/main/java/weaver/weilin/zhu/xyzq/scheduled/sqlmapper/OrganizationSyncSqlMapper.java @@ -36,6 +36,7 @@ public interface OrganizationSyncSqlMapper { id = @Id(value = Integer.class,methodId = 2) ) }) + @CaseConversion(value = false) SyncConfigDao getConfigurationByKeyId(@ParamMapper("keyId") int keyId); /** diff --git a/src/main/java/weaver/zwl/common/ToolUtilNew.java b/src/main/java/weaver/zwl/common/ToolUtilNew.java index 05c0ee2..6605a91 100644 --- a/src/main/java/weaver/zwl/common/ToolUtilNew.java +++ b/src/main/java/weaver/zwl/common/ToolUtilNew.java @@ -431,7 +431,7 @@ public class ToolUtilNew extends ToolUtil{ public static String getModeTableById(int modeId){ 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 "";