数智办公对接数智财务逻辑
This commit is contained in:
parent
ef065c3f8c
commit
3e726e8b3c
|
@ -176,15 +176,18 @@
|
|||
SELECT
|
||||
plug.plugin_code,
|
||||
plug.plugin_name,
|
||||
application.name as app_name,
|
||||
source.source_name,
|
||||
source.source_code ,
|
||||
application.app_type,
|
||||
model.mdm_code,
|
||||
applicationdatabase.source_code as db_code
|
||||
FROM
|
||||
mdm_module_source source
|
||||
LEFT JOIN sys_application_plugin plug ON plug.id = source.source_code
|
||||
LEFT JOIN sys_application application ON source.source_name = application.id
|
||||
left join sys_application_database applicationdatabase on applicationdatabase.app_id = source.source_name
|
||||
LEFT JOIN mdm_module model on source.mdm_id = model.id
|
||||
WHERE
|
||||
source.source_type = '1'
|
||||
AND source.sts = 'Y'
|
||||
|
@ -329,32 +332,7 @@ update mdm_module_source set sts= 'N' ,modify_time = #{modify_time},modify_user
|
|||
<delete id="entity_delete">
|
||||
delete from mdm_module_source where id = #{id}
|
||||
</delete>
|
||||
<!-- 根据数据来源内类型是插件的应用类型做分组 -->
|
||||
<select id="queryMdmModuleSourceentityGroupByType" resultMap="get-MdmModuleSourceEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity">
|
||||
SELECT
|
||||
plug.plugin_code,
|
||||
plug.plugin_name,
|
||||
application.name as app_name,
|
||||
source.source_name,
|
||||
source.source_code ,
|
||||
application.app_type,
|
||||
model.mdm_code,
|
||||
applicationdatabase.source_code as db_code
|
||||
FROM
|
||||
mdm_module_source source
|
||||
LEFT JOIN sys_application_plugin plug ON plug.id = source.source_code
|
||||
LEFT JOIN sys_application application ON source.source_name = application.id
|
||||
left join sys_application_database applicationdatabase on applicationdatabase.app_id = source.source_name
|
||||
LEFT JOIN mdm_module model on source.mdm_id = model.id
|
||||
WHERE
|
||||
source.source_type = '1'
|
||||
AND source.sts = 'Y'
|
||||
AND plug.sts = 'Y'
|
||||
and application.sts = 'Y'
|
||||
AND applicationdatabase.sts = 'Y'
|
||||
AND applicationdatabase.db_status = '1'
|
||||
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
||||
|
|
|
@ -21,6 +21,33 @@ public class PayBillEntity extends BaseEntity {
|
|||
private String tableName;//表名称
|
||||
private String fieldName;//字段名称
|
||||
private String state;//推送状态
|
||||
private String pkOrg;//组织
|
||||
private String pkCustomer;//客户
|
||||
private String pk_oppaccount;//付款账户
|
||||
|
||||
public String getPkCustomer() {
|
||||
return pkCustomer;
|
||||
}
|
||||
|
||||
public void setPkCustomer(String pkCustomer) {
|
||||
this.pkCustomer = pkCustomer;
|
||||
}
|
||||
|
||||
public String getPk_oppaccount() {
|
||||
return pk_oppaccount;
|
||||
}
|
||||
|
||||
public void setPk_oppaccount(String pk_oppaccount) {
|
||||
this.pk_oppaccount = pk_oppaccount;
|
||||
}
|
||||
|
||||
public String getPkOrg() {
|
||||
return pkOrg;
|
||||
}
|
||||
|
||||
public void setPkOrg(String pkOrg) {
|
||||
this.pkOrg = pkOrg;
|
||||
}
|
||||
|
||||
public String getState() {
|
||||
return state;
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
<mapper namespace="com.hzya.frame.seeyon.paybill.dao.impl.PayBillDaoImpl">
|
||||
<resultMap id="get-PayBillEntity-result" type="com.hzya.frame.seeyon.paybill.entity.PayBillEntity" >
|
||||
<result property="id" column="id" jdbcType="VARCHAR"/>
|
||||
<result property="pkOrg" column="pk_org" jdbcType="VARCHAR"/>
|
||||
<result property="billDate" column="bill_date" jdbcType="VARCHAR"/>
|
||||
<result property="primalMoney" column="primal_money" jdbcType="VARCHAR"/>
|
||||
<result property="pkOppaccount" column="pk_oppaccount" jdbcType="VARCHAR"/>
|
||||
|
|
|
@ -93,7 +93,9 @@ public class PayBillServiceImpl extends BaseService<PaymentEntity,String> implem
|
|||
body.put("pay_primal",pay.getPrimalMoney());//付款原币金额
|
||||
body.put("creationtime",pay.getBillDate());//创建时间
|
||||
body.put("direction","-1");//方向 :1=收;-1=付;
|
||||
body.put("objecttype","");//交易对象
|
||||
body.put("objecttype","0");//交易对象
|
||||
body.put("pk_customer",pay.getPkCustomer());//客户
|
||||
body.put("pk_account",pay.getPkOppaccount());//付款银行账号
|
||||
detailsArr.add(body);
|
||||
JSONObject main = new JSONObject();
|
||||
main.put("head",head);//表头
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
package com.hzya.frame.seeyon.recbill.dao;
|
||||
|
||||
import com.hzya.frame.seeyon.recbill.entity.RecBillEntity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author 👻👻👻👻👻👻👻👻👻👻 gjh
|
||||
* @version 1.0
|
||||
* @content
|
||||
* @date 2023-08-30 10:27
|
||||
*/
|
||||
public interface IRecBillDao {
|
||||
/**
|
||||
*
|
||||
* @content 获取OA工程付款单数据
|
||||
* @author laborer
|
||||
* @date 2024/6/20 0020 11:30
|
||||
*
|
||||
*/
|
||||
List<RecBillEntity> getOaRecBill(RecBillEntity rec);
|
||||
/**
|
||||
*
|
||||
* @content 修改推送状态
|
||||
* @author laborer
|
||||
* @date 2024/6/21 0021 11:15
|
||||
*
|
||||
*/
|
||||
|
||||
int updateState(RecBillEntity rec);
|
||||
}
|
|
@ -0,0 +1,30 @@
|
|||
package com.hzya.frame.seeyon.recbill.dao.impl;
|
||||
|
||||
import com.baomidou.dynamic.datasource.annotation.DS;
|
||||
import com.hzya.frame.basedao.dao.MybatisGenericDao;
|
||||
import com.hzya.frame.seeyon.recbill.dao.IRecBillDao;
|
||||
import com.hzya.frame.seeyon.recbill.entity.RecBillEntity;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author 👻👻👻👻👻👻👻👻👻👻 gjh
|
||||
* @version 1.0
|
||||
* @content
|
||||
* @date 2023-08-30 10:27
|
||||
*/
|
||||
@Repository(value = "PayBillDaoImpl")
|
||||
public class RecBillDaoImpl extends MybatisGenericDao implements IRecBillDao {
|
||||
|
||||
@DS("#rec.dataSourceCode")
|
||||
@Override
|
||||
public List<RecBillEntity> getOaRecBill(RecBillEntity rec) {
|
||||
return super.selectList("com.hzya.frame.seeyon.recbill.dao.impl.RecBillDaoImpl.PayBillEntity_list_base",rec);
|
||||
}
|
||||
@DS("#rec.dataSourceCode")
|
||||
@Override
|
||||
public int updateState(RecBillEntity rec) {
|
||||
return super.update("com.hzya.frame.seeyon.recbill.dao.impl.RecBillDaoImpl.PayBillEntity_update",rec);
|
||||
}
|
||||
}
|
|
@ -0,0 +1,104 @@
|
|||
package com.hzya.frame.seeyon.recbill.entity;
|
||||
|
||||
import com.hzya.frame.web.entity.BaseEntity;
|
||||
|
||||
/**
|
||||
*
|
||||
* @content 付款結算單
|
||||
* @author laborer
|
||||
* @date 2024/6/20 0020 11:07
|
||||
*
|
||||
*/
|
||||
|
||||
public class RecBillEntity extends BaseEntity {
|
||||
private String billDate;//付款日期
|
||||
private String primalMoney;//付款金额信息
|
||||
private String pkOppaccount;//付款银行信息
|
||||
private String pkSupplier;//供应商信息
|
||||
private String tableName;//表名称
|
||||
private String fieldName;//字段名称
|
||||
private String state;//推送状态
|
||||
private String pkCustomer;//客户
|
||||
private String pkAccount;//收款账户
|
||||
private String pkOrg;//组织
|
||||
|
||||
public String getPkCustomer() {
|
||||
return pkCustomer;
|
||||
}
|
||||
|
||||
public void setPkCustomer(String pkCustomer) {
|
||||
this.pkCustomer = pkCustomer;
|
||||
}
|
||||
|
||||
public String getPkAccount() {
|
||||
return pkAccount;
|
||||
}
|
||||
|
||||
public void setPkAccount(String pkAccount) {
|
||||
this.pkAccount = pkAccount;
|
||||
}
|
||||
|
||||
public String getPkOrg() {
|
||||
return pkOrg;
|
||||
}
|
||||
|
||||
public void setPkOrg(String pkOrg) {
|
||||
this.pkOrg = pkOrg;
|
||||
}
|
||||
|
||||
public String getState() {
|
||||
return state;
|
||||
}
|
||||
|
||||
public void setState(String state) {
|
||||
this.state = state;
|
||||
}
|
||||
|
||||
public String getTableName() {
|
||||
return tableName;
|
||||
}
|
||||
|
||||
public void setTableName(String tableName) {
|
||||
this.tableName = tableName;
|
||||
}
|
||||
|
||||
public String getFieldName() {
|
||||
return fieldName;
|
||||
}
|
||||
|
||||
public void setFieldName(String fieldName) {
|
||||
this.fieldName = fieldName;
|
||||
}
|
||||
|
||||
public String getBillDate() {
|
||||
return billDate;
|
||||
}
|
||||
|
||||
public void setBillDate(String billDate) {
|
||||
this.billDate = billDate;
|
||||
}
|
||||
|
||||
public String getPrimalMoney() {
|
||||
return primalMoney;
|
||||
}
|
||||
|
||||
public void setPrimalMoney(String primalMoney) {
|
||||
this.primalMoney = primalMoney;
|
||||
}
|
||||
|
||||
public String getPkOppaccount() {
|
||||
return pkOppaccount;
|
||||
}
|
||||
|
||||
public void setPkOppaccount(String pkOppaccount) {
|
||||
this.pkOppaccount = pkOppaccount;
|
||||
}
|
||||
|
||||
public String getPkSupplier() {
|
||||
return pkSupplier;
|
||||
}
|
||||
|
||||
public void setPkSupplier(String pkSupplier) {
|
||||
this.pkSupplier = pkSupplier;
|
||||
}
|
||||
}
|
|
@ -0,0 +1,40 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.hzya.frame.seeyon.recbill.dao.impl.RecBillDaoImpl">
|
||||
<resultMap id="get-RecBillEntity-result" type="com.hzya.frame.seeyon.recbill.entity.RecBillEntity" >
|
||||
<result property="id" column="id" jdbcType="VARCHAR"/>
|
||||
<result property="pkOrg" column="pk_org" jdbcType="VARCHAR"/>
|
||||
<result property="billDate" column="bill_date" jdbcType="VARCHAR"/>
|
||||
<result property="primalMoney" column="primal_money" jdbcType="VARCHAR"/>
|
||||
<result property="pkAccount" column="pk_account" jdbcType="VARCHAR"/>
|
||||
<result property="pkCustomer" column="pk_customer" jdbcType="VARCHAR"/>
|
||||
<result property="pkOppaccount" column="pk_oppaccount" jdbcType="VARCHAR"/>
|
||||
<result property="pkSupplier" column="pk_supplier" jdbcType="VARCHAR"/>
|
||||
<result property="tableName" column="table_name" jdbcType="VARCHAR"/>
|
||||
<result property="fieldName" column="field_name" jdbcType="VARCHAR"/>
|
||||
|
||||
</resultMap>
|
||||
|
||||
<!--工程项目查询-->
|
||||
<select id="RecBillEntity_list_base" resultMap="get-RecBillEntity-result" parameterType="com.hzya.frame.seeyon.recbill.entity.RecBillEntity">
|
||||
SELECT
|
||||
field0002 AS pk_org,
|
||||
field0006 AS bill_date,
|
||||
field0009 AS primal_money,
|
||||
field0001 AS pk_account,
|
||||
field0013 AS pk_customer,
|
||||
field0012 AS pk_oppaccount,
|
||||
'formmain_0233' as table_name,
|
||||
'field0016' as field_name
|
||||
FROM formmain_0233
|
||||
WHERE field0016 IS null
|
||||
</select>
|
||||
|
||||
<!--通过主键修改方法-->
|
||||
<update id="RecBillEntity_update" parameterType = "java.util.Map" >
|
||||
update ${tableName} set ${fieldName} = #{state} where id = #{id}
|
||||
</update>
|
||||
|
||||
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
package com.hzya.frame.seeyon.recbill.service;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.hzya.frame.basedao.service.IBaseService;
|
||||
import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
|
||||
import com.hzya.frame.web.entity.JsonResultEntity;
|
||||
|
||||
/**
|
||||
*
|
||||
* @content huoqu
|
||||
* @author laborer获取OA付款单数据并推送BIP生成付款结算单
|
||||
* @date 2024/6/20 0020 11:19
|
||||
*
|
||||
*/
|
||||
|
||||
public interface IRecBillService extends IBaseService<PaymentEntity,String> {
|
||||
/**
|
||||
*
|
||||
* @content 工程付款单数据同步BIP
|
||||
* @author laborer
|
||||
* @date 2024/6/20 0020 11:24
|
||||
*
|
||||
*/
|
||||
JsonResultEntity sendRecBillToBip(JSONObject requestJson);
|
||||
|
||||
}
|
|
@ -0,0 +1,104 @@
|
|||
package com.hzya.frame.seeyon.recbill.service.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.hzya.frame.basedao.service.impl.BaseService;
|
||||
import com.hzya.frame.bip.v3.v2207.util.BipUtil;
|
||||
import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
|
||||
import com.hzya.frame.seeyon.recbill.dao.IRecBillDao;
|
||||
import com.hzya.frame.seeyon.recbill.entity.RecBillEntity;
|
||||
import com.hzya.frame.seeyon.recbill.service.IRecBillService;
|
||||
import com.hzya.frame.web.entity.JsonResultEntity;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
*
|
||||
* @content 付款单同步BIP
|
||||
* @author laborer
|
||||
* @date 2024/6/20 0020 15:20
|
||||
*
|
||||
*/
|
||||
|
||||
@Service("PayBillServiceImpl")
|
||||
public class RecBillServiceImpl extends BaseService<PaymentEntity,String> implements IRecBillService {
|
||||
private static final Logger logger = LoggerFactory.getLogger(RecBillServiceImpl.class);
|
||||
|
||||
@Autowired
|
||||
private IRecBillDao payBillDao;
|
||||
/**
|
||||
*
|
||||
* @content 工程付款单数据同步BIP
|
||||
* @author laborer
|
||||
* @date 2024/6/20 0020 11:24
|
||||
*
|
||||
*/
|
||||
@Override
|
||||
public JsonResultEntity sendRecBillToBip(JSONObject requestJson) {
|
||||
RecBillEntity entity = new RecBillEntity();
|
||||
requestJson.put("db_code","OA");
|
||||
entity.setDataSourceCode(requestJson.getString("db_code"));
|
||||
List<RecBillEntity>payBillEntityList = payBillDao.getOaRecBill(entity);
|
||||
if(CollectionUtils.isNotEmpty(payBillEntityList)){
|
||||
for(RecBillEntity pay : payBillEntityList){
|
||||
String token = BipUtil.getBipToken("yonyou","8000230000");
|
||||
JSONObject main = bindingAdd(pay);
|
||||
logger.info("银行流水收款信息数据{}",main.toString());
|
||||
String result = BipUtil.sendU9cTOBipEsb(main.toString(),"8000230016",token);
|
||||
logger.info("银行流水收款信息数据{}",result);
|
||||
JSONObject resultObj = JSON.parseObject(result);
|
||||
boolean flag = resultObj.getBoolean("success");
|
||||
if(flag){
|
||||
pay.setState("Y");
|
||||
}else{
|
||||
pay.setState("N");
|
||||
}
|
||||
pay.setDataSourceCode(requestJson.getString("db_code"));
|
||||
payBillDao.updateState(pay);
|
||||
// todo 后续在写吧(没字段等OA开了外网在创建),修改推送状态,避免再次查询
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
private JSONObject bindingAdd(RecBillEntity pay) {
|
||||
JSONObject head = new JSONObject();
|
||||
head.put("pk_org","");//所属组织
|
||||
head.put("pk_group","");//集团
|
||||
head.put("bill_type","F4");//单据类型 默认F5
|
||||
head.put("trade_type","D4");//付款结算类型 默认D5
|
||||
head.put("source_flag","2");//付款结算类型 默认2
|
||||
head.put("bill_date",pay.getBillDate());//单据日期
|
||||
head.put("primal_money",pay.getPrimalMoney());//付款原币金额
|
||||
head.put("pk_currtype","CNY");//币种
|
||||
head.put("billmaker","");//制单人
|
||||
//处理明细数据,按照明细付款 多个明细生成多个付款结算单
|
||||
JSONArray detailsArr = new JSONArray();
|
||||
JSONObject body = new JSONObject();
|
||||
body.put("pk_org","");//所属组织
|
||||
body.put("pk_group","");//集团
|
||||
body.put("bill_type","F4");//单据类型 默认F5
|
||||
body.put("trade_type","D4");//付款结算类型 默认D5
|
||||
body.put("pk_currtype","CNY");//币种
|
||||
body.put("bill_date",pay.getBillDate());//单据日期
|
||||
body.put("pay_primal",pay.getPrimalMoney());//付款原币金额
|
||||
body.put("creationtime",pay.getBillDate());//创建时间
|
||||
body.put("direction","-1");//方向 :1=收;-1=付;
|
||||
body.put("objecttype","0");//交易对象
|
||||
body.put("pk_customer",pay.getPkCustomer());//客户
|
||||
body.put("pk_account",pay.getPkAccount());//收款银行账号
|
||||
detailsArr.add(body);
|
||||
JSONObject main = new JSONObject();
|
||||
main.put("head",head);//表头
|
||||
main.put("body",detailsArr);//明细数据
|
||||
return main;
|
||||
}
|
||||
}
|
|
@ -14,6 +14,7 @@ import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataService;
|
|||
import com.hzya.frame.sysnew.comparison.service.impl.ComparisonServiceImpl;
|
||||
import com.hzya.frame.web.entity.BaseResult;
|
||||
import com.hzya.frame.web.entity.JsonResultEntity;
|
||||
import com.hzya.frame.web.exception.BaseSystemException;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
@ -60,7 +61,7 @@ public class MasterDataServiceImpl extends BaseService<ComparisonEntity, String>
|
|||
String dbCode = mdmModuleSourceEntity.getDbCode();
|
||||
String mdmCode = mdmModuleSourceEntity.getMdmCode();
|
||||
List<JSONObject> listAll = new ArrayList<>();
|
||||
if(!"10007".equals(mdmCode)){
|
||||
if(!"10004".equals(mdmCode)){
|
||||
continue;
|
||||
}
|
||||
switch (appTyp) {//1、致远OA 2、用友U8C 3、用友BIP
|
||||
|
@ -98,7 +99,7 @@ public class MasterDataServiceImpl extends BaseService<ComparisonEntity, String>
|
|||
return BaseResult.getSuccessMessageEntity("主数据同步成功");
|
||||
}
|
||||
//绑定银行
|
||||
private List<JSONObject> binDingBank(JSONObject jsonObject, MdmModuleSourceEntity mdmModuleSourceEntity, String dbCode) {
|
||||
private List<JSONObject> binDingBank(JSONObject jsonObject, MdmModuleSourceEntity mdmModuleSourceEntity, String dbCode)throws Exception {
|
||||
List<JSONObject> list = new ArrayList<>();
|
||||
StringBuffer sb = new StringBuffer();
|
||||
if(null != jsonObject && StrUtil.isNotEmpty(jsonObject.getString("code"))){
|
||||
|
@ -109,7 +110,7 @@ public class MasterDataServiceImpl extends BaseService<ComparisonEntity, String>
|
|||
sb.append(" and a.update_time >= '"+ts+"'");
|
||||
}
|
||||
StringBuffer stringBuffer = new StringBuffer();
|
||||
stringBuffer.append("select *from bank");
|
||||
stringBuffer.append("select id as data_id,a.* from bank a");
|
||||
mdmModuleSourceEntity.setDataSourceCode(dbCode);
|
||||
List<HashMap<String, Object>> hashMaps = masterDataDaoImpl.queryArchivesByDataSource(stringBuffer.toString(),mdmModuleSourceEntity);
|
||||
int i = 0;
|
||||
|
@ -128,7 +129,7 @@ public class MasterDataServiceImpl extends BaseService<ComparisonEntity, String>
|
|||
}
|
||||
|
||||
//绑定客户档案
|
||||
private List<JSONObject> binDingCust(JSONObject jsonObject, MdmModuleSourceEntity mdmModuleSourceEntity, String dbCode) {
|
||||
private List<JSONObject> binDingCust(JSONObject jsonObject, MdmModuleSourceEntity mdmModuleSourceEntity, String dbCode)throws Exception {
|
||||
List<JSONObject> list = new ArrayList<>();
|
||||
StringBuffer sb = new StringBuffer();
|
||||
if(null != jsonObject && StrUtil.isNotEmpty(jsonObject.getString("code"))){
|
||||
|
@ -139,7 +140,7 @@ public class MasterDataServiceImpl extends BaseService<ComparisonEntity, String>
|
|||
sb.append(" and a.update_time >= '"+ts+"'");
|
||||
}
|
||||
StringBuffer stringBuffer = new StringBuffer();
|
||||
stringBuffer.append("SELECT id as id,field0013 AS code,field0014 AS name,field0016 AS pk_custclass,field0015 AS shortname,field0012 AS pk_org FROM formmain_0226 a WHERE 1=1 ");
|
||||
stringBuffer.append("SELECT id as data_id,field0013 AS code,field0014 AS name,field0016 AS pk_custclass,field0015 AS shortname,field0012 AS pk_org FROM formmain_0226 a WHERE 1=1 ");
|
||||
mdmModuleSourceEntity.setDataSourceCode(dbCode);
|
||||
List<HashMap<String, Object>> hashMaps = masterDataDaoImpl.queryArchivesByDataSource(stringBuffer.toString(),mdmModuleSourceEntity);
|
||||
if(CollectionUtils.isNotEmpty(hashMaps)){
|
||||
|
@ -150,9 +151,9 @@ public class MasterDataServiceImpl extends BaseService<ComparisonEntity, String>
|
|||
mdm_cust.put(key, hashMap.get(key));
|
||||
}
|
||||
//获取明细信息
|
||||
Long formmainId = (Long) hashMap.get("id");
|
||||
Long formmainId = (Long) hashMap.get("data_id");
|
||||
StringBuffer stringBufferDetails = new StringBuffer();
|
||||
stringBufferDetails.append("SELECT id as id ,field0023 AS pk_bankdoc,field0024 AS accnum,field0025 AS combinenum FROM formson_0229 WHERE formmain_id = '"+formmainId+"' " );
|
||||
stringBufferDetails.append("SELECT id as data_id ,field0023 AS pk_bankdoc,field0024 AS accnum,field0025 AS combinenum FROM formson_0229 WHERE formmain_id = '"+formmainId+"' " );
|
||||
List<HashMap<String, Object>> hashMapsDetails = masterDataDaoImpl.queryArchivesByDataSource(stringBufferDetails.toString(),mdmModuleSourceEntity);
|
||||
JSONArray mdm_customer_bank = new JSONArray();
|
||||
if(CollectionUtils.isNotEmpty(hashMapsDetails)){
|
||||
|
@ -173,7 +174,7 @@ public class MasterDataServiceImpl extends BaseService<ComparisonEntity, String>
|
|||
}
|
||||
|
||||
//绑定OA用户参数
|
||||
private List<JSONObject> bindingUser(JSONObject jsonObject, MdmModuleSourceEntity mdmModuleSourceEntity, String dbCode) {
|
||||
private List<JSONObject> bindingUser(JSONObject jsonObject, MdmModuleSourceEntity mdmModuleSourceEntity, String dbCode)throws Exception {
|
||||
List<JSONObject> list = new ArrayList<>();
|
||||
StringBuffer sb = new StringBuffer();
|
||||
if(null != jsonObject && StrUtil.isNotEmpty(jsonObject.getString("code"))){
|
||||
|
@ -184,7 +185,7 @@ public class MasterDataServiceImpl extends BaseService<ComparisonEntity, String>
|
|||
sb.append(" and a.update_time >= '"+ts+"'");
|
||||
}
|
||||
StringBuffer stringBuffer = new StringBuffer();
|
||||
stringBuffer.append("select a.id as id, a.name as user_name, e.LOGIN_NAME as user_code FROM org_member a left join org_principal e on a.id = e.MEMBER_ID" +
|
||||
stringBuffer.append("select a.id as data_id, a.name as user_name, e.LOGIN_NAME as user_code FROM org_member a left join org_principal e on a.id = e.MEMBER_ID" +
|
||||
" WHERE 1=1 " + sb.toString());
|
||||
mdmModuleSourceEntity.setDataSourceCode(dbCode);
|
||||
List<HashMap<String, Object>> hashMaps = masterDataDaoImpl.queryArchivesByDataSource(stringBuffer.toString(),mdmModuleSourceEntity);
|
||||
|
@ -205,13 +206,13 @@ public class MasterDataServiceImpl extends BaseService<ComparisonEntity, String>
|
|||
|
||||
|
||||
//查询档案参数组装
|
||||
public JsonResultEntity ParametricAssembly(MdmModuleSourceEntity mdmModuleSourceEntity,List<JSONObject> hashMaps,String mdmCode,String tableName){
|
||||
public JsonResultEntity ParametricAssembly(MdmModuleSourceEntity mdmModuleSourceEntity,List<JSONObject> hashMaps,String mdmCode,String tableName)throws Exception{
|
||||
for (JSONObject hashMap : hashMaps) {
|
||||
JSONObject main = hashMap.getJSONObject(tableName);
|
||||
|
||||
JSONObject jsonObjectUser = new JSONObject();
|
||||
JSONObject jsonStr = new JSONObject();
|
||||
jsonObjectUser.put("id", main.get("id"));
|
||||
jsonObjectUser.put("data_id", main.get("data_id"));
|
||||
jsonObjectUser.put("mdmCode", mdmCode);
|
||||
jsonStr.put("jsonStr", jsonObjectUser);
|
||||
//先查询编码和名称查询是否存在
|
||||
|
@ -233,10 +234,9 @@ public class MasterDataServiceImpl extends BaseService<ComparisonEntity, String>
|
|||
hashMap.put("mdmCode", mdmCode);
|
||||
hashMap.put("optionName", "数智中台");
|
||||
jsonStr.put("jsonStr", hashMap);
|
||||
try {
|
||||
JsonResultEntity result = comparisonServiceimpl.saveEntity(jsonStr);
|
||||
} catch (Exception e) {
|
||||
logger.info("U8C主数据档案新增用户档案失败,失败原因:{}",e.getMessage());
|
||||
if(!result.isFlag()){
|
||||
throw new BaseSystemException("主数据保存失败"+ result.getMsg());
|
||||
}
|
||||
} else {
|
||||
hashMap.put("appName","数智中台");
|
||||
|
@ -244,10 +244,9 @@ public class MasterDataServiceImpl extends BaseService<ComparisonEntity, String>
|
|||
hashMap.put("mdmCode", mdmCode);
|
||||
hashMap.put("optionName", "数智中台");
|
||||
jsonStr.put("jsonStr", hashMap);
|
||||
try {
|
||||
comparisonServiceimpl.updateEntity(jsonStr);
|
||||
} catch (Exception e) {
|
||||
logger.info("U8C主数据档案更新用户档案失败,失败原因:{}", e.getMessage());
|
||||
JsonResultEntity result = comparisonServiceimpl.updateEntity(jsonStr);
|
||||
if(!result.isFlag()){
|
||||
throw new BaseSystemException("主数据更新失败"+ result.getMsg());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue