diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFiles.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFiles.java
index 99106b9bc0..7e3972ac3c 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFiles.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFiles.java
@@ -31,19 +31,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-/**
- * Project: anrui-base(安瑞基础信息)
- * File: BaseDataList.java
- * Class: com.yxt.anrui.base.api.basedatalist.BaseDataList
- * Description: 资料清单.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-02-26 09:59:29
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@ApiModel(value = "附件清单", description = "附件清单")
@TableName("base_files")
@Data
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseFeign.java
index 383ab4681d..a88b1278f5 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseFeign.java
@@ -38,23 +38,9 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
-
import javax.validation.Valid;
import java.util.List;
-/**
- * Project: anrui-base(内申请管理)
- * File: BaseInternalPurchaseFeign.java
- * Class: com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseFeign
- * Description: 内购表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-06-16 13:46:25
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Api(tags = "内购表")
@FeignClient(
contextId = "anrui-base-BaseInternalPurchase",
@@ -72,12 +58,12 @@ public interface BaseInternalPurchaseFeign {
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody BaseInternalPurchaseDto dto);
-
+
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
-
+
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
@@ -91,6 +77,7 @@ public interface BaseInternalPurchaseFeign {
/**
* 申请方审批同意、应对方审批同意（除申请方最后一个环节）
+ *
* @param bvd
* @return
*/
@@ -100,6 +87,7 @@ public interface BaseInternalPurchaseFeign {
/**
* 申请方跳应对方的同意
+ *
* @param bvd
* @return
*/
@@ -109,6 +97,7 @@ public interface BaseInternalPurchaseFeign {
/**
* 分公司到事业部同意
+ *
* @param bvd
* @return
*/
@@ -138,6 +127,6 @@ public interface BaseInternalPurchaseFeign {
@ApiOperation(value = "移动端调车详情")
@PostMapping(value = "/getCompanyShunting/{sid}")
- ResultBean getCompanyShunting(@PathVariable("sid")String sid);
+ ResultBean getCompanyShunting(@PathVariable("sid") String sid);
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java
index bdbad2a44a..d91d49c53e 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java
@@ -69,13 +69,13 @@ public interface BasePurchaseSystemFeign {
@ApiOperation("维护分摊比例")
@PostMapping("/maintenance")
@ResponseBody
- public ResultBean maintenance(@RequestParam("sid") String sid,@RequestParam("shareProportion") String shareProportion);
-
+ public ResultBean maintenance(@RequestParam("sid") String sid, @RequestParam("shareProportion") String shareProportion);
+
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
-
+
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
@@ -100,4 +100,9 @@ public interface BasePurchaseSystemFeign {
@GetMapping("/fetchDetailsByUseOrgPath")
@ResponseBody
public ResultBean> fetchDetailsByUseOrgPath(@RequestParam("orgPath") String orgPath);
+
+ @ApiOperation("根据采购系统名称查询采购系统sid")
+ @GetMapping("/selByPurchaseSystemName")
+ @ResponseBody
+ public ResultBean selByPurchaseSystemName(@RequestParam("purchaseSystemName") String purchaseSystemName, @RequestParam("useOrgSid") String useOrgSid);
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeignFallback.java
index 76019efae5..213fb31935 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeignFallback.java
@@ -94,4 +94,9 @@ public class BasePurchaseSystemFeignFallback implements BasePurchaseSystemFeign
public ResultBean> fetchDetailsByUseOrgPath(String orgPath) {
return null;
}
+
+ @Override
+ public ResultBean selByPurchaseSystemName(String purchaseSystemName, String useOrgSid) {
+ return null;
+ }
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyFeign.java
index a7bd152e73..1d289557cc 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyFeign.java
@@ -43,23 +43,9 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
-
import javax.validation.Valid;
import java.util.List;
-/**
- * Project: anrui-base(调车开票)
- * File: BaseShuntingInvoicingApplyFeign.java
- * Class: com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyFeign
- * Description: 调车开票申请表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-07-11 15:30:28
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Api(tags = "调车开票申请表")
@FeignClient(
contextId = "anrui-base-BaseShuntingInvoicingApply",
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java
index 2869935ca2..58176c4248 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java
@@ -108,7 +108,7 @@ public interface BaseVehicleBrandFeign {
@ApiOperation("手机端根据厂商sid查询品牌列表")
@GetMapping("/selectAppListByManufacturerSid")
- ResultBean> selectAppListByManufacturerSid(@RequestParam(value = "manufacturerSid",required = false) String manufacturerSid);
+ ResultBean> selectAppListByManufacturerSid(@RequestParam(value = "manufacturerSid", required = false) String manufacturerSid);
@ApiOperation("手机端-获取品牌数据字典")
@GetMapping("/selectAppListByUserSid/{userSid}")
@@ -121,4 +121,8 @@ public interface BaseVehicleBrandFeign {
@ApiOperation("根据品牌sid获取品牌信息")
@GetMapping("/fetchBySid/{sid}")
BaseVehicleBrand fetchBySid(@RequestParam("sid") String sid);
+
+ @ApiOperation("根据品牌名称获取品牌sid")
+ @GetMapping("/selByBrandName")
+ ResultBean selByBrandName(@RequestParam("brandName") String brandName);
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeignFallback.java
index 8b5f6e7e27..edd0bcc1ec 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeignFallback.java
@@ -91,5 +91,10 @@ public class BaseVehicleBrandFeignFallback implements BaseVehicleBrandFeign {
return null;
}
+ @Override
+ public ResultBean selByBrandName(String brandName) {
+ return null;
+ }
+
}
\ No newline at end of file
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 e36c63305a..1060a2b321 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
@@ -28,7 +28,6 @@ package com.yxt.anrui.base.biz.baseaccadjapply;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.baseaccadjapply.*;
@@ -37,25 +36,13 @@ import com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeQuery;
import com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeVo;
import com.yxt.anrui.base.api.baseaccadjapply.flow.SubmitBaseAccAdjApplyDto;
import com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVeh;
-import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchase;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
-import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
-import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerDetailsVo;
-import com.yxt.anrui.base.api.basemanufacturerbank.BaseManPayVo;
-import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
-import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
-import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
-import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
import com.yxt.anrui.base.biz.baseaccadjapplyeveh.BaseAccadjApplyeVehService;
-import com.yxt.anrui.base.biz.baseinternalpurchase.BaseInternalPurchaseService;
import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService;
-import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService;
import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
@@ -80,7 +67,6 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
-import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@@ -88,43 +74,25 @@ 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.portal.api.sysuser.UserQuery;
import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign;
-import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
-import com.yxt.common.base.utils.HanZiConverterPinYin;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
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.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
-/**
- * Project: anrui-base(调账管理)
- * File: BaseAccadjApplyService.java
- * Class: com.yxt.anrui.base.biz.baseaccadjapply.BaseAccadjApplyService
- * Description: 调账申请表 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-07-07 16:57:24
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Service
public class BaseAccadjApplyService extends MybatisBaseService {
@@ -514,21 +482,21 @@ public class BaseAccadjApplyService extends MybatisBaseService flowList = flowRecordVo.getFlowList();
for (FlowTask flowTask : flowList) {
- if (flowTask.getTaskName().equals("发起方分公司会计主管审批")){
+ if (flowTask.getTaskName().equals("发起方分公司会计主管审批")) {
confirmSid = flowTask.getTaskUserInfos().get(0).getAssigneeSid();
confirmName = flowTask.getTaskUserInfos().get(0).getAssigneeName();
confirmDate = DateUtil.formatDate(flowTask.getFinishTime());
}
}
- }else if (baseAccadjApply.getAccadjTypeValue().equals("调出")){
+ } else if (baseAccadjApply.getAccadjTypeValue().equals("调出")) {
FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(bv.getInstanceId()).getData();
List flowList = flowRecordVo.getFlowList();
for (FlowTask flowTask : flowList) {
- if (flowTask.getTaskName().equals("应对方分公司会计主管审批")){
+ if (flowTask.getTaskName().equals("应对方分公司会计主管审批")) {
confirmSid = flowTask.getTaskUserInfos().get(0).getAssigneeSid();
confirmName = flowTask.getTaskUserInfos().get(0).getAssigneeName();
confirmDate = DateUtil.formatDate(flowTask.getFinishTime());
@@ -1083,21 +1051,10 @@ public class BaseAccadjApplyService extends MybatisBaseService 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());
- }
- List purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
String businessTaskId = baseAccadjApply.getTaskId();
+ List purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
if (StringUtils.isNotBlank(businessTaskId)) {
- if (businessTaskId.equals(query.getTaskId())) {
+ if (query.getUserSid().equals(baseAccadjApply.getCreateBySid())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo);
@@ -1110,6 +1067,21 @@ public class BaseAccadjApplyService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
+ }
+ Map map = BeanUtil.beanToMap(resultBean.getData());
+ updateFlowFiled(map);
+ for (String purchaseSid : purchaseSids) {
+ baseInternalPurchaseVehicleService.updateIsAccadj(purchaseSid, "0");
+ }
+ return rb.success().setData(resultBean.getData());
+ }
}
}
return rb.setMsg("操作失败!提交的数据不一致!");
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
index f4ee8c02e3..53267796d3 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
@@ -940,7 +940,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo);
@@ -957,6 +957,25 @@ public class BaseInternalPurchaseService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
+ }
+ updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+ List baseInternalPurchaseVehicleVos = baseInternalPurchaseVehicleService.fetchByMainSid(query.getBusinessSid());
+ for (BaseInternalPurchaseVehicleVo baseInternalPurchaseVehicleVo : baseInternalPurchaseVehicleVos) {
+ BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(baseInternalPurchaseVehicleVo.getVinNo(), baseInternalPurchase.getCreateOrgSid());
+ baseVehicle.setVinNo(baseInternalPurchaseVehicleVo.getVinNo());
+ baseVehicle.setVehicleState(VehicleState.StockEnum.STOCK.getCode());
+ baseVehicle.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks());
+ baseVehicleService.updateVeh(baseVehicle);
+ }
+ return rb.success().setData(resultBean.getData());
+ }
}
}
return rb.setMsg("操作失败!提交的数据不一致!");
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehMapper.xml
index 5c43ab49dd..5b13584e8b 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehMapper.xml
@@ -33,10 +33,10 @@
FROM
base_manufacturer_retware_veh mrv
LEFT JOIN base_manufacturer_retware mr
- ON mrv.`mainSid` = mr.sid
+ ON mrv.mainSid = mr.sid
WHERE mrv.vinNo = #{vinNo}
- AND mr.`createOrgSid` = #{createOrgSid}
- ORDER BY mr.`createTime` DESC
+ AND mr.createOrgSid = #{createOrgSid}
+ ORDER BY mr.createTime DESC
LIMIT 1
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java
index 4810bdeb28..8c7a21b326 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java
@@ -56,24 +56,24 @@ import java.util.List;
@Mapper
public interface BasePurchaseSystemMapper extends BaseMapper {
- //@Update("update base_purchase_system set name=#{msg} where id=#{id}")
- //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
-
- IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
-
- List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
-
- @Select("select * from base_purchase_system")
- List selectListVo();
+ //@Update("update base_purchase_system set name=#{msg} where id=#{id}")
+ //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
- @Select("select * from base_purchase_system where useOrgSid = #{useOrgSid}")
- List fetchDetailsByUseOrgSid(String useOrgSid);
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
- @Select("select * from base_purchase_system where deptSid = #{deptSid}")
- BasePurchaseSystemDetailsVo fetchDetailsByDeptSid(String deptSid);
+ List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
- @Select("select * from base_purchase_system where deptSid = #{deptSid} and sid != #{sid}")
- BasePurchaseSystemDetailsVo fetchDetailsByDeptSidAndSid(@Param("deptSid") String deptSid,@Param("sid") String sid);
+ @Select("select * from base_purchase_system")
+ List selectListVo();
+
+ @Select("select * from base_purchase_system where useOrgSid = #{useOrgSid}")
+ List fetchDetailsByUseOrgSid(String useOrgSid);
+
+ @Select("select * from base_purchase_system where deptSid = #{deptSid}")
+ BasePurchaseSystemDetailsVo fetchDetailsByDeptSid(String deptSid);
+
+ @Select("select * from base_purchase_system where deptSid = #{deptSid} and sid != #{sid}")
+ BasePurchaseSystemDetailsVo fetchDetailsByDeptSidAndSid(@Param("deptSid") String deptSid, @Param("sid") String sid);
List fetchOrgCodeByUseOrgSid(String useOrgSid);
@@ -81,6 +81,9 @@ public interface BasePurchaseSystemMapper extends BaseMapper
List selectByUseOrgSid(String useOrgSid);
- @Update("update base_purchase_system set shareProportion = #{shareProportion} where sid = #{sid}")
- void maintenance(@Param("sid") String sid,@Param("shareProportion") String shareProportion);
+ @Update("update base_purchase_system set shareProportion = #{shareProportion} where sid = #{sid}")
+ void maintenance(@Param("sid") String sid, @Param("shareProportion") String shareProportion);
+
+ @Select("select deptSid from base_purchase_system where purchaseSystemName = #{purchaseSystemName} and useOrgSid = #{useOrgSid}")
+ String selByPurchaseSystemName(@Param("purchaseSystemName") String purchaseSystemName, @Param("useOrgSid") String useOrgSid);
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java
index 191f9e2aa9..05e5b55ae8 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java
@@ -36,83 +36,75 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
-/**
- * Project: anrui-base(采购系统管理)
- * File: BasePurchaseSystemFeignFallback.java
- * Class: com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemRest
- * Description: 采购系统管理表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-01-06 09:27:28
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Api(tags = "采购系统管理表")
-@RestController("com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemRest")
+@RestController
@RequestMapping("v1/basepurchasesystem")
public class BasePurchaseSystemRest implements BasePurchaseSystemFeign {
- @Autowired
- private BasePurchaseSystemService basePurchaseSystemService;
+ @Autowired
+ private BasePurchaseSystemService basePurchaseSystemService;
- @Override
- @ApiOperation("根据条件分页查询数据的列表")
- @PostMapping("/listPage")
- public ResultBean> listPage(@RequestBody PagerQuery pq){
- ResultBean rb = ResultBean.fireFail();
- PagerVo pv = basePurchaseSystemService.listPageVo(pq);
- return rb.success().setData(pv);
- }
+ @Override
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = basePurchaseSystemService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
- @Override
- @ApiOperation("新增或修改")
- @PostMapping("/save")
- public ResultBean save(@RequestBody BasePurchaseSystemDto dto){
- return basePurchaseSystemService.saveOrUpdateDto(dto);
- }
+ @Override
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody BasePurchaseSystemDto dto) {
+ return basePurchaseSystemService.saveOrUpdateDto(dto);
+ }
- @Override
- public ResultBean maintenance(String sid, String shareProportion) {
- return basePurchaseSystemService.maintenance(sid,shareProportion);
- }
+ @Override
+ public ResultBean maintenance(String sid, String shareProportion) {
+ return basePurchaseSystemService.maintenance(sid, shareProportion);
+ }
- @Override
- @ApiOperation("根据sid批量删除")
+ @Override
+ @ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
- public ResultBean delBySids(@RequestBody String[] sids){
- ResultBean rb = ResultBean.fireFail();
- basePurchaseSystemService.delBySids(sids);
- return rb.success();
- }
+ public ResultBean delBySids(@RequestBody String[] sids) {
+ ResultBean rb = ResultBean.fireFail();
+ basePurchaseSystemService.delBySids(sids);
+ return rb.success();
+ }
- @Override
- @ApiOperation("根据SID获取一条记录")
+ @Override
+ @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
- public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
- ResultBean rb = ResultBean.fireFail();
- BasePurchaseSystemDetailsVo vo = basePurchaseSystemService.fetchDetailsVoBySid(sid);
- return rb.success().setData(vo);
- }
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ BasePurchaseSystemDetailsVo vo = basePurchaseSystemService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
- @Override
- public ResultBean> fetchDetailsByUseOrgSid(String useOrgSid) {
- return basePurchaseSystemService.fetchDetailsByUseOrgSid(useOrgSid);
- }
+ @Override
+ public ResultBean> fetchDetailsByUseOrgSid(String useOrgSid) {
+ return basePurchaseSystemService.fetchDetailsByUseOrgSid(useOrgSid);
+ }
- @Override
- public ResultBean> fetchOrgCodeByUseOrgSid(String useOrgSid) {
- return basePurchaseSystemService.fetchOrgCodeByUseOrgSid(useOrgSid);
- }
+ @Override
+ public ResultBean> fetchOrgCodeByUseOrgSid(String useOrgSid) {
+ return basePurchaseSystemService.fetchOrgCodeByUseOrgSid(useOrgSid);
+ }
- @Override
- public ResultBean fetchDetailsByDeptSid(String deptSid) {
- return basePurchaseSystemService.fetchDetailsByDeptSid(deptSid);
- }
+ @Override
+ public ResultBean fetchDetailsByDeptSid(String deptSid) {
+ return basePurchaseSystemService.fetchDetailsByDeptSid(deptSid);
+ }
- @Override
- public ResultBean> fetchDetailsByUseOrgPath(String orgPath) {
- return basePurchaseSystemService.fetchDetailsByUseOrgPath(orgPath);
- }
+ @Override
+ public ResultBean> fetchDetailsByUseOrgPath(String orgPath) {
+ return basePurchaseSystemService.fetchDetailsByUseOrgPath(orgPath);
+ }
+
+ @Override
+ public ResultBean selByPurchaseSystemName(String purchaseSystemName, String useOrgSid) {
+ return basePurchaseSystemService.selByPurchaseSystemName(purchaseSystemName, useOrgSid);
+ }
}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java
index 916c217a20..0f37f382fd 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java
@@ -57,109 +57,115 @@ import java.util.List;
@Service
public class BasePurchaseSystemService extends MybatisBaseService {
- @Autowired
- private SysStaffOrgFeign sysStaffOrgFeign;
-
- private QueryWrapper createQueryWrapper(BasePurchaseSystemQuery 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) {
- BasePurchaseSystemQuery query = pq.getParams();
- QueryWrapper qw = new QueryWrapper<>();
- if (StringUtils.isNotBlank(query.getUseOrgSid())){
- qw.eq("useOrgSid",query.getUseOrgSid());
- }
- if (StringUtils.isNotBlank(query.getPurchaseSystemName())){
- qw.like("purchaseSystemName",query.getPurchaseSystemName());
- }
- IPage page = PagerUtil.queryToPage(pq);
- IPage pagging = baseMapper.selectPageVo(page, qw);
- PagerVo p = PagerUtil.pageToVo(pagging, null);
- return p;
- }
-
- public ResultBean saveOrUpdateDto(BasePurchaseSystemDto dto){
- ResultBean rb = ResultBean.fireFail();
+ @Autowired
+ private SysStaffOrgFeign sysStaffOrgFeign;
+
+ private QueryWrapper createQueryWrapper(BasePurchaseSystemQuery 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) {
+ BasePurchaseSystemQuery query = pq.getParams();
+ QueryWrapper qw = new QueryWrapper<>();
+ if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+ qw.eq("useOrgSid", query.getUseOrgSid());
+ }
+ if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
+ qw.like("purchaseSystemName", query.getPurchaseSystemName());
+ }
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public ResultBean saveOrUpdateDto(BasePurchaseSystemDto dto) {
+ ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
- BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSid(dto.getDeptSid());
- if (basePurchaseSystemDetailsVo == null){
- this.insertByDto(dto);
- return rb.success().setMsg("添加成功");
- }
+ BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSid(dto.getDeptSid());
+ if (basePurchaseSystemDetailsVo == null) {
+ this.insertByDto(dto);
+ return rb.success().setMsg("添加成功");
+ }
return rb.setMsg("该部门下已存在采购系统，请重新选择");
}
- BasePurchaseSystem basePurchaseSystem = fetchBySid(dtoSid);
- if (basePurchaseSystem == null){
- return rb.setMsg("该采购系统信息不存在");
- }
- BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSidAndSid(dto.getDeptSid(), dtoSid);
- if (basePurchaseSystemDetailsVo == null){
- this.updateByDto(dto);
- return rb.success().setMsg("修改成功");
- }
- return rb.setMsg("该部门下已存在采购系统，请重新选择");
- }
-
- public void insertByDto(BasePurchaseSystemDto dto){
- BasePurchaseSystem entity = new BasePurchaseSystem();
- BeanUtil.copyProperties(dto, entity, "id", "sid");
- baseMapper.insert(entity);
- }
-
- public void updateByDto(BasePurchaseSystemDto dto){
- String dtoSid = dto.getSid();
+ BasePurchaseSystem basePurchaseSystem = fetchBySid(dtoSid);
+ if (basePurchaseSystem == null) {
+ return rb.setMsg("该采购系统信息不存在");
+ }
+ BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSidAndSid(dto.getDeptSid(), dtoSid);
+ if (basePurchaseSystemDetailsVo == null) {
+ this.updateByDto(dto);
+ return rb.success().setMsg("修改成功");
+ }
+ return rb.setMsg("该部门下已存在采购系统，请重新选择");
+ }
+
+ public void insertByDto(BasePurchaseSystemDto dto) {
+ BasePurchaseSystem entity = new BasePurchaseSystem();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.insert(entity);
+ }
+
+ public void updateByDto(BasePurchaseSystemDto dto) {
+ String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
- }
- BasePurchaseSystem entity = fetchBySid(dtoSid);
- BeanUtil.copyProperties(dto, entity, "id", "sid");
- baseMapper.updateById(entity);
- }
-
- public BasePurchaseSystemDetailsVo fetchDetailsVoBySid(String sid){
- BasePurchaseSystem entity = fetchBySid(sid);
- BasePurchaseSystemDetailsVo vo = new BasePurchaseSystemDetailsVo();
- BeanUtil.copyProperties(entity, vo);
- return vo;
- }
-
- public ResultBean> fetchDetailsByUseOrgSid(String useOrgSid) {
- ResultBean rb = ResultBean.fireFail();
- List basePurchaseSystemDetailsVos = baseMapper.fetchDetailsByUseOrgSid(useOrgSid);
- return rb.success().setData(basePurchaseSystemDetailsVos);
- }
-
- public ResultBean fetchDetailsByDeptSid(String deptSid) {
- ResultBean rb = ResultBean.fireFail();
- BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSid(deptSid);
- return rb.success().setData(basePurchaseSystemDetailsVo);
- }
-
- public ResultBean> fetchOrgCodeByUseOrgSid(String useOrgSid) {
- ResultBean rb = ResultBean.fireFail();
- List basePurchaseSystemDetailsVos = baseMapper.fetchOrgCodeByUseOrgSid(useOrgSid);
- return rb.success().setData(basePurchaseSystemDetailsVos);
- }
-
- public ResultBean> fetchDetailsByUseOrgPath(String orgPath) {
- ResultBean rb = ResultBean.fireFail();
- String orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
- List basePurchSystemVoList = baseMapper.fetchDetailsByUseOrgPath(orgSid);
- return rb.success().setData(basePurchSystemVoList);
- }
-
- public List selectByUseOrgSid(String useOrgSid) {
- return baseMapper.selectByUseOrgSid(useOrgSid);
- }
-
- public ResultBean maintenance(String sid, String shareProportion) {
- ResultBean rb = ResultBean.fireFail();
- baseMapper.maintenance(sid,shareProportion);
- return rb.success();
- }
+ }
+ BasePurchaseSystem entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public BasePurchaseSystemDetailsVo fetchDetailsVoBySid(String sid) {
+ BasePurchaseSystem entity = fetchBySid(sid);
+ BasePurchaseSystemDetailsVo vo = new BasePurchaseSystemDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+
+ public ResultBean> fetchDetailsByUseOrgSid(String useOrgSid) {
+ ResultBean rb = ResultBean.fireFail();
+ List basePurchaseSystemDetailsVos = baseMapper.fetchDetailsByUseOrgSid(useOrgSid);
+ return rb.success().setData(basePurchaseSystemDetailsVos);
+ }
+
+ public ResultBean fetchDetailsByDeptSid(String deptSid) {
+ ResultBean rb = ResultBean.fireFail();
+ BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSid(deptSid);
+ return rb.success().setData(basePurchaseSystemDetailsVo);
+ }
+
+ public ResultBean> fetchOrgCodeByUseOrgSid(String useOrgSid) {
+ ResultBean rb = ResultBean.fireFail();
+ List basePurchaseSystemDetailsVos = baseMapper.fetchOrgCodeByUseOrgSid(useOrgSid);
+ return rb.success().setData(basePurchaseSystemDetailsVos);
+ }
+
+ public ResultBean> fetchDetailsByUseOrgPath(String orgPath) {
+ ResultBean rb = ResultBean.fireFail();
+ String orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+ List basePurchSystemVoList = baseMapper.fetchDetailsByUseOrgPath(orgSid);
+ return rb.success().setData(basePurchSystemVoList);
+ }
+
+ public List selectByUseOrgSid(String useOrgSid) {
+ return baseMapper.selectByUseOrgSid(useOrgSid);
+ }
+
+ public ResultBean maintenance(String sid, String shareProportion) {
+ ResultBean rb = ResultBean.fireFail();
+ baseMapper.maintenance(sid, shareProportion);
+ return rb.success();
+ }
+
+ public ResultBean selByPurchaseSystemName(String purchaseSystemName, String useOrgSid) {
+ ResultBean rb = ResultBean.fireFail();
+ String purchaseSystemSid = baseMapper.selByPurchaseSystemName(purchaseSystemName, useOrgSid);
+ return rb.success().setData(purchaseSystemSid);
+ }
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java
index dbdd32de0e..15d4541c83 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java
@@ -138,4 +138,7 @@ public interface BaseVehicleBrandMapper extends BaseMapper {
String selectByManufacturerSid(@Param("carBrandSid") String carBrandSid);
List selectByUseOrgSid(String sid);
+
+ @Select("select sid from base_vehicle_brand where brandName=#{brandName}")
+ String selByBrandName(String brandName);
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java
index 7c24b31e80..b8e3f77a29 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java
@@ -189,4 +189,9 @@ public class BaseVehicleBrandRest implements BaseVehicleBrandFeign {
public BaseVehicleBrand fetchBySid(String sid) {
return baseVehicleBrandService.fetchBySid(sid);
}
+
+ @Override
+ public ResultBean selByBrandName(String brandName) {
+ return baseVehicleBrandService.selByBrandName(brandName);
+ }
}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java
index 3a0450cc77..c15dead2f9 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java
@@ -10,6 +10,7 @@ import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.AppResultData;
+import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -256,4 +257,10 @@ public class BaseVehicleBrandService extends MybatisBaseService selectByUseOrgSid(String sid) {
return baseMapper.selectByUseOrgSid(sid);
}
+
+ public ResultBean selByBrandName(String brandName) {
+ ResultBean rb = ResultBean.fireFail();
+ String sid = baseMapper.selByBrandName(brandName);
+ return rb.success().setData(sid);
+ }
}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
index 85184ee4a3..8db454751f 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
@@ -1191,14 +1191,17 @@ public class BusDeliveredApplyService extends MybatisBaseService {
- pushVehRebate(busDeliveredApply, detailsList, solutionsDetailsVo.getFactoryDiscount());
- });
- Future future12 = pool.submit(() -> {
- pushVehRebateAdjustBill(busDeliveredApply, detailsList, solutionsDetailsVo);
- });
+ if(!"0".equals(solutionsDetailsVo.getFactoryDiscount())){
+ if ("2".equals(busSalesOrder.getFinancePlan())) {
+ Future future11 = pool.submit(() -> {
+ pushVehRebate(busDeliveredApply, detailsList, solutionsDetailsVo.getFactoryDiscount());
+ });
+ Future future12 = pool.submit(() -> {
+ pushVehRebateAdjustBill(busDeliveredApply, detailsList, solutionsDetailsVo);
+ });
+ }
}
+
}
}
}
@@ -1680,14 +1683,17 @@ public class BusDeliveredApplyService extends MybatisBaseService {
- pushVehRebate(busDeliveredApply, detailsList, solutionsDetailsVo.getFactoryDiscount());
- });
- Future future12 = pool.submit(() -> {
- pushVehRebateAdjustBill(busDeliveredApply, detailsList, solutionsDetailsVo);
- });
+ if(!"0".equals(solutionsDetailsVo.getFactoryDiscount())){
+ if ("2".equals(busSalesOrder.getFinancePlan())) {
+ Future future11 = pool.submit(() -> {
+ pushVehRebate(busDeliveredApply, detailsList, solutionsDetailsVo.getFactoryDiscount());
+ });
+ Future future12 = pool.submit(() -> {
+ pushVehRebateAdjustBill(busDeliveredApply, detailsList, solutionsDetailsVo);
+ });
+ }
}
+
}
}
}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
index 73d3466595..463deec5bd 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
@@ -746,7 +746,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService> selectSids(@RequestParam("busVehSid") String busVehSid);
- /*-------------------------------------------------------------------------*/
+ /*-----------------------------售后认款申请--------------------------------------------*/
@ApiOperation("售后提交新增保存")
@PostMapping("/asSave")
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index 995492918a..78a21c2f86 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -52,14 +52,19 @@ import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDe
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
-import com.yxt.anrui.crm.api.crmcustomertemp.*;
+import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempDto;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
+import com.yxt.anrui.crm.api.crmcustomertemp.CustomerQuery;
import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
import com.yxt.anrui.fin.api.fincollectionconfirmation.as.*;
import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.*;
-import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto;
-import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
@@ -96,9 +101,6 @@ import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank;
import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankFeign;
import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
-import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyFeign;
-import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyVo;
-import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualrecord.LoanMonthlyAccrualRecord;
import com.yxt.anrui.riskcenter.api.loanpushfundhistory.LoanPushFundHistory;
import com.yxt.anrui.riskcenter.api.loanpushfundhistory.LoanPushFundHistoryFeign;
import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
@@ -106,15 +108,11 @@ import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryFei
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForFundVoucher;
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsFeign;
-import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsForOverDue;
import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule;
import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleFeign;
-import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApply;
import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApplyFeign;
import com.yxt.anrui.riskcenter.api.loansettleapply.SettleFinVo;
-import com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCost;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
-import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDto;
@@ -123,7 +121,10 @@ import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVehDto;
import com.yxt.common.base.config.component.DocPdfComponent;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.*;
+import com.yxt.common.base.utils.HanZiConverterPinYin;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.WordConvertUtils;
+import com.yxt.common.base.utils.WordUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@@ -2205,14 +2206,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService scmVehRebateVehDtos = new ArrayList<>();
- ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto();
- scmVehRebateDto.setCreateBySid(confirmation.getCreateBySid());
- scmVehRebateDto.setRebateTypeKey("029");
- scmVehRebateDto.setRebateTypeValue("金融贴息");
- scmVehRebateDto.setRebateName("金融贴息");
BigDecimal all = BigDecimal.ZERO;
if(loanSolutions.getActualDiscount() != null){
all = all.add(loanSolutions.getActualDiscount());
@@ -2220,33 +2213,44 @@ public class FinCollectionConfirmationService extends MybatisBaseService 0){
+ //推送单车返利管理
+ ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto();
+ List scmVehRebateVehDtos = new ArrayList<>();
+ ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto();
+ scmVehRebateDto.setCreateBySid(confirmation.getCreateBySid());
+ scmVehRebateDto.setRebateTypeKey("029");
+ scmVehRebateDto.setRebateTypeValue("金融贴息");
+ scmVehRebateDto.setRebateName("金融贴息");
+ scmVehRebateDto.setCalculationStandard(all.toString());
+ scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM"));
+ scmVehRebateDto.setCalculationModeKey("002");
+ scmVehRebateDto.setCalculationModeValue("固定金额");
+ scmVehRebateDto.setOrgPath(confirmation.getOrgSidPath());
+ scmVehRebateVehDto.setState("2");
+ scmVehRebateVehDto.setBrandSid(baseVehicle.getCarBrandSid());
+ scmVehRebateVehDto.setBrandName(baseVehicle.getCarBrandName());
+ scmVehRebateVehDto.setVehModelSid(baseVehicle.getModelSid());
+ scmVehRebateVehDto.setVehModelName(baseVehicle.getModelName());
+ scmVehRebateVehDto.setVehSid(baseVehicle.getSid());
+ scmVehRebateVehDto.setVinNo(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8));
+ scmVehRebateVehDto.setManufactorSettlementPrice(baseVehicle.getCostPrice().toString());
+ scmVehRebateVehDto.setFreight(baseVehicle.getFreight().toString());
+ BigDecimal ll = BigDecimal.ZERO;
+ if(loanSolutions.getActualDiscount() != null){
+ ll = ll.add(loanSolutions.getActualDiscount());
+ }
+ if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){
+ ll = ll.add(loanSolutionsOtherpolicy.getOtherActualDiscount());
+ }
+ scmVehRebateVehDto.setEstimateRebate(ll.toString());
+ scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid());
+ scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
+ scmVehRebateVehDtos.add(scmVehRebateVehDto);
+ scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos);
+ scmVehRebateFeign.save(scmVehRebateDto);
}
- scmVehRebateVehDto.setEstimateRebate(ll.toString());
- scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid());
- scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
- scmVehRebateVehDtos.add(scmVehRebateVehDto);
- scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos);
- scmVehRebateFeign.save(scmVehRebateDto);
+
finUncollectedReceivablesDetailed.setReveivableMoney(finSelectedReceivablesDetailed.getSubscriptionMoney().toString());
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
}
@@ -2374,14 +2378,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService scmVehRebateVehDtos = new ArrayList<>();
- ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto();
- scmVehRebateDto.setCreateBySid(confirmation.getCreateBySid());
- scmVehRebateDto.setRebateTypeKey("029");
- scmVehRebateDto.setRebateTypeValue("金融贴息");
- scmVehRebateDto.setRebateName("金融贴息");
BigDecimal all = BigDecimal.ZERO;
if(loanSolutions.getActualDiscount() != null){
all = all.add(loanSolutions.getActualDiscount());
@@ -2389,33 +2385,45 @@ public class FinCollectionConfirmationService extends MybatisBaseService0){
+ //推送单车返利管理
+ ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto();
+ List scmVehRebateVehDtos = new ArrayList<>();
+ ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto();
+ scmVehRebateDto.setCreateBySid(confirmation.getCreateBySid());
+ scmVehRebateDto.setRebateTypeKey("029");
+ scmVehRebateDto.setRebateTypeValue("金融贴息");
+ scmVehRebateDto.setRebateName("金融贴息");
+
+ scmVehRebateDto.setCalculationStandard(all.toString());
+ scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM"));
+ scmVehRebateDto.setCalculationModeKey("002");
+ scmVehRebateDto.setCalculationModeValue("固定金额");
+ scmVehRebateDto.setOrgPath(confirmation.getOrgSidPath());
+ scmVehRebateVehDto.setState("2");
+ scmVehRebateVehDto.setBrandSid(baseVehicle.getCarBrandSid());
+ scmVehRebateVehDto.setBrandName(baseVehicle.getCarBrandName());
+ scmVehRebateVehDto.setVehModelSid(baseVehicle.getModelSid());
+ scmVehRebateVehDto.setVehModelName(baseVehicle.getModelName());
+ scmVehRebateVehDto.setVehSid(baseVehicle.getSid());
+ scmVehRebateVehDto.setVinNo(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8));
+ scmVehRebateVehDto.setManufactorSettlementPrice(baseVehicle.getCostPrice().toString());
+ scmVehRebateVehDto.setFreight(baseVehicle.getFreight().toString());
+ BigDecimal ll = BigDecimal.ZERO;
+ if(loanSolutions.getActualDiscount() != null){
+ ll = ll.add(loanSolutions.getActualDiscount());
+ }
+ if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){
+ ll = ll.add(loanSolutionsOtherpolicy.getOtherActualDiscount());
+ }
+ scmVehRebateVehDto.setEstimateRebate(ll.toString());
+ scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid());
+ scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
+ scmVehRebateVehDtos.add(scmVehRebateVehDto);
+ scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos);
+ scmVehRebateFeign.save(scmVehRebateDto);
}
- scmVehRebateVehDto.setEstimateRebate(ll.toString());
- scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid());
- scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
- scmVehRebateVehDtos.add(scmVehRebateVehDto);
- scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos);
- scmVehRebateFeign.save(scmVehRebateDto);
+
finUncollectedReceivablesDetailed.setReveivableMoney(finSelectedReceivablesDetailed.getSubscriptionMoney().toString());
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
}
@@ -5826,6 +5834,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService 0) {
+ if (voucherDetail.getAmount().compareTo(BigDecimal.ZERO) != 0) {
+ Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方
+ dto1.setSummary(voucherDetail.getBankName() + "结清");
+ dto1.setSubjectNo(bankCode);
+ dto1.setDimensionDept(voucherDetail.getDeptCode());
+ dto1.setDimensionCustom(voucherDetail.getCustomerCode());
+ dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
+ resultDetails.add(dto1);
+ }
+ if (voucherDetail.getPaymentCharges().compareTo(BigDecimal.ZERO) != 0) {
Voucher.VoucherResultDetailDto dto0 = new Voucher.VoucherResultDetailDto(); //借方
dto0.setSummary("付款手续费");
dto0.setSubjectNo("6603.03.00");
dto0.setDebit(String.valueOf(voucherDetail.getPaymentCharges()));
resultDetails.add(dto0);
}
- if (voucherDetail.getNoRelief().compareTo(BigDecimal.ZERO) > 0) {
+ if (voucherDetail.getNoRelief().compareTo(BigDecimal.ZERO) != 0) {
Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //借方
dto2.setSummary(voucherDetail.getBankName() + "结清未到期利息不减免");
dto2.setSubjectNo("6002.01.17");
@@ -1678,49 +1680,58 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
dto2.setCredit(String.valueOf(voucherDetail.getNoRelief()));
resultDetails.add(dto2);
}
- if (voucherDetail.getRelief().compareTo(BigDecimal.ZERO) > 0) {
+ if (voucherDetail.getRelief().compareTo(BigDecimal.ZERO) != 0) {
Voucher.VoucherResultDetailDto dto3 = new Voucher.VoucherResultDetailDto(); //借方
dto3.setSummary(voucherDetail.getBankName() + "结清未到期利息减免");
dto3.setSubjectNo("1201.01.00");
dto3.setDimensionDept(voucherDetail.getDeptCode());
- dto1.setDimensionCustom(voucherDetail.getCustomerCode());
+ dto3.setDimensionCustom(voucherDetail.getCustomerCode());
dto3.setCredit(String.valueOf(voucherDetail.getRelief()));
resultDetails.add(dto3);
}
- Voucher.VoucherResultDetailDto dto4 = new Voucher.VoucherResultDetailDto(); //贷方
- dto4.setSummary(voucherDetail.getBankName() + "个贷保证金抵结清款");
- dto4.setSubjectNo("1009.01.00");
- dto4.setDimensionDept(voucherDetail.getDeptCode());
- dto4.setDimensionCustom(voucherDetail.getCustomerCode());
- dto4.setBank("342");
- dto4.setCredit(String.valueOf(voucherDetail.getSubtrahend()));
- resultDetails.add(dto4);
- Voucher.VoucherResultDetailDto dto5 = new Voucher.VoucherResultDetailDto(); //贷方
- dto5.setSummary(voucherDetail.getBankName() + "结清");
- if (voucher.getPayTypeCode().equals("02")) {
- dto5.setSubjectNo("1002.01.00");
- } else if (voucher.getPayTypeCode().equals("01")) {
- dto5.setSubjectNo("1002.02.01");
+ if (voucherDetail.getSubtrahend().compareTo(BigDecimal.ZERO) != 0) {
+ Voucher.VoucherResultDetailDto dto4 = new Voucher.VoucherResultDetailDto(); //贷方
+ dto4.setSummary(voucherDetail.getBankName() + "个贷保证金抵结清款");
+ dto4.setSubjectNo("1009.01.00");
+ dto4.setDimensionDept(voucherDetail.getDeptCode());
+ dto4.setDimensionCustom(voucherDetail.getCustomerCode());
+ dto4.setBank("342");
+ dto4.setCredit(String.valueOf(voucherDetail.getSubtrahend()));
+ resultDetails.add(dto4);
+ }
+
+ if (voucherDetail.getBalance().compareTo(BigDecimal.ZERO) != 0) {
+ Voucher.VoucherResultDetailDto dto5 = new Voucher.VoucherResultDetailDto(); //贷方
+ dto5.setSummary(voucherDetail.getBankName() + "结清");
+ if (voucher.getPayTypeCode().equals("02")) {
+ dto5.setSubjectNo("1002.01.00");
+ } else if (voucher.getPayTypeCode().equals("01")) {
+ dto5.setSubjectNo("1002.02.01");
+ }
+ dto5.setBankAccount(voucher.getBankAccount());
+ dto5.setCredit(String.valueOf(voucherDetail.getBalance()));
+ resultDetails.add(dto5);
}
- dto5.setBankAccount(voucher.getBankAccount());
- dto5.setCredit(String.valueOf(voucherDetail.getBalance()));
- resultDetails.add(dto5);
+
} else {
- Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方
- dto1.setSummary(voucherDetail.getBankName() + "结清");
- dto1.setSubjectNo(bankCode);
- dto1.setDimensionDept(voucherDetail.getDeptCode());
- dto1.setDimensionCustom(voucherDetail.getCustomerCode());
- dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
- resultDetails.add(dto1);
- if (voucherDetail.getPaymentCharges().compareTo(BigDecimal.ZERO) > 0) {
+ if (voucherDetail.getAmount().compareTo(BigDecimal.ZERO) != 0) {
+ Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方
+ dto1.setSummary(voucherDetail.getBankName() + "结清");
+ dto1.setSubjectNo(bankCode);
+ dto1.setDimensionDept(voucherDetail.getDeptCode());
+ dto1.setDimensionCustom(voucherDetail.getCustomerCode());
+ dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
+ resultDetails.add(dto1);
+ }
+
+ if (voucherDetail.getPaymentCharges().compareTo(BigDecimal.ZERO) != 0) {
Voucher.VoucherResultDetailDto dto0 = new Voucher.VoucherResultDetailDto(); //借方
dto0.setSummary("付款手续费");
dto0.setSubjectNo("6603.03.00");
dto0.setDebit(String.valueOf(voucherDetail.getPaymentCharges()));
resultDetails.add(dto0);
}
- if (voucherDetail.getNoRelief().compareTo(BigDecimal.ZERO) > 0) {
+ if (voucherDetail.getNoRelief().compareTo(BigDecimal.ZERO) != 0) {
Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //借方
dto2.setSummary(voucherDetail.getBankName() + "结清未到期利息不减免");
dto2.setSubjectNo("6002.01.17");
@@ -1728,7 +1739,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
dto2.setCredit(String.valueOf(voucherDetail.getNoRelief()));
resultDetails.add(dto2);
}
- if (voucherDetail.getRelief().compareTo(BigDecimal.ZERO) > 0) {
+ if (voucherDetail.getRelief().compareTo(BigDecimal.ZERO) != 0) {
Voucher.VoucherResultDetailDto dto3 = new Voucher.VoucherResultDetailDto(); //借方
dto3.setSummary(voucherDetail.getBankName() + "结清未到期利息减免");
dto3.setSubjectNo("1201.01.00");
@@ -1737,16 +1748,18 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
dto3.setCredit(String.valueOf(voucherDetail.getRelief()));
resultDetails.add(dto3);
}
- Voucher.VoucherResultDetailDto dto4 = new Voucher.VoucherResultDetailDto(); //贷方
- dto4.setSummary(voucherDetail.getBankName() + "结清");
- if (voucher.getPayTypeCode().equals("02")) {
- dto4.setSubjectNo("1002.01.00");
- } else if (voucher.getPayTypeCode().equals("01")) {
- dto4.setSubjectNo("1002.02.01");
+ if (voucherDetail.getBalance().compareTo(BigDecimal.ZERO) != 0) {
+ Voucher.VoucherResultDetailDto dto4 = new Voucher.VoucherResultDetailDto(); //贷方
+ dto4.setSummary(voucherDetail.getBankName() + "结清");
+ if (voucher.getPayTypeCode().equals("02")) {
+ dto4.setSubjectNo("1002.01.00");
+ } else if (voucher.getPayTypeCode().equals("01")) {
+ dto4.setSubjectNo("1002.02.01");
+ }
+ dto4.setBankAccount(voucher.getBankAccount());
+ dto4.setCredit(String.valueOf(voucherDetail.getBalance()));
+ resultDetails.add(dto4);
}
- dto4.setBankAccount(voucher.getBankAccount());
- dto4.setCredit(String.valueOf(voucherDetail.getBalance()));
- resultDetails.add(dto4);
}
}
newVoucher.setResultDetails(resultDetails);
diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowapprover/FlowApprover.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowapprover/FlowApprover.java
new file mode 100644
index 0000000000..d111bd2c1c
--- /dev/null
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowapprover/FlowApprover.java
@@ -0,0 +1,23 @@
+package com.yxt.anrui.flowable.api.flowapprover;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/2/20
+ **/
+@Data
+public class FlowApprover extends BaseEntity {
+ private static final long serialVersionUID = 8140464420543873852L;
+ @ApiModelProperty("申请sid")
+ private String businessSid;
+ @ApiModelProperty("序号")
+ private Integer sortNo;
+ @ApiModelProperty("审批人sid")
+ private String approverSid;
+ @ApiModelProperty("审批人名称")
+ private String approverName;
+}
diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowapprover/FlowApproverDto.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowapprover/FlowApproverDto.java
new file mode 100644
index 0000000000..2d7597af72
--- /dev/null
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowapprover/FlowApproverDto.java
@@ -0,0 +1,20 @@
+package com.yxt.anrui.flowable.api.flowapprover;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/2/20
+ **/
+@Data
+public class FlowApproverDto {
+
+ @ApiModelProperty("申请sid")
+ private String businessSid;
+ @ApiModelProperty("审批人sid")
+ private List approverSidList;
+}
diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowcc/FlowCc.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowcc/FlowCc.java
new file mode 100644
index 0000000000..24f6e3810a
--- /dev/null
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowcc/FlowCc.java
@@ -0,0 +1,21 @@
+package com.yxt.anrui.flowable.api.flowcc;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/2/20
+ **/
+@Data
+public class FlowCc extends BaseEntity {
+ private static final long serialVersionUID = -4299550952719113083L;
+ @ApiModelProperty("申请sid")
+ private String businessSid;
+ @ApiModelProperty("抄送人sids")
+ private String ccSids;
+ @ApiModelProperty("抄送人名称")
+ private String ccNames;
+}
diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
index d21fdf8daa..c5de7f4850 100644
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
@@ -38,10 +38,10 @@ public enum ProcDefEnum {
QKBUSDELIVEREDAPPLY("欠款出库申请", "process_161otrwo:3:7192504"),
BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"),
BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"),
- SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:4:16412508"),
- SCMVEHREBATECHECKAPPLY("单车返利核对申请", "process_3xtbbru8:4:16412512"),
- SCMSPECIALREBATEWITHAPPLY("专项返利预提申请", "process_l0yxpgs2:4:16412520"),
- SCMSPECIALREBATECHECKAPPLY("专项返利核对申请", "process_qw22vupn:4:16412516"),
+ SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:5:17935004"),
+ SCMVEHREBATECHECKAPPLY("单车返利核对申请", "process_3xtbbru8:5:17935008"),
+ SCMSPECIALREBATEWITHAPPLY("专项返利预提申请", "process_l0yxpgs2:5:17935012"),
+ SCMSPECIALREBATECHECKAPPLY("专项返利核对申请", "process_qw22vupn:5:17935016"),
SCMSPECIALREBATECHEDISTRIBUTE("专项返利分配申请", "process_h3w1aval:4:16412524"),
SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:4:16412532"),
SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:4:16412528"),
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 cb7e2ce5b3..e0628875e7 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
@@ -95,8 +95,6 @@ public class Flow3Service extends MybatisBaseService {
private MessageFeign messageFeign;
@Autowired
private SysFlowccFeign sysFlowccFeign;
- @Autowired
- private ProcessEngine processEngine;
public ResultBean businessStartProcessInstanceById(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
@@ -146,6 +144,8 @@ public class Flow3Service extends MybatisBaseService {
String id_ = "";
String name_ = "";
String task_def_key_ = "";
+ //设置是否是管理员自动审批，默认否
+ boolean adminContains = false;
//查询当前实例的最新待办任务
List tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
if (StringUtils.isBlank(nextNodeUserSids)) {
@@ -168,6 +168,21 @@ public class Flow3Service extends MybatisBaseService {
taskService.setVariablesLocal(id_, variables);
}
}
+ tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
+ //遍历待办任务
+ 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)) {
+ if(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId().equals(task2.getAssignee())){
+ adminContains = true;
+ break;
+ }
+ }
+ }
} else {
Task task2 = tasks.get(0);
id_ = task2.getId();
@@ -179,8 +194,10 @@ public class Flow3Service extends MybatisBaseService {
taskService.setVariablesLocal(id_, variables);
}
+
+
//提交前传入下一环节待办人
- if (ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId().equals(nextNodeUserSids)) {
+ if (ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId().equals(nextNodeUserSids) || adminContains) {
return handleAutomaticApproval(bv, task, id_, task_def_key_, variables, variablesSeconds, processDefinition);
}
// 如果申请人与下一环节审批人相同，则自动审批
@@ -301,6 +318,22 @@ public class Flow3Service extends MybatisBaseService {
nodeState = task2.getName();
taskDefKey = task2.getTaskDefinitionKey();
}
+ tasks = taskService.createTaskQuery().processInstanceId(instanceId).list();
+ //遍历待办任务
+ for (int i = 0; i < tasks.size(); i++) {
+ Task task2 = tasks.get(i);
+ isMultiInstanceTask = isMultiInstanceTask(task2);
+ vo.setTaskId(task2.getId());
+ nodeState = task2.getName();
+ taskDefKey = task2.getTaskDefinitionKey();
+ if ("会签任务".equals(isMultiInstanceTask) || "或签任务".equals(isMultiInstanceTask)) {
+ if(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId().equals(task2.getAssignee())){
+ nextUserSid = ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId();
+ adminContains = true;
+ break;
+ }
+ }
+ }
} else {
nodeState = FlowComment.SETTLE.getRemark();
taskDefKey = "Event_end";
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Mapper.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Mapper.java
new file mode 100644
index 0000000000..a2c0a120ba
--- /dev/null
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Mapper.java
@@ -0,0 +1,18 @@
+package com.yxt.anrui.flowable.biz.flow4;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.flowable.api.flow.Flowable;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/2/20
+ **/
+@Mapper
+public interface Flow4Mapper extends BaseMapper {
+
+ List selectByProcInstId(String instanceId);
+}
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Mapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Mapper.xml
new file mode 100644
index 0000000000..457aa52e23
--- /dev/null
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Mapper.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Rest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Rest.java
new file mode 100644
index 0000000000..658a5b531d
--- /dev/null
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Rest.java
@@ -0,0 +1,112 @@
+package com.yxt.anrui.flowable.biz.flow4;
+
+import cn.hutool.core.bean.BeanUtil;
+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.flowcc.FlowCc;
+import com.yxt.anrui.flowable.biz.flow2.FlowRest;
+import com.yxt.anrui.flowable.feign.form.MessageFlowVo;
+import com.yxt.anrui.flowable.feign.form.MessageFlowableQuery;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.portal.api.sysflowcc.SysFlowccVo;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.portal.api.sysuser.UserByRolesAndOrgQuery;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.result.ResultBean;
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
+import org.flowable.task.api.history.HistoricTaskInstance;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+import java.util.concurrent.*;
+
+/**
+ * @description: 通用审批
+ * @author: dimengzhe
+ * @date: 2025/2/20
+ **/
+@RestController
+@RequestMapping("v4/flow")
+public class Flow4Rest {
+
+ Logger log = LoggerFactory.getLogger(FlowRest.class);
+
+ @Autowired
+ private Flow4Service flowService;
+
+ @PostMapping("/startProcess")
+ public ResultBean startProcess(@RequestBody BusinessVariables bv) {
+ ResultBean rb = ResultBean.fireFail();
+ //获取表单中的参数
+ Map formVariables = bv.getFormVariables();
+ formVariables = formVariables == null ? new HashMap<>() : formVariables;
+ //发起人的组织全路径
+ String orgPath = bv.getOrgSidPath();
+ formVariables.put("createrOrgPath", orgPath);
+ formVariables.put("businessSid", bv.getBusinessSid());
+
+ //启动流程实例
+ ResultBean startResultBean = flowService.businessStartProcessInstanceById(bv);
+ return startResultBean;
+ }
+
+ @PostMapping("/submit2")
+ ResultBean submit2() {
+ ResultBean rb = ResultBean.fireFail();
+ List userIds = new ArrayList<>();
+ userIds.add("1d85d1fe-e527-4ec5-a5e4-c37a76a36518");
+ userIds.add("64e289bc-80cd-487a-9498-5ae61e260f71");
+ userIds.add("7ffcd76a-4fa0-4c9c-87ca-a0c2116bb2ed");
+
+ Map variables = new HashMap<>();
+ variables.put("approvers", userIds);
+ BusinessVariables bv = new BusinessVariables();
+ bv.setFormVariables(variables);
+ bv.setModelId("process_wj9q4vwi:1:17170004");
+ bv.setUserSid("7f56f6ec-4a5f-47b0-aaab-158d64cb97b1");
+ //启动流程
+ ResultBean voResultBean = startProcess(bv);
+ System.out.println("voResultBean{}" + voResultBean);
+ return voResultBean;
+ }
+
+ public ResultBean handleProsess(BusinessVariables bv) {
+ ResultBean rb = ResultBean.fireFail();
+ ResultBean updateFlowFieldVoResultBean = flowService.handleProsess(bv, true);
+ //添加抄送
+ log.info("流程返回：{}", JSONObject.toJSONString(updateFlowFieldVoResultBean));
+ //需要判断办结后再执行 TODO
+ if (updateFlowFieldVoResultBean.getSuccess()) {
+ log.info("流程返回：{}", JSONObject.toJSONString(updateFlowFieldVoResultBean));
+ if ("Event_end".equals(updateFlowFieldVoResultBean.getData().getTaskDefKey())) {
+ 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(() -> {
+ HashMap map = new HashMap<>();
+ map.put("bv", bv);
+ UpdateFlowFieldVo ufVo = updateFlowFieldVoResultBean.getData();
+ ufVo.setTaskId(bv.getTaskId());
+ map.put("uff", ufVo);
+ flowService.cc(map, bv.getTaskDefKey());
+ });
+ } catch (Exception e) {
+ e.printStackTrace();
+ return rb.setMsg("抄送失败");
+ }
+ }
+ }
+ return updateFlowFieldVoResultBean;
+ }
+}
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Service.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Service.java
new file mode 100644
index 0000000000..e576886108
--- /dev/null
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Service.java
@@ -0,0 +1,449 @@
+package com.yxt.anrui.flowable.biz.flow4;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.yxt.anrui.flowable.api.flow.Flowable;
+import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.api.flowapprover.FlowApprover;
+import com.yxt.anrui.flowable.api.flowapprover.FlowApproverDto;
+import com.yxt.anrui.flowable.api.flowcc.FlowCc;
+import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
+import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
+import com.yxt.anrui.flowable.api.processcomment.ProcessCommentDto;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.biz.flow2.FlowMapper;
+import com.yxt.anrui.flowable.biz.flowapprover.FlowApproverService;
+import com.yxt.anrui.flowable.biz.flowcc.FlowCcService;
+import com.yxt.anrui.flowable.biz.flowtask.FlowTaskService;
+import com.yxt.anrui.flowable.biz.process.ProcessService;
+import com.yxt.anrui.flowable.biz.processcomment.ProcessCommentService;
+import com.yxt.anrui.flowable.common.ProcessConstants;
+import com.yxt.anrui.flowable.feign.MessageFeign;
+import com.yxt.anrui.flowable.feign.form.MessageFlowVo;
+import com.yxt.anrui.flowable.feign.form.MessageFlowableQuery;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigFeign;
+import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigQuery;
+import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigVvo;
+import com.yxt.anrui.portal.api.sysflowcc.SysFlowccFeign;
+import com.yxt.anrui.portal.api.sysflowcc.SysFlowccVo;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.portal.api.sysuser.UserByRolesAndOrgQuery;
+import com.yxt.anrui.portal.api.sysuser.UserssQuery;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.result.ResultBean;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.bpmn.model.BpmnModel;
+import org.flowable.bpmn.model.FlowElement;
+import org.flowable.bpmn.model.UserTask;
+import org.flowable.common.engine.impl.identity.Authentication;
+import org.flowable.engine.*;
+import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.flowable.engine.runtime.ProcessInstance;
+import org.flowable.task.api.DelegationState;
+import org.flowable.task.api.Task;
+import org.flowable.task.api.history.HistoricTaskInstance;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/2/20
+ **/
+@Service
+@Slf4j
+public class Flow4Service extends MybatisBaseService {
+
+ @Autowired
+ RepositoryService repositoryService;
+ @Autowired
+ RuntimeService runtimeService;
+
+ @Autowired
+ ManagementService managementService;
+ @Autowired
+ ProcessEngineConfigurationImpl processEngineConfiguration;
+ @Autowired
+ private SysUserFeign sysUserFeign;
+
+ @Autowired
+ protected IdentityService identityService;
+ @Autowired
+ protected TaskService taskService;
+ @Autowired
+ private SysFlowableConfigFeign sysFlowableConfigFeign;
+ @Autowired
+ private FlowTaskService flowTaskService;
+ @Autowired
+ private ProcessCommentService processCommentService;
+
+ @Autowired
+ protected HistoryService historyService;
+
+ @Autowired
+ private ProcessService processService;
+
+ @Autowired
+ private MessageFeign messageFeign;
+ @Autowired
+ private SysFlowccFeign sysFlowccFeign;
+
+ @Autowired
+ private FlowApproverService flowApproverService;
+ @Autowired
+ private FlowCcService flowCcService;
+
+
+ /**
+ * 启动流程
+ *
+ * @param bv
+ * @return
+ */
+ public ResultBean businessStartProcessInstanceById(BusinessVariables bv) {
+ ResultBean rb = ResultBean.fireFail();
+ UpdateFlowFieldVo updateFlowFieldVo = new UpdateFlowFieldVo();
+ String procDefId = bv.getModelId();
+ String userSid = bv.getUserSid();
+ String nextNodeUserSids = bv.getNextNodeUserSids();
+ Map variables = bv.getFormVariables();
+ // 获取审批人列表
+ List approvers = (List) variables.get("approvers");
+ // 获取抄送人列表
+ List ccList = (List) variables.get("ccList");
+
+
+ //根据流程定义id查询
+ ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(procDefId)
+ .latestVersion().singleResult();
+ if (Objects.nonNull(processDefinition) && processDefinition.isSuspended()) {
+ return rb.setMsg("流程已被挂起,请先激活流程");
+ }
+ // 设置流程发起人Id到流程中
+ ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(userSid);
+ SysUserVo sysUser = sysUserVoResultBean.getData();
+ identityService.setAuthenticatedUserId(sysUser.getSid());
+ variables.put(ProcessConstants.PROCESS_INITIATOR, userSid);
+ variables.put(ProcessConstants.USER_TYPE_ASSIGNEE, userSid);
+ ProcessInstance processInstance = runtimeService.startProcessInstanceById(procDefId, variables);
+ // 给第一步申请人节点设置任务执行人和意见
+ Task task = taskService.createTaskQuery().processInstanceId(processInstance.getProcessInstanceId()).singleResult();
+ if (Objects.nonNull(task)) {
+ taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.START.getType(),
+ sysUser.getName() + "发起流程申请");
+ taskService.setAssignee(task.getId(), userSid);
+ taskService.complete(task.getId(), variables);
+ }
+ assembleFlowApprover(bv);
+ //查询当前实例的最新待办任务
+ List tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
+ task = tasks.get(0);
+ Integer sortNo = sortNo(procDefId, task.getTaskDefinitionKey());
+ System.out.println("获取环节序号================" + sortNo);
+ String approverSid = flowApproverService.selectApproverSid(bv.getBusinessSid(), sortNo);
+ String id_ = task.getId();
+ String task_def_key_ = task.getTaskDefinitionKey();
+ String nodeState = task.getName();
+ //查询下一环节是否有转办并添加评论
+ nextNodeUserSids = change(approverSid, processInstance.getProcessInstanceId());
+ taskService.setAssignee(id_, nextNodeUserSids);
+ taskService.setVariablesLocal(id_, variables);
+ updateFlowFieldVo.setProcInsId(task.getProcessInstanceId());
+ updateFlowFieldVo.setNodeState(nodeState);
+ updateFlowFieldVo.setTaskId(id_);
+ updateFlowFieldVo.setTaskDefKey(task_def_key_);
+ updateFlowFieldVo.setProcDefId(bv.getModelId());
+ updateFlowFieldVo.setSid(bv.getBusinessSid());
+ updateFlowFieldVo.setName(processDefinition.getName());
+ return rb.success().setData(updateFlowFieldVo).setMsg("流程启动成功");
+ }
+
+ /**
+ * 查询下一环节用户是否有转办用户，若有转办用户则添加转办评论
+ *
+ * @param nextNodeUserSids 下一环节用户
+ * @param instanceId 实例id
+ * @return
+ */
+ public String change(String nextNodeUserSids, String instanceId) {
+ //查询下一环节是否有转办
+ String firstSid = "";
+ String firstName = "";
+ //默认无转办
+ boolean isChange = false;
+ if (StringUtils.isNotBlank(nextNodeUserSids)) {
+ List nextUserList = Arrays.asList(nextNodeUserSids.split(","));
+ if (nextUserList.size() == 1) {
+ firstSid = nextUserList.get(0);
+ ResultBean userVoResultBean = sysUserFeign.fetchBySid(firstSid);
+ if (userVoResultBean.getData() != null) {
+ firstName = userVoResultBean.getData().getName();
+ }
+ SysFlowableConfigQuery sysFlowableConfigQuery = new SysFlowableConfigQuery();
+ sysFlowableConfigQuery.setUserSid(firstSid);
+ sysFlowableConfigQuery.setNowDate(new Date());
+ ResultBean sysFlowableConfigVvoResultBean = sysFlowableConfigFeign.selectByUserSid(sysFlowableConfigQuery);
+ if (sysFlowableConfigVvoResultBean.getData() != null) {
+ if (StringUtils.isNotBlank(sysFlowableConfigVvoResultBean.getData().getChangeUserSid())) {
+ nextNodeUserSids = sysFlowableConfigVvoResultBean.getData().getChangeUserSid();
+ isChange = true;
+ }
+ }
+ }
+ }
+ if (isChange) {//添加评论
+ ResultBean userVoResultBean = sysUserFeign.fetchBySid(nextNodeUserSids);
+ ProcessCommentDto processCommentDto = new ProcessCommentDto();
+ processCommentDto.setReviewerSid(firstSid);
+ if (userVoResultBean.getData() != null) {
+ String changeName = userVoResultBean.getData().getName();
+ processCommentDto.setReviewer(firstName);
+ processCommentDto.setContent("交" + changeName + "转办");
+ }
+ processCommentDto.setTime(new Date());
+ processCommentDto.setProcessId(instanceId);
+ processCommentService.saveOrUpdateDto(processCommentDto);
+ }
+ return nextNodeUserSids;
+ }
+
+ public Integer sortNo(String proDefId, String taskDefKey) {
+ // 获取所有 UserTask，并以 Map 形式存储环节位置
+ Map taskKeyToPositionMap = new HashMap<>();
+ // 获取流程定义的 BPMN 模型
+ BpmnModel bpmnModel = repositoryService.getBpmnModel(proDefId);
+ // 使用 Stream API 遍历流程元素并缓存顺序
+ List userTasks = bpmnModel.getProcesses().stream()
+ .flatMap(process -> process.getFlowElements().stream()) // 遍历所有流程
+ .filter(flowElement -> flowElement instanceof UserTask) // 只筛选 UserTask
+ .map(flowElement -> (UserTask) flowElement)
+ .collect(Collectors.toList());
+
+ // 将 UserTask 的 key 和位置映射到 Map 中
+ int position = 1;
+ for (UserTask userTask : userTasks) {
+ taskKeyToPositionMap.put(userTask.getId(), position++);
+ }
+ Integer taskPosition = taskKeyToPositionMap.get(taskDefKey);
+
+ return taskPosition;
+ }
+
+ public void assembleFlowApprover(BusinessVariables bv) {
+ Map variables = bv.getFormVariables();
+ // 获取审批人列表
+ List approvers = (List) variables.get("approvers");
+ // 获取抄送人列表
+ List ccList = (List) variables.get("ccList");
+ if (approvers != null) {
+ FlowApproverDto flowApproverDto = new FlowApproverDto();
+ flowApproverDto.setBusinessSid(bv.getBusinessSid());
+ flowApproverDto.setApproverSidList(approvers);
+ ResultBean resultBean = flowApproverService.saveFlowApprover(flowApproverDto);
+ }
+
+ if (ccList != null) {
+ String ccSids = String.join(",", ccList);
+ ResultBean> listResultBean = sysUserFeign.fetchBySids(ccSids);
+ List ccNameList = listResultBean.getData().stream().map(v -> v.getName()).collect(Collectors.toList());
+ // 将 List 转换为逗号分隔的字符串
+ String result = String.join(",", ccNameList);
+ FlowCc flowCc = new FlowCc();
+ flowCc.setBusinessSid(bv.getBusinessSid());
+ flowCc.setCcSids(ccSids);
+ flowCc.setCcNames(result);
+ flowCcService.insertFlowCc(flowCc);
+ }
+
+ }
+
+ /**
+ * 办理
+ *
+ * @param bv
+ * @param b
+ * @return
+ */
+ public ResultBean handleProsess(BusinessVariables bv, boolean b) {
+ ResultBean rb = ResultBean.fireFail();
+ UpdateFlowFieldVo vo = new UpdateFlowFieldVo();
+ //获取表单中的参数
+ Map formVariables = bv.getFormVariables();
+ formVariables = formVariables == null ? new HashMap<>() : formVariables;
+ formVariables.put("businessSid", bv.getBusinessSid());
+ String nextUserSid = bv.getNextNodeUserSids();
+ String taskId = bv.getTaskId();
+ String userSid = bv.getUserSid();
+ String instanceId = bv.getInstanceId();
+ String comment = bv.getComment();
+ String nodeState = "";
+ String taskDefKey = "";
+ String orgPath = bv.getOrgSidPath();
+ //查询任务id为taskId的任务是否存在
+ Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+ if (Objects.isNull(task)) {
+ return rb.setMsg("任务不存在");
+ }
+ String assignee = task.getAssignee();
+ if (b && (StringUtils.isNotBlank(assignee) && assignee.indexOf(userSid) < 0)) {
+ return rb.setMsg("当前用户不是环节的待办人，不能进行办理操作!");
+ }
+ if (DelegationState.PENDING.equals(task.getDelegationState())) {
+ //加签
+ Authentication.setAuthenticatedUserId(userSid);
+ taskService.addComment(taskId, instanceId,
+ FlowComment.DELEGATE.getType(), comment);
+ taskService.resolveTask(taskId, formVariables);
+ nodeState = task.getName();
+ taskDefKey = task.getTaskDefinitionKey();
+ } else {
+ //当前环节办理通过，且将下一环节用户放入流程中
+ taskService.addComment(taskId, instanceId, FlowComment.NORMAL.getType(), comment);
+ log.error("taskid:{}，userSid:{}", taskId, userSid);
+ log.error("formVariables:{}", JSON.toJSONString(formVariables));
+ taskService.setAssignee(taskId, userSid);
+ taskService.complete(taskId, formVariables);//当前用户办理通过
+ //查询当前实例的最新待办任务
+ List tasks = taskService.createTaskQuery().processInstanceId(bv.getInstanceId()).list();
+ if (tasks.size() > 0) {
+ task = tasks.get(0);
+ Integer sortNo = sortNo(bv.getModelId(), task.getTaskDefinitionKey());
+ System.out.println("获取环节序号================" + sortNo);
+ String approverSid = flowApproverService.selectApproverSid(bv.getBusinessSid(), sortNo);
+ String id_ = task.getId();
+ //查询下一环节用户是否有转办人
+ nextUserSid = change(approverSid, bv.getInstanceId());
+ taskService.setAssignee(id_, nextUserSid);//将下一环节用户放入流程中
+ vo.setTaskId(id_);
+ //在act_ru_variable表中增加环节上的业务参数的变量
+ taskService.setVariablesLocal(id_, formVariables);
+ nodeState = task.getName();
+ taskDefKey = task.getTaskDefinitionKey();
+
+ } else {
+ nodeState = FlowComment.SETTLE.getRemark();
+ taskDefKey = "Event_end";
+ vo.setNodeState(FlowComment.SETTLE.getRemark());
+ }
+ }
+ vo.setProcInsId(instanceId);
+ vo.setProcDefId(bv.getModelId());
+ vo.setNodeState(nodeState);
+ vo.setTaskDefKey(taskDefKey);
+ vo.setSid(bv.getBusinessSid());
+ return rb.success().setData(vo);
+ }
+
+ /**
+ * 流程抄送的功能
+ *
+ * @param map
+ * @return
+ */
+ public ResultBean cc(Map map, String taskDefKey) {
+ ResultBean rb = ResultBean.fireFail();
+ log.info("FlowableRest-cc:{}", JSONObject.toJSONString(map));
+ Object bv1 = map.get("bv");
+ BusinessVariables bv = new BusinessVariables();
+ BeanUtil.copyProperties(bv1, bv);
+ Object uff1 = map.get("uff");
+ UpdateFlowFieldVo uff = new UpdateFlowFieldVo();
+ BeanUtil.copyProperties(uff1, uff);
+ uff.setTaskDefKey(taskDefKey);
+ StringBuilder userSids = new StringBuilder();
+ StringBuilder userName = new StringBuilder();
+ FlowCc flowCc = flowCcService.selectByBusinessSid(bv.getBusinessSid());
+ if(flowCc != null){
+ userSids = new StringBuilder(flowCc.getCcSids());
+ userName = new StringBuilder(flowCc.getCcNames());
+ }
+
+ //抄送的业务逻辑
+ MessageFlowableQuery mfq = new MessageFlowableQuery();
+ MessageFlowVo messageFlowVo = new MessageFlowVo();
+ BeanUtil.copyProperties(uff, messageFlowVo);
+ mfq.setUfVo(messageFlowVo);
+ //移动端的参数
+ HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery()
+ .includeProcessVariables().taskId(bv.getTaskId()).singleResult();
+ if (historicTaskInstance == null) {
+ log.info("抄送失败：没有获取到业务参数!");
+ return rb.setMsg("抄送失败！");
+ }
+ Map processVariables = historicTaskInstance.getProcessVariables();
+ String createrOrgPath = (String) processVariables.get("createrOrgPath");
+ if (historicTaskInstance == null) {
+ log.info("抄送失败：没有获取到业务参数!");
+ return rb.setMsg("抄送失败！");
+ }
+ //
+ String assignee = (String) processVariables.get("assignee");
+ ResultBean stringResultBean = sysUserFeign.fetchBySid(assignee);
+ String assigneeName = "";
+ if (stringResultBean.getData() != null) {
+ assigneeName = stringResultBean.getData().getName();
+ }
+
+ Map app = new HashMap<>();
+ if (processVariables.get("app") != null) {
+ app = (Map) processVariables.get("app");
+ }
+ log.info("抄送方法-historicTaskInstance:{}", JSONObject.toJSONString(historicTaskInstance));
+ mfq.setAppMap(app);
+ mfq.setBusinessSid(bv.getBusinessSid());
+ mfq.setMsgContent(assigneeName + "抄送的流程审批,请查看");
+// act_re_procdef
+ Map process = processService.getProcessDefByDefId(historicTaskInstance.getProcessDefinitionId());
+ log.info("抄送成功-process:{}", process);
+ if (process == null) {
+ log.info("抄送失败，流程定义不存在!");
+ return rb.setMsg("抄送失败，流程定义不存在！");
+ }
+ mfq.setModuleName(process.get("NAME_"));
+ if (processVariables.containsKey("orderNames")) {
+ mfq.setMsgTitle(processVariables.get("orderNames").toString());
+ } else {
+ mfq.setMsgTitle(process.get("NAME_"));
+ }
+ if (processVariables.containsKey("sendRecommendSid")) {//增加的其他的抄送人
+ userSids.append(processVariables.get("sendRecommendSid").toString()).append(",");
+ }
+ //查询是否有设置转办的，抄送给设置转办人员
+ List zbUserSids = processCommentService.selectByIdAndComment("转办", bv.getInstanceId());
+ zbUserSids.removeAll(Collections.singleton(null));
+ if (!zbUserSids.isEmpty()) {
+ String zbUser = String.join(",", zbUserSids);
+ userSids.append(zbUser).append(",");
+ }
+ userSids.deleteCharAt(userSids.length() - 1);
+ //若抄送的用户已在审批人员中（审批记录中有该用户），则该用户不抄送
+ List taskinstUserSidList = baseMapper.selectByProcInstId(bv.getInstanceId());
+ List uss = Arrays.asList(userSids.toString().split(","));
+ List uniqueList = new ArrayList(new HashSet(uss));
+ uniqueList.removeIf(taskinstUserSidList::contains);
+ String userSidss = String.join(",", uniqueList);
+ mfq.setUserSids(userSidss);
+ mfq.setOrgPath(createrOrgPath);
+ mfq.setUserSid(assignee);
+ mfq.setApplicationName(assigneeName);
+ ResultBean resultBean = messageFeign.pushMessageCC(mfq);
+ log.info("抄送成功:{}", userName.toString());
+ log.info("抄送成功-resultBean:{}", resultBean);
+ if (!resultBean.getSuccess()) {
+ log.info("抄送失败，同送消息异常！:{}", JSONObject.toJSONString(resultBean));
+ return rb.setMsg("抄送失败，同送消息异常！");
+ }
+ return rb.success().setMsg("抄送" + userName.toString() + "成功！");
+ }
+
+}
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverMapper.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverMapper.java
new file mode 100644
index 0000000000..e712aeff93
--- /dev/null
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverMapper.java
@@ -0,0 +1,19 @@
+package com.yxt.anrui.flowable.biz.flowapprover;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.flowable.api.flow.Flowable;
+import com.yxt.anrui.flowable.api.flowapprover.FlowApprover;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/2/20
+ **/
+@Mapper
+public interface FlowApproverMapper extends BaseMapper {
+ String selectApproverSid(@Param("businessSid") String businessSid, @Param("sortNo") Integer sortNo);
+
+ int insertApprover(FlowApprover flowApprover);
+}
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverMapper.xml
new file mode 100644
index 0000000000..71963306b9
--- /dev/null
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverMapper.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+ insert into flow_approver
+
+ sid,
+
+ businessSid,
+
+
+ approverSid,
+
+
+ approverName,
+
+
+ sortNo,
+
+
+
+ UUID(),
+
+ #{businessSid},
+
+
+ #{approverSid},
+
+
+ #{approverName},
+
+
+ #{sortNo},
+
+
+
+
\ No newline at end of file
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverService.java
new file mode 100644
index 0000000000..7d5127d362
--- /dev/null
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverService.java
@@ -0,0 +1,53 @@
+package com.yxt.anrui.flowable.biz.flowapprover;
+
+import com.yxt.anrui.flowable.api.flow.Flowable;
+import com.yxt.anrui.flowable.api.flowapprover.FlowApprover;
+import com.yxt.anrui.flowable.api.flowapprover.FlowApproverDto;
+import com.yxt.anrui.flowable.biz.flow4.Flow4Mapper;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/2/20
+ **/
+@Service
+public class FlowApproverService extends MybatisBaseService {
+
+ @Autowired
+ private SysUserFeign sysUserFeign;
+
+ public ResultBean saveFlowApprover(FlowApproverDto flowApproverDto) {
+ ResultBean rb = ResultBean.fireFail();
+ String businessSid = flowApproverDto.getBusinessSid();
+ List approverSidList = flowApproverDto.getApproverSidList();
+ approverSidList.removeAll(Collections.singleton(null));
+ if (!approverSidList.isEmpty()) {
+ for (int i = 0; i < approverSidList.size(); i++) {
+ FlowApprover flowApprover = new FlowApprover();
+ String approverSid = approverSidList.get(i);
+ Integer sortNo = i + 2;
+ flowApprover.setBusinessSid(businessSid);
+ flowApprover.setApproverSid(approverSid);
+ ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(approverSid);
+ SysUserVo sysUser = sysUserVoResultBean.getData();
+ flowApprover.setApproverName(sysUser.getName());
+ flowApprover.setSortNo(sortNo);
+ baseMapper.insertApprover(flowApprover);
+ }
+ }
+ return rb.success();
+ }
+
+ public String selectApproverSid(String businessSid, Integer sortNo) {
+ return baseMapper.selectApproverSid(businessSid, sortNo);
+ }
+}
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.java
new file mode 100644
index 0000000000..3306cea860
--- /dev/null
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.java
@@ -0,0 +1,18 @@
+package com.yxt.anrui.flowable.biz.flowcc;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.flowable.api.flowapprover.FlowApprover;
+import com.yxt.anrui.flowable.api.flowcc.FlowCc;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/2/20
+ **/
+@Mapper
+public interface FlowCcMapper extends BaseMapper {
+ FlowCc selectByBusinessSid(String businessSid);
+
+ int insertFlowCc(FlowCc flowCc);
+}
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.xml
new file mode 100644
index 0000000000..46dcb001f4
--- /dev/null
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+ insert into flow_cc
+
+ sid,
+
+ businessSid,
+
+
+ ccSids,
+
+
+ ccNames,
+
+
+
+ UUID(),
+
+ #{businessSid},
+
+
+ #{ccSids},
+
+
+ #{ccNames},
+
+
+
+
\ No newline at end of file
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcService.java
new file mode 100644
index 0000000000..8cdecd1f70
--- /dev/null
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcService.java
@@ -0,0 +1,23 @@
+package com.yxt.anrui.flowable.biz.flowcc;
+
+import com.yxt.anrui.flowable.api.flowapprover.FlowApprover;
+import com.yxt.anrui.flowable.api.flowcc.FlowCc;
+import com.yxt.anrui.flowable.biz.flowapprover.FlowApproverMapper;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/2/20
+ **/
+@Service
+public class FlowCcService extends MybatisBaseService {
+ public FlowCc selectByBusinessSid(String businessSid) {
+ return baseMapper.selectByBusinessSid(businessSid);
+ }
+
+ public int insertFlowCc(FlowCc flowCc) {
+ return baseMapper.insertFlowCc(flowCc);
+ }
+}
diff --git a/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongAdd.vue b/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongAdd.vue
index 68222996d7..44763f6624 100644
--- a/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongAdd.vue
+++ b/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongAdd.vue
@@ -22,7 +22,7 @@
-
+
@@ -45,11 +45,11 @@
- *出生年月日
+ 出生日期
-
-
+
+
@@ -59,7 +59,7 @@
-
+
@@ -553,7 +553,8 @@ export default {
// props传值
value: 'sid',
label: 'name',
- children: 'children'
+ children: 'children',
+ checkStrictly: true
},
// 上传图片
// photo_list: [],
@@ -834,6 +835,14 @@ export default {
})
},
+ changeIdNo(value) {
+ if (value.length === 18) {
+ const year = value.substr(6, 4)
+ const month = value.substr(10, 2)
+ const day = value.substr(12, 2)
+ this.temp.birthday = year + '-' + (month >= 10 ? month : '0' + month) + '-' + (day >= 10 ? day : '0' + day)
+ }
+ },
getNational(value) {
console.log('触发下拉框按钮')
let bb = null
diff --git a/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongInfo.vue b/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongInfo.vue
index 9be2fe7653..cd202e2555 100644
--- a/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongInfo.vue
+++ b/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongInfo.vue
@@ -49,7 +49,7 @@
- 出生年月日
+ 出生日期
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java
index 85bb9d5dd8..45002fafdd 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java
@@ -54,9 +54,9 @@ public class AppIndexEnum {
JFKC("a204a3fa-c8ac-4795-966c-df1d0e131bcf", "家访考察"),
FKZLSC("65dc12e0-9213-4364-ae81-18afa9c7e1ee", "放款资料上传"),
DYBL("ab7df5a0-9708-48b1-b58a-60d7e024d0a2", "抵押办理"),
- WXWB("c3a6be91-3e95-4520-b5a7-c805d8f187d7", "维修完毕-售后"),
- SPSJ("781ce38b-b003-4efd-accf-fbee0ca33091", "商品上架-售后"),
- PJJS("37905444-5454-4b08-897d-6c2c089c317d", "配件接收-售后"),
+ WXWB("c3a6be91-3e95-4520-b5a7-c805d8f187d7", "维修完毕"),
+ SPSJ("781ce38b-b003-4efd-accf-fbee0ca33091", "商品上架"),
+ PJJS("37905444-5454-4b08-897d-6c2c089c317d", "配件接收"),
;
/**
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
index 0fd0d3faf2..381c8423a3 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
@@ -624,8 +624,15 @@ public class SysStaffinfoService extends MybatisBaseService 0) {
//根据staffSid查询token
String token = sysUserService.selectByStaffsid(sid).getToken();
- //清空该token
- redisUtil.remove(token);
+ if(StringUtils.isNotBlank(token)){
+ //查询redis中是否包含该token
+ String userName = redisUtil.get(token);
+ if(StringUtils.isNotBlank(userName)){
+ //清空该token
+ redisUtil.remove(token);
+ }
+ }
+
}
return rb.success().setMsg("更新员工信息成功");
}
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml
index 2f582d15a9..c0413d3deb 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml
@@ -481,10 +481,12 @@
#{deptSid},
'%'
)
+
AND st.name LIKE CONCAT(
'%',
#{name},
'%'
)
+
\ 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 abb8a6cdbc..d69fa4a151 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
@@ -286,7 +286,9 @@ public class SysUserRest implements SysUserFeign {
if (i == 0) {
return ResultBean.fireFail().setMsg("修改失败");
}
- redisUtil.remove(token);
+ if(StringUtils.isNotBlank(token)){
+ redisUtil.remove(token);
+ }
return ResultBean.fireSuccess().setMsg("修改成功");
}
diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java
index e0aaef1b58..5a12848c45 100644
--- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java
+++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java
@@ -12,6 +12,7 @@ import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
+import java.util.Map;
/**
* @description:
@@ -41,8 +42,10 @@ public interface DailyReportMapper extends BaseMapper {
String select3(@Param("busOrgSid") String busOrgSid, @Param("brandSid") String brandSid, @Param("vehModelSid") String vehModelSid, @Param("vehMConfigSid") String vehMConfigSid, @Param("createTime") String createTime);
List selectByBrand(@Param("sybOrgSid") String sybOrgSid, @Param("queryTime") String queryTime);
+ List selectByBrandNew(@Param("sybOrgSid") String sybOrgSid, @Param("startDate") String startDate,@Param("endDate") String endDate);
List selectReport(@Param("join") List brandList, @Param("sybOrgSid") String sybOrgSid, @Param("queryTime") String queryTime);
+ List selectReportNew(@Param("join") List brandList, @Param("sybOrgSid") String sybOrgSid, @Param("startDate") String startDate,@Param("endDate") String endDate);
IPage pageList1(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
IPage pageList2(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
@@ -50,14 +53,28 @@ public interface DailyReportMapper extends BaseMapper {
ReportVo getReport(@Param(Constants.WRAPPER) QueryWrapper qw);
List selectReport2(String date);
+ List selectReport2New(@Param("startDate") String startDate,@Param("endDate") String endDate);
List list2(String date);
+ List list2New(@Param("startDate") String startDate,@Param("endDate") String endDate);
List list3(@Param("date") String date, @Param("busOrgSid") String busOrgSid);
+ List list3New(@Param("startDate") String startDate,@Param("endDate") String endDate, @Param("busOrgSid") String busOrgSid);
List selectReport3(@Param("date") String date, @Param("busOrgSid") String busOrgSid);
+ List selectReport3New(@Param("startDate") String startDate,@Param("endDate") String endDate, @Param("busOrgSid") String busOrgSid);
List selectByBrand2(@Param("useOrgSid") String useOrgSid, @Param("date") String date,@Param(Constants.WRAPPER) QueryWrapper qw);
+ List selectByBrand2New(@Param("useOrgSid") String useOrgSid,@Param("startDate") String startDate,@Param("endDate") String endDate,@Param(Constants.WRAPPER) QueryWrapper qw);
List selectReport4(@Param("join") List brandList, @Param("useOrgSid") String useOrgSid, @Param("date") String date,@Param(Constants.WRAPPER) QueryWrapper qw);
+ List selectReport4New(@Param(Constants.WRAPPER) QueryWrapper qw);
+
+ List selectRecordList(@Param("map") Map map, @Param(Constants.WRAPPER)QueryWrapper qw);
+
+ int selectRecordCount(@Param(Constants.WRAPPER)QueryWrapper qw);
+
+ List selectRecordList2(@Param("map") Map map, @Param(Constants.WRAPPER)QueryWrapper qw);
+
+ List selectRecordList3(@Param("map") Map map, @Param(Constants.WRAPPER)QueryWrapper qw);
}
diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
index dabb7578be..e8d1d4abaa 100644
--- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
+++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
@@ -10,111 +10,111 @@
${ew.sqlSegment}
-->
select ifnull(sum(dr.saleOfStockRatio), 0)
- as saleOfStockRatio,
- ifnull(sum(dr.stock_total), 0) as stock_total,
- ifnull(sum(dr.stock_unreserve), 0) as stock_unreserve,
- ifnull(sum(dr.stock_reserve), 0) as stock_reserve,
- ifnull(sum(dr.stock_subtotal), 0) as stock_subtotal,
- ifnull(sum(dr.stock_buyout_unreserve), 0) as stock_buyout_unreserve,
- ifnull(sum(dr.stock_buyout_reserve), 0) as stock_buyout_reserve,
- ifnull(sum(dr.stock_buyout_subtotal), 0) as stock_buyout_subtotal,
- ifnull(sum(dr.pcOrder_unreserve), 0) as pcOrder_unreserve,
- ifnull(sum(dr.pcOrder_reserve), 0) as pcOrder_reserve,
- ifnull(sum(dr.pcOrder_subtotal), 0) as pcOrder_subtotal,
- ifnull(sum(dr.simpleOrder_day), 0) as simpleOrder_day,
- ifnull(sum(dr.simpleOrder_month), 0) as simpleOrder_month,
- ifnull(sum(dr.saleOrder_full_day), 0) as saleOrder_full_day,
- ifnull(sum(dr.saleOrder_loan_day), 0) as saleOrder_loan_day,
- ifnull(sum(dr.saleOrder_subtotal_day), 0) as saleOrder_subtotal_day,
- ifnull(sum(dr.saleOrder_full_month), 0) as saleOrder_full_month,
- ifnull(sum(dr.saleOrder_loan_month), 0) as saleOrder_loan_month,
- ifnull(sum(dr.saleOrder_subtotal_month), 0) as saleOrder_subtotal_month,
- ifnull(sum(dr.saleOrder_waitVeh_total), 0) as saleOrder_waitVeh_total,
- ifnull(sum(dr.sale_full_day), 0) as sale_full_day,
- ifnull(sum(dr.sale_loan_day), 0) as sale_loan_day,
- ifnull(sum(dr.sale_subtotal_day), 0) as sale_subtotal_day,
- ifnull(sum(dr.sale_full_month), 0) as sale_full_month,
- ifnull(sum(dr.sale_loan_month), 0) as sale_loan_month,
- ifnull(sum(dr.sale_subtotal_month), 0) as sale_subtotal_month,
- ifnull(sum(dr.sale_full_year), 0) as sale_full_year,
- ifnull(sum(dr.sale_loan_year), 0) as sale_loan_year,
- ifnull(sum(dr.sale_subtotal_year), 0) as sale_subtotal_year,
- ifnull(sum(dr.manufacturer_invoicing_year), 0) as manufacturer_invoicing_year,
- ifnull(sum(dr.buyout_day), 0) as buyout_day,
- ifnull(sum(dr.buyout_month), 0) as buyout_month,
- ifnull(sum(dr.buyout_year), 0) as buyout_year,
- ifnull(sum(dr.arrears_carry_veh_count), 0) as arrears_carry_veh_count,
- ifnull(sum(dr.arrears_carry_veh_amount), 0) as arrears_carry_veh_amount,
- ifnull(sum(dr.loan_not_count), 0) as loan_not_count,
- ifnull(sum(dr.loan_not_amount), 0) as loan_not_amount,
- ifnull(sum(dr.deliver_loan_day), 0) as deliver_loan_day,
- ifnull(sum(dr.deliver_full_day), 0) as deliver_full_day,
- ifnull(sum(dr.deliver_subtotal_day), 0) as deliver_subtotal_day,
- ifnull(sum(dr.deliver_loan_month), 0) as deliver_loan_month,
- ifnull(sum(dr.deliver_full_month), 0) as deliver_full_month,
- ifnull(sum(dr.deliver_subtotal_month), 0) as deliver_subtotal_month,
- ifnull(sum(dr.deliver_loan_year), 0) as deliver_loan_year,
- ifnull(sum(dr.deliver_full_year), 0) as deliver_full_year,
- ifnull(sum(dr.deliver_subtotal_year), 0) as deliver_subtotal_year,
- ifnull(sum(dr.saleAllToThree), 0) as saleAllToThree
- ,
- ifnull(sum(dr.loan_not_counts), 0) as loan_not_counts,
- ifnull(sum(dr.loan_not_amounts), 0) as loan_not_amounts,
- dr.busOrgName,
- dr.brandName,
- dr.busOrgSid,
- dr.useOrgSid,
- dr.useOrgName,
- dr.remarks,
- bm.vehicleAlias vehModeName,
- bmc.carColor,
- bmc.specification,
- bmc.fuelTank,
- bmc.baffleModel,
- bmc.independentSources,
- bmc.tireCover,
- bmc.saddle,
- bmc.airConditioner,
- bmc.rearAxleRatio,
- bmc.rearAxleValue,
- bmc.tireSize,
- bmc.slowMachine,
- bmc.rearViewMirror,
- bmc.wheelbase,
- bmc.suspension,
- bmc.packingCase,
- bmc.seat,
- bmc.hubMaterial,
- bmc.configuringBao,
- bmc.multimedia,
- bmc.bumper,
- bmc.clutchValue,
- bmc.dirMachineValue,
- bmc.proponsValue,
- bmc.doorAndWindowValue,
- bmc.doorLockValue,
- bmc.headlightValue,
- bmc.boardPedalValue,
- bmc.steerWheelValue,
- bmc.storagBatteryValue,
- bmc.comfortPackValue,
- bmc.cheBasePackValue,
- bmc.savingPackValue,
- bmc.conPackValue,
- bm.vehicleTypeValue,
- bm.emissionStandardValue,
- bm.productLineValue,
- bm.driveFormValue,
- bm.powerValue,
- bm.tranCaseTypeValue,
- bm.gearboxTypeValue,
- bm.fuelTypeValue,
- bm.vehicleVersionValue,
- bm.engineTypeValue,
- bm.specifications
+ as saleOfStockRatio,
+ ifnull(sum(dr.stock_total), 0) as stock_total,
+ ifnull(sum(dr.stock_unreserve), 0) as stock_unreserve,
+ ifnull(sum(dr.stock_reserve), 0) as stock_reserve,
+ ifnull(sum(dr.stock_subtotal), 0) as stock_subtotal,
+ ifnull(sum(dr.stock_buyout_unreserve), 0) as stock_buyout_unreserve,
+ ifnull(sum(dr.stock_buyout_reserve), 0) as stock_buyout_reserve,
+ ifnull(sum(dr.stock_buyout_subtotal), 0) as stock_buyout_subtotal,
+ ifnull(sum(dr.pcOrder_unreserve), 0) as pcOrder_unreserve,
+ ifnull(sum(dr.pcOrder_reserve), 0) as pcOrder_reserve,
+ ifnull(sum(dr.pcOrder_subtotal), 0) as pcOrder_subtotal,
+ ifnull(sum(dr.simpleOrder_day), 0) as simpleOrder_day,
+ ifnull(sum(dr.simpleOrder_month), 0) as simpleOrder_month,
+ ifnull(sum(dr.saleOrder_full_day), 0) as saleOrder_full_day,
+ ifnull(sum(dr.saleOrder_loan_day), 0) as saleOrder_loan_day,
+ ifnull(sum(dr.saleOrder_subtotal_day), 0) as saleOrder_subtotal_day,
+ ifnull(sum(dr.saleOrder_full_month), 0) as saleOrder_full_month,
+ ifnull(sum(dr.saleOrder_loan_month), 0) as saleOrder_loan_month,
+ ifnull(sum(dr.saleOrder_subtotal_month), 0) as saleOrder_subtotal_month,
+ ifnull(sum(dr.saleOrder_waitVeh_total), 0) as saleOrder_waitVeh_total,
+ ifnull(sum(dr.sale_full_day), 0) as sale_full_day,
+ ifnull(sum(dr.sale_loan_day), 0) as sale_loan_day,
+ ifnull(sum(dr.sale_subtotal_day), 0) as sale_subtotal_day,
+ ifnull(sum(dr.sale_full_month), 0) as sale_full_month,
+ ifnull(sum(dr.sale_loan_month), 0) as sale_loan_month,
+ ifnull(sum(dr.sale_subtotal_month), 0) as sale_subtotal_month,
+ ifnull(sum(dr.sale_full_year), 0) as sale_full_year,
+ ifnull(sum(dr.sale_loan_year), 0) as sale_loan_year,
+ ifnull(sum(dr.sale_subtotal_year), 0) as sale_subtotal_year,
+ ifnull(sum(dr.manufacturer_invoicing_year), 0) as manufacturer_invoicing_year,
+ ifnull(sum(dr.buyout_day), 0) as buyout_day,
+ ifnull(sum(dr.buyout_month), 0) as buyout_month,
+ ifnull(sum(dr.buyout_year), 0) as buyout_year,
+ ifnull(sum(dr.arrears_carry_veh_count), 0) as arrears_carry_veh_count,
+ ifnull(sum(dr.arrears_carry_veh_amount), 0) as arrears_carry_veh_amount,
+ ifnull(sum(dr.loan_not_count), 0) as loan_not_count,
+ ifnull(sum(dr.loan_not_amount), 0) as loan_not_amount,
+ ifnull(sum(dr.deliver_loan_day), 0) as deliver_loan_day,
+ ifnull(sum(dr.deliver_full_day), 0) as deliver_full_day,
+ ifnull(sum(dr.deliver_subtotal_day), 0) as deliver_subtotal_day,
+ ifnull(sum(dr.deliver_loan_month), 0) as deliver_loan_month,
+ ifnull(sum(dr.deliver_full_month), 0) as deliver_full_month,
+ ifnull(sum(dr.deliver_subtotal_month), 0) as deliver_subtotal_month,
+ ifnull(sum(dr.deliver_loan_year), 0) as deliver_loan_year,
+ ifnull(sum(dr.deliver_full_year), 0) as deliver_full_year,
+ ifnull(sum(dr.deliver_subtotal_year), 0) as deliver_subtotal_year,
+ ifnull(sum(dr.saleAllToThree), 0) as saleAllToThree
+ ,
+ ifnull(sum(dr.loan_not_counts), 0) as loan_not_counts,
+ ifnull(sum(dr.loan_not_amounts), 0) as loan_not_amounts,
+ dr.busOrgName,
+ dr.brandName,
+ dr.busOrgSid,
+ dr.useOrgSid,
+ dr.useOrgName,
+ dr.remarks,
+ bm.vehicleAlias vehModeName,
+ bmc.carColor,
+ bmc.specification,
+ bmc.fuelTank,
+ bmc.baffleModel,
+ bmc.independentSources,
+ bmc.tireCover,
+ bmc.saddle,
+ bmc.airConditioner,
+ bmc.rearAxleRatio,
+ bmc.rearAxleValue,
+ bmc.tireSize,
+ bmc.slowMachine,
+ bmc.rearViewMirror,
+ bmc.wheelbase,
+ bmc.suspension,
+ bmc.packingCase,
+ bmc.seat,
+ bmc.hubMaterial,
+ bmc.configuringBao,
+ bmc.multimedia,
+ bmc.bumper,
+ bmc.clutchValue,
+ bmc.dirMachineValue,
+ bmc.proponsValue,
+ bmc.doorAndWindowValue,
+ bmc.doorLockValue,
+ bmc.headlightValue,
+ bmc.boardPedalValue,
+ bmc.steerWheelValue,
+ bmc.storagBatteryValue,
+ bmc.comfortPackValue,
+ bmc.cheBasePackValue,
+ bmc.savingPackValue,
+ bmc.conPackValue,
+ bm.vehicleTypeValue,
+ bm.emissionStandardValue,
+ bm.productLineValue,
+ bm.driveFormValue,
+ bm.powerValue,
+ bm.tranCaseTypeValue,
+ bm.gearboxTypeValue,
+ bm.fuelTypeValue,
+ bm.vehicleVersionValue,
+ bm.engineTypeValue,
+ bm.specifications
from daily_report dr
- left join anrui_base.base_vehicle_model bm on bm.sid = dr.vehModelSid
- left join anrui_base.base_model_config bmc on bmc.sid = dr.vehMConfigSid
+ left join anrui_base.base_vehicle_model bm on bm.sid = dr.vehModelSid
+ left join anrui_base.base_model_config bmc on bmc.sid = dr.vehMConfigSid
${ew.sqlSegment}
@@ -122,67 +122,67 @@