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 eef04f0a..1735bcc5 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 @@ -165,6 +165,8 @@ public class CallBackServiceImpl implements CallBackService { operationRecords = operationRecords.stream().filter(item -> !item.getType().equals("START_PROCESS_INSTANCE")).collect(Collectors.toList()); System.out.println(operationRecords); + String remark=""; + //钉钉问题记录执行明细 for (GetProcessInstanceResponseBody.GetProcessInstanceResponseBodyResultOperationRecords operationRecord : operationRecords) { //操作结果 @@ -179,9 +181,13 @@ public class CallBackServiceImpl implements CallBackService { dingU8cBillEntity.setDing_res("未处理"); break; } + //处理意见 + remark = operationRecord.getRemark(); } - dingU8cBillDao.saveOrUpDateV2(dingU8cBillEntity); + + //审批u8c单据 + approveArapDjzb(dingU8cBillEntity,remark); }catch (Exception e){ logger.error("代理采购(付款单)->采购付款申请(店群专用)回调报错:"+e); } @@ -203,10 +209,9 @@ public class CallBackServiceImpl implements CallBackService { /** * 审核付款单 - * @param vbillcode 单据号 - * @param corpCode 公司编码 + * @param remark 处理意见 */ - public void approveArapDjzb(String vbillcode,String corpCode){ + public void approveArapDjzb(DingU8cBillEntity dingU8cBillEntity,String remark){ ArapDjzb arapDjzb = new ArapDjzb(); } } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/dao/impl/DingU8cBillDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/dao/impl/DingU8cBillDaoImpl.java index ea984ac7..34ec9c8d 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/dao/impl/DingU8cBillDaoImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/dao/impl/DingU8cBillDaoImpl.java @@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; +import java.util.Date; import java.util.List; /** @@ -43,16 +44,22 @@ public class DingU8cBillDaoImpl extends MybatisGenericDaoN + dingU8cBill.setId(dingU8cBillEntity.getId()); + dingU8cBill.setModify_time(new Date()); dingU8cBill.setPushStatus("N"); dingU8cBill.setPushInfo(dingU8cBillEntityNew.getPushInfo()); this.update(dingU8cBill); }else if("N".equals(pushStatus)&&"Y".equals(pushStatusNew)){ //N->Y + dingU8cBill.setId(dingU8cBillEntity.getId()); + dingU8cBill.setModify_time(new Date()); dingU8cBill.setPushStatus("Y"); dingU8cBill.setPushInfo(dingU8cBillEntityNew.getPushInfo()); this.update(dingU8cBill); }else if("Y".equals(pushStatus)&&"Y".equals(pushStatusNew)){ //Y->Y + dingU8cBill.setId(dingU8cBillEntity.getId()); + dingU8cBill.setModify_time(new Date()); dingU8cBill.setDing_res(dingU8cBillEntityNew.getDing_res()); this.update(dingU8cBill); } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/entity/DingU8cBillEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/entity/DingU8cBillEntity.java index ebfd25b6..6fe0c4b5 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/entity/DingU8cBillEntity.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/entity/DingU8cBillEntity.java @@ -1,6 +1,5 @@ package com.hzya.frame.plugin.lets.dingtalk.entity; -import java.util.Date; import com.hzya.frame.web.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; @@ -35,6 +34,19 @@ public class DingU8cBillEntity extends BaseEntity { private String dingTalkProcessId; /** 钉钉返回结果 */ private String ding_res; + /** 是否审核 Y 、 N */ + private String approve; + public DingU8cBillEntity(String u8cPkCorp, String u8cCodeCorp, String u8cBillType, String u8cBillCode, String u8cBillId, String pushStatus, String pushInfo, String dingTalkProcessId, String ding_res) { + this.u8cPkCorp = u8cPkCorp; + this.u8cCodeCorp = u8cCodeCorp; + this.u8cBillType = u8cBillType; + this.u8cBillCode = u8cBillCode; + this.u8cBillId = u8cBillId; + this.pushStatus = pushStatus; + this.pushInfo = pushInfo; + this.dingTalkProcessId = dingTalkProcessId; + this.ding_res = ding_res; + } } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/entity/DingU8cBillEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/entity/DingU8cBillEntity.xml index 80db07c8..005d7871 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/entity/DingU8cBillEntity.xml +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/entity/DingU8cBillEntity.xml @@ -13,6 +13,7 @@ + @@ -29,6 +30,7 @@ ,push_info ,ding_talk_process_id ,ding_res + ,approve ,modify_time ,create_time ,sts @@ -49,6 +51,7 @@ and push_info = #{pushInfo} and ding_talk_process_id = #{dingTalkProcessId} and ding_res = #{ding_res} + and approve = #{approve} and modify_time = #{modify_time} and create_time = #{create_time} and sts = #{sts} @@ -70,6 +73,7 @@ and push_info = #{pushInfo} and ding_talk_process_id = #{dingTalkProcessId} and ding_res = #{ding_res} + and approve = #{approve} and modify_time = #{modify_time} and create_time = #{create_time} and sts = #{sts} @@ -93,6 +97,7 @@ and push_info like concat('%',#{pushInfo},'%') and ding_talk_process_id like concat('%',#{dingTalkProcessId},'%') and ding_res like concat('%',#{ding_res},'%') + and approve like concat('%',#{approve},'%') and modify_time like concat('%',#{modify_time},'%') and create_time like concat('%',#{create_time},'%') and sts like concat('%',#{sts},'%') @@ -116,6 +121,7 @@ or push_info = #{pushInfo} or ding_talk_process_id = #{dingTalkProcessId} or ding_res = #{ding_res} + or approve = #{approve} or modify_time = #{modify_time} or create_time = #{create_time} or sts = #{sts} @@ -137,6 +143,7 @@ push_info , ding_talk_process_id , ding_res , + approve , modify_time , create_time , sts , @@ -154,6 +161,7 @@ #{pushInfo} , #{dingTalkProcessId} , #{ding_res} , + #{approve} , #{modify_time} , #{create_time} , #{sts} , @@ -201,6 +209,7 @@ update ding_u8c_bill set push_info = #{pushInfo}, ding_talk_process_id = #{dingTalkProcessId}, ding_res = #{ding_res}, + approve = #{approve}, modify_time = #{modify_time}, create_time = #{create_time}, sts = #{sts},