diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index ebbad6e4f5..5ad0ed0504 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -67,7 +67,6 @@ import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; -import com.yxt.anrui.fin.api.kingdee.KingDeeResult; import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer; import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier; import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; @@ -154,27 +153,16 @@ public class BaseAccadjApplyService extends MybatisBaseService createQueryWrapper(BaseAccadjApplyQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - public PagerVo listPageVo(PagerQuery pq) { BaseAccadjApplyQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java index a384e3edf0..a9a6a439af 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java @@ -39,6 +39,7 @@ import com.yxt.anrui.base.api.basevehicle.ExiCarConfigDetailVo; import com.yxt.anrui.base.biz.basemanufacturerretwareveh.BaseManufacturerRetwareVehService; import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; +import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService; import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.base.common.utils.Rule; @@ -48,7 +49,6 @@ import com.yxt.anrui.fin.api.kingdee.push.STKInStockPushPurmrb; import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; -import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDetailsVo; import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign; import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDetailsVo; @@ -64,34 +64,17 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import javax.annotation.Resource; import java.io.File; import java.io.InputStream; import java.math.BigDecimal; import java.util.*; -/** - * Project: anrui-base(厂家退库)
- * File: BaseManufacturerRetwareService.java
- * Class: com.yxt.anrui.base.biz.basemanufacturerretware.BaseManufacturerRetwareService
- * Description: 厂家退库表 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-07-05 17:02:32
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class BaseManufacturerRetwareService extends MybatisBaseService { - @Autowired - private SysStaffOrgFeign sysStaffOrgFeign; @Autowired private SysOrganizationFeign sysOrganizationFeign; @Autowired @@ -104,23 +87,15 @@ public class BaseManufacturerRetwareService extends MybatisBaseService createQueryWrapper(BaseManufacturerRetwareQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - public PagerVo listPageVo(PagerQuery pq) { BaseManufacturerRetwareQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -273,6 +248,7 @@ public class BaseManufacturerRetwareService extends MybatisBaseService details = getSaleOrderDetails(bv.getBusinessSid()); - AppOrderDetailsVo vo = details.getData(); - - // 锁定车辆的状态 - if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) { - handleVehicleLock(bv, busSalesOrder); - } - // 合同处理 handleContract(bv, busSalesOrder); busSalesOrder = fetchBySid(bv.getBusinessSid()); // 处理车辆的状态更新 updateVehicleState(bv, busSalesOrder); - - // 贷款相关操作 - handleLoan(bv, busSalesOrder, vo); - // 采购渠道推送 handlePurchaseChannelPush(busSalesOrder); - // 更新办结日期 updateClosingDate(bv, busSalesOrder); - // 异步消息推送 asyncPushMessage(busSalesOrder); } catch (Exception e) { - log.error("销售订单处理失败，错误信息：", e); + log.error("销售订单处理失败1，错误信息：", e); + } + + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(1, 10, + 1000, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusSalesOrder finalBusSalesOrder = busSalesOrder; + Future future1 = pool.submit(() -> { + //查询销售订单详情 + ResultBean details = getSaleOrderDetails(bv.getBusinessSid()); + AppOrderDetailsVo vo = details.getData(); + // 锁定车辆的状态 + if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) { + handleVehicleLock(bv, finalBusSalesOrder); + } + + // 贷款相关操作 + handleLoan(bv, finalBusSalesOrder, vo); + + }); + } catch (Exception e) { + e.printStackTrace(); + log.error("销售订单处理失败2，错误信息：", e); } } diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow3/Flow3Feign.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow3/Flow3Feign.java new file mode 100644 index 0000000000..dab2b4ae9a --- /dev/null +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow3/Flow3Feign.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.flowable.api.flow3; + +import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.anrui.flowable.api.flow2.FlowFeignback; +import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/2/12 + **/ +@FeignClient( + contextId = "anrui-flowable-Flow3", + name = "anrui-flowable", + path = "v3/flow", + fallback = Flow3Feignback.class) +public interface Flow3Feign { + + @ApiOperation(value = "启动流程") + @PostMapping(value = "/startProcess") + @ResponseBody + ResultBean startProcess(@RequestBody BusinessVariables dto); + + @ApiOperation(value = "处理流程") + @PostMapping(value = "/handleProsess") + @ResponseBody + ResultBean handleProsess(@RequestBody BusinessVariables bv); +} diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow3/Flow3Feignback.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow3/Flow3Feignback.java new file mode 100644 index 0000000000..00634fe6a1 --- /dev/null +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow3/Flow3Feignback.java @@ -0,0 +1,12 @@ +package com.yxt.anrui.flowable.api.flow3; + +import org.springframework.stereotype.Component; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/2/12 + **/ +@Component +public class Flow3Feignback { +} diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow3/Flow3Rest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow3/Flow3Rest.java index af5ed8881b..811b48190e 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow3/Flow3Rest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow3/Flow3Rest.java @@ -3,6 +3,8 @@ package com.yxt.anrui.flowable.biz.flow3; import com.alibaba.fastjson.JSONObject; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.anrui.flowable.api.flow2.FlowFeign; +import com.yxt.anrui.flowable.api.flow3.Flow3Feign; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; @@ -26,13 +28,14 @@ import java.util.concurrent.*; **/ @RestController @RequestMapping("v3/flow") -public class Flow3Rest { +public class Flow3Rest implements Flow3Feign { Logger log = LoggerFactory.getLogger(Flow3Rest.class); @Autowired private Flow3Service flowService; @PostMapping("/startProcess") + @Override public ResultBean startProcess(@RequestBody BusinessVariables bv) { ResultBean rb = ResultBean.fireFail(); //获取表单中的参数 @@ -54,6 +57,7 @@ public class Flow3Rest { } @PostMapping("/handleProsess") + @Override public ResultBean handleProsess(@RequestBody BusinessVariables bv) { ResultBean rb = ResultBean.fireFail(); ResultBean updateFlowFieldVoResultBean = flowService.handleProsess(bv, true); diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow3/Flow3Service.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow3/Flow3Service.java index 730cf2b86b..cb7e2ce5b3 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow3/Flow3Service.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow3/Flow3Service.java @@ -106,13 +106,11 @@ public class Flow3Service extends MybatisBaseService { // 获取传入的变量 Map variables = bv.getFormVariables(); Map variablesSeconds = bv.getFormVariables(); - String nextNodeUserSids = ""; + String nextNodeUserSids = bv.getNextNodeUserSids(); List userSidForNextNode = new ArrayList<>(); if (StringUtils.isBlank(nextNodeUserSids)) { userSidForNextNode = getNextNodeUser(bv).getData(); variables.put("approvers", userSidForNextNode); - } else { - nextNodeUserSids = bv.getNextNodeUserSids(); } @@ -155,21 +153,30 @@ public class Flow3Service extends MybatisBaseService { for (int i = 0; i < tasks.size(); i++) { Task task2 = tasks.get(i); String isMultiInstanceTask = isMultiInstanceTask(task2); + id_ = task2.getId(); + task_def_key_ = task2.getTaskDefinitionKey(); + name_ = task2.getName(); if ("会签任务".equals(isMultiInstanceTask) || "或签任务".equals(isMultiInstanceTask)) { String approver = getApproverForTask(userSidForNextNode, i); + approver = change(approver, bv.getInstanceId()); taskService.claim(task2.getId(), approver); } else { nextNodeUserSids = userSidForNextNode.get(0); + //查询下一环节是否有转办并添加评论 + nextNodeUserSids = change(nextNodeUserSids, processInstance.getProcessInstanceId()); + taskService.setAssignee(id_, nextNodeUserSids); + taskService.setVariablesLocal(id_, variables); } - id_ = task2.getId(); - task_def_key_ = task2.getTaskDefinitionKey(); - name_ = task2.getName(); } } else { Task task2 = tasks.get(0); id_ = task2.getId(); task_def_key_ = task2.getTaskDefinitionKey(); name_ = task2.getName(); + //查询下一环节是否有转办并添加评论 + nextNodeUserSids = change(nextNodeUserSids, processInstance.getProcessInstanceId()); + taskService.setAssignee(id_, nextNodeUserSids); + taskService.setVariablesLocal(id_, variables); } //提交前传入下一环节待办人 @@ -234,7 +241,7 @@ public class Flow3Service extends MybatisBaseService { nextUserSid = ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId(); adminContains = true; } else { - if(!listResultBean.getData().isEmpty()){ + if(listResultBean.getData() != null){ userSidForNextNode = listResultBean.getData(); formVariables.put("approvers", listResultBean.getData()); } @@ -277,7 +284,9 @@ public class Flow3Service extends MybatisBaseService { Task task2 = tasks.get(i); isMultiInstanceTask = isMultiInstanceTask(task2); if ("会签任务".equals(isMultiInstanceTask) || "或签任务".equals(isMultiInstanceTask)) { - taskService.claim(task2.getId(), userSidForNextNode.get(i)); // 由候选人认领任务 + String nextUserSidNext = userSidForNextNode.get(i); + nextUserSidNext = change(nextUserSidNext, bv.getInstanceId()); + taskService.claim(task2.getId(), nextUserSidNext); // 由候选人认领任务 isMultiInstanceTaskNext = true; } else { diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.java index 6dae632b30..7451e1b686 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.java @@ -44,4 +44,6 @@ public interface FlowTaskMapper extends BaseMapper { Map getTaskByDefKey(@Param("procId")String processInstanceId, @Param("taskId")String id); Map getActHiVarinstForOrgPath(@Param("taskId")String taskId); + + List selectAssignee(@Param("taskDefKey") String taskDefKey, @Param("procInsId") String procInsId); } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml index 5ba94024db..195db43440 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml @@ -277,4 +277,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE ahv.task_id_= #{taskId} and ahv.name_="orgPath" order by ahv.id_ desc limit 0,1 + + \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index cf22c64048..06863c772a 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -330,10 +330,12 @@ public class FlowTaskService extends MybatisBaseService 转换为以逗号分隔的字符串 String assigneeIdsStr = String.join(",", assigneeIds); - - // 远程调用批量查询用户信息 - Map userMap = sysUserFeign.fetchBySids(assigneeIdsStr).getData().stream() - .collect(Collectors.toMap(SysUserVo::getSid, user -> user)); + Map userMap = new HashMap<>(); + if(StringUtils.isNotBlank(assigneeIdsStr)){ + // 远程调用批量查询用户信息 + userMap = sysUserFeign.fetchBySids(assigneeIdsStr).getData().stream() + .collect(Collectors.toMap(SysUserVo::getSid, user -> user)); + } // 直接查询所有流程实例评论 List commentList = taskService.getProcessInstanceComments(procInsId); @@ -345,6 +347,7 @@ public class FlowTaskService extends MybatisBaseService finalHisFlowList = Collections.synchronizedList(hisFlowList); // 使用 parallelStream 前先进行 null 检查和过滤 + Map finalUserMap = userMap; hisFlowList = list.parallelStream() .filter(histIns -> histIns != null && histIns.getTaskId() != null) // 过滤掉 histIns 或 histIns.getTaskId() 为 null 的元素 .map(histIns -> { @@ -364,17 +367,32 @@ public class FlowTaskService extends MybatisBaseService taskUserInfos = new ArrayList<>(); // 处理审批人员 - if (StringUtils.isNotBlank(histIns.getAssignee()) && userMap.containsKey(histIns.getAssignee())) { - SysUserVo user = userMap.get(histIns.getAssignee()); + if (StringUtils.isNotBlank(histIns.getAssignee())) { + /* SysUserVo user = finalUserMap.get(histIns.getAssignee()); if (user != null) { TaskUserInfo taskUserInfo = new TaskUserInfo(); taskUserInfo.setAssigneeName(user.getName()); taskUserInfo.setAssigneeSid(user.getSid()); taskUserInfo.setAssigneeHeadImage(fileUploadComponent.getUrlPrefix() + user.getHeadImage()); flowTask.setTaskUserInfos(Collections.singletonList(taskUserInfo)); + }*/ + List stringList = Arrays.asList(histIns.getAssignee().split(",")); + for (int i = 0; i < stringList.size(); i++) { + SysUserVo user = finalUserMap.get(stringList.get(i)); + if (user != null) { + TaskUserInfo taskUserInfo = new TaskUserInfo(); + taskUserInfo.setAssigneeName(user.getName()); + taskUserInfo.setAssigneeSid(user.getSid()); + taskUserInfo.setAssigneeHeadImage(fileUploadComponent.getUrlPrefix() + user.getHeadImage()); + taskUserInfos.add(taskUserInfo); + } + + } + flowTask.setTaskUserInfos(taskUserInfos); + } // 处理意见评论内容 if (commentList != null && !commentList.isEmpty()) { @@ -386,7 +404,7 @@ public class FlowTaskService extends MybatisBaseService> assignee_ = sysUserFeign.fetchBySids(histTask.get("ASSIGNEE_").toString()); StringBuilder userName = new StringBuilder(); @@ -913,7 +931,8 @@ public class FlowTaskService extends MybatisBaseService ASSIGNEE_List = baseMapper.selectAssignee(flowTask.getTaskDefKey(),flowTask.getProcInsId()); + if(!ASSIGNEE_List.isEmpty()){ + StringBuilder userName = new StringBuilder(); + for (String assignee : ASSIGNEE_List) { + ResultBean> assignee_ = sysUserFeign.fetchBySids(assignee); + List data1 = assignee_.getData(); + for (SysUserVo data : data1) { + userName.append(data.getName()).append(","); + } + } + String userName_str = ""; + userName_str = userName.substring(0, userName.length() - 1); + flowTask.setAssigneeName(userName_str); + } + //===2025-02-12添加结束 ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(histTask.get("START_USER_ID_").toString()); flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid()); flowTask.setStartUserName(sysUserVoResultBean.getData().getName()); @@ -1035,7 +1070,7 @@ public class FlowTaskService extends MybatisBaseService> assignee_ = sysUserFeign.fetchBySids(histTask.get("ASSIGNEE_").toString()); StringBuilder userName = new StringBuilder(); @@ -1046,7 +1081,7 @@ public class FlowTaskService extends MybatisBaseService ASSIGNEE_List = baseMapper.selectAssignee(flowTask.getTaskDefKey(),flowTask.getProcInsId()); + if(!ASSIGNEE_List.isEmpty()){ + StringBuilder userName = new StringBuilder(); + for (String assignee : ASSIGNEE_List) { + ResultBean> assignee_ = sysUserFeign.fetchBySids(assignee); + List data1 = assignee_.getData(); + for (SysUserVo data : data1) { + userName.append(data.getName()).append(","); + } + } + String userName_str = ""; + userName_str = userName.substring(0, userName.length() - 1); + flowTask.setAssigneeName(userName_str); + } + //===2025-02-12添加结束 ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(histTask.get("START_USER_ID_").toString()); flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid()); flowTask.setStartUserName(sysUserVoResultBean.getData().getName()); @@ -1157,7 +1208,7 @@ public class FlowTaskService extends MybatisBaseService> assignee_ = sysUserFeign.fetchBySids(histTask.get("ASSIGNEE_").toString()); StringBuilder userName = new StringBuilder(); @@ -1168,7 +1219,7 @@ public class FlowTaskService extends MybatisBaseService ASSIGNEE_List = baseMapper.selectAssignee(flowTask.getTaskDefKey(),flowTask.getProcInsId()); + if(!ASSIGNEE_List.isEmpty()){ + StringBuilder userName = new StringBuilder(); + for (String assignee : ASSIGNEE_List) { + ResultBean> assignee_ = sysUserFeign.fetchBySids(assignee); + List data1 = assignee_.getData(); + for (SysUserVo data : data1) { + userName.append(data.getName()).append(","); + } + } + String userName_str = ""; + userName_str = userName.substring(0, userName.length() - 1); + flowTask.setAssigneeName(userName_str); + } + //===2025-02-12添加结束 ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(histTask.get("START_USER_ID_").toString()); flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid()); flowTask.setStartUserName(sysUserVoResultBean.getData().getName()); @@ -2418,17 +2485,18 @@ public class FlowTaskService extends MybatisBaseService map = flowableQuery.getMap(); boolean taskKeyTrue = false; List flowElements = processService.calApprovePath("", modelId, map); + // 过滤空的节点ID List collect = flowElements.stream().filter(item -> item.getId().length() > 0).collect(Collectors.toList()); for (int i = 0; i < collect.size(); i++) { Map itemMap = new HashMap<>(); FlowElement item = collect.get(i); if (StringUtils.isBlank(flowableQuery.getTaskDefKey())) { - log.info("flowElement:{}", item); - log.info("nodeName:{}", item.getName()); +// log.info("flowElement:{}", item); +// log.info("nodeName:{}", item.getName()); itemMap.put("nodeName", item.getName()); - log.info("nodeId:{}", item.getId()); +// log.info("nodeId:{}", item.getId()); itemMap.put("nodeId", item.getId()); - String s = JSON.toJSONString(item); + /* String s = JSON.toJSONString(item); JSONObject jsonObject = JSONObject.parseObject(s); log.info("item:{}", jsonObject); Object candidateGroups = jsonObject.get("candidateGroups"); @@ -2439,7 +2507,7 @@ public class FlowTaskService extends MybatisBaseService 0) { log.info("candidateGroups_sid:{}", candidateGroups_arr.get(0)); } - log.info("candidateGroups:{}", candidateGroups_arr); + log.info("candidateGroups:{}", candidateGroups_arr);*/ list.add(itemMap); } else { if (flowableQuery.getTaskDefKey().equals(item.getId())) { @@ -2447,12 +2515,12 @@ public class FlowTaskService extends MybatisBaseService 0) { log.info("candidateGroups_sid:{}", candidateGroups_arr.get(0)); } - log.info("candidateGroups:{}", candidateGroups_arr); + log.info("candidateGroups:{}", candidateGroups_arr);*/ list.add(itemMap); } } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentService.java index 4095efe52f..d756dc8d59 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentService.java @@ -42,9 +42,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; +import java.util.*; import java.util.stream.Collectors; /** @@ -62,81 +60,122 @@ import java.util.stream.Collectors; */ @Service public class ProcessCommentService extends MybatisBaseService { - @Resource - private SysUserFeign sysUserFeign; - @Resource - private FileUploadComponent fileUploadComponent; - private QueryWrapper createQueryWrapper(ProcessCommentQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - ProcessCommentQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(ProcessCommentDto dto){ + @Resource + private SysUserFeign sysUserFeign; + @Resource + private FileUploadComponent fileUploadComponent; + + private QueryWrapper createQueryWrapper(ProcessCommentQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + ProcessCommentQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(ProcessCommentDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { - dto.setSid(UUID.randomUUID().toString()); - baseMapper.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(ProcessCommentDto dto){ - ProcessComment entity = new ProcessComment(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(ProcessCommentDto dto){ - String dtoSid = dto.getSid(); + dto.setSid(UUID.randomUUID().toString()); + baseMapper.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(ProcessCommentDto dto) { + ProcessComment entity = new ProcessComment(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(ProcessCommentDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - ProcessComment entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public ProcessCommentDetailsVo fetchDetailsVoBySid(String sid){ - ProcessComment entity = fetchBySid(sid); - ProcessCommentDetailsVo vo = new ProcessCommentDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } - - public List getCommentList(String processId) { - List commentList = baseMapper.getCommentList(processId); - for(ProcessCommentVo histIns:commentList){ - if(StringUtils.isNotBlank(histIns.getProcessFile())){ - List processFile = Arrays.asList(histIns.getProcessFile().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); - histIns.setFileList(processFile); - } - ResultBean> sysUserVoResultBean = sysUserFeign.fetchBySids(histIns.getReviewerSid());// sysUserService.selectUserById(Long.parseLong(histIns.getAssignee())); - List data1 = sysUserVoResultBean.getData(); - for( SysUserVo data:data1){ - AppUserVo taskUserInfo=new AppUserVo(); - taskUserInfo.setAssigneeName(data.getName()); - if(!com.yxt.common.base.utils.StringUtils.isBlank(data.getHeadImage())){ - taskUserInfo.setAssigneeHeadImage(fileUploadComponent.getUrlPrefix() +data.getHeadImage()); - } - histIns.setTaskUserInfo(taskUserInfo); - } - } - return commentList; - } - - public List selectByIdAndComment(String comment, String instanceId) { - return baseMapper.selectByIdAndComment(comment, instanceId); - } + } + ProcessComment entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ProcessCommentDetailsVo fetchDetailsVoBySid(String sid) { + ProcessComment entity = fetchBySid(sid); + ProcessCommentDetailsVo vo = new ProcessCommentDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public List getCommentList(String processId) { + List commentList = baseMapper.getCommentList(processId); + // 2. 获取所有 reviewerSid 批量查询用户信息 + Set reviewerSids = commentList.stream() + .filter(c -> StringUtils.isNotBlank(c.getReviewerSid())) + .map(ProcessCommentVo::getReviewerSid) + .collect(Collectors.toSet()); + // 批量查询所有评论中的 reviewerSid 对应的用户信息 + Map userMap = new HashMap<>(); + // 将 Set 转换为以逗号分隔的字符串 + String assigneeIdsStr = String.join(",", reviewerSids); + if (StringUtils.isNotBlank(assigneeIdsStr)) { + userMap = sysUserFeign.fetchBySids(assigneeIdsStr).getData().stream() + .collect(Collectors.toMap(SysUserVo::getSid, user -> user)); + } + + + // 3. 遍历 commentList，填充文件列表和用户信息 + for (ProcessCommentVo histIns : commentList) { + // 处理文件列表 + if (StringUtils.isNotBlank(histIns.getProcessFile())) { + List processFile = Arrays.asList(histIns.getProcessFile().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); + histIns.setFileList(processFile); + } + + // 处理用户信息 + SysUserVo user = userMap.get(histIns.getReviewerSid()); + if (user != null) { + AppUserVo taskUserInfo = new AppUserVo(); + taskUserInfo.setAssigneeName(user.getName()); + if (StringUtils.isNotBlank(user.getHeadImage())) { + taskUserInfo.setAssigneeHeadImage(fileUploadComponent.getUrlPrefix() + user.getHeadImage()); + } + histIns.setTaskUserInfo(taskUserInfo); + } + } + + return commentList; + } + + public List getCommentListOld(String processId) { + List commentList = baseMapper.getCommentList(processId); + for (ProcessCommentVo histIns : commentList) { + if (StringUtils.isNotBlank(histIns.getProcessFile())) { + List processFile = Arrays.asList(histIns.getProcessFile().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); + histIns.setFileList(processFile); + } + ResultBean> sysUserVoResultBean = sysUserFeign.fetchBySids(histIns.getReviewerSid());// sysUserService.selectUserById(Long.parseLong(histIns.getAssignee())); + List data1 = sysUserVoResultBean.getData(); + for (SysUserVo data : data1) { + AppUserVo taskUserInfo = new AppUserVo(); + taskUserInfo.setAssigneeName(data.getName()); + if (!com.yxt.common.base.utils.StringUtils.isBlank(data.getHeadImage())) { + taskUserInfo.setAssigneeHeadImage(fileUploadComponent.getUrlPrefix() + data.getHeadImage()); + } + histIns.setTaskUserInfo(taskUserInfo); + } + } + return commentList; + } + + public List selectByIdAndComment(String comment, String instanceId) { + return baseMapper.selectByIdAndComment(comment, instanceId); + } } \ No newline at end of file diff --git a/anrui-management/anrui-management-ui/src/api/Common/dictcommons.js b/anrui-management/anrui-management-ui/src/api/Common/dictcommons.js new file mode 100644 index 0000000000..f550a2c286 --- /dev/null +++ b/anrui-management/anrui-management-ui/src/api/Common/dictcommons.js @@ -0,0 +1,366 @@ +import request from '@/utils/request' + +export function typeValues(data) { + return request({ + url: '/portal/v1/dictcommons/typeValues', + method: 'get', + params: data + }) +} + +// 获取数据字典（根据分组） +export function getTypeValueList(data) { + return request({ + url: '/portal/v1/dictcommons/getTypeValueList', + method: 'get', + params: data + }) +} + +// 获取所有分公司 +export function selectOrgSidList(data) { + return request({ + url: '/portal/v1/sysorganization/selectOrgSidList', + method: 'get', + params: data + }) +} + +// 根据当前登录人orgSidPath(全路径sid)查询分公司 +export function getOrgSidByPath(data) { + return request({ + url: '/portal/v1/sysstafforg/getOrgSidByPath', + method: 'get', + params: data + }) +} + +// 根据分公司sid查询分公司 +export function fetchBySid(sid) { + return request({ + url: '/portal/v1/sysorganization/fetchBySid/' + sid, + method: 'get' + }) +} + +// 根据分公司全路径Sid获取分公司下开票信息(采购系统不能为空) +// 开票单位 +export function getInvoicingList(data) { + return request({ + url: '/fin/v1/fincompanyinvoicing/getInvoicingList', + method: 'GET', + params: data + }) +} + +// 根据分公司Sid获取分公司下所有的部门 +export function getListDeptByOrgSid(data) { + return request({ + url: '/portal/v1/sysorganization/getListDeptByOrgSid/' + data, + method: 'GET' + }) +} + +// 根据分公司Sid获取分公司下部门对应的采购系统 +export function fetchDetailsByUseOrgSid(data) { + return request({ + url: '/base/v1/basepurchasesystem/fetchDetailsByUseOrgSid/' + data, + method: 'GET' + }) +} + +// 根据部门sid查询部门信息 +export function fetchByDepSid(data) { + return request({ + url: '/portal/v1/sysorganization/selectBySid', + method: 'get', + params: data + }) +} + +// 查当前部门所属一级站内的所有合作二级站 +export function tranFive(data) { + return request({ + url: '/portal/v1/sysorganization//tranFive/' + data, + method: 'GET' + }) +} + +// 调出一级站-调入当前一级站内所有二级站 +export function tranOne(data) { + return request({ + // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default", + url: '/portal/v1/sysorganization/tranOne/' + data, + method: 'GET' + }) +} + +// 调出一级站-调入当前分公司内所有一级站，不包含自身 +export function tranTwo(data) { + return request({ + // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default", + url: '/portal/v1/sysorganization/tranTwo/' + data, + method: 'GET' + }) +} + +// 调出一级站-调入当前选择分公司内所有一级站，不包含自身 +export function tranThree(data) { + return request({ + // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default", + url: '/portal/v1/sysorganization/tranThree/' + data.sid + "/" + data.deptSid, + method: 'GET', + }) +} + +// 调出二级站-调入上级一级站内所有二级站，不包含自身 +export function tranfour(data) { + return request({ + // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default", + url: '/portal/v1/sysorganization/tranfour/' + data, + method: 'GET' + }) +} + +// 获取所有岗位 +export function postName(data) { + return request({ + url: '/portal/v1/syspost/selectList', + method: 'get', + params: data + }) +} + +// 根据当前登录用户sid获取本分公司下的销售部门和销售专员 +export function selectOrgList(data) { + return request({ + url: '/portal/v1/sysorganization/selectOrgList', + method: 'get', + params: data + }) +} + +// 根据当前登录用户的全路径查询财务部门下的所有人 +export function selFianceByOrgSidPath(data) { + return request({ + // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default", + url: '/portal/v1/sysstafforg/selFianceByOrgSidPath', + method: 'post', + params: data + }) +} + +// 根据当前登录用户部门sid获取本部门下角色为维修技师的人员 +export function getUserByDeptSid(data) { + return request({ + url: '/portal/v1/sysuser/getUserByDeptSid', + method: 'get', + params: data + }) +} + +// 当前用户创建申请时判断该用户是否有该菜单的操作权限 +export function selectHaveMessage(data) { + return request({ + url: '/portal/v1/sysuser/selectHaveMessage ', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 根据当前登录用户的角色获取菜单分页列表页面右上角按钮的隐藏 +export function getButtonPermissions(data) { + return request({ + url: '/portal/v1/sysfunction/getButtonPermissions', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 获取集团所有在职人员 +export function selectStaffListss() { + return request({ + url: '/portal/v1/sysstaffinfo/selectStaffListss', + method: 'get' + }) +} + +// 根据当前登录用户的全路径查询相应部门下的所有人 +export function selAllByOrgSidPath(data) { + return request({ + url: '/portal/v1/sysstafforg/selAllByOrgSidPath', + method: 'post', + params: data + }) +} + +// 分公司全路径sid获取工种 +export function getServiceType(data) { + return request({ + url: '/as/v1/AsServiceItem/getServiceType', + method: 'get', + params: data + }) +} + +// 分公司全路径sid获取科目 +export function selSubjectInfo(data) { + return request({ + url: '/as/v1/asservicepackage/selSubjectInfo', + method: 'get', + params: data + }) +} + +// 分公司全路径sid获取班组 +export function getGroupList(data) { + return request({ + url: '/as/v1/asservicegroup/getGroupList', + method: 'post', + params: data + }) +} + +// 部门sid获取索赔厂家 +export function getListByUseOrgSid(data) { + return request({ + url: '/as/v1/asserviceclaimanu/getListByUseOrgSid', + method: 'get', + params: data + }) +} + +// 部门sid获取维修项目(已备案且已启用的) +export function getServiceItemListPage(data) { + return request({ + url: '/as/v1/AsServiceItem/getServiceItemListPage', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 查询分页列表 -- 客户列表 +export function customerList(params) { + return request({ + url: '/as/v1/ascustomervehicle/customerList', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 获取省 +export function getProvince() { + return request({ + url: '/portal/v1/regions/getProvince', + method: 'get' + }) +} +// 根据省sid获取该省的所有市 +export function getCity(data) { + return request({ + url: '/portal/v1/regions/getCity', + method: 'get', + params: data + }) +} +// 根据市sid获取该市的所有县区 +export function getCounty(data) { + return request({ + url: '/portal/v1/regions/getCounty', + method: 'get', + params: data + }) +} + +// 获取售后服务--基础信息--供应商信息 +// 开票名称 +export function choiceSupplierInfo(data) { + return request({ + url: '/pms/v1/pmssupplierinfo/choiceSupplierInfo', + method: 'post', + params: data + }) +} + +// 查询分页列表 -- 商品列表 -- 从商品管理中获取数据 +export function chooseproducts(params) { + return request({ + url: '/yxtbase/apiadmin/base/basegoodssku/getGoodsListPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 查询分页列表 -- 商品列表 -- 从商品售价列表中获取数据 +export function listPageSales(params) { + return request({ + url: '/sms/apiadmin/v1/smssalesbill/listPageSales', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 查询分页列表 -- 商品列表 -- 根据部门sid从库存商品中获取 +export function selInvenGoodsByUseOrgSid(params) { + return request({ + url: '/wms/apiadmin/inventory/wmsinventory/selInvenGoodsByUseOrgSid', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 查询分页列表 -- 商品列表 +export function getInventoryList(params) { + return request({ + url: '/wms/apiadmin/WmsOutBill/getInventoryList', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 查询分页列表 -- 维修工单列表 +export function getAsBusrepairBill(params) { + return request({ + url: '/as/v1/AsBusrepairBill/listPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) +} +// 查询分页列表 --商品类别列表 +export function getGoodsCategory(params) { + return request({ + url: '/yxtbase/apiadmin/base/basegoodstype/selectByUseOrgSid', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) +} diff --git a/anrui-management/anrui-management-ui/src/api/commodity/commodity.js b/anrui-management/anrui-management-ui/src/api/commodity/commodity.js new file mode 100644 index 0000000000..1907d1853e --- /dev/null +++ b/anrui-management/anrui-management-ui/src/api/commodity/commodity.js @@ -0,0 +1,75 @@ +import request from '@/utils/request' + +export default { + // 查询分页列表 + listPage: function(data) { + return request({ + url: '/yxtbase/apiadmin/base/basegoodsspu/oaGoodsListPage', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 商品-- 删除 + deleteBySids: function(data) { + return request({ + url: '/yxtbase/apiadmin/base/basegoodsspu/delGoodsBySids', + method: 'DELETE', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 初始化 + initGoods: function(data) { + return request({ + url: '/yxtbase/apiadmin/base/basegoodsspu/goodsDetails/' + data, + method: 'get' + }) + }, + saveOrUpdate: function(data) { + return request({ + url: '/yxtbase/apiadmin/base/basegoodsspu/saveOrUpdateOaGoods', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 计量单位查询 + getUnit: function(params) { + return request({ + url: '/yxtbase/apiadmin/base/basegoodsunit/listAll', + method: 'get', + params: params + }) + }, + // 厂家查询 + getFacturer: function(params) { + return request({ + url: '/yxtbase/apiadmin/base/basemanufacturer/listAll', + method: 'get', + params: params + }) + }, + // 商品类别查询 + getType: function(params) { + return request({ + url: '/yxtbase/apiadmin/base/basegoodstype/listAll', + method: 'get', + params: params + }) + }, + // 商品品牌查询 + getBrand: function(params) { + return request({ + url: '/yxtbase/apiadmin/base/basegoodsbrand/listAll', + method: 'get', + params: params + }) + }, +} diff --git a/anrui-management/anrui-management-ui/src/components/uploadFile/uploadImg.vue b/anrui-management/anrui-management-ui/src/components/uploadFile/uploadImg.vue new file mode 100644 index 0000000000..2721bedb56 --- /dev/null +++ b/anrui-management/anrui-management-ui/src/components/uploadFile/uploadImg.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/anrui-management/anrui-management-ui/src/main.js b/anrui-management/anrui-management-ui/src/main.js index 9d7101a5b7..87451be1ed 100644 --- a/anrui-management/anrui-management-ui/src/main.js +++ b/anrui-management/anrui-management-ui/src/main.js @@ -11,7 +11,7 @@ import '@/styles/index.scss' // global css import App from './App' import store from './store' import router from './router' - +import { setStorage, setDefaultOrgPathName, setDefaultOrgPath } from './utils/auth.js' import '@/icons' // icon import request from '@/utils/request' // import '@/permission' //权限控制 @@ -28,7 +28,6 @@ Vue.component('eimage', eimage) import Print from '@/utils/print' // 引入附件的js文件 Vue.use(Print) // 注册 -import { setStorage, getStorage } from './utils/auth.js' let token = null token = GetQueryString('token') @@ -39,6 +38,17 @@ let href = window.location.href // window.location.href = href.slice(0, href.length - 1) } +var one = window.location.href.indexOf('&organizationData') + 18 +if (parseInt(one) > 18) { + const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用 + var data1 = decodeURIComponent(data) + if (data1 !== undefined) { + const obj = JSON.parse(data1) + setDefaultOrgPath(obj.defaultOrgPath) + setDefaultOrgPathName(obj.defaultOrgPathName) + } +} + // 获取登录用户信息 function getUserInfo() { return request({ diff --git a/anrui-management/anrui-management-ui/src/router/index.js b/anrui-management/anrui-management-ui/src/router/index.js index e2bb93b113..e675962bdc 100644 --- a/anrui-management/anrui-management-ui/src/router/index.js +++ b/anrui-management/anrui-management-ui/src/router/index.js @@ -21,16 +21,6 @@ export const constantRoutes = [ path: '/', redirect: 'index' }, - /*{ - path: '/login', - component: () => import('@/views/login/login.vue') - },*/ -/* { - path: '/home', - component: () => import('@/views/Home/Home.vue'), - name: 'home' - - },*/ { path: '/index', component: Layout, @@ -59,8 +49,24 @@ export const constantRoutes = [ path: '/yuangongguanli', component: () => import('@/views/sysstaffinfo/yuangongguanli.vue'), name: 'yuangongguanli', - meta: { title: '员工信息管理',noCache:false } - }, + meta: { title: '员工信息管理', noCache: false } + } + ] + }, + { + path: '/commodity', + component: Layout, + redirect: '/commodity', + meta: { + title: '商品管理' + }, + children: [ + { + path: '/commodity/commodity', + component: () => import('@/views/commodity/commodity.vue'), + name: 'Commodity', + meta: { title: '商品管理', noCache: false } + } ] }, { diff --git a/anrui-management/anrui-management-ui/src/styles/index.scss b/anrui-management/anrui-management-ui/src/styles/index.scss index 2370ac7844..f7759cd3d9 100644 --- a/anrui-management/anrui-management-ui/src/styles/index.scss +++ b/anrui-management/anrui-management-ui/src/styles/index.scss @@ -188,6 +188,71 @@ div:focus { .footer{margin: 20px;} } +.formaddcopy02 { + padding: 10px 40px 0 40px; + .title { + padding: 12px; + font-weight: bold; + font-size: 16px; + background-color: #0294d7; + color: #ffffff; + text-align: left; + } + + .el-row { + display: flex; + flex-wrap: wrap; + border-left: 1px solid $table-border-color; + + .el-col { + border-right: 1px solid $table-border-color; + border-bottom: 1px solid $table-border-color; + min-height: 42px; + padding: 0 15px; + line-height: 42px; + position: relative; + .span-sty { + position: absolute; + top: 0; + bottom: 0; + left: 0; + line-height: 42px; + text-align: right; + font-size: 14px; + color: #606266; + font-weight: 600; + width: 70px; + padding-right: 5px; + border-right: 1px solid #e0e3eb; + } + + .el-form-item { + margin-bottom: 0; + line-height: 42px; + .addinputw { + //padding: 5px 0; + width: 65%; + margin-left: 80px; + line-height: 42px; + } + + .addinputInfo { + margin-left: 80px; + line-height: 42px; + } + + .el-input__inner { + height: 36px !important; + } + } + } + + } + + .footer { + margin: 20px; + } +} .forminfo { padding: 20px 0; diff --git a/anrui-management/anrui-management-ui/src/utils/auth.js b/anrui-management/anrui-management-ui/src/utils/auth.js index 81df9ea509..c3846143c1 100644 --- a/anrui-management/anrui-management-ui/src/utils/auth.js +++ b/anrui-management/anrui-management-ui/src/utils/auth.js @@ -27,3 +27,11 @@ export function setStorage(session) { export function removeStorage() { return sessionStorage.removeItem('token') } + +export function setDefaultOrgPathName(data) { + return sessionStorage.setItem('defaultOrgPathName', data) +} + +export function setDefaultOrgPath(data) { + return sessionStorage.setItem('defaultOrgPath', data) +} diff --git a/anrui-management/anrui-management-ui/src/views/commodity/commodity.vue b/anrui-management/anrui-management-ui/src/views/commodity/commodity.vue new file mode 100644 index 0000000000..821ae353d6 --- /dev/null +++ b/anrui-management/anrui-management-ui/src/views/commodity/commodity.vue @@ -0,0 +1,377 @@ + + + + diff --git a/anrui-management/anrui-management-ui/src/views/commodity/commodityAdd.vue b/anrui-management/anrui-management-ui/src/views/commodity/commodityAdd.vue new file mode 100644 index 0000000000..764ce7568a --- /dev/null +++ b/anrui-management/anrui-management-ui/src/views/commodity/commodityAdd.vue @@ -0,0 +1,392 @@ + + + + diff --git a/anrui-management/anrui-management-ui/src/views/commodity/commodityInfo.vue b/anrui-management/anrui-management-ui/src/views/commodity/commodityInfo.vue new file mode 100644 index 0000000000..cc05f2178a --- /dev/null +++ b/anrui-management/anrui-management-ui/src/views/commodity/commodityInfo.vue @@ -0,0 +1,203 @@ + + + + diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java index 21f08f2218..6dd9fdc747 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java @@ -241,7 +241,7 @@ public interface SysUserFeign { @ApiOperation(value = "获取本部门下人员") @GetMapping(value = "getAllPeo") - ResultBean> getAllPeo(@RequestParam("deptSid") String deptSid); + ResultBean> getAllPeo(@RequestParam("deptSid") String deptSid, @RequestParam(value = "name", required = false) String name); @ApiOperation(value = "根据用户sid获取用户id") @PostMapping(value = "selectIdBySid") diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java index e2f823e5f9..656bb0c76a 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java @@ -222,7 +222,7 @@ public class SysUserFeignFallback implements SysUserFeign { } @Override - public ResultBean> getAllPeo(String deptSid) { + public ResultBean> getAllPeo(String deptSid, String name) { return null; } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java index 19beea9753..75d6d874c5 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java @@ -48,6 +48,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.comparators.NullComparator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -75,6 +76,7 @@ import java.util.stream.Collectors; @RestController @RequestMapping("v1/flow") @Api(tags = "业务系统中业务和工作流相关操作") +@Slf4j public class FlowableRest implements FlowableFeign { @Autowired @@ -166,6 +168,7 @@ public class FlowableRest implements FlowableFeign { @Override public ResultBean> flowRecordAndComment(String procInsId, String deployId) { + long startTimes = System.currentTimeMillis(); // 记录开始时间 // 并行调用外部服务 CompletableFuture> flowRecordFuture = CompletableFuture.supplyAsync(() -> flowableService.flowRecord(procInsId, deployId)); @@ -253,7 +256,7 @@ public class FlowableRest implements FlowableFeign { stringObjectMap.put("taskName", f.get("nodeName").toString()); stringObjectMap.put("finishTime", null); stringObjectMap.put("createTime", ""); - stringObjectMap.put("taskUserInfos", new ArrayList<>()); + stringObjectMap.put("taskUserInfos", Collections.emptyList()); a.setFlowableRecordVo(stringObjectMap); a.setState("3"); @@ -266,6 +269,8 @@ public class FlowableRest implements FlowableFeign { // 返回结果 ResultBean> resultBean = new ResultBean>().success(); resultBean.setData(flowList); + long endTime = System.currentTimeMillis(); + log.info("流程记录接口耗时 {} ms", endTime - startTimes); return resultBean; } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml index a8b5053dc7..99f2406064 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml @@ -396,7 +396,7 @@ left join sys_staffinfo si on su.staffSid = si.sid where su.isAdmin is NULL and si.personTypeKey != '01' \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java index b9a1f3cbcd..abb8a6cdbc 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java @@ -665,8 +665,8 @@ public class SysUserRest implements SysUserFeign { } @Override - public ResultBean> getAllPeo(String deptSid) { - return sysUserService.getAllPeo(deptSid); + public ResultBean> getAllPeo(String deptSid, String name) { + return sysUserService.getAllPeo(deptSid, name); } @Override diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index 2de9c42154..51702debb4 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -1718,9 +1718,9 @@ public class SysUserService extends MybatisBaseService { } - public ResultBean> getAllPeo(String deptSid) { + public ResultBean> getAllPeo(String deptSid, String name) { ResultBean rb = ResultBean.fireFail(); - List allPeo = baseMapper.getAllPeo(deptSid); + List allPeo = baseMapper.getAllPeo(deptSid, name); return rb.success().setData(allPeo); } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java index 8b5a12b383..8431b60d47 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java @@ -3566,7 +3566,7 @@ public class LoanSettleApplyService extends MybatisBaseService> listPage(@RequestBody PagerQuery pq); + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listAll") + @ResponseBody + public ResultBean> listAll(@RequestBody ScmSpecialRebateQuery query); + @ApiOperation("新增或修改") @PostMapping("/save") @ResponseBody @@ -81,6 +87,11 @@ public interface ScmSpecialRebateFeign { @ResponseBody public ResultBean> checkApplyGetSpecialRebate(@RequestBody PagerQuery pq); + @ApiOperation("专项返利核对申请选择待核对专项返利信息") + @PostMapping("/checkApplyGetSpecialRebateAll") + @ResponseBody + public ResultBean> checkApplyGetSpecialRebateAll(@RequestBody ScmSpecialRebateQuery query); + @ApiOperation("专项返利核对申请选择已上传专项返利信息") @PostMapping("/checkApplyGetAlreadyUploadSpecialRebate") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java index e9ed62f35d..fe638e29c1 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java @@ -34,6 +34,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.text.ParseException; +import java.util.List; /** * Project: anrui-scm(专项返利管理)
@@ -57,6 +58,11 @@ public class ScmSpecialRebateFeignFallback implements ScmSpecialRebateFeign { return rb.setMsg("接口anrui-scm/scmspecialrebate/listPage无法访问"); } + @Override + public ResultBean> listAll(ScmSpecialRebateQuery query) { + return null; + } + @Override public ResultBean save(ScmSpecialRebateDto dto){ return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebate/save无法访问"); @@ -88,6 +94,11 @@ public class ScmSpecialRebateFeignFallback implements ScmSpecialRebateFeign { return null; } + @Override + public ResultBean> checkApplyGetSpecialRebateAll(ScmSpecialRebateQuery query) { + return null; + } + @Override public ResultBean> checkApplyGetAlreadyUploadSpecialRebate(PagerQuery pq) { return null; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelVo.java index 3bea60b78b..57c96860fa 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelVo.java @@ -20,12 +20,12 @@ public class TwoExcelVo { @ExportEntityMap(CnName = "创建日期*", EnName = "createTime") private String createTime; - @ExportEntityMap(CnName = "返利名称*", EnName = "rebateName") - private String rebateName; - @ExportEntityMap(CnName = "返利类型*", EnName = "rebateTypeValue") private String rebateTypeValue; + @ExportEntityMap(CnName = "返利名称*", EnName = "rebateName") + private String rebateName; + @ExportEntityMap(CnName = "预提返利*", EnName = "estimateRebate") private String estimateRebate; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/OneExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/OneExcelVo.java index fecebb5b52..b2a84473f8 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/OneExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/OneExcelVo.java @@ -30,14 +30,12 @@ public class OneExcelVo { @ExportEntityMap(CnName = "创建日期*", EnName = "createTime") private String createTime; - //返利名称 - @ExportEntityMap(CnName = "返利名称*", EnName = "rebateName") - private String rebateName; - - //返利类型 @ExportEntityMap(CnName = "返利类型*", EnName = "rebateTypeValue") private String rebateTypeValue; + @ExportEntityMap(CnName = "返利名称*", EnName = "rebateName") + private String rebateName; + //预提返利 @ExportEntityMap(CnName = "预提返利*", EnName = "estimateRebate") private String estimateRebate; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java index a8aca5d63a..94c2266b07 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java @@ -67,6 +67,11 @@ public interface ScmVehRebateFeign { @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listAll") + @ResponseBody + public ResultBean> listAll(@RequestBody ScmVehRebateQuery query); + @ApiOperation("单车返利未预提申请选择单车返利信息") @PostMapping("/withApplyGetVehRebate") @ResponseBody @@ -77,6 +82,11 @@ public interface ScmVehRebateFeign { @ResponseBody public ResultBean> checkApplyGetVehRebate(@RequestBody PagerQuery pq); + @ApiOperation("单车返利核对申请选择待核对单车返利信息") + @PostMapping("/checkApplyGetVehRebateAll") + @ResponseBody + public ResultBean> checkApplyGetVehRebateAll(@RequestBody ScmVehRebateQuery query); + @ApiOperation("一次导出") @PostMapping("/excelListOne") public void excelListOne(@RequestBody ScmVehRebateQuery scmVehRebateQuery); diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java index 99b2344a7b..aea32d91aa 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java @@ -58,6 +58,11 @@ public class ScmVehRebateFeignFallback implements ScmVehRebateFeign { return rb.setMsg("接口anrui-scm/scmvehrebate/listPage无法访问"); } + @Override + public ResultBean> listAll(ScmVehRebateQuery query) { + return null; + } + @Override public ResultBean> withApplyGetVehRebate(PagerQuery pq) { return null; @@ -68,6 +73,11 @@ public class ScmVehRebateFeignFallback implements ScmVehRebateFeign { return null; } + @Override + public ResultBean> checkApplyGetVehRebateAll(ScmVehRebateQuery query) { + return null; + } + @Override public void excelListOne(ScmVehRebateQuery scmVehRebateQuery) { diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/TwoExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/TwoExcelVo.java index 559943ead1..797b9ca24c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/TwoExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/TwoExcelVo.java @@ -29,14 +29,12 @@ public class TwoExcelVo { @ExportEntityMap(CnName = "创建日期*", EnName = "createTime") private String createTime; - //返利名称 - @ExportEntityMap(CnName = "返利名称*", EnName = "rebateName") - private String rebateName; - - //返利类型 @ExportEntityMap(CnName = "返利类型*", EnName = "rebateTypeValue") private String rebateTypeValue; + @ExportEntityMap(CnName = "返利名称*", EnName = "rebateName") + private String rebateName; + //预提返利 @ExportEntityMap(CnName = "预提返利*", EnName = "estimateRebate") private String estimateRebate; diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java index a1c4a335e7..3f5733da46 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java @@ -85,4 +85,8 @@ public interface ScmSpecialRebateMapper extends BaseMapper { void updateAdjustmentState(@Param("sid") String sid, @Param("adjustmentState") int adjustmentState); List excelList(@Param(Constants.WRAPPER) QueryWrapper qw); + + List checkApplyGetSpecialRebateAll(@Param(Constants.WRAPPER) QueryWrapper qw); + + List listAll(@Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml index 97236b716a..8633e675aa 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml @@ -151,4 +151,26 @@ ${ew.sqlSegment} + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java index 6dfc180012..f2fed61d96 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java @@ -73,6 +73,13 @@ public class ScmSpecialRebateRest implements ScmSpecialRebateFeign { return rb.success().setData(pv); } + @Override + public ResultBean> listAll(ScmSpecialRebateQuery query) { + ResultBean rb = ResultBean.fireFail(); + List scmSpecialRebateVoList = scmSpecialRebateService.listAll(query); + return rb.success().setData(scmSpecialRebateVoList); + } + @ApiOperation("导出") @PostMapping("/excelList") public void excelList(@RequestBody ScmSpecialRebateQuery query) { @@ -147,6 +154,13 @@ public class ScmSpecialRebateRest implements ScmSpecialRebateFeign { return rb.success().setData(pv); } + @Override + public ResultBean> checkApplyGetSpecialRebateAll(ScmSpecialRebateQuery query) { + ResultBean rb = ResultBean.fireFail(); + List scmSpecialRebateVoList = scmSpecialRebateService.checkApplyGetSpecialRebateAll(query); + return rb.success().setData(scmSpecialRebateVoList); + } + @Override public ResultBean> checkApplyGetAlreadyUploadSpecialRebate(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java index 5b26477c8b..dc416a6b7a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java @@ -150,6 +150,76 @@ public class ScmSpecialRebateService extends MybatisBaseService listAll(ScmSpecialRebateQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setMenuSid(query.getMenuSid()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("orgPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("orgPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("orgPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("orgPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("createBySid", query.getUserSid()); + } else { + List p = new ArrayList<>(); + return p; + } + } else { + List p = new ArrayList<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getCreateOrgName())) { + qw.like("createOrgName", query.getCreateOrgName()); + } + if (StringUtils.isNotBlank(query.getBrandName())) { + qw.like("brandName", query.getBrandName()); + } + if (StringUtils.isNotBlank(query.getPurchaseSystemName())) { + qw.like("purchaseSystemName", query.getPurchaseSystemName()); + } + if (StringUtils.isNotBlank(query.getRebateTypeKey())) { + qw.eq("rebateTypeKey", query.getRebateTypeKey()); + } + if (StringUtils.isNotBlank(query.getRebateName())) { + qw.like("rebateName", query.getRebateName()); + } + if (StringUtils.isNotBlank(query.getState())) { + qw.eq("state", query.getState()); + } + String createStartTime = query.getCreateStartTime(); + String createEndTime = query.getCreateEndTime(); + qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + qw.orderByDesc("createTime"); + List scmSpecialRebateVoList = baseMapper.listAll(qw); + return scmSpecialRebateVoList; + } + public ResultBean saveOrUpdateDto(ScmSpecialRebateDto dto) { ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); @@ -318,6 +388,86 @@ public class ScmSpecialRebateService extends MybatisBaseService checkApplyGetSpecialRebateAll(ScmSpecialRebateQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setMenuSid(query.getMenuSid()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("orgPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("orgPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("orgPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("orgPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("createBySid", query.getUserSid()); + } else { + List p = new ArrayList<>(); + return p; + } + } else { + List p = new ArrayList<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getCreateOrgName())) { + qw.like("createOrgName", query.getCreateOrgName()); + } + if (StringUtils.isNotBlank(query.getBrandName())) { + qw.like("brandName", query.getBrandName()); + } + if (StringUtils.isNotBlank(query.getPurchaseSystemName())) { + qw.like("purchaseSystemName", query.getPurchaseSystemName()); + } + if (StringUtils.isNotBlank(query.getRebateTypeKey())) { + qw.eq("rebateTypeKey", query.getRebateTypeKey()); + } + if (StringUtils.isNotBlank(query.getRebateName())) { + qw.like("rebateName", query.getRebateName()); + } + if (StringUtils.isNotBlank(query.getOnceCheckState())) { + qw.eq("onceCheckState", query.getOnceCheckState()); + } + String createStartTime = query.getCreateStartTime(); + String createEndTime = query.getCreateEndTime(); + qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + qw.eq("state", 2); + qw.eq("adjustmentState", 0); + qw.orderByDesc("createTime"); + List scmSpecialRebateVoList = baseMapper.checkApplyGetSpecialRebateAll(qw); + for (ScmSpecialRebateVo record : scmSpecialRebateVoList) { + //上传状态：未上传 + if (StringUtils.isBlank(record.getUploadDate())) { + record.setUploadState("0"); + } else {//上传状态：已上传 + record.setUploadState("1"); + } + } + return scmSpecialRebateVoList; + } + public PagerVo checkApplyGetAlreadyUploadSpecialRebate(PagerQuery pq) { ScmSpecialRebateQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -552,10 +702,10 @@ public class ScmSpecialRebateService extends MybatisBaseService wrapper.eq("uploadDate", "") + .or().isNull("uploadDate") + ); qw.orderByDesc("createTime"); List oneExcelVos = baseMapper.excelListOne(qw); for (OneExcelVo oneExcelVo : oneExcelVos) { @@ -1548,8 +1701,9 @@ public class ScmSpecialRebateService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); - qw.ne("adjustmentState", 0); + qw.eq("adjustmentState", 0); qw.eq("state", 2); + qw.ne("uploadDate", ""); qw.isNotNull("uploadDate"); qw.orderByDesc("createTime"); List twoExcelVos = baseMapper.excelListTwo(qw); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java index aceae5b5ec..ded42b3fac 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java @@ -49,11 +49,9 @@ import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; -import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; -import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.scm.api.flow.FlowTaskVo; import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebate; import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.*; @@ -560,7 +558,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService { void delByVehSid(String vehSid); List excelList(@Param(Constants.WRAPPER) QueryWrapper qw); + + List checkApplyGetVehRebateAll(@Param(Constants.WRAPPER) QueryWrapper qw); + + List listAll(@Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml index 332d457a01..c14436ba0e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml @@ -131,4 +131,32 @@ ${ew.sqlSegment} + + + + diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java index 4fa1a647e4..b89b4214a6 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java @@ -79,6 +79,13 @@ public class ScmVehRebateRest implements ScmVehRebateFeign { return rb.success().setData(pv); } + @Override + public ResultBean> listAll(ScmVehRebateQuery query) { + ResultBean rb = ResultBean.fireFail(); + List scmVehRebateVoList = scmVehRebateService.listAll(query); + return rb.success().setData(scmVehRebateVoList); + } + @ApiOperation("导出") @PostMapping("/excelList") public void excelList(@RequestBody ScmVehRebateQuery query) { @@ -109,6 +116,13 @@ public class ScmVehRebateRest implements ScmVehRebateFeign { return rb.success().setData(pv); } + @Override + public ResultBean> checkApplyGetVehRebateAll(ScmVehRebateQuery query) { + ResultBean rb = ResultBean.fireFail(); + List scmVehRebateVoList = scmVehRebateService.checkApplyGetVehRebateAll(query); + return rb.success().setData(scmVehRebateVoList); + } + @Override public void excelListOne(ScmVehRebateQuery scmVehRebateQuery) { //得到所有要导出的数据 diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java index 62535fcae9..fe85a089d8 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java @@ -66,19 +66,6 @@ import java.net.URLEncoder; import java.util.*; import java.util.regex.Pattern; -/** - * Project: anrui-scm(单车返利)
- * File: ScmVehRebateService.java
- * Class: com.yxt.anrui.scm.biz.scmvehrebate.ScmVehRebateService
- * Description: 单车返利表 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-08-24 09:01:54
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class ScmVehRebateService extends MybatisBaseService { @@ -171,7 +158,7 @@ public class ScmVehRebateService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); for (ScmVehRebateVo record : pagging.getRecords()) { - if ("001".equals(record.getCalculationModeKey())){ + if ("001".equals(record.getCalculationModeKey())) { record.setCalculationStandard(record.getCalculationStandard() + "%"); } } @@ -179,6 +166,87 @@ public class ScmVehRebateService extends MybatisBaseService listAll(ScmVehRebateQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setMenuSid(query.getMenuSid()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("orgPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("orgPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("orgPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("orgPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("createBySid", query.getUserSid()); + } else { + List p = new ArrayList<>(); + return p; + } + } else { + List p = new ArrayList<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getBrandName())) { + qw.like("brandName", query.getBrandName()); + } + if (StringUtils.isNotBlank(query.getVehModelName())) { + qw.like("vehModelName", query.getVehModelName()); + } + if (StringUtils.isNotBlank(query.getVinNo())) { + qw.like("vinNo", query.getVinNo()); + } + if (StringUtils.isNotBlank(query.getRebateTypeKey())) { + qw.eq("rebateTypeKey", query.getRebateTypeKey()); + } + if (StringUtils.isNotBlank(query.getRebateName())) { + qw.like("rebateName", query.getRebateName()); + } + if (StringUtils.isNotBlank(query.getState())) { + qw.eq("state", query.getState()); + } + if (StringUtils.isNotBlank(query.getUseOrgName())) { + qw.like("useOrgName", query.getUseOrgName()); + } + if (StringUtils.isNotBlank(query.getPurchaseSystemName())) { + qw.like("purchaseSystemName", query.getPurchaseSystemName()); + } + String createStartTime = query.getCreateStartTime(); + String createEndTime = query.getCreateEndTime(); + qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + qw.orderByDesc("createTime"); + List scmVehRebateVoList = baseMapper.listAll(qw); + for (ScmVehRebateVo record : scmVehRebateVoList) { + if ("001".equals(record.getCalculationModeKey())) { + record.setCalculationStandard(record.getCalculationStandard() + "%"); + } + } + return scmVehRebateVoList; + } + public PagerVo withApplyGetVehRebate(PagerQuery pq) { ScmVehRebateQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -302,6 +370,89 @@ public class ScmVehRebateService extends MybatisBaseService checkApplyGetVehRebateAll(ScmVehRebateQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setMenuSid(query.getMenuSid()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("orgPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("orgPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("orgPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("orgPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("createBySid", query.getUserSid()); + } else { + List p = new ArrayList<>(); + return p; + } + } else { + List p = new ArrayList<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getBrandName())) { + qw.like("brandName", query.getBrandName()); + } + if (StringUtils.isNotBlank(query.getVehModelName())) { + qw.like("vehModelName", query.getVehModelName()); + } + if (StringUtils.isNotBlank(query.getVinNo())) { + qw.like("vinNo", query.getVinNo()); + } + if (StringUtils.isNotBlank(query.getRebateTypeValue())) { + qw.like("rebateTypeValue", query.getRebateTypeValue()); + } + if (StringUtils.isNotBlank(query.getRebateName())) { + qw.like("rebateName", query.getRebateName()); + } + if (StringUtils.isNotBlank(query.getPurchaseSystemName())) { + qw.like("purchaseSystemName", query.getPurchaseSystemName()); + } + if (StringUtils.isNotBlank(query.getUseOrgName())) { + qw.like("useOrgName", query.getUseOrgName()); + } + String createStartTime = query.getCreateStartTime(); + String createEndTime = query.getCreateEndTime(); + qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + qw.eq("state", 2); + qw.eq("adjustmentState", 0); + qw.orderByDesc("createTime"); + List scmVehRebateVoList = baseMapper.checkApplyGetVehRebateAll(qw); + for (ScmVehRebateVo record : scmVehRebateVoList) { + //上传状态：未上传 + if (StringUtils.isBlank(record.getUploadDate())) { + record.setUploadState("0"); + } else {//上传状态：已上传 + record.setUploadState("1"); + } + } + return scmVehRebateVoList; + } + public List excelListOne(ScmVehRebateQuery query) { QueryWrapper qw = new QueryWrapper<>(); //========================================数据授权开始 @@ -373,6 +524,9 @@ public class ScmVehRebateService extends MybatisBaseService wrapper.eq("uploadDate", "") + .or().isNull("uploadDate") + ); qw.orderByDesc("createTime"); List oneExcelVos = baseMapper.excelListOne(qw); for (OneExcelVo oneExcelVo : oneExcelVos) { @@ -449,8 +603,9 @@ public class ScmVehRebateService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); - qw.ne("adjustmentState", 0); + qw.eq("adjustmentState", 0); qw.eq("state", 2); + qw.ne("uploadDate", ""); qw.isNotNull("uploadDate"); qw.orderByDesc("createTime"); List twoExcelVos = baseMapper.excelListTwo(qw); @@ -541,7 +696,7 @@ public class ScmVehRebateService extends MybatisBaseService scmVehRebateExcelVos = baseMapper.excelList(qw); for (ScmVehRebateExcelVo scmVehRebateExcelVo : scmVehRebateExcelVos) { - if (scmVehRebateExcelVo.getState().equals("0")){ + if (scmVehRebateExcelVo.getState().equals("0")) { scmVehRebateExcelVo.setState("未预提"); - }else if (scmVehRebateExcelVo.getState().equals("1")){ + } else if (scmVehRebateExcelVo.getState().equals("1")) { scmVehRebateExcelVo.setState("预提中"); - }else if (scmVehRebateExcelVo.getState().equals("2")){ + } else if (scmVehRebateExcelVo.getState().equals("2")) { scmVehRebateExcelVo.setState("待核对"); - }else if (scmVehRebateExcelVo.getState().equals("3")){ + } else if (scmVehRebateExcelVo.getState().equals("3")) { scmVehRebateExcelVo.setState("核对中"); - }else if (scmVehRebateExcelVo.getState().equals("4")){ + } else if (scmVehRebateExcelVo.getState().equals("4")) { scmVehRebateExcelVo.setState("已核对"); } - if (scmVehRebateExcelVo.getOnceCheckState().equals("0")){ + if (scmVehRebateExcelVo.getOnceCheckState().equals("0")) { scmVehRebateExcelVo.setOnceCheckState("否"); - }else if (scmVehRebateExcelVo.getOnceCheckState().equals("1")){ + } else if (scmVehRebateExcelVo.getOnceCheckState().equals("1")) { scmVehRebateExcelVo.setOnceCheckState("是"); - }else if (scmVehRebateExcelVo.getOnceCheckState().equals("2")){ + } else if (scmVehRebateExcelVo.getOnceCheckState().equals("2")) { scmVehRebateExcelVo.setOnceCheckState("一次核对中"); } scmVehRebateExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parse(scmVehRebateExcelVo.getCreateTime()))); - if ("是".equals(scmVehRebateExcelVo.getIsAdjustment())){ + if ("是".equals(scmVehRebateExcelVo.getIsAdjustment())) { scmVehRebateExcelVo.setTreatAdjustmentMoney(scmVehRebateExcelVo.getOnceTreatCost().add(scmVehRebateExcelVo.getSecondTreatCost()).subtract(scmVehRebateExcelVo.getExpectTreatCost())); scmVehRebateExcelVo.setSuppAdjustmentMoney(scmVehRebateExcelVo.getOnceSuppCost().add(scmVehRebateExcelVo.getSecondSuppCost()).subtract(scmVehRebateExcelVo.getExpectSuppCost())); - }else { + } else { scmVehRebateExcelVo.setTreatAdjustmentMoney(BigDecimal.ZERO); scmVehRebateExcelVo.setSuppAdjustmentMoney(BigDecimal.ZERO); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java index e7ef35b815..3fcf4ddcb0 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java @@ -30,13 +30,17 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutFeign; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusOrderAndVehInfo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; +import com.yxt.anrui.buscenter.api.common.BusSalesOrderConstantUtils; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; @@ -86,6 +90,7 @@ import com.yxt.messagecenter.api.message.MessageFlowableQuery; import com.yxt.messagecenter.api.messagelist.MessageList; import com.yxt.messagecenter.api.messagelist.MessageListFeign; import org.apache.commons.lang3.StringUtils; +import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -93,6 +98,7 @@ import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.concurrent.*; import java.util.stream.Collectors; import static java.util.Comparator.comparing; @@ -675,12 +681,33 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + ScmVehRebateWithApply finalScmVehRebateWithApply = scmVehRebateWithApply; + Future future1 = pool.submit(() -> { + for (String vehRebateSid : vehRebateSids) { + scmVehRebateService.updateState(vehRebateSid, 2); + scmVehRebateService.updateWithholdingDateBySid(vehRebateSid, finalScmVehRebateWithApply.getWithApply()); + } + //推送单车返利预提凭证 + pushVehRebateWithVoucher(bv.getBusinessSid()); + + }); + } catch (Exception e) { + e.printStackTrace(); + } } else { //极光推送 scmVehRebateWithApply = fetchBySid(bv.getBusinessSid()); diff --git a/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js b/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js index ccc8febec6..100d8beb74 100644 --- a/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js +++ b/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js @@ -10,6 +10,15 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, + // 单车返利核对（待核对）查询不分页数据 + checkApplyGetVehRebateAll: function(data) { + return request({ + url: '/scm/v1/scmvehrebate/checkApplyGetVehRebateAll', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, // 一次导出 excelListOne: function(data) { return request({ diff --git a/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatemanagement.js b/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatemanagement.js index e0b949e670..e6dfd0ff72 100644 --- a/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatemanagement.js +++ b/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatemanagement.js @@ -10,6 +10,15 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, + // 查询不分页 + listAll: function(data) { + return request({ + url: '/scm/v1/scmvehrebate/listAll', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, // 选择车辆信息--查询分页列表 pageList: function(data) { return request({ diff --git a/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js b/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js index 63362654dd..cc6a96e18c 100644 --- a/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js +++ b/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js @@ -1,7 +1,7 @@ import request from '@/utils/request' export default { - // 单车返利核对（待核对）查询分页列表 + // 专项返利核对（待核对）查询分页列表 listPage: function(data) { return request({ url: '/scm/v1/scmspecialrebate/checkApplyGetSpecialRebate', @@ -10,6 +10,15 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, + // 专项返利核对（待核对）查询不分页 + checkApplyGetSpecialRebateAll: function(data) { + return request({ + url: '/scm/v1/scmspecialrebate/checkApplyGetSpecialRebateAll', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, // 一次导出 excelListOne: function(data) { return request({ diff --git a/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatemanagement.js b/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatemanagement.js index 529335f4ac..457e7e719c 100644 --- a/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatemanagement.js +++ b/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatemanagement.js @@ -10,6 +10,15 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, + // 查询不分页 + listAll: function(data) { + return request({ + url: '/scm/v1/scmspecialrebate/listAll', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, // 删除 delete: function(params) { return request({ diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue index 5722faf4b5..dc911326db 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue @@ -57,8 +57,8 @@
- - + +