hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

丽知：1、钉钉回调日志记录优化

This commit is contained in:
zhengyf 2024-11-26 11:45:44 +08:00
parent 65333dceb6
commit a1298d42d5
1 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/dao/impl/DingU8cBillDaoImpl.java
View File

@ -78,18 +78,6 @@ public class DingU8cBillDaoImpl extends MybatisGenericDao<DingU8cBillEntity, Str
dingU8cBill.setPush_process_ids(dingU8cBillEntity.getPush_process_ids() == null ? dingU8cBillEntityNew.getDing_talk_process_id() : dingU8cBillEntity.getPush_process_ids() + "," + dingU8cBillEntityNew.getDing_talk_process_id()); dingU8cBill.setPush_process_ids(dingU8cBillEntity.getPush_process_ids() == null ? dingU8cBillEntityNew.getDing_talk_process_id() : dingU8cBillEntity.getPush_process_ids() + "," + dingU8cBillEntityNew.getDing_talk_process_id());
this.update(dingU8cBill); this.update(dingU8cBill);
} }
// else if ("Y".equals(pushStatus)&&"Y".equals(pushStatusNew)) {
// //Y->Y
// dingU8cBill.setId(dingU8cBillEntity.getId());
// dingU8cBill.setDing_talk_process_id(dingU8cBillEntityNew.getDing_talk_process_id());
// dingU8cBill.setModify_time(new Date());
// dingU8cBill.setDing_res(dingU8cBillEntityNew.getDing_res());
// dingU8cBill.setApprove(dingU8cBillEntityNew.getApprove());
// dingU8cBill.setPush_info(dingU8cBillEntityNew.getPush_info());
// dingU8cBill.setPush_count(dingU8cBillEntityNew.getPush_count());
// dingU8cBill.setPush_process_ids(dingU8cBillEntityNew.getPush_process_ids());
// this.update(dingU8cBill);
// }
} }
} }
@ -109,34 +97,56 @@ public class DingU8cBillDaoImpl extends MybatisGenericDao<DingU8cBillEntity, Str
// dingU8cBill.setInitiate(dingU8cBillEntityNew.getInitiate());//来源平台，默认是U，如果发自钉钉会传D // dingU8cBill.setInitiate(dingU8cBillEntityNew.getInitiate());//来源平台，默认是U，如果发自钉钉会传D
List<DingU8cBillEntity> query = this.query(dingU8cBill); List<DingU8cBillEntity> query = this.query(dingU8cBill);
if (query.size() == 0) { if (query.size() == 0) {
//->Y 钉钉发起单据 //->Y ->N 钉钉发起单据
if ("D".equals(dingU8cBillEntityNew.getInitiate())) { if ("D".equals(dingU8cBillEntityNew.getInitiate())) {
this.save(dingU8cBillEntityNew); this.save(dingU8cBillEntityNew);
} }
} else if (query.size() == 1) { } else if (query.size() == 1) {
DingU8cBillEntity dingU8cBillEntity = query.get(0); DingU8cBillEntity dingU8cBillEntity = query.get(0);
String pushStatus = dingU8cBillEntity.getPush_status(); if("D".equals(dingU8cBillEntityNew.getInitiate())){
String pushStatusNew = dingU8cBillEntityNew.getPush_status(); if("Y".equals(dingU8cBillEntityNew.getPush_status())){
String approveNew = dingU8cBillEntityNew.getApprove(); //钉钉发起单据 N->Y
//Y->Y 钉钉审批通过 dingU8cBill.setId(dingU8cBillEntity.getId());
//Y->N 钉钉审批拒绝 dingU8cBill.setApprove("Y");
if("Y".equals(pushStatus) && "Y".equals(approveNew)){ dingU8cBill.setPush_status("Y");
//Y->Y 钉钉审批通过，推送成功，审批成功 dingU8cBill.setModify_time(new Date());
dingU8cBill.setId(dingU8cBillEntity.getId()); dingU8cBill.setDing_res(dingU8cBillEntityNew.getDing_res());
dingU8cBill.setDing_res(dingU8cBillEntityNew.getDing_res()); dingU8cBill.setPush_info(dingU8cBillEntityNew.getPush_info());
dingU8cBill.setApprove("Y"); this.update(dingU8cBill);
dingU8cBill.setModify_time(new Date()); }else if("N".equals(dingU8cBillEntityNew.getPush_status())){
dingU8cBill.setPush_info(dingU8cBillEntityNew.getPush_info()); //钉钉发起单据 N->N
this.update(dingU8cBill); dingU8cBill.setId(dingU8cBillEntity.getId());
} else if ("Y".equals(pushStatus) && "N".equals(approveNew)) { dingU8cBill.setApprove("N");
//Y->N 钉钉审批拒绝，推送成功，审批拒绝 dingU8cBill.setPush_status("N");
dingU8cBill.setId(dingU8cBillEntity.getId()); dingU8cBill.setModify_time(new Date());
dingU8cBill.setApprove("N"); dingU8cBill.setDing_res(null);
dingU8cBill.setPush_status("N"); dingU8cBill.setPush_info(dingU8cBillEntityNew.getPush_info());
dingU8cBill.setDing_res(null); this.update(dingU8cBill);
dingU8cBill.setDing_talk_process_id(null); }
dingU8cBill.setPush_info(dingU8cBillEntityNew.getPush_info()); } else if ("U".equals(dingU8cBillEntityNew.getInitiate())) {
this.update(dingU8cBill); String pushStatus = dingU8cBillEntity.getPush_status();
String pushStatusNew = dingU8cBillEntityNew.getPush_status();
String approveNew = dingU8cBillEntityNew.getApprove();
//Y->Y 钉钉审批通过
//Y->N 钉钉审批拒绝
if("Y".equals(pushStatus) && "Y".equals(approveNew)){
//Y->Y 钉钉审批通过，推送成功，审批成功
dingU8cBill.setId(dingU8cBillEntity.getId());
dingU8cBill.setDing_res(dingU8cBillEntityNew.getDing_res());
dingU8cBill.setApprove("Y");
dingU8cBill.setModify_time(new Date());
dingU8cBill.setPush_info(dingU8cBillEntityNew.getPush_info());
this.update(dingU8cBill);
} else if ("Y".equals(pushStatus) && "N".equals(approveNew)) {
//Y->N 钉钉审批拒绝，推送成功，审批拒绝
dingU8cBill.setId(dingU8cBillEntity.getId());
dingU8cBill.setApprove("N");
dingU8cBill.setPush_status("N");
dingU8cBill.setDing_res(null);
dingU8cBill.setDing_talk_process_id(null);
dingU8cBill.setPush_info(dingU8cBillEntityNew.getPush_info());
this.update(dingU8cBill);
}
} }
} else { } else {