diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/callback/service/impl/CallBackServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/callback/service/impl/CallBackServiceImpl.java
index 86dac423..1788ea54 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/callback/service/impl/CallBackServiceImpl.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/callback/service/impl/CallBackServiceImpl.java
@@ -288,7 +288,7 @@ public class CallBackServiceImpl implements CallBackService {
*/
public DingU8cBillEntity queryU8CDing(String ding_talk_process_id) {
DingU8cBillEntity dingU8cBillEntity = new DingU8cBillEntity();
- dingU8cBillEntity.setDingTalkProcessId(ding_talk_process_id);
+ dingU8cBillEntity.setDing_talk_process_id(ding_talk_process_id);
dingU8cBillEntity.setSts("Y");
List<DingU8cBillEntity> query = dingU8cBillDao.query(dingU8cBillEntity);
if (query.size() == 0) {
@@ -382,8 +382,8 @@ public class CallBackServiceImpl implements CallBackService {
LocalDate now = LocalDate.now();
Map bills = new HashMap();
- bills.put("djbh", dingU8cBillEntity.getU8cBillCode());
- bills.put("dwbm", dingU8cBillEntity.getU8cCodeCorp());
+ bills.put("djbh", dingU8cBillEntity.getU8c_bill_code());
+ bills.put("dwbm", dingU8cBillEntity.getU8c_code_corp());
bills.put("opinion", "同意");
// bills.put("operatorid", OverallConstant.getOverAllValue("u8cApiZdrCode"));
bills.put("operatorid", mobile);
@@ -417,7 +417,7 @@ public class CallBackServiceImpl implements CallBackService {
logger.error("推送U8C--> 丽知：审核付款单审核 失败" + e);
//失败
dingU8cBillEntity.setApprove("N");
- dingU8cBillEntity.setPushInfo(e.getMessage());
+ dingU8cBillEntity.setPush_info(e.getMessage());
dingU8cBillDao.callBackSaveOrUpdate(dingU8cBillEntity);
}
@@ -484,6 +484,8 @@ public class CallBackServiceImpl implements CallBackService {
String mapStr = "";
String response = "";
+ BdCorpEntity bdCorpEntity_w=null;
+
try {
ArapDjzbVO billvo = new ArapDjzbVO();
ArapDjzbVO.Parentt parentvo = new ArapDjzbVO.Parentt();
@@ -496,6 +498,7 @@ public class CallBackServiceImpl implements CallBackService {
if (bdCorpEntity == null) {
Assert.state(false, "钉钉回调->付款单新增：根据表单【费用所属公司】：{}，未查询到u8c对应公司，请检查名称。", corpName);
}
+ bdCorpEntity_w=bdCorpEntity;
parentvo.setDwbm(bdCorpEntity.getUnitcode());
//djlxbm单据类型编码 采购付款单 D3
@@ -550,14 +553,15 @@ public class CallBackServiceImpl implements CallBackService {
//成功
DingU8cBillEntity dingU8cBillEntity = new DingU8cBillEntity();
- dingU8cBillEntity.setU8cPkCorp(bdCorpEntity.getPkCorp());//公司主键
- dingU8cBillEntity.setU8cCodeCorp(bdCorpEntity.getUnitcode());//公司编码
- dingU8cBillEntity.setU8cBillType("D3");//单据类型
- dingU8cBillEntity.setU8cBillCode(vbillcode);//单据号
- dingU8cBillEntity.setU8cBillId(vbillId);//单据主键
- dingU8cBillEntity.setPushStatus("Y");//推送成功
- dingU8cBillEntity.setPushInfo("success");//推送成功
- dingU8cBillEntity.setDingTalkProcessId(processInstanceId);//钉钉审批实例id
+ dingU8cBillEntity.setU8c_pk_corp(bdCorpEntity.getPkCorp());//公司主键
+ dingU8cBillEntity.setU8c_code_corp(bdCorpEntity.getUnitcode());//公司编码
+ dingU8cBillEntity.setU8c_name_corp(corpName);//公司名称
+ dingU8cBillEntity.setU8c_bill_type("D3");//单据类型
+ dingU8cBillEntity.setU8c_bill_code(vbillcode);//单据号
+ dingU8cBillEntity.setU8c_bill_id(vbillId);//单据主键
+ dingU8cBillEntity.setPush_status("Y");//推送成功
+ dingU8cBillEntity.setPush_info("success");//推送成功
+ dingU8cBillEntity.setDing_talk_process_id(processInstanceId);//钉钉审批实例id
dingU8cBillEntity.setCreate_time(new Date());//创建时间
dingU8cBillEntity.setApprove("Y");//Y审核 N不审核
dingU8cBillEntity.setInitiate("D");//D钉钉发起，U u8c发起
@@ -575,14 +579,15 @@ public class CallBackServiceImpl implements CallBackService {
logger.error(e);
//失败
DingU8cBillEntity dingU8cBillEntity = new DingU8cBillEntity();
- dingU8cBillEntity.setU8cCodeCorp(corpName);//公司主键
- dingU8cBillEntity.setU8cCodeCorp(null);//公司编码
- dingU8cBillEntity.setU8cBillType(null);//单据类型
- dingU8cBillEntity.setU8cBillCode(null);//单据号
- dingU8cBillEntity.setU8cBillId(null);//单据主键
- dingU8cBillEntity.setPushStatus("N");//推送失败
- dingU8cBillEntity.setPushInfo(e.getMessage());//失败消息
- dingU8cBillEntity.setDingTalkProcessId(processInstanceId);//钉钉审批实例id
+ dingU8cBillEntity.setU8c_code_corp(bdCorpEntity_w==null?null:bdCorpEntity_w.getPkCorp());//公司主键
+ dingU8cBillEntity.setU8c_code_corp(bdCorpEntity_w==null?null:bdCorpEntity_w.getUnitcode());//公司编码
+ dingU8cBillEntity.setU8c_name_corp(corpName);//公司编码
+ dingU8cBillEntity.setU8c_bill_type("D3");//单据类型
+ dingU8cBillEntity.setU8c_bill_code(null);//单据号
+ dingU8cBillEntity.setU8c_bill_id(null);//单据主键
+ dingU8cBillEntity.setPush_status("N");//推送失败
+ dingU8cBillEntity.setPush_info(e.getMessage());//失败消息
+ dingU8cBillEntity.setDing_talk_process_id(processInstanceId);//钉钉审批实例id
dingU8cBillEntity.setCreate_time(new Date());//创建时间
dingU8cBillEntity.setApprove(null);//Y审核 N不审核
dingU8cBillEntity.setInitiate("D");//D钉钉发起，U u8c发起
@@ -624,9 +629,9 @@ public class CallBackServiceImpl implements CallBackService {
//请求体
Map<String, String> fileMap = new HashMap<>();
- fileMap.put("instanceId", dingU8cBillEntity.getDingTalkProcessId());
+ fileMap.put("instanceId", dingU8cBillEntity.getDing_talk_process_id());
fileMap.put("userCode", mobile);//审批人
- fileMap.put("ckeckResult", "N");
+ fileMap.put("ckeckResult", "R");
fileMap.put("ckeckNote", "无");
String jsonFileMap = JSONUtil.toJsonStr(fileMap);
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/dingtalk/DingCallBackPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/dingtalk/DingCallBackPluginInitializer.java
index 09a61d01..008d6bd3 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/dingtalk/DingCallBackPluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/dingtalk/DingCallBackPluginInitializer.java
@@ -136,7 +136,7 @@ public class DingCallBackPluginInitializer extends PluginBaseEntity {
if (filterData == null || filterData.size() == 0) {
return;
}
-// List<String> collect = filterData.stream().map(DingU8cBillEntity::getDingTalkProcessId).collect(Collectors.toList());
+// List<String> collect = filterData.stream().map(DingU8cBillEntity::getDing_talk_process_id).collect(Collectors.toList());
// if (collect == null || collect.size() == 0) {
// return;
// }
@@ -154,7 +154,7 @@ public class DingCallBackPluginInitializer extends PluginBaseEntity {
public void start(String processInstanceId) {
try {
DingU8cBillEntity dingU8cBillEntity = new DingU8cBillEntity();
- dingU8cBillEntity.setDingTalkProcessId(processInstanceId);
+ dingU8cBillEntity.setDing_talk_process_id(processInstanceId);
dingU8cBillEntity.setSts("Y");
dingU8cBillEntity.setInitiate("U");
List<DingU8cBillEntity> query = dingU8cBillDao.query(dingU8cBillEntity);
@@ -182,7 +182,7 @@ public class DingCallBackPluginInitializer extends PluginBaseEntity {
public List<DingU8cBillEntity> filterPass(List<DingU8cBillEntity> query) {
List<DingU8cBillEntity> filter = new ArrayList<>();
for (DingU8cBillEntity dingU8cBillEntity : query) {
- if ("Y".equals(dingU8cBillEntity.getApprove()) || (dingU8cBillEntity.getDingTalkProcessId() == null || "".equals(dingU8cBillEntity.getDingTalkProcessId().trim()))) {
+ if ("Y".equals(dingU8cBillEntity.getApprove()) || (dingU8cBillEntity.getDing_talk_process_id() == null || "".equals(dingU8cBillEntity.getDing_talk_process_id().trim()))) {
continue;
}
filter.add(dingU8cBillEntity);
@@ -200,7 +200,7 @@ public class DingCallBackPluginInitializer extends PluginBaseEntity {
//获取token
String token = getDingTalkToken();
for (DingU8cBillEntity dingU8cBillEntity : filterData) {
- if(dingU8cBillEntity.getDingTalkProcessId()==null||"".equals(dingU8cBillEntity.getDingTalkProcessId().trim())){
+ if(dingU8cBillEntity.getDing_talk_process_id()==null||"".equals(dingU8cBillEntity.getDing_talk_process_id().trim())){
continue;
}
if("Y".equals(dingU8cBillEntity.getApprove())){
@@ -211,7 +211,7 @@ public class DingCallBackPluginInitializer extends PluginBaseEntity {
try {
//查询实例的具体信息
- GetProcessInstanceResponse processInstanceDetails = DingTalkUtils.getProcessInstanceDetails(token, dingU8cBillEntity.getDingTalkProcessId());
+ GetProcessInstanceResponse processInstanceDetails = DingTalkUtils.getProcessInstanceDetails(token, dingU8cBillEntity.getDing_talk_process_id());
GetProcessInstanceResponseBody.GetProcessInstanceResponseBodyResult processInstanceResponseBodyResult = processInstanceDetails.getBody().getResult();
String status = null;//审批状态。RUNNING：审批中 TERMINATED：已撤销 COMPLETED：审批完成
@@ -226,8 +226,8 @@ public class DingCallBackPluginInitializer extends PluginBaseEntity {
}
//查询u8c的单据状态//spzt：1审核 null 未审核
- String u8cPkCorp = dingU8cBillEntity.getU8cPkCorp();
- String u8cBillCode = dingU8cBillEntity.getU8cBillCode();
+ String u8cPkCorp = dingU8cBillEntity.getU8c_pk_corp();
+ String u8cBillCode = dingU8cBillEntity.getU8c_bill_code();
ArapDjzbEntity arapDjzbEntity = queryArapDjzbEntity(u8cPkCorp, u8cBillCode);
if(arapDjzbEntity==null){
return;
@@ -260,7 +260,7 @@ public class DingCallBackPluginInitializer extends PluginBaseEntity {
* @param dingU8cBillEntity
*/
public void updateDingU8C(DingU8cBillEntity dingU8cBillEntity){
- dingU8cBillEntity.setDingTalkProcessId(null);
+ dingU8cBillEntity.setDing_talk_process_id(null);
dingU8cBillDao.update(dingU8cBillEntity);
}
@@ -274,8 +274,8 @@ public class DingCallBackPluginInitializer extends PluginBaseEntity {
LocalDate now = LocalDate.now();
Map bills = new HashMap();
- bills.put("djbh", dingU8cBillEntity.getU8cBillCode());
- bills.put("dwbm", dingU8cBillEntity.getU8cCodeCorp());
+ bills.put("djbh", dingU8cBillEntity.getU8c_bill_code());
+ bills.put("dwbm", dingU8cBillEntity.getU8c_code_corp());
bills.put("opinion", "同意");
// bills.put("operatorid", OverallConstant.getOverAllValue("u8cApiZdrCode"));
bills.put("operatorid", mobile);
@@ -309,7 +309,7 @@ public class DingCallBackPluginInitializer extends PluginBaseEntity {
logger.error("推送U8C--> 丽知：审核付款单审核 失败" + e);
//失败
dingU8cBillEntity.setApprove("N");
- dingU8cBillEntity.setPushInfo(e.getMessage());
+ dingU8cBillEntity.setPush_info(e.getMessage());
dingU8cBillDao.callBackSaveOrUpdate(dingU8cBillEntity);
}
@@ -333,7 +333,7 @@ public class DingCallBackPluginInitializer extends PluginBaseEntity {
//请求体
Map<String, String> fileMap = new HashMap<>();
- fileMap.put("instanceId", dingU8cBillEntity.getDingTalkProcessId());
+ fileMap.put("instanceId", dingU8cBillEntity.getDing_talk_process_id());
fileMap.put("userCode", mobile);//审批人
fileMap.put("ckeckResult", "R");
fileMap.put("ckeckNote", "无");
@@ -357,7 +357,7 @@ public class DingCallBackPluginInitializer extends PluginBaseEntity {
//记录日志
dingU8cBillEntity.setApprove("N");
- dingU8cBillEntity.setPushStatus("N");
+ dingU8cBillEntity.setPush_status("N");
dingU8cBillDao.callBackSaveOrUpdate(dingU8cBillEntity);
}