diff --git a/secDevLib/secondev-chapanda-integration.jar b/secDevLib/secondev-chapanda-integration.jar index 2bab73d..bee39c9 100644 Binary files a/secDevLib/secondev-chapanda-integration.jar and b/secDevLib/secondev-chapanda-integration.jar differ diff --git a/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/action/KqMindDoneAction.java b/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/action/KqMindDoneAction.java index 1002086..8d5b08c 100644 --- a/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/action/KqMindDoneAction.java +++ b/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/action/KqMindDoneAction.java @@ -68,7 +68,7 @@ public class KqMindDoneAction implements EsbServerlessRpcRemoteInterface { } private void sendToFeiShuTodo(SimpleEmployee user, String dataId, String pcUrl, String mobileUrl, String status) { - Map userMap = esb2FeishuOpenIdUtil.queryFeishuOpenIdByMobiles(user.getMobile()); + Map userMap = esb2FeishuOpenIdUtil.queryFeishuUnionIdByMobiles(user.getMobile()); String operator_open_id = String.valueOf(userMap.get(user.getMobile())); String token = (String) baseCache.get(Constant.MODULE_KEY, Constant.FEI_SHU_TOKEN_KEY); diff --git a/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/action/SendKqMindAction.java b/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/action/SendKqMindAction.java index 0e0606c..91e81dd 100644 --- a/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/action/SendKqMindAction.java +++ b/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/action/SendKqMindAction.java @@ -125,11 +125,11 @@ public class SendKqMindAction implements EsbServerlessRpcRemoteInterface { token = esb2FeishuTokenUtil.getToken(); baseCache.set(Constant.MODULE_KEY, Constant.FEI_SHU_TOKEN_KEY, token, 6000); } - Map userMap = esb2FeishuOpenIdUtil.queryFeishuOpenIdByMobiles(operatorMobile); + Map userMap = esb2FeishuOpenIdUtil.queryFeishuUnionIdByMobiles(operatorMobile); String operator_open_id = String.valueOf(userMap.get(operatorMobile)); long currentTimeStamp = System.currentTimeMillis(); //接收人openid - Map receiverMap = esb2FeishuOpenIdUtil.queryFeishuOpenIdByMobiles(receiver.getMobile()); + Map receiverMap = esb2FeishuOpenIdUtil.queryFeishuUnionIdByMobiles(receiver.getMobile()); String receiver_open_id = String.valueOf(receiverMap.get(receiver.getMobile())); String status = "PENDING"; @@ -212,7 +212,7 @@ public class SendKqMindAction implements EsbServerlessRpcRemoteInterface { } private void sendToFeiShuBotTodo(String operatorMobile, String dataId, String text, String title, String content, String pcUrl, String mobileUrl, SimpleEmployee receiver) { - Map userMap = esb2FeishuOpenIdUtil.queryFeishuOpenIdByMobiles(operatorMobile); + Map userMap = esb2FeishuOpenIdUtil.queryFeishuUnionIdByMobiles(operatorMobile); String operator_open_id = String.valueOf(userMap.get(operatorMobile)); String token = (String) baseCache.get(Constant.MODULE_KEY, Constant.FEI_SHU_TOKEN_KEY); @@ -222,7 +222,7 @@ public class SendKqMindAction implements EsbServerlessRpcRemoteInterface { } long currentTimeStamp = System.currentTimeMillis(); //接收人openid - Map receiverMap = esb2FeishuOpenIdUtil.queryFeishuOpenIdByMobiles(receiver.getMobile()); + Map receiverMap = esb2FeishuOpenIdUtil.queryFeishuUnionIdByMobiles(receiver.getMobile()); String receiver_open_id = String.valueOf(receiverMap.get(receiver.getMobile())); diff --git a/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/action/UrgingAction.java b/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/action/UrgingAction.java index a5e01c7..dbb5938 100644 --- a/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/action/UrgingAction.java +++ b/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/action/UrgingAction.java @@ -72,7 +72,7 @@ public class UrgingAction implements EsbServerlessRpcRemoteInterface { private void sendUnOperatedToBotMsg(String unOperateUrl, String requestId, String requestName, String creatorId, String operator, ObjectMapper mapper) throws JsonProcessingException { //流程创建人飞书openid SimpleEmployee creatorEmployee = hrmCommonUtil.getSimpleEmployee(Long.valueOf(creatorId)); - Map creatorMap = esb2FeishuOpenIdUtil.queryFeishuOpenIdByMobiles(creatorEmployee.getMobile()); + Map creatorMap = esb2FeishuOpenIdUtil.queryFeishuUnionIdByMobiles(creatorEmployee.getMobile()); String create_open_id = String.valueOf(creatorMap.get(creatorEmployee.getMobile())); String papiCode = PapiUtil.getPapiCode(ApplicationConfigConstant.APP_URL, ApplicationConfigConstant.CORP_ID, "A1a"); @@ -91,7 +91,7 @@ public class UrgingAction implements EsbServerlessRpcRemoteInterface { operatorUsers.forEach(user -> { //流程未操作人飞书openid SimpleEmployee unOperator = hrmCommonUtil.getSimpleEmployee(Long.valueOf(user.getUserId())); - Map unMap = esb2FeishuOpenIdUtil.queryFeishuOpenIdByMobiles(unOperator.getMobile()); + Map unMap = esb2FeishuOpenIdUtil.queryFeishuUnionIdByMobiles(unOperator.getMobile()); String unOperator_open_id = String.valueOf(unMap.get(unOperator.getMobile())); String mobileurl = "/mobile/workflow/flowpage/view/" + requestId; String pcurl = "/sp/workflow/flowpage/view/" + requestId; diff --git a/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/entity/dto/DemoSearchConditionDTO.java b/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/entity/dto/DemoSearchConditionDTO.java new file mode 100644 index 0000000..f5334e1 --- /dev/null +++ b/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/entity/dto/DemoSearchConditionDTO.java @@ -0,0 +1,58 @@ +package com.weaver.seconddev.chapanda.entity.dto; + +import com.weaver.common.component.search.item.WeaSearchConditionItemType; +import com.weaver.seconddev.chapanda.annotation.SearchCondition; +import com.weaver.seconddev.chapanda.annotation.SearchConditionItem; +import com.weaver.seconddev.chapanda.constant.Constant; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DemoSearchConditionDTO { + + @SearchCondition( + label = "创建人", + labelId = 0, + needQuickSearch = true, + quickSearchKey = "username", + items = { + @SearchConditionItem(itemType = WeaSearchConditionItemType.INPUT, name = "username"), + } + ) + private String username; + + @SearchCondition( + label = "部门", + labelId = 0, + needQuickSearch = true, + items = { + @SearchConditionItem(itemType = WeaSearchConditionItemType.BROWSER, + browserType = "department", browserMultiple = true, name = "department"), + } + ) + private String department; + + @SearchCondition( + label = "工单类型", + labelId = 0, + items = @SearchConditionItem(itemType = WeaSearchConditionItemType.BROWSER, + browserType = "orderTypeBrowser", name = "orderType", browserModule = Constant.MODULE) + ) + private String orderType; + + + @SearchCondition( + label = "创建日期", + labelId = 0, + items = { + @SearchConditionItem(itemType = WeaSearchConditionItemType.DATEPICKER, name = "createTime"), + } + ) + private String createTime; + +}