diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordFeign.java index 977b3da238..a9de9f8443 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordFeign.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordFeign.java @@ -86,43 +86,43 @@ public interface CrmMaintenanceenterpriseRecordFeign { public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); -// //------------------------------流程接口---------------------------------------------- -// -// @ApiOperation("提交") -// @PostMapping("/submit") -// public ResultBean submitRecordApplication(@RequestBody @Valid SubmitEnterpriseDto dto); -// -// @ApiOperation(value = "办理（同意）") -// @PostMapping("/complete") -// public ResultBean complete(@Valid @RequestBody EnterpriseCompleteDto dto); -// -// @ApiOperation(value = "撤回流程") -// @PostMapping(value = "/revokeProcess") -// public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody EnterpriseTaskQuery query); -// -// @ApiOperation(value = "驳回任务") -// @PostMapping(value = "/reject") -// public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody EnterpriseTaskQuery query); -// -// @ApiOperation(value = "终止任务") -// @PostMapping(value = "/breakProcess") -// public ResultBean breakProcess(@RequestBody EnterpriseTaskQuery query); -// -// @ApiOperation(value = "流程历史流转记录") -// @GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}") -// public ResultBean flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId); -// -// @ApiOperation(value = "获取下一个环节") -// @GetMapping(value = "/getNextNodesForSubmit") -// ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap EnterpriseNodeQuery query); -// -// @ApiOperation(value = "获取上一个环节") -// @GetMapping(value = "/getPreviousNodesForReject") -// ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap EnterpriseNodeQuery query); -// -// @ApiOperation(value = "加签") -// @PostMapping(value = "/delegate") -// public ResultBean delegate(@RequestBody EnterpriseDelegateQuery query); + //------------------------------流程接口---------------------------------------------- + + @ApiOperation("提交") + @PostMapping("/submit") + public ResultBean submitRecordApplication(@RequestBody @Valid SubmitEnterpriseDto dto); + + @ApiOperation(value = "办理（同意）") + @PostMapping("/complete") + public ResultBean complete(@Valid @RequestBody EnterpriseCompleteDto dto); + + @ApiOperation(value = "撤回流程") + @PostMapping(value = "/revokeProcess") + public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody EnterpriseTaskQuery query); + + @ApiOperation(value = "驳回任务") + @PostMapping(value = "/reject") + public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody EnterpriseTaskQuery query); + + @ApiOperation(value = "终止任务") + @PostMapping(value = "/breakProcess") + public ResultBean breakProcess(@RequestBody EnterpriseTaskQuery query); + + @ApiOperation(value = "流程历史流转记录") + @GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}") + public ResultBean flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId); + + @ApiOperation(value = "获取下一个环节") + @GetMapping(value = "/getNextNodesForSubmit") + ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap EnterpriseNodeQuery query); + + @ApiOperation(value = "获取上一个环节") + @GetMapping(value = "/getPreviousNodesForReject") + ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap EnterpriseNodeQuery query); + + @ApiOperation(value = "加签") + @PostMapping(value = "/delegate") + public ResultBean delegate(@RequestBody EnterpriseDelegateQuery query); } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordFeignFallback.java index 69e140d60a..9599c34103 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordFeignFallback.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordFeignFallback.java @@ -76,48 +76,48 @@ public class CrmMaintenanceenterpriseRecordFeignFallback implements CrmMaintenan return rb.setMsg("接口crm/crmmaintenanceenterpriserecord/fetchDetailsBySid无法访问"); } -// @Override -// public ResultBean submitRecordApplication(SubmitEnterpriseDto dto) { -// return null; -// } -// -// @Override -// public ResultBean complete(EnterpriseCompleteDto dto) { -// return null; -// } -// -// @Override -// public ResultBean revokeProcess(EnterpriseTaskQuery query) { -// return null; -// } -// -// @Override -// public ResultBean taskReject(EnterpriseTaskQuery query) { -// return null; -// } -// -// @Override -// public ResultBean breakProcess(EnterpriseTaskQuery query) { -// return null; -// } -// -// @Override -// public ResultBean flowRecord(String procInsId) { -// return null; -// } -// -// @Override -// public ResultBean> getNextNodesForSubmit(EnterpriseNodeQuery query) { -// return null; -// } -// -// @Override -// public ResultBean> getPreviousNodesForReject(EnterpriseNodeQuery query) { -// return null; -// } -// -// @Override -// public ResultBean delegate(EnterpriseDelegateQuery query) { -// return null; -// } + @Override + public ResultBean submitRecordApplication(SubmitEnterpriseDto dto) { + return null; + } + + @Override + public ResultBean complete(EnterpriseCompleteDto dto) { + return null; + } + + @Override + public ResultBean revokeProcess(EnterpriseTaskQuery query) { + return null; + } + + @Override + public ResultBean taskReject(EnterpriseTaskQuery query) { + return null; + } + + @Override + public ResultBean breakProcess(EnterpriseTaskQuery query) { + return null; + } + + @Override + public ResultBean flowRecord(String procInsId) { + return null; + } + + @Override + public ResultBean> getNextNodesForSubmit(EnterpriseNodeQuery query) { + return null; + } + + @Override + public ResultBean> getPreviousNodesForReject(EnterpriseNodeQuery query) { + return null; + } + + @Override + public ResultBean delegate(EnterpriseDelegateQuery query) { + return null; + } } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmdockingpeople/CrmDockingPeopleMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmdockingpeople/CrmDockingPeopleMapper.java index 360480b124..c1009a71a3 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmdockingpeople/CrmDockingPeopleMapper.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmdockingpeople/CrmDockingPeopleMapper.java @@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.crm.api.crmdockingpeople.PeopleList; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -65,4 +66,7 @@ public interface CrmDockingPeopleMapper extends BaseMapper { List selectListVo(); List getListByCustomerSid(@Param("customerSid") String customerSid); + + @Delete("delete from crm_docking_people where customerSid = #{customerSid}") + void delByCustomerSid(String customerSid); } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmdockingpeople/CrmDockingPeopleService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmdockingpeople/CrmDockingPeopleService.java index 40a786e8aa..9919e5e826 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmdockingpeople/CrmDockingPeopleService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmdockingpeople/CrmDockingPeopleService.java @@ -126,4 +126,9 @@ public class CrmDockingPeopleService extends MybatisBaseService getListByCustomerSid(String customerSid) { return baseMapper.getListByCustomerSid(customerSid); } + + public void delByCustomerSid(String customerSid) { + baseMapper.delByCustomerSid(customerSid); + } + } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.java index e32e301add..11a04c938e 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.java @@ -37,6 +37,7 @@ import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterp import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordVo; import java.util.List; +import java.util.Map; /** * Project: crm(crm)
@@ -71,4 +72,6 @@ public interface CrmMaintenanceenterpriseRecordMapper extends BaseMapper map); } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml index 299d85c95c..22c8af7459 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml @@ -71,4 +71,20 @@ WHERE nodeState != '待提交' and find_in_set(sid, #{list}) + + + UPDATE crm_maintenanceenterprise_record + SET nodeState=#{nodeState} + , nodeSid=#{taskDefKey} + + , procDefId=#{procDefId} + + + , procInstId=#{procInsId} + + + , taskId=#{taskId} + + WHERE sid = #{sid} + diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordRest.java index eb8bd715d0..413a808aa2 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordRest.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordRest.java @@ -107,51 +107,51 @@ public class CrmMaintenanceenterpriseRecordRest implements CrmMaintenanceenterpr } -// @Override -// public ResultBean submitRecordApplication(SubmitEnterpriseDto dto) { -// return crmMaintenanceenterpriseRecordService.submitRecordApplication(dto); -// } -// -// @Override -// public ResultBean complete(EnterpriseCompleteDto dto) { -// BusinessVariables bv = new BusinessVariables(); -// BeanUtil.copyProperties(dto, bv); -// bv.setModelId(ProcDefEnum.ENTERPRISEAPPLY.getProDefId()); -// return crmMaintenanceenterpriseRecordService.complete(bv); -// } -// -// @Override -// public ResultBean revokeProcess(EnterpriseTaskQuery query) { -// return crmMaintenanceenterpriseRecordService.revokeProcess(query); -// } -// -// @Override -// public ResultBean taskReject(EnterpriseTaskQuery query) { -// return crmMaintenanceenterpriseRecordService.taskReject(query); -// } -// -// @Override -// public ResultBean breakProcess(EnterpriseTaskQuery query) { -// return crmMaintenanceenterpriseRecordService.breakProcess(query); -// } -// -// @Override -// public ResultBean flowRecord(String procInsId) { -// return crmMaintenanceenterpriseRecordService.flowRecord(procInsId); -// } -// -// @Override -// public ResultBean> getNextNodesForSubmit(EnterpriseNodeQuery query) { -// return crmMaintenanceenterpriseRecordService.getNextNodesForSubmit(query); -// } -// -// @Override -// public ResultBean> getPreviousNodesForReject(EnterpriseNodeQuery query) { -// return crmMaintenanceenterpriseRecordService.getPreviousNodesForReject(query); -// } -// -// @Override -// public ResultBean delegate(EnterpriseDelegateQuery query) { -// return crmMaintenanceenterpriseRecordService.delegate(query); -// } + @Override + public ResultBean submitRecordApplication(SubmitEnterpriseDto dto) { + return crmMaintenanceenterpriseRecordService.submitRecordApplication(dto); + } + + @Override + public ResultBean complete(EnterpriseCompleteDto dto) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(dto, bv); + bv.setModelId(ProcDefEnum.ENTERPRISEAPPLY.getProDefId()); + return crmMaintenanceenterpriseRecordService.complete(bv); + } + + @Override + public ResultBean revokeProcess(EnterpriseTaskQuery query) { + return crmMaintenanceenterpriseRecordService.revokeProcess(query); + } + + @Override + public ResultBean taskReject(EnterpriseTaskQuery query) { + return crmMaintenanceenterpriseRecordService.taskReject(query); + } + + @Override + public ResultBean breakProcess(EnterpriseTaskQuery query) { + return crmMaintenanceenterpriseRecordService.breakProcess(query); + } + + @Override + public ResultBean flowRecord(String procInsId) { + return crmMaintenanceenterpriseRecordService.flowRecord(procInsId); + } + + @Override + public ResultBean> getNextNodesForSubmit(EnterpriseNodeQuery query) { + return crmMaintenanceenterpriseRecordService.getNextNodesForSubmit(query); + } + + @Override + public ResultBean> getPreviousNodesForReject(EnterpriseNodeQuery query) { + return crmMaintenanceenterpriseRecordService.getPreviousNodesForReject(query); + } + + @Override + public ResultBean delegate(EnterpriseDelegateQuery query) { + return crmMaintenanceenterpriseRecordService.delegate(query); + } } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java index 5dc14b0dd3..e68a9ef173 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java @@ -27,28 +27,50 @@ package com.yxt.anrui.crm.biz.crmmaintenanceenterpriserecord; import cn.hutool.core.bean.BeanUtil; 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.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; -import com.yxt.anrui.crm.api.crmcustomertemp.AsCustomerListVo; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp; +import com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeople; import com.yxt.anrui.crm.api.crmfile.CrmFile; import com.yxt.anrui.crm.api.crmfile.CrmFileDetailsVo; import com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePerson; import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.*; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.flowable.*; import com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVeh; import com.yxt.anrui.crm.biz.crmcustomertemp.CrmCustomerTempService; +import com.yxt.anrui.crm.biz.crmdockingpeople.CrmDockingPeopleService; import com.yxt.anrui.crm.biz.crmfile.CrmFileService; import com.yxt.anrui.crm.biz.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonService; import com.yxt.anrui.crm.biz.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehService; +import com.yxt.anrui.crm.fegin.as.AsCustomerVehicleDto; import com.yxt.anrui.crm.fegin.as.AsCustomerVehicleFeign; +import com.yxt.anrui.flowable.api.flow.FlowableFeign; +import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; +import com.yxt.anrui.flowable.api.flow2.FlowFeign; +import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; +import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; +import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; +import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; 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.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentApply; import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.messagecenter.api.message.MessageFeign; +import com.yxt.messagecenter.api.message.MessageFlowVo; +import com.yxt.messagecenter.api.message.MessageFlowableQuery; +import com.yxt.messagecenter.api.messagelist.MessageListFeign; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -60,11 +82,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.concurrent.*; +import java.util.function.Predicate; +import java.util.stream.Collectors; /** * Project: crm(crm)
@@ -82,6 +106,20 @@ import java.util.List; @Service public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService { + @Autowired + private AsCustomerVehicleFeign asCustomerVehicleFeign; + @Autowired + private MessageListFeign messageListFeign; + @Autowired + private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignPro; + @Resource + private FlowFeign flowFeign; + @Resource + private FlowableFeign flowableFeign; + @Resource + private FlowTaskFeign flowTaskFeign; + @Autowired + private MessageFeign messageFeign; @Autowired private CrmFileService crmFileService; @Autowired @@ -92,14 +130,14 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService createQueryWrapper(CrmMaintenanceenterpriseRecordQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -493,4 +531,463 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService map) { + return baseMapper.updateFlowFiled(map); + } + + public ResultBean submitRecordApplication(SubmitEnterpriseDto dto) { + ResultBean rb = ResultBean.fireFail(); + CrmMaintenanceenterpriseRecord apply = fetchBySid(dto.getSid()); + int r = submitBusinessData(dto, apply); + if (r == 3) { + return rb.setMsg("该申请不存在"); + } + if (r == 0) { + return rb.setMsg("操作失败!提交的数据不一致"); + } + //新增修改保存 + String businessSid = saveOrUpdateDto(dto); + CrmMaintenanceenterpriseRecord entity = fetchBySid(businessSid); + String orgSidPath = ""; + SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(entity.getDeptSid()).getData(); + if (null != organizationVo) { + orgSidPath = organizationVo.getOrgSidPath(); + } else { + SysUserVo data = sysUserFeign.fetchBySid(entity.getCreateBySid()).getData(); + if (null != data) { + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(data.getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + //用户的组织全路径 + orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + } + } + List orgPathList = Arrays.asList(orgSidPath.split("/")); + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData(); + if (sysOrganization == null) { + return rb.setMsg("当前所在的组织机构不存在"); + } + if (StringUtils.isBlank(sysOrganization.getManagerSid())) { +// return rb.setMsg("当前所在的组织机构未设置主管人员"); + sysOrganization.setManagerSid(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId()); + } + //创建BusinessVariables实体对象 + BusinessVariables bv = new BusinessVariables(); + //流程中的参数赋值 + Map variables = BeanUtil.beanToMap(dto); + Map appMap = new HashMap<>(); + //若有网关，则赋值网关中判断的字段。 +// boolean isTure = true; +// //去查询是否同意 +// if (StringUtils.isNotBlank(entity.getSalesUserSid())) { +// if (!entity.getCreateBySid().equals(entity.getSalesUserSid())) { +// isTure = false; +// } +// } +// variables.put("isTure", isTure); + variables.put("businessSid", businessSid); + appMap.put("sid", businessSid); + variables.put("app", appMap); +// String orderNames = "<" + entity.getCustomer() + ">" + "欠款客户备案"; +// variables.put("orderNames", orderNames); + CrmMaintenanceenterpriseRecord record = fetchBySid(businessSid); + String msgBusinessSid = record.getSid(); + //用户的部门全路径sid + bv.setOrgSidPath(orgSidPath); + //业务sid + bv.setBusinessSid(businessSid); + //用户sid + bv.setUserSid(dto.getCreateBySid()); + bv.setFormVariables(variables); +// String nextNodeUserSids_ = sysOrganization.getManagerSid(); +// if (isTure) { +// bv.setNextNodeUserSids(nextNodeUserSids_); +// } else { +// bv.setNextNodeUserSids(entity.getSalesUserSid()); +// } + //流程定义id + bv.setModelId(ProcDefEnum.ENTERPRISEAPPLY.getProDefId()); + if (r == 1) { + //流程定义id + bv.setModelId(ProcDefEnum.ENTERPRISEAPPLY.getProDefId()); + ResultBean voResultBean = flowFeign.startProcess(bv); + if (!voResultBean.getSuccess()) { + return rb.setMsg(voResultBean.getMsg()); + } + UpdateFlowFieldVo ufVo = voResultBean.getData(); + int i = updateFlowFiled(BeanUtil.beanToMap(ufVo)); + //==================================添加线程 + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + Future future1 = pool.submit(() -> { + //极光推送 + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(msgBusinessSid); + messageFlowableQuery.setModuleName("定点维修月结欠款备案申请"); + SysUserVo userVo = sysUserFeign.fetchBySid(record.getCreateBySid()).getData(); + if (userVo != null) { + if (StringUtils.isNotBlank(userVo.getName())) { + messageFlowableQuery.setMsgContent(userVo.getName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + } + } + messageFlowableQuery.setMsgTitle("定点维修月结欠款备案申请"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + }); + } catch (Exception e) { + e.printStackTrace(); + } + //==================================添加线程 + return voResultBean; + } + if (r == 2) { + // ToDo:驳回到发起人后再次提交 + if (StringUtils.isBlank(dto.getInstanceId())) { + return rb.setMsg("参数错误：instanceId"); + } + CrmMaintenanceenterpriseRecord record1 = fetchBySid(dto.getSid()); + bv.setTaskId(dto.getTaskId()); + bv.setTaskDefKey(record1.getNodeSid()); + bv.setComment("重新提交"); + bv.setInstanceId(dto.getInstanceId()); + return complete(bv); + } + return rb; + } + + public ResultBean complete(BusinessVariables bv) { + ResultBean rb = ResultBean.fireFail(); + String businessSid = bv.getBusinessSid(); + CrmMaintenanceenterpriseRecord record = this.fetchBySid(businessSid); + if (bv.getTaskId().equals(record.getTaskId())) { + String orgSidPath = ""; + SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(record.getDeptSid()).getData(); + if (null != organizationVo) { + orgSidPath = organizationVo.getOrgSidPath(); + } + bv.setOrgSidPath(orgSidPath); + //流程中的参数赋值 + Map variables = new HashMap<>(); + Map appMap = new HashMap<>(); + //若有网关，则赋值网关中判断的字段。 + variables.put("businessSid", businessSid); + appMap.put("sid", businessSid); + variables.put("app", appMap); + bv.setFormVariables(variables); + ResultBean resultBean = flowFeign.handleProsess(bv); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + int i = updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { + CrmMaintenanceenterpriseRecord entity = fetchBySid(businessSid); + entity.setClosingDate(new Date()); + baseMapper.updateById(entity); + Date filingIndate = entity.getFilingIndate(); + String customerSid = entity.getCustomerSid(); + List personList = crmMaintenanceenterprisePersonService.selByBillSid(businessSid); + if (!personList.isEmpty()) { + crmDockingPeopleService.delByCustomerSid(customerSid); + for (CrmMaintenanceenterprisePerson person : personList) { + CrmDockingPeople crmDockingPeople = new CrmDockingPeople(); + if (StringUtils.isNotBlank(person.getName())) { + crmDockingPeople.setName(person.getName()); + } + if (StringUtils.isNotBlank(person.getMobile())) { + crmDockingPeople.setMobile(person.getMobile()); + } + crmDockingPeople.setCustomerSid(customerSid); + crmDockingPeopleService.insert(crmDockingPeople); + } + } + List vehs = crmMaintenanceenterpriseVehService.selByBillSid(businessSid); + if (!vehs.isEmpty()) { + for (CrmMaintenanceenterpriseVeh veh : vehs) { + if (StringUtils.isNotBlank(veh.getAsVinSid())) { + AsCustomerVehicleDto v = new AsCustomerVehicleDto(); + v.setSid(veh.getAsVinSid()); + if (StringUtils.isNotBlank(veh.getVehMark())) { + v.setVehMark(veh.getVehMark()); + } + if (StringUtils.isNotBlank(veh.getVinNo())) { + v.setVinNo(veh.getVinNo()); + } + v.setCustomerSid(customerSid); + asCustomerVehicleFeign.save(v); + } else { + AsCustomerVehicleDto v = new AsCustomerVehicleDto(); + if (StringUtils.isNotBlank(veh.getVehMark())) { + v.setVehMark(veh.getVehMark()); + } + if (StringUtils.isNotBlank(veh.getVinNo())) { + v.setVinNo(veh.getVinNo()); + } + v.setCustomerSid(customerSid); + asCustomerVehicleFeign.save(v); + } + } + } + CrmCustomerTemp customerTemp = crmCustomerTempService.fetchBySid(customerSid); + customerTemp.setFilingIndate(filingIndate); + customerTemp.setIsEnable(1); + customerTemp.setIsDesignatedEnterprise(1); + crmCustomerTempService.updateById(customerTemp); + } + return rb.success().setData(resultBean.getData()); + } else { + return rb.setMsg("操作失败!提交的数据不一致"); + } + } + + + + public ResultBean revokeProcess(EnterpriseTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(query.getUserSid())) { + return rb.setMsg("参数错误：userSid"); + } + CrmMaintenanceenterpriseRecord paymentApply = fetchBySid(query.getBusinessSid()); + String businessTaskId = paymentApply.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (businessTaskId.equals(query.getTaskId())) { + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.revokeProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + return rb.success().setData(resultBean.getData()); + } + } + return rb.setMsg("操作失败，提交的数据不一致!"); + } + + public ResultBean taskReject(EnterpriseTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + String businessSid = query.getBusinessSid(); + CrmMaintenanceenterpriseRecord paymentApply = fetchBySid(businessSid); + if (paymentApply == null) { + return rb.setMsg("该申请不存在"); + } + String businessTaskId = paymentApply.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (businessTaskId.equals(query.getTaskId())) { + if (StringUtils.isBlank(query.getComment())) { + return rb.setMsg("请填写意见"); + } + if (org.apache.commons.lang3.StringUtils.isBlank(query.getUserSid())) { + return rb.setMsg("参数错误：userSid"); + } + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + Map variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid", businessSid); + variables.put("app", appMap); + //若有网关，则赋值网关中判断的字段。 +// boolean isTure = true; +// //去查询是否同意 +// if (StringUtils.isNotBlank(loanCustomerRecord.getSalesUserSid())) { +// if (!loanCustomerRecord.getCreateBySid().equals(loanCustomerRecord.getSalesUserSid())) { +// isTure = false; +// } +// } +// variables.put("isTure", isTure); + flowTaskVo.setValues(variables); + ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + UpdateFlowFieldVo ufVo = resultBean.getData(); + Map map = BeanUtil.beanToMap(ufVo); + //更新业务中的流程相关的参数 + updateFlowFiled(map); + //极光推送 + paymentApply = fetchBySid(businessSid); + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + String procId = paymentApply.getProcInstId(); + messageFlowVo.setProcInsId(procId); + messageFlowVo.setProcDefId(paymentApply.getProcDefId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("定点维修月结欠款备案申请"); + ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); + String nextName = listResultBean.getData().get(0).getName_(); + String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); +// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busVehicleApply.getCreateBySid())) { + if ("发起申请".equals(nextName)) { + messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + } else { + SysUserVo userVo = sysUserFeign.fetchBySid(paymentApply.getCreateBySid()).getData(); + if (userVo != null) { + if (org.apache.commons.lang3.StringUtils.isNotBlank(userVo.getName())) { + messageFlowableQuery.setMsgContent(userVo.getName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + } + } + } + messageFlowableQuery.setMsgTitle("定点维修月结欠款备案申请"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + return rb.success(); + } + } + return rb.setMsg("操作失败!提交的数据不一致!"); + } + + public ResultBean breakProcess(EnterpriseTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + if (org.apache.commons.lang3.StringUtils.isBlank(query.getInstanceId())) { + return rb.setMsg("参数错误：instanceId"); + } + if (org.apache.commons.lang3.StringUtils.isBlank(query.getUserSid())) { + return rb.setMsg("参数错误：userSid"); + } + if (org.apache.commons.lang3.StringUtils.isBlank(query.getComment())) { + return rb.setMsg("请填写意见"); + } + CrmMaintenanceenterpriseRecord paymentApply = fetchBySid(query.getBusinessSid()); + String businessTaskId = paymentApply.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (query.getUserSid().equals(paymentApply.getCreateBySid())) { + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map map = BeanUtil.beanToMap(resultBean.getData()); + updateFlowFiled(map); + + return rb.success().setData(resultBean.getData()); + } else { + if (businessTaskId.equals(query.getTaskId())) { + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map map = BeanUtil.beanToMap(resultBean.getData()); + updateFlowFiled(map); + return rb.success().setData(resultBean.getData()); + } + } + + } + return rb.setMsg("操作失败!提交的数据不一致!"); + } + + public ResultBean flowRecord(String procInsId) { + return flowTaskFeign.businessFlowRecord(procInsId); + } + + public ResultBean> getNextNodesForSubmit(EnterpriseNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + + //根据业务sid查询排产信息 + CrmMaintenanceenterpriseRecord paymentApply = fetchBySid(query.getBusinessSid()); + //若有网关，则赋值网关中判断的字段。 +// boolean isTure = true; +// //去查询是否同意 +// if (StringUtils.isNotBlank(loanCustomerRecord.getSalesUserSid())) { +// if (!loanCustomerRecord.getCreateBySid().equals(loanCustomerRecord.getSalesUserSid())) { +// isTure = false; +// } +// } +// variables.put("isTure", isTure); + bv.setFormVariables(variables); + bv.setModelId(paymentApply.getProcDefId()); + ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), EnterpriseNodeVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } + + public ResultBean> getPreviousNodesForReject(EnterpriseNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //根据业务sid查询排产信息 + CrmMaintenanceenterpriseRecord paymentApply = fetchBySid(query.getBusinessSid()); +// //若有网关，则赋值网关中判断的字段。 +// boolean isTure = true; +// //去查询是否同意 +// if (StringUtils.isNotBlank(loanCustomerRecord.getSalesUserSid())) { +// if (!loanCustomerRecord.getCreateBySid().equals(loanCustomerRecord.getSalesUserSid())) { +// isTure = false; +// } +// } +// variables.put("isTure", isTure); + bv.setFormVariables(variables); + bv.setModelId(paymentApply.getProcDefId()); + ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), EnterpriseNodeVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } + + public ResultBean delegate(EnterpriseDelegateQuery query) { + ResultBean rb = ResultBean.fireFail(); + FlowDelegateQuery delegateQuery = new FlowDelegateQuery(); + BeanUtil.copyProperties(query, delegateQuery); + flowFeign.delegate(delegateQuery); + return rb.success(); + } + } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/fegin/as/AsCustomerVehicleDto.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/fegin/as/AsCustomerVehicleDto.java new file mode 100644 index 0000000000..73bd2957db --- /dev/null +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/fegin/as/AsCustomerVehicleDto.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.fegin.as; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: asdfasd(sdg)
+ * File: AsCustomerVehicleDto.java
+ * Class: as.api.ascustomervehicle.AsCustomerVehicleDto
+ * Description: 客户车辆信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 11:28:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "客户车辆信息 数据传输对象", description = "客户车辆信息 数据传输对象") +public class AsCustomerVehicleDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("客户sid") + private String customerSid; // 客户sid + @ApiModelProperty("车牌号") + private String vehMark; // 车牌号 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("发动机号") + private String engineNo; // 发动机号 + @ApiModelProperty("车型sid") + private String vehModelSid; // 车型sid + @ApiModelProperty("车型") + private String vehModel; // 车型 + @ApiModelProperty("购车日期") + private String buyDate; // 购车日期 + @ApiModelProperty("0为内部车，1为外部车") + private Integer vehState; // 0为内部车，1为外部车 + +} diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/fegin/as/AsCustomerVehicleFeign.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/fegin/as/AsCustomerVehicleFeign.java index 14988ede70..9998e0d016 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/fegin/as/AsCustomerVehicleFeign.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/fegin/as/AsCustomerVehicleFeign.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -29,4 +30,12 @@ public interface AsCustomerVehicleFeign { @ApiOperation("根据客户sid查询车辆数量") @GetMapping("/getVehListCountsByCustomerSid") public int getVehListCountsByCustomerSid(@RequestParam("customerSid") String customerSid); + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody AsCustomerVehicleDto dto); + + @ApiOperation("根据客户sid删除") + @PostMapping("/deleteByCustomerSid") + public void deleteByCustomerSid(@RequestParam("customerSid") String customerSid); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/crm/crmmaintenanceenterpriserecord/MonthEndRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/crm/crmmaintenanceenterpriserecord/MonthEndRest.java index e67e71fa07..5107e1def9 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/crm/crmmaintenanceenterpriserecord/MonthEndRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/crm/crmmaintenanceenterpriserecord/MonthEndRest.java @@ -32,6 +32,10 @@ import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow.Comple import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow.MonthEndDelegateQuery; import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow.MonthEndFlowableQuery; import com.yxt.anrui.terminal.api.finance.collectionConfirm.*; +import com.yxt.anrui.terminal.api.risk.buckle.flow.AppBuckleDelegateQuery; +import com.yxt.anrui.terminal.api.risk.buckle.flow.AppBuckleTaskQuery; +import com.yxt.anrui.terminal.api.risk.buckle.flow.BuckleFlowableQuery; +import com.yxt.anrui.terminal.api.risk.buckle.flow.CompleteBuckleDto; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; @@ -67,31 +71,31 @@ public class MonthEndRest implements MonthEndFeign { @Override public ResultBean agreeCreditInfo(CompleteMonthEndDto dto) { - return null; + return monthEndService.agreeCreditInfo(dto); } @Override public ResultBean rejectCreditInfo(AppMonthEndTaskQuery query) { - return null; + return monthEndService.rejectCreditInfo(query); } @Override public ResultBean recallCreditInfo(AppMonthEndTaskQuery query) { - return null; + return monthEndService.recallCreditInfo(query); } @Override public ResultBean stopCreditInfo(AppMonthEndTaskQuery query) { - return null; + return monthEndService.stopCreditInfo(query); } @Override public ResultBean getFlowOperateTitle(MonthEndFlowableQuery query) { - return null; + return monthEndService.getFlowOperateTitle(query); } @Override public ResultBean delegate(MonthEndDelegateQuery delegateQuery) { - return null; + return monthEndService.delegate(delegateQuery); } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/crm/crmmaintenanceenterpriserecord/MonthEndService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/crm/crmmaintenanceenterpriserecord/MonthEndService.java index ebde9a11ac..68c9724645 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/crm/crmmaintenanceenterpriserecord/MonthEndService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/crm/crmmaintenanceenterpriserecord/MonthEndService.java @@ -29,12 +29,27 @@ package com.yxt.anrui.terminal.biz.crm.crmmaintenanceenterpriserecord; import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordDetailsVo; import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordFeign; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.flowable.*; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.riskcenter.api.loanbuckleapply.flow.*; import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.MonthEndDetailsVo; +import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow.AppMonthEndTaskQuery; +import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow.CompleteMonthEndDto; +import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow.MonthEndDelegateQuery; +import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow.MonthEndFlowableQuery; +import com.yxt.anrui.terminal.api.risk.buckle.flow.AppBuckleDelegateQuery; +import com.yxt.anrui.terminal.api.risk.buckle.flow.AppBuckleTaskQuery; +import com.yxt.anrui.terminal.api.risk.buckle.flow.BuckleFlowableQuery; +import com.yxt.anrui.terminal.api.risk.buckle.flow.CompleteBuckleDto; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; @@ -57,6 +72,10 @@ public class MonthEndService { @Autowired private CrmMaintenanceenterpriseRecordFeign crmMaintenanceenterpriseRecordFeign; + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; public ResultBean detail(String sid) { ResultBean rb = ResultBean.fireFail(); @@ -67,4 +86,104 @@ public class MonthEndService { } return rb.success().setData(vo); } + + public ResultBean agreeCreditInfo(CompleteMonthEndDto dto) { + ResultBean rb = ResultBean.fireFail(); + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + //用户的组织全路径 + String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + EnterpriseCompleteDto buckleCompleteDto = new + EnterpriseCompleteDto(); + BeanUtil.copyProperties(dto, buckleCompleteDto); +// buckleCompleteDto.setOrgSidPath(orgSidPath); + ResultBean resultBean = crmMaintenanceenterpriseRecordFeign.complete(buckleCompleteDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean rejectCreditInfo(AppMonthEndTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + EnterpriseTaskQuery taskQuery = new + EnterpriseTaskQuery(); + BeanUtil.copyProperties(query, taskQuery); + ResultBean resultBean = crmMaintenanceenterpriseRecordFeign.taskReject(taskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean recallCreditInfo(AppMonthEndTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + EnterpriseTaskQuery taskQuery = new + EnterpriseTaskQuery(); + BeanUtil.copyProperties(query, taskQuery); + ResultBean resultBean = crmMaintenanceenterpriseRecordFeign.revokeProcess(taskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean stopCreditInfo(AppMonthEndTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + EnterpriseTaskQuery taskQuery = new + EnterpriseTaskQuery(); + BeanUtil.copyProperties(query, taskQuery); + ResultBean resultBean = crmMaintenanceenterpriseRecordFeign.breakProcess(taskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean getFlowOperateTitle(MonthEndFlowableQuery query) { + ResultBean rb = ResultBean.fireFail(); + //0 上一环节 1下一环节 + int next = query.getNext(); + EnterpriseNodeQuery getNodeQuery = new + EnterpriseNodeQuery(); + BeanUtil.copyProperties(query, getNodeQuery); + String data = ""; + if (next == 0) { + ResultBean> getPreviousNodesForReject = crmMaintenanceenterpriseRecordFeign.getPreviousNodesForReject(getNodeQuery); + if (getPreviousNodesForReject.getSuccess()) { + getPreviousNodesForReject.getData().removeAll(Collections.singleton(null)); + data = getPreviousNodesForReject.getData().get(0).getName(); + } else { + return rb.setMsg(getPreviousNodesForReject.getMsg()); + } + } else if (next == 1) { + ResultBean> getNextNodesForSubmit = crmMaintenanceenterpriseRecordFeign.getNextNodesForSubmit(getNodeQuery); + if (getNextNodesForSubmit.getSuccess()) { + getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); + data = getNextNodesForSubmit.getData().get(0).getName(); + } else { + return rb.setMsg(getNextNodesForSubmit.getMsg()); + } + } else { + return rb.setMsg("参数错误：next"); + } + return rb.success().setData(data); + } + + public ResultBean delegate(MonthEndDelegateQuery delegateQuery) { + ResultBean rb = ResultBean.fireFail(); + EnterpriseDelegateQuery delegateQuery1 = new + EnterpriseDelegateQuery(); + BeanUtil.copyProperties(delegateQuery, delegateQuery1); + ResultBean delegate = crmMaintenanceenterpriseRecordFeign.delegate(delegateQuery1); + return rb.success(); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/flowable/AsSitemsCompleteDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/flowable/AsSitemsCompleteDto.java new file mode 100644 index 0000000000..e2e01e5886 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/flowable/AsSitemsCompleteDto.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.as.api.asserviceitemapply.flowable; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/9/6 14:57 + * @Description + */ +@Data +public class AsSitemsCompleteDto implements Dto { + private static final long serialVersionUID = 6378752532534735663L; + + @ApiModelProperty(value = "用户sid") + private String userSid; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + @ApiModelProperty(value = "流程id(PC)") + private String instanceId; + @ApiModelProperty(value = "流程id(移动)") + private String procInsId; + @ApiModelProperty(value = "意见") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + + private String orgPath; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/flowable/SitemsDelegateQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/flowable/SitemsDelegateQuery.java new file mode 100644 index 0000000000..1996f72bf8 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/flowable/SitemsDelegateQuery.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.as.api.asserviceitemapply.flowable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/9/28 9:28 + */ +@Data +public class SitemsDelegateQuery { + @ApiModelProperty + private String userSid; + @ApiModelProperty("流程实例id") +// @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty("任务Id") + private String taskId; + @ApiModelProperty("审批人sid") + private String assignee; + @ApiModelProperty("填写意见") + private String views; + + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/flowable/SitemsNodeQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/flowable/SitemsNodeQuery.java new file mode 100644 index 0000000000..bf06c05ba3 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/flowable/SitemsNodeQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.as.api.asserviceitemapply.flowable; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/9/6 15:04 + * @Description + */ +@Data +public class SitemsNodeQuery implements Query { + private static final long serialVersionUID = 9117613683840483366L; + + @ApiModelProperty(value = "环节定义id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; + @ApiModelProperty(value = "业务sid") + private String businessSid; + @ApiModelProperty(value = "0 上一环节 1下一环节") + private Integer next; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/flowable/SitemsNodeVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/flowable/SitemsNodeVo.java new file mode 100644 index 0000000000..bbfef8409a --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/flowable/SitemsNodeVo.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.as.api.asserviceitemapply.flowable; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/9/6 15:03 + * @Description + */ +@Data +public class SitemsNodeVo implements Vo { + private static final long serialVersionUID = -833419512294877848L; + + @ApiModelProperty(value = "节点名称") + private String name; + @ApiModelProperty(value = "节点id") + private String id; + @ApiModelProperty(value = "审批组") + private List candidateGroups; + @ApiModelProperty(value = "是否是最后环节") + private String endTask; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/flowable/SitemsTaskQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/flowable/SitemsTaskQuery.java new file mode 100644 index 0000000000..f0125e7579 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/flowable/SitemsTaskQuery.java @@ -0,0 +1,48 @@ +package com.yxt.anrui.as.api.asserviceitemapply.flowable; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/9/6 15:06 + * @Description + */ +@Data +public class SitemsTaskQuery implements Query { + private static final long serialVersionUID = 1288615499873178778L; + + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("任务Id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + /** + * 终止、驳回 + */ + @ApiModelProperty("任务意见") + private String comment; + /** + * 终止、撤回、驳回 + */ + @ApiModelProperty("用户Sid") + private String userSid; + /** + * 终止 + */ + @ApiModelProperty("流程实例Id(PC)") + private String instanceId; + + @ApiModelProperty("流程实例Id(移动)") + private String procInsId; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/flowable/SubmitSitemsDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/flowable/SubmitSitemsDto.java new file mode 100644 index 0000000000..02f0c6e829 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/flowable/SubmitSitemsDto.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.as.api.asserviceitemapply.flowable; + +import com.yxt.anrui.as.api.asbusrepairbillreversesettle.AsBusrepairBillReverseSettleDto; +import com.yxt.anrui.as.api.asserviceitemapply.AsServiceItemApplyDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author liuguohui + * @version 1.0 + * @description + * @date 2022/04/13 + */ +@ApiModel("提交") +@Data +public class SubmitSitemsDto extends AsServiceItemApplyDto { + + @ApiModelProperty("意见") + private String comment; + @ApiModelProperty("流程实例id") + private String instanceId; + @ApiModelProperty("任务id") + private String taskId; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.java index dd9d37bcf1..86ab551f57 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.java @@ -54,27 +54,30 @@ import java.util.List; @Mapper public interface AsCustomerVehicleMapper extends BaseMapper { - //@Update("update as_customer_vehicle set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + //@Update("update as_customer_vehicle set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from as_customer_vehicle") - List selectListVo(); + @Select("select * from as_customer_vehicle") + List selectListVo(); - @Select("select * from as_customer_vehicle") - List listCustomerVeh(); + @Select("select * from as_customer_vehicle") + List listCustomerVeh(); - List selVehListByCustomerSid(@Param("sid") String sid); + List selVehListByCustomerSid(@Param("sid") String sid); - @Update("update as_customer_vehicle set isDelete = '1' where sid =#{sid}") - void delBySid(@Param("sid") String sid); + @Update("update as_customer_vehicle set isDelete = '1' where sid =#{sid}") + void delBySid(@Param("sid") String sid); - IPage customerList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + IPage customerList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List getVehListByCustomerSid(@Param("customerSid") String customerSid); - int getVehListCountsByCustomerSid(@Param("customerSid") String customerSid); + int getVehListCountsByCustomerSid(@Param("customerSid") String customerSid); + + @Delete("delete from as_customer_vehicle where customerSid =#{customerSid}") + void deleteByCustomerSid(@Param("customerSid") String customerSid); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleRest.java index cb98a9a963..b348609c4a 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleRest.java @@ -52,129 +52,133 @@ import java.util.List; @Api(tags = "客户车辆信息") @RestController @RequestMapping("v1/ascustomervehicle") -public class AsCustomerVehicleRest{ - - @Autowired - private AsCustomerVehicleService asCustomerVehicleService; - - - - @ApiOperation("批量禁用") - @PostMapping("/disableState") - public ResultBean disableState(@RequestBody String[] sid){ - ResultBean rb = ResultBean.fireFail(); - for (String s : sid) { - AsCustomerVehicle asCustomerVehicle = asCustomerVehicleService.fetchBySid(s); - asCustomerVehicle.setIsEnable(0); - asCustomerVehicleService.updateById(asCustomerVehicle); - } - return rb.success(); - } - - @ApiOperation("批量启用") - @PostMapping("/enable") - public ResultBean enable(@RequestBody String[] sid){ - ResultBean rb = ResultBean.fireFail(); - for (String s : sid) { - AsCustomerVehicle asCustomerVehicle = asCustomerVehicleService.fetchBySid(s); - asCustomerVehicle.setIsEnable(1); - asCustomerVehicleService.updateById(asCustomerVehicle); - } - return rb.success(); - } - - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = asCustomerVehicleService.listPageVo(pq); - return rb.success().setData(pv); - } - - @ApiOperation("查询数据的列表") - @PostMapping("/listCustomerVeh") - public ResultBean> listCustomerVeh(){ - ResultBean rb = ResultBean.fireFail(); - List list = asCustomerVehicleService.listCustomerVeh(); - return rb.success().setData(list); - } - - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody AsCustomerVehicleDto dto){ - ResultBean rb = ResultBean.fireFail(); - asCustomerVehicleService.saveOrUpdateDto(dto); - return rb.success(); - } - - @ApiOperation("查询数据的列表") - @PostMapping("/customerList") - public ResultBean> customerList(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = asCustomerVehicleService.customerList(pq); - return rb.success().setData(pv); - } - - @ApiOperation("根据sid批量删除") +public class AsCustomerVehicleRest { + + @Autowired + private AsCustomerVehicleService asCustomerVehicleService; + + + @ApiOperation("批量禁用") + @PostMapping("/disableState") + public ResultBean disableState(@RequestBody String[] sid) { + ResultBean rb = ResultBean.fireFail(); + for (String s : sid) { + AsCustomerVehicle asCustomerVehicle = asCustomerVehicleService.fetchBySid(s); + asCustomerVehicle.setIsEnable(0); + asCustomerVehicleService.updateById(asCustomerVehicle); + } + return rb.success(); + } + + @ApiOperation("批量启用") + @PostMapping("/enable") + public ResultBean enable(@RequestBody String[] sid) { + ResultBean rb = ResultBean.fireFail(); + for (String s : sid) { + AsCustomerVehicle asCustomerVehicle = asCustomerVehicleService.fetchBySid(s); + asCustomerVehicle.setIsEnable(1); + asCustomerVehicleService.updateById(asCustomerVehicle); + } + return rb.success(); + } + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = asCustomerVehicleService.listPageVo(pq); + return rb.success().setData(pv); + } + + @ApiOperation("查询数据的列表") + @PostMapping("/listCustomerVeh") + public ResultBean> listCustomerVeh() { + ResultBean rb = ResultBean.fireFail(); + List list = asCustomerVehicleService.listCustomerVeh(); + return rb.success().setData(list); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody AsCustomerVehicleDto dto) { + ResultBean rb = ResultBean.fireFail(); + asCustomerVehicleService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("查询数据的列表") + @PostMapping("/customerList") + public ResultBean> customerList(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = asCustomerVehicleService.customerList(pq); + return rb.success().setData(pv); + } + + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - return asCustomerVehicleService.deleteBySids(sids); - } + public ResultBean delBySids(@RequestBody String[] sids) { + return asCustomerVehicleService.deleteBySids(sids); + } - @ApiOperation("根据SID获取一条记录") + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{customerVehSid}") - public ResultBean fetchDetailsBySid(@PathVariable("customerVehSid") String customerVehSid){ - ResultBean rb = ResultBean.fireFail(); - AsCustomerVehicleDetails vo = asCustomerVehicleService.fetchDetailsVoBySid(customerVehSid); - return rb.success().setData(vo); - } - - - @ApiOperation("根据SID获取一条记录") - @GetMapping("/vehList") - public ResultBean> vehList(@RequestParam("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - List list = asCustomerVehicleService.vehList(sid); - return rb.success().setData(list); - - } - - @ApiOperation("保存修改车辆信息") - @PostMapping("/saveCustomerVeh") - public ResultBean saveCustomerVeh(@RequestBody AsCustomerVehicleDetails dto){ - return asCustomerVehicleService.saveCustomerVeh(dto); - } - - - @ApiOperation("快捷新增初始化") - @GetMapping("/quickAddInit") - public ResultBean quickAddInit(@RequestParam("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - QuickAddCustomer quickAddInit = asCustomerVehicleService.quickAddInit(sid); - return rb.success().setData(quickAddInit); - } - - @ApiOperation("快捷新增初保存") - @PostMapping("/quickAddSave") - public ResultBean quickAddSave(@RequestBody QuickAddCustomer dto){ - return asCustomerVehicleService.quickAddSave(dto); - } - - @ApiOperation("根据客户sid查询车辆") - @GetMapping("/getVehListByCustomerSid") - public ResultBean> getVehListByCustomerSid(@RequestParam("customerSid") String customerSid){ - ResultBean rb = ResultBean.fireFail(); - List list = asCustomerVehicleService.getVehListByCustomerSid(customerSid); - return rb.success().setData(list); - } - - - @ApiOperation("根据客户sid查询车辆数量") - @GetMapping("/getVehListCountsByCustomerSid") - public int getVehListCountsByCustomerSid(@RequestParam("customerSid") String customerSid){ - int i = asCustomerVehicleService.getVehListCountsByCustomerSid(customerSid); - return i; - } - + public ResultBean fetchDetailsBySid(@PathVariable("customerVehSid") String customerVehSid) { + ResultBean rb = ResultBean.fireFail(); + AsCustomerVehicleDetails vo = asCustomerVehicleService.fetchDetailsVoBySid(customerVehSid); + return rb.success().setData(vo); + } + + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/vehList") + public ResultBean> vehList(@RequestParam("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + List list = asCustomerVehicleService.vehList(sid); + return rb.success().setData(list); + + } + + @ApiOperation("保存修改车辆信息") + @PostMapping("/saveCustomerVeh") + public ResultBean saveCustomerVeh(@RequestBody AsCustomerVehicleDetails dto) { + return asCustomerVehicleService.saveCustomerVeh(dto); + } + + + @ApiOperation("快捷新增初始化") + @GetMapping("/quickAddInit") + public ResultBean quickAddInit(@RequestParam("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + QuickAddCustomer quickAddInit = asCustomerVehicleService.quickAddInit(sid); + return rb.success().setData(quickAddInit); + } + + @ApiOperation("快捷新增初保存") + @PostMapping("/quickAddSave") + public ResultBean quickAddSave(@RequestBody QuickAddCustomer dto) { + return asCustomerVehicleService.quickAddSave(dto); + } + + @ApiOperation("根据客户sid查询车辆") + @GetMapping("/getVehListByCustomerSid") + public ResultBean> getVehListByCustomerSid(@RequestParam("customerSid") String customerSid) { + ResultBean rb = ResultBean.fireFail(); + List list = asCustomerVehicleService.getVehListByCustomerSid(customerSid); + return rb.success().setData(list); + } + + + @ApiOperation("根据客户sid查询车辆数量") + @GetMapping("/getVehListCountsByCustomerSid") + public int getVehListCountsByCustomerSid(@RequestParam("customerSid") String customerSid) { + int i = asCustomerVehicleService.getVehListCountsByCustomerSid(customerSid); + return i; + } + + @ApiOperation("根据客户sid删除") + @PostMapping("/deleteByCustomerSid") + public void deleteByCustomerSid(@RequestParam("customerSid") String customerSid) { + asCustomerVehicleService.deleteByCustomerSid(customerSid); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java index f80d8b75e9..385ef4c411 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java @@ -279,4 +279,8 @@ public class AsCustomerVehicleService extends MybatisBaseService @@ -66,4 +67,6 @@ public interface AsServiceItemApplyMapper extends BaseMapper int selectNum(String bill); int selectBySid(String join); + + int updateFlowFiled(Map map); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyMapper.xml index ef3a458da8..b79b5511f6 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyMapper.xml @@ -3,6 +3,22 @@ + + UPDATE as_service_item_apply + SET nodeState=#{nodeState} + , nodeSid=#{taskDefKey} + + , procDefId=#{procDefId} + + + , procInstId=#{procInsId} + + + , taskId=#{taskId} + + WHERE sid = #{sid} + +