diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/GenericEventConsumer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/GenericEventConsumer.java index 0f9c62d5..6549d0ac 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/GenericEventConsumer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/GenericEventConsumer.java @@ -100,7 +100,7 @@ public class GenericEventConsumer { //获取用户详情 String userRes = getUserById(String.valueOf(userIds.get(i))); //保存钉钉用户到mdm - String userMdmRes = createUser(userRes); + String userMdmRes = createUser(userRes,eventType); } }else if ("dept".equals(type)){ JSONArray deptIdArr = bizData.getJSONArray("deptId"); @@ -153,14 +153,15 @@ public class GenericEventConsumer { } //保存用户到mdm - private static String createUser(String userRes) { + private static String createUser(String userRes,String eventType) { JsonResultEntity jsonResult = JSONObject.parseObject(userRes,JsonResultEntity.class); if (jsonResult.isFlag()){ shade.com.alibaba.fastjson2.JSONObject attribute = (shade.com.alibaba.fastjson2.JSONObject) jsonResult.getAttribute(); String attrStr = attribute.toString(); OapiV2UserGetResponse rsp = JSONObject.parseObject(attrStr, OapiV2UserGetResponse.class); if (rsp.isSuccess()){ - OapiV2UserGetResponse.UserGetResponse userInfo = rsp.getResult(); + String result = attribute.getString("result"); + OapiV2UserGetResponse.UserGetResponse userInfo = com.alibaba.fastjson.JSONObject.parseObject(result,OapiV2UserGetResponse.UserGetResponse.class); //OapiV2UserGetResponse.UserGetResponse userInfo = dingtalkService.getUserById(userIds.getString(i)); Map mdmMap = new LinkedHashMap<>(); mdmMap.put("mdmCode",DDUSERMDMCODE); @@ -175,6 +176,8 @@ public class GenericEventConsumer { userMap.put("title",userInfo.getTitle()); userMap.put("email",userInfo.getEmail()); userMap.put("org_email",userInfo.getOrgEmail()); + userMap.put("event_type",eventType); + userMap.put("dept_id_list",userInfo.getDeptIdList()); if (null != userInfo.getHiredDate()){ userMap.put("hired_date", DateUtil.date(userInfo.getHiredDate())); } @@ -203,8 +206,6 @@ public class GenericEventConsumer { JsonResultEntity jsonResult = JSONObject.parseObject(deptRes,JsonResultEntity.class); if (jsonResult.isFlag()){ shade.com.alibaba.fastjson2.JSONObject attribute = (shade.com.alibaba.fastjson2.JSONObject) jsonResult.getAttribute(); - String attrStr = attribute.toString(); - OapiV2DepartmentGetResponse rsp = JSONObject.parseObject(attrStr,OapiV2DepartmentGetResponse.class); String result = attribute.getString("result"); OapiV2DepartmentGetResponse.DeptGetResponse deptInfo = com.alibaba.fastjson.JSONObject.parseObject(result,OapiV2DepartmentGetResponse.DeptGetResponse.class); //OapiV2DepartmentGetResponse.DeptGetResponse deptInfo = dingtalkService.getDeptById(deptIdArr.getLong(i)); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/DeliveryOrderPluginServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/DeliveryOrderPluginServiceImpl.java index bc3814d9..35d2a2d7 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/DeliveryOrderPluginServiceImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/DeliveryOrderPluginServiceImpl.java @@ -81,7 +81,7 @@ public class DeliveryOrderPluginServiceImpl extends KjsPluginBaseService impleme DeliveryOrderDTO deliveryOrderDTO = DeliveryMapper.INSTANCE.deliveryEntityToDto(order); //发货单表体entity转dto List deliveryDetailList = DeliveryMapper.INSTANCE.deliveryDetailListToDto(detailList); - deliveryOrderDTO.setItesm(deliveryDetailList); + deliveryOrderDTO.setItems(deliveryDetailList); String reqParams = JSONObject.toJSONString(deliveryOrderDTO); logger.info("发货单请求参数:{}",reqParams); //调用wms接口 diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/KjsPluginBaseService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/KjsPluginBaseService.java index b11f8b4d..6e8838d5 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/KjsPluginBaseService.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/KjsPluginBaseService.java @@ -51,6 +51,7 @@ public class KjsPluginBaseService { taskLivingDetailsService.saveLogToFail(taskLivingDetail); } }else { + taskLivingDetail.setId(integration_task_living_details_id); if (flag){ //如果是重试 成功调这个方法 taskLivingDetailsService.saveLogFailToSuccess(taskLivingDetail); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/MomOrderPluginServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/MomOrderPluginServiceImpl.java index 5afa5599..134176a7 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/MomOrderPluginServiceImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/MomOrderPluginServiceImpl.java @@ -75,8 +75,10 @@ public class MomOrderPluginServiceImpl extends KjsPluginBaseService implements I //查询生产订单明细表 MomOrderDetailEntity detailEntity = new MomOrderDetailEntity(); detailEntity.setMoId(order.getMoId()); - detailEntity.setStartTime(startTime); - detailEntity.setEndTime(endTime); + if (StrUtil.isEmpty(id)){ + detailEntity.setStartTime(startTime); + detailEntity.setEndTime(endTime); + } detailEntity.setDataSourceCode(datasourceCode); List detailList = momOrderDetailService.query(detailEntity); //表头转换dto diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/dto/DeliveryOrderDTO.java b/service/src/main/java/com/hzya/frame/u8/delivery/dto/DeliveryOrderDTO.java index 69d17c1e..131d6bce 100644 --- a/service/src/main/java/com/hzya/frame/u8/delivery/dto/DeliveryOrderDTO.java +++ b/service/src/main/java/com/hzya/frame/u8/delivery/dto/DeliveryOrderDTO.java @@ -47,7 +47,7 @@ public class DeliveryOrderDTO { private String cmemo; //子表 @JSONField(ordinal = 12) - private List itesm; + private List items; public String getDlid() { return dlid; @@ -145,11 +145,11 @@ public class DeliveryOrderDTO { this.cmemo = cmemo; } - public List getItesm() { - return itesm; + public List getItems() { + return items; } - public void setItesm(List itesm) { - this.itesm = itesm; + public void setItems(List items) { + this.items = items; } }