Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 3 years ago
parent
commit
72394587f9
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributor.java
  2. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java
  3. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsListQuery.java
  4. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleman.java
  5. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDetailsVo.java
  6. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDto.java
  7. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanQuery.java
  8. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java
  9. 63
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  10. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml
  11. 35
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
  12. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanMapper.xml
  13. 86
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java
  14. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml
  15. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java
  16. 30
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  17. 1
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.xml
  18. 4
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
  19. 5
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java
  20. 9
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempVo.java
  21. 6
      anrui-crm/anrui-crm-biz/pom.xml
  22. 2
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/CrmApplication.java
  23. 6
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
  24. 44
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
  25. 10
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java
  26. 10
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java
  27. 7
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdcustomer/BdCustomer.java
  28. 18
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
  29. 20
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java
  30. 16
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java
  31. 66
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdcustomer/BdCustomerService.java
  32. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdcustomer/data_model.json
  33. 19
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockService.java
  34. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json
  35. 15
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java
  36. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectService.java
  37. 13
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexFeign.java
  38. 10
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexFeignFallBack.java
  39. 33
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexNewListVo.java
  40. 22
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexNewVo.java
  41. 20
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexNumQuery.java
  42. 19
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexNumVo.java
  43. 2
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenu.java
  44. 5
      anrui-portal/anrui-portal-biz/pom.xml
  45. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java
  46. 74
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java
  47. 21
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java
  48. 121
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java
  49. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuMapper.java
  50. 25
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuMapper.xml
  51. 4
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuService.java
  52. 12
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleMapper.java
  53. 34
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleMapper.xml
  54. 20
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleService.java
  55. 11
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleService.java
  56. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java
  57. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
  58. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoDto.java
  59. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoVo.java
  60. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java
  61. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorQuery.java
  62. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/intermediary/MiddlemanDetailsVo.java
  63. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/intermediary/MiddlemanDto.java
  64. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/intermediary/MiddlemanQuery.java
  65. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java
  66. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/purchaseReturn/AppScmVehicleReturnFeign.java
  67. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleenterlibrary/AppScmVehicleEnterlibraryFeign.java
  68. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppScmVehicleExamineFeign.java

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributor.java

@ -76,6 +76,8 @@ public class BaseDistributor extends BaseEntity {
private String pDistributorName;
@ApiModelProperty("是否担保 0是/1否")
private String isGuarantee;
@ApiModelProperty(value = "是否担保key")
private String isGuaranteeKey;
@ApiModelProperty("开始合作日期")
private String startCoopDate;
@ApiModelProperty("创建组织")

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java

@ -84,7 +84,7 @@ public interface BaseDistributorFeign {
ResultBean<List<BaseDistributorsListVo>> getDistributors(@RequestBody BaseDistributorsListQuery pagerQuery);
//---------------------------------------移动端-------------------------------------------------//
@ApiOperation("移动端-销售订单-经销商分页列表")
@ApiOperation("移动端-销售订单-经销商分页列 表")
@PostMapping("/getDistributorList")
ResultBean<PagerVo<BaseDistributorsListVo>> getDistributorList(@RequestBody PagerQuery<BaseDistributorsListQuery> pagerQuery);

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsListQuery.java

@ -20,4 +20,7 @@ public class BaseDistributorsListQuery implements Query {
@ApiModelProperty("机构sid")
private String orgPath;
@ApiModelProperty(value = "当前经销商sid")
private String distributorSid;
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleman.java

@ -66,6 +66,8 @@ public class BaseMiddleman extends BaseEntity {
private String useOrgSid;
@ApiModelProperty("编码")
private String middleCode;
@ApiModelProperty(value = "备注")
private String remarks;
private String companySid;

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDetailsVo.java

@ -64,7 +64,8 @@ public class BaseMiddlemanDetailsVo implements Vo {
private String bankAccount;
@ApiModelProperty(value = "用户sid")
private String createBySid;
@ApiModelProperty("机构sid")
private String orgPath;
@ApiModelProperty(value = "备注")
private String remarks;

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDto.java

@ -53,7 +53,8 @@ public class BaseMiddlemanDto implements Dto {
private static final long serialVersionUID = -5243202627956647201L;
private String sid;
@ApiModelProperty("机构sid")
private String orgPath;
@ApiModelProperty("姓名")
@NotBlank(message = "姓名不能为空")
private String name;

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanQuery.java

@ -54,5 +54,7 @@ public class BaseMiddlemanQuery implements Query {
private String userSid;
@ApiModelProperty("姓名")
private String name;
@ApiModelProperty("机构sid")
private String orgPath;
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java

@ -115,7 +115,7 @@ public class BaseAccadjApplyRest implements BaseAccadjApplyFeign {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.BASEACCADJAPPLY.getProDefId());
return baseAccadjApplyService.InitiatorToAnswer(bv);
return baseAccadjApplyService.InitiatorToAnswer(bv,query.getBaseInternalPurchaseVehicles());
}
@Override
@ -123,7 +123,7 @@ public class BaseAccadjApplyRest implements BaseAccadjApplyFeign {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.BASEACCADJAPPLY.getProDefId());
return baseAccadjApplyService.companyToFinancialCenter(bv);
return baseAccadjApplyService.companyToFinancialCenter(bv,query.getBaseInternalPurchaseVehicles());
}
@Override

63
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@ -675,10 +675,35 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
return salOutStock;
}
public ResultBean InitiatorToAnswer(BusinessVariables bv) {
public ResultBean InitiatorToAnswer(BusinessVariables bv,List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles) {
ResultBean rb = ResultBean.fireFail();
BaseAccadjApply baseAccadjApply = fetchBySid(bv.getBusinessSid());
List<String> purchaseSidss = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
Boolean i = false;
if (baseInternalPurchaseVehicles != null) {
if (baseInternalPurchaseVehicles.size() > 0) {
for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
String sid = baseInternalPurchaseVehicle.getSid();
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicleService.fetchBySid(sid);
String witPinMoney1 = baseInternalPurchaseVehicle1.getInitialWitPinMoney();
if (!witPinMoney.equals(witPinMoney1)) {
i = true;
baseInternalPurchaseVehicleService.updateWitPinMoneyBySid(witPinMoney, sid);
}
}
}
} else {
for (String s : purchaseSidss) {
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
String initialWitPinMoney = baseInternalPurchaseVehicle.getInitialWitPinMoney();
if (!witPinMoney.equals(initialWitPinMoney)) {
i = true;
break;
}
}
}
Map<String, Object> map = new HashMap<>();
Map<String, Object> formVariables = bv.getFormVariables();
if (formVariables == null) {
@ -756,9 +781,43 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
}
}
public ResultBean companyToFinancialCenter(BusinessVariables bv) {
public ResultBean companyToFinancialCenter(BusinessVariables bv,List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles) {
ResultBean rb = ResultBean.fireFail();
BaseAccadjApply baseAccadjApply = fetchBySid(bv.getBusinessSid());
List<String> purchaseSidss = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
Boolean i = false;
if (baseInternalPurchaseVehicles != null) {
if (baseInternalPurchaseVehicles.size() > 0) {
for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
String sid = baseInternalPurchaseVehicle.getSid();
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicleService.fetchBySid(sid);
String witPinMoney1 = baseInternalPurchaseVehicle1.getInitialWitPinMoney();
if (!witPinMoney.equals(witPinMoney1)) {
i = true;
baseInternalPurchaseVehicleService.updateWitPinMoneyBySid(witPinMoney, sid);
}
}
}
} else {
for (String s : purchaseSidss) {
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
String initialWitPinMoney = baseInternalPurchaseVehicle.getInitialWitPinMoney();
if (!witPinMoney.equals(initialWitPinMoney)) {
i = true;
break;
}
}
}
Map<String, Object> map = new HashMap<>();
Map<String, Object> formVariables = bv.getFormVariables();
if (formVariables == null) {
map.put("isAdj", i);
bv.setFormVariables(map);
} else {
formVariables.put("isAdj", i);
}
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml

@ -146,10 +146,8 @@
bd.managementDetailAddress,
DATE_FORMAT(bd.setUpTime, '%Y-%d-%m') as setUpTime,
bd.startCoopDate,
bd.isGuarantee as isGuaranteeKey,
case bd.isGuarantee
when 1 then '是'
when 0 then '否' end as isGuarantee,
bd.isGuaranteeKey,
bd.isGuarantee,
bd.legalName,
bd.legalIdCard,
bd.legalMobile,

35
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@ -513,17 +513,20 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
BaseDistributorsListQuery params = pagerQuery.getParams();
QueryWrapper<BaseMiddleman> qw = new QueryWrapper<>();
if (params != null) {
String orgPath = "";
if (StringUtils.isBlank(params.getOrgPath())) {
orgPath = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
qw.eq("useOrg", orgPath);
} else {
orgPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
qw.eq("useOrg", orgPath);
}
if (StringUtils.isNotBlank(params.getDistributorSid())) {
qw.notIn("sid", params.getDistributorSid());
}
if (StringUtils.isNotBlank(params.getOrgName())) {
qw.like("disName", params.getOrgName());
}
if (StringUtils.isNotBlank(params.getOrgPath())) {
qw.eq("useOrg", params.getOrgPath());
} else {
if (StringUtils.isNotBlank(params.getUserSid())) {
ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid());
qw.eq("useOrg", resultBean.getData());
}
}
}
IPage<BaseDistributorsListVo> pagging = baseMapper.getDistributorList(page, qw);
PagerVo<BaseDistributorsListVo> p = PagerUtil.pageToVo(pagging, null);
@ -546,7 +549,7 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
}
}
}
List<BaseDistributorsListVo> list = baseMapper.getDistributors(pagerQuery,qw);
List<BaseDistributorsListVo> list = baseMapper.getDistributors(pagerQuery, qw);
return list;
}
@ -555,13 +558,13 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
BaseDistributorsQuery params = pagerQuery.getParams();
QueryWrapper<BaseDistributor> qw = new QueryWrapper<>();
if (params != null) {
if (StringUtils.isNotBlank(params.getOrgPath())) {
qw.eq("bd.useOrg", params.getOrgPath());
String orgPath = "";
if (StringUtils.isBlank(params.getOrgPath())) {
orgPath = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
qw.eq("bd.useOrg", orgPath);
} else {
if (StringUtils.isNotBlank(params.getUserSid())) {
ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid());
qw.eq("bd.useOrg", resultBean.getData());
}
orgPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
qw.eq("bd.useOrg", orgPath);
}
if (StringUtils.isNotBlank(params.getName())) {
qw.like("bd.disName", params.getName());
@ -704,6 +707,8 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
baseDistributor.setCreateBySid(userSid);
if (StringUtils.isBlank(orgPath)) {
orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
} else {
orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
}
//查询机构信息
ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(orgPath);

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanMapper.xml

@ -44,7 +44,9 @@
bm.bankAccount,
bm.createBySid,
bm.name,
bm.remarks
bm.remarks,
bm.companySid,
bm.useOrgSid as orgPath
from base_middleman bm
where bm.sid = #{sid}
</select>

86
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java

@ -30,8 +30,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basemiddleman.*;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
@ -76,9 +74,13 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
BaseMiddlemanQuery params = pq.getParams();
QueryWrapper<BaseMiddleman> qw = new QueryWrapper<>();
if (params != null) {
if (StringUtils.isNotBlank(params.getUserSid())) {
ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid());
qw.eq("useOrgSid", resultBean.getData());
String orgPath = "";
if (com.yxt.common.base.utils.StringUtils.isBlank(params.getOrgPath())) {
orgPath = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
qw.eq("useOrgSid", orgPath);
} else {
orgPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
qw.eq("useOrgSid", orgPath);
}
}
IPage<BaseMiddlemanVo> pagging = baseMapper.selectPageVo(page, qw, params.getName());
@ -89,43 +91,19 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
public ResultBean saveOrUpdateDto(BaseMiddlemanDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(dto.getCreateBySid());
String orgPath = dto.getOrgPath();
if (StringUtils.isBlank(orgPath)) {
orgPath = sysStaffOrgFeign.getPathSidByUserSid(dto.getCreateBySid()).getData();
} else {
orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
}
if (StringUtils.isBlank(dtoSid)) {
BaseMiddleman baseMiddleman = new BaseMiddleman();
BeanUtil.copyProperties(dto, baseMiddleman, "sid");
baseMiddleman.setCreateOrgSid(resultBean.getData());
baseMiddleman.setUseOrgSid(resultBean.getData());
String customerNoPrefix = "";
//查询业务员的分公司简称和部门编码
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (staffOrgResultBean.getSuccess()) {
SysStaffOrg sysStaffOrg = staffOrgResultBean.getData();
if (sysStaffOrg != null) {
ResultBean<String> resultBean1 = sysStaffOrgFeign.getOrgSidByPath(sysStaffOrg.getOrgSidPath());
if (resultBean1.getSuccess()) {
String osid = resultBean1.getData();
if (StringUtils.isNotBlank(osid)) {
ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(osid);
if (sysOrganizationVoResultBean.getSuccess()) {
SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData();
customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgAbbre();
}
}
}
String orgSid1 = sysStaffOrg.getOrgSid();
ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgSid1);
if (sysOrganizationVoResultBean.getSuccess()) {
SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData();
customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgCode();
}
}
}
String middleCode = customerNoPrefix + HanZiConverterPinYin.getPinYinFirst(baseMiddleman.getName()) + baseMiddleman.getMobile();
String middleCode = HanZiConverterPinYin.getPinYinFirst(baseMiddleman.getName()) + baseMiddleman.getMobile();
baseMiddleman.setMiddleCode(middleCode);
baseMiddleman.setUseOrgSid(orgPath);
baseMiddleman.setCreateOrgSid(orgPath);
baseMapper.insert(baseMiddleman);
} else {
BaseMiddleman baseMiddleman = fetchBySid(dtoSid);
@ -133,37 +111,9 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
return rb.setMsg("该数据不存在");
}
BeanUtil.copyProperties(dto, baseMiddleman);
String customerNoPrefix = "";
//查询业务员的分公司简称和部门编码
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (staffOrgResultBean.getSuccess()) {
SysStaffOrg sysStaffOrg = staffOrgResultBean.getData();
if (sysStaffOrg != null) {
ResultBean<String> resultBean1 = sysStaffOrgFeign.getOrgSidByPath(sysStaffOrg.getOrgSidPath());
if (resultBean1.getSuccess()) {
String osid = resultBean1.getData();
if (StringUtils.isNotBlank(osid)) {
ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(osid);
if (sysOrganizationVoResultBean.getSuccess()) {
SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData();
customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgAbbre();
}
}
}
String orgSid1 = sysStaffOrg.getOrgSid();
ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgSid1);
if (sysOrganizationVoResultBean.getSuccess()) {
SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData();
customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgCode();
}
}
}
String middleCode = customerNoPrefix + HanZiConverterPinYin.getPinYinFirst(baseMiddleman.getName()) + baseMiddleman.getMobile();
String middleCode = HanZiConverterPinYin.getPinYinFirst(baseMiddleman.getName()) + baseMiddleman.getMobile();
baseMiddleman.setMiddleCode(middleCode);
baseMiddleman.setUseOrgSid(orgPath);
baseMapper.updateById(baseMiddleman);
}
return rb.success();

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml

@ -144,7 +144,7 @@
<!--轮胎数-->
bvc.tyreNum,
<!--车辆品牌-->
bvb.brandName carBrand,
bvc.carBrand,
<!--功率-->
bvc.power,
<!--底盘型号-->

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java

@ -157,7 +157,7 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign {
if (vinNo.length() == 17) {
BaseVehicle baseVehicle = baseVehicleService.fetchBySid(baseVehicleCertificate.getVehicleSid());
String vinNo1 = baseVehicle.getVinNo();
if (!vinNo.substring(vinNo.length() - 8).equals(vinNo1) && StringUtils.isBlank(dto.getSmRemarks())) {
if (!vinNo.substring(vinNo.length() - 8).equals(vinNo1.substring(vinNo1.length() - 8)) && StringUtils.isBlank(dto.getSmRemarks())) {
return rb.success().setMsg("该车架号后八位与车辆台账中车架号不符,请填写说明原因");
}else {
String remarks = baseVehicleCertificate.getRemarks();
@ -165,7 +165,9 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign {
remarks = "";
}
String smRemarks = dto.getSmRemarks();
remarks += smRemarks + "由原车架号" + baseVehicleCertificate.getVinNo() + "改成新车架号" + vinNo;
if (!vinNo.equals(vinNo1)){
remarks += smRemarks + "由原车架号" + baseVehicleCertificate.getVinNo() + "改成新车架号" + vinNo;
}
baseVehicleService.updateVinNoByVehSid(vinNo, baseVehicleCertificate.getVehicleSid());
dto.setRemarks(remarks);
baseVehicleCertificateService.updateBySid(dto.toMap(), sid);

30
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@ -4,8 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basemiddleman.BaseMiddleman;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicleout.*;
import com.yxt.anrui.base.biz.basemiddleman.BaseMiddlemanService;
import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
@ -45,7 +47,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
private FinKingDeeFeign finKingDeeFeign;
@Autowired
private ScmWarehouseFeign scmWarehouseFeign;
@Autowired
private BaseMiddlemanService baseMiddlemanService;
public ResultBean vehicleOut(BaseVehicleOutDto dto) {
ResultBean rb = ResultBean.fireFail();
/* List<BaseVehicleOutQuery> list = dto.getQueryList();
@ -98,10 +101,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
try {
//推送财务客户信息
BdCustomer bdCustomer = createBdCustomer(baseVehicle, dto);
ResultBean resultBeanCustomer = finKingDeeFeign.draftBdCustomer(bdCustomer);
//推送财务中介单位
BdCustomer bdMiddle = createBdMiddle(baseVehicle, dto);
ResultBean resultBeanMiddle = finKingDeeFeign.draftBdCustomer(bdMiddle);
ResultBean resultBeanCustomer = finKingDeeFeign.updateSingleCustomer(bdCustomer);
//推送财务中介人
if(StringUtils.isNotBlank( dto.getMiddleOne())){
BdCustomer bdMiddle = createBdMiddle(baseVehicle, dto);
ResultBean resultBeanMiddle = finKingDeeFeign.draftBdCustomer(bdMiddle);
}
//创建出库单数据对象前 需要将客户的编码修改为新生成的客户的编码。
dto.setCustomerNo(bdCustomer.getFNumber());
SalOutStock salOutStock = createSalOutStock(baseVehicle, dto);
ResultBean resultBean1 = finKingDeeFeign.draftSalOutStock(salOutStock);
} catch (Exception e) {
@ -116,6 +123,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
String vinNo = baseVehicle.getVinNo();
//客户编码=简拼+手机号码
bdCustomer.setFNumber(HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName())+vinNo.substring(vinNo.length()-8));
bdCustomer.setOldFNumber(dto.getCustomerNo());
ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(baseVehicle.getCreateOrgSid());
if (resultBean.getSuccess()) {
SysOrganizationVo vo = resultBean.getData();
@ -140,7 +148,17 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
bdCustomer.setTOrgIds(vo.getOrgCode());
}
}
bdCustomer.setFName(dto.getMiddleOne());
//TODO 去中介人表 查询手机号码 根据中介人sid: middleOneSid
// 拼接: bdCustomer.setFName(中介人名称(MiddleOne) + 手机号后四位);
BaseMiddleman baseMiddleman = baseMiddlemanService.fetchBySid(dto.getMiddleOne());
if(baseMiddleman!=null){
String mobile = baseMiddleman.getMobile();
String middleOne = dto.getMiddleOne();
middleOne=middleOne+mobile.substring(mobile.length()-4);
bdCustomer.setFName(middleOne);
}else{
bdCustomer.setFName("");
}
return bdCustomer;
}

1
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.xml

@ -67,6 +67,7 @@
, '%')
</if>
</where>
order by id desc
</select>
<update id="updateFlowFiled">

4
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java

@ -55,6 +55,10 @@ public interface CrmCustomerTempFeign {
@PostMapping("/listPageByOrgPathSid")
public ResultBean<PagerVo<CrmCustomerTempVo>> listPageByOrgPathSid(@RequestBody PagerQuery<CrmCustomerTempQuery> pq);
@ApiOperation("推送财务客户")
@PostMapping("/sendFinCustomer")
public ResultBean sendFinCustomer(@RequestBody String[] customerSids);
@ApiOperation("根据条件查询所有数据列表")
@PostMapping("/listAll")
public ResultBean<List<CrmCustomerTempVo>> listAll(@RequestBody CrmCustomerTempQuery query);

5
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java

@ -36,6 +36,11 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign {
return null;
}
@Override
public ResultBean sendFinCustomer(String[] customerSids) {
return null;
}
@Override
public ResultBean<List<CrmCustomerTempVo>> listAll(CrmCustomerTempQuery query){
ResultBean rb = ResultBean.fireFail();

9
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempVo.java

@ -35,6 +35,15 @@ public class CrmCustomerTempVo implements Vo {
@ApiModelProperty("潜在客户sid")
private String sid;
@ApiModelProperty("分公司名称")
private String createOrgName;
@ApiModelProperty("业务员名称")
private String staffName;
@ApiModelProperty("部门名称")
private String deptName;
@ApiModelProperty("创建人sid")
private String createBySid;

6
anrui-crm/anrui-crm-biz/pom.xml

@ -90,6 +90,12 @@
<version>4.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.yxt.anrui.fin</groupId>
<artifactId>anrui-fin-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>

2
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/CrmApplication.java

@ -16,7 +16,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
})
@EnableScheduling
@EnableDiscoveryClient
@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.base", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter", "com.yxt.messagecenter"})
@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.base", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter", "com.yxt.messagecenter", "com.yxt.anrui.fin"})
public class CrmApplication {
public static void main(String[] args) {

6
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java

@ -6,6 +6,7 @@ import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesDto;
import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesVo;
import com.yxt.anrui.crm.api.crmcustomertemp.*;
import com.yxt.anrui.crm.biz.crmcustomerfile.CrmCustomerFileService;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
@ -72,6 +73,11 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
return rb.success().setData(pv);
}
@Override
public ResultBean sendFinCustomer(String[] customerSids) {
return crmCustomerTempService.sendFinCustomer(customerSids);
}
@Override
public ResultBean<List<CrmCustomerTempVo>> listAll(@RequestBody CrmCustomerTempQuery query) {
ResultBean rb = ResultBean.fireFail();

44
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@ -21,12 +21,17 @@ import com.yxt.anrui.crm.biz.crmcustomerfile.CrmCustomerFileService;
import com.yxt.anrui.crm.biz.crmfile.CrmFileService;
import com.yxt.anrui.crm.biz.crmvehicledemand.CrmVehicledemandService;
import com.yxt.anrui.crm.biz.crmvisit.CrmVisitService;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial;
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
@ -93,7 +98,11 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysStaffinfoFeign sysStaffinfoFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private FinKingDeeFeign finKingDeeFeign;
public PagerVo<CrmCustomerTemp> listPage(PagerQuery<CrmCustomerTempQuery> pq) {
@ -191,6 +200,21 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
);
IPage<CrmCustomerTemp> page = PagerUtil.queryToPage(pq);
IPage<CrmCustomerTempVo> pagging = baseMapper.selectPageVo(page, qw);
for (CrmCustomerTempVo record : pagging.getRecords()) {
String createOrgSid = record.getCreateOrgSid();
String staffSid = record.getStaffSid();
String createOrgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName();
record.setCreateOrgName(createOrgName);
String staffName = sysStaffinfoFeign.fetchBySid(staffSid).getData().getName();
record.setStaffName(staffName);
List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid).getData();
StringBuilder deptName = new StringBuilder();
for (SysStaffOrgVo sysStaffOrgVo : sysStaffOrgVos) {
String orgName = sysStaffOrgVo.getOrgName();
deptName.append(orgName).append(" ");
}
record.setDeptName(deptName.toString());
}
PagerVo<CrmCustomerTempVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
@ -977,8 +1001,8 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
}
}
}
customerNoPrefix = customerNoPrefix + HanZiConverterPinYin.getPinYinFirst(name) + mobile;
return customerNoPrefix;
customerNoPrefix = customerNoPrefix+ mobile + HanZiConverterPinYin.getPinYinFirst(name) ;
return customerNoPrefix.length()>30?customerNoPrefix.substring(0,29):customerNoPrefix;
}
private Map<String, String> genetrateCustomerNumO(String customerTypeKey, SysUserInfoVo sysUserInfoVo) {
@ -1095,4 +1119,20 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
return rb.success().setData(list);
}
public ResultBean sendFinCustomer(String[] customerSids) {
ResultBean rb = ResultBean.fireFail();
List<BdCustomer> bdCustomers = new ArrayList<>();
for (String customerSid : customerSids) {
BdCustomer bdCustomer = new BdCustomer();
CrmCustomerTemp crmCustomerTemp = fetchBySid(customerSid);
String createOrgSid = crmCustomerTemp.getCreateOrgSid();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
bdCustomer.setFName(crmCustomerTemp.getName() + crmCustomerTemp.getMobile());
bdCustomer.setFNumber(crmCustomerTemp.getCustomerNo());
bdCustomers.add(bdCustomer);
}
finKingDeeFeign.draftBdCustomers(bdCustomers);
return rb.success();
}
}

10
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java

@ -88,14 +88,22 @@ public interface FinKingDeeFeign {
@PostMapping("/draftBdSupplier")
@ResponseBody
ResultBean<String> draftBdSupplier(@RequestBody @Valid BdSupplier bdSupplier);
@ApiOperation("暂存客户信息的接口")
@ApiOperation("新增客户信息的接口 适用客户查询的批量推送财务客户数据")
@PostMapping("/draftBdCustomer")
@ResponseBody
ResultBean<String> draftBdCustomer(@RequestBody @Valid BdCustomer bdCustomer);
@ApiOperation("新增客户信息的接口 适用客户查询的批量推送财务客户数据 批量")
@PostMapping("/draftBdCustomers")
@ResponseBody
ResultBean<String> draftBdCustomers(@RequestBody List<BdCustomer> bdCustomers);
@ApiOperation("修改客户信息的接口")
@PostMapping("/saveBdCustomers")
@ResponseBody
ResultBean<String> saveBdCustomers(@RequestBody @Valid List<BdCustomer> bdCustomers);
@ApiOperation("单个 销售出库单 推送客户信息")
@PostMapping("/updateSingleCustomer")
@ResponseBody
public ResultBean<String> updateSingleCustomer(@RequestBody @Valid BdCustomer bdCustomer);
@ApiOperation("使用number查看数据表单")
@GetMapping("/getKingDataInfoByNumber/{formId}/{number}")
@ResponseBody

10
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java

@ -81,11 +81,21 @@ implements FinKingDeeFeign{
return null;
}
@Override
public ResultBean<String> draftBdCustomers(List<BdCustomer> bdCustomers) {
return null;
}
@Override
public ResultBean<String> saveBdCustomers(List<BdCustomer> bdCustomers) {
return null;
}
@Override
public ResultBean<String> updateSingleCustomer(BdCustomer bdCustomers) {
return null;
}
@Override
public ResultBean<String> getKingDataInfoByNumber(String formId,String number) {
return null;

7
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdcustomer/BdCustomer.java

@ -14,7 +14,12 @@ public class BdCustomer {
@NotBlank( message = "FName不能为空")
@JsonProperty("FName")
public String FName;
/*客户编码:FName (必填项)*/
/*旧客户编码:oldFNumber*/
@JsonProperty("oldFNumber")
public String oldFNumber="";
/*客户编码:FNumber (必填项)*/
@NotBlank(message = "FNumber不能为空")
@JsonProperty("FNumber")
public String FNumber;

18
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@ -216,12 +216,28 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
public ResultBean<String> draftBdCustomer(@RequestBody @Valid BdCustomer bdCustomer) {
return bdCustomerService.draftBdCustomer(bdCustomer);
}
@ApiOperation("暂存客户信息的接口 批量")
@PostMapping("/draftBdCustomers")
@ResponseBody
@Override
public ResultBean<String> draftBdCustomers(@RequestBody @Valid List<BdCustomer> bdCustomers) {
return bdCustomerService.draftBdCustomers(bdCustomers);
}
@ApiOperation("修改客户信息的接口")
@PostMapping("/saveBdCustomers")
@ResponseBody
@Override
public ResultBean<String> saveBdCustomers(List<BdCustomer> bdCustomers) {
return bdCustomerService.saveBdCustomers(bdCustomers);
return bdCustomerService.updateCustomers(bdCustomers);
}
@ApiOperation("单个 销售出库单 推送客户信息")
@PostMapping("/updateSingleCustomer")
@ResponseBody
@Override
public ResultBean<String> updateSingleCustomer( BdCustomer bdCustomers) {
return bdCustomerService.updateSingleCustomer(bdCustomers);
}
@ApiOperation("使用number查看数据表单")

20
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java

@ -12,44 +12,44 @@ public class KingDeeConfig {
/**
* 登录金蝶的账户信息 2022010测试
*/
public static String acctID = "61dce6601125a0";
// public static String acctID = "61dce6601125a0";
/**
* 登录金蝶的账户信息 正式系统 正式系统 正式系统 正式系统 正式系统 正式系统 正式系统 正式系统 正式系统 正式系统
*/
// public static String acctID = "5e84c526016ed7";
public static String acctID = "5e84c526016ed7";
/**
* 登录金蝶的账户信息 2022010测试的
*/
public static String userName = "信息部2";
// public static String userName = "信息部2";
/**
* 登录金蝶的账户信息
*/
public static String password = "123321";
//public static String password = "123321";
/**
* 登录金蝶的账户信息 2022010测试
*/
public static String userName_administrator = "administrator";
// public static String userName_administrator = "administrator";
/**
* 登录金蝶的账户信息 2022010测试
*/
public static String password_administrator = "ANrui123456.";
// public static String password_administrator = "ANrui123456.";
/**
* 登录金蝶的账户信息 正式系统正式系统正式系统正式系统正式系统 正式系统 正式系统 正式系统 正式系统
*/
// public static String userName = "信息部";
public static String userName = "信息部";
/**
* 登录金蝶的账户信息 正式系统正式系统正式系统正式系统正式系统 正式系统 正式系统 正式系统 正式系统
*/
// public static String password = "ywzx0750";
public static String password = "ywzx0750";
/**
* 登录金蝶的账户信息 正式系统 正式系统 正式系统 正式系统
*/
// public static String userName_administrator = "Administrator";
public static String userName_administrator = "Administrator";
/**
* 登录金蝶的账户信息 正式系统 正式系统 正式系统 正式系统
*/
// public static String password_administrator = "hebei@anrui202108.";
public static String password_administrator = "hebei@anrui202108.";
/**
* 登录金蝶的账户信息
*/

16
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java

@ -1,8 +1,10 @@
package com.yxt.anrui.fin.biz.kingdee.appaybill;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONObject;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl;
import com.yxt.anrui.fin.api.kingdee.KingDeeCode;
import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill;
import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial;
import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
@ -56,7 +58,19 @@ public class ApPayBillService extends FinKingDeeService {
params.put("FSETTLETYPEID",sysMappingInfoVoResultBean.getData().getMap_itemKey());//"02");//
}
String kingDeeData = ApPayBillCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_,vehicleListMap);
return accessKingDeeInterface(KingDeeBillId.AP_PAYBILL.getID(),kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL());
// ResultBean<String> stringResultBean = accessKingDeeInterface(KingDeeBillId.AP_PAYBILL.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL());
ResultBean<String> stringResultBean = accessKingDeeInterface(KingDeeBillId.AP_PAYBILL.getID(), kingDeeData, KingDeeBillUrl.SAVE_URL.getURL());
String data = stringResultBean.getData();
JSONObject jsonObject = JSONObject.parseObject(data.toString());
JSONObject result = (JSONObject)jsonObject.get("Result");
JSONObject result2 = (JSONObject)result.get("Result");
log.info("ApPayBillService:{}",data);
log.info("result:{}",result);
log.info("result2:{}",result2);
int id = (int)result.get("Id");
ResultBean<String> submit = submit(KingDeeBillId.AP_PAYBILL.getID(),id+"");
if (!submit.getSuccess()) return rb.setCode(KingDeeCode.SUBMIT.getCode()).setData(submit.getData());
return stringResultBean;
} catch (Exception e) {
e.printStackTrace();
}

66
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdcustomer/BdCustomerService.java

@ -40,8 +40,23 @@ public class BdCustomerService extends FinKingDeeService {
return rb.success().setData(list);
}
/**
* 保存客户信息 批量
* 适用客户查询的批量推送财务客户数据
* @param bdCustomers
* @return
*/
public ResultBean<String> draftBdCustomers(List<BdCustomer> bdCustomers) {
ResultBean rb=ResultBean.fireFail();
List<String> list_r=new ArrayList<>();
for(BdCustomer b:bdCustomers) {
list_r.add(draftBdCustomer(b).getMsg());
}
return rb.success().setData(JSONObject.toJSONString(list_r));
}
/**
* 保存客户信息
* 适用客户查询的批量推送财务客户数据
* @param bdCustomer
* @return
*/
@ -57,10 +72,10 @@ public class BdCustomerService extends FinKingDeeService {
if("0".equals(custId)){
//新增客户
ResultBean<String> stringResultBean1 = sendCustomer(bdCustomer);
if(!stringResultBean1.getSuccess()){
//if(!stringResultBean1.getSuccess()){
return stringResultBean1;
}
custId =draftResultGetId(stringResultBean1.getData());
//}
//custId =draftResultGetId(stringResultBean1.getData());
}
ResultBean<String> resultBean3=allocate(KingDeeBillId.BD_CUSTOMER.getID(),custId,bdCustomer.getTOrgIds());
return resultBean3;
@ -94,6 +109,13 @@ public class BdCustomerService extends FinKingDeeService {
return rb.setMsg("客户审核失败!");
}
log.info("客户审核成功!");
String custId =draftResultGetId((String) rb.getData());
ResultBean<String> resultBean3=allocate(KingDeeBillId.BD_CUSTOMER.getID(),custId,bdCustomer.getTOrgIds());
if(!resultBean3.getSuccess()){
log.info("客户分配失败!");
return rb.setMsg("客户分配失败!");
}
log.info("客户分配成功!");
return rb;
}catch (Exception e){
e.printStackTrace();
@ -102,31 +124,42 @@ public class BdCustomerService extends FinKingDeeService {
}
/**
* 批量修改客户 list
* 批量修改客户
* 使用于出库单中推送财务客户数据
* @return
*/
public ResultBean<String> saveBdCustomers(List<BdCustomer > bdCustomers) {
public ResultBean<String> updateCustomers(List<BdCustomer > bdCustomers) {
ResultBean<String> rb=ResultBean.fireFail();
List<String> list_r=new ArrayList<>();
for(BdCustomer b:bdCustomers) {
ResultBean<String> stringResultBean = viewGetId(KingDeeBillId.BD_CUSTOMER.getID(), b.getFNumber());
list_r.add(updateSingleCustomer(b).getMsg());
}
return rb.success().setData(JSONObject.toJSONString(list_r));
}
/**
* 单个 销售出库单 推送客户信息
* @return
*/
public ResultBean<String> updateSingleCustomer( BdCustomer b) {
ResultBean<String> rb=ResultBean.fireFail();
ResultBean<String> stringResultBean = viewGetId(KingDeeBillId.BD_CUSTOMER.getID(), b.getOldFNumber());
if(!stringResultBean.getSuccess()&&!"0".equals(stringResultBean.getData())){
return stringResultBean;
}
String custId = stringResultBean.getData();
if("0".equals(custId)){
ResultBean<String> stringResultBean1 = sendCustomer(b);
if(!stringResultBean1.getSuccess()){
/*if(!stringResultBean1.getSuccess()){
return stringResultBean1;
}
custId =draftResultGetId(stringResultBean1.getData());
}*/
return stringResultBean1;
}
stringResultBean = unAudit(KingDeeBillId.BD_CUSTOMER.getID(),b.getFNumber());
stringResultBean = unAudit(KingDeeBillId.BD_CUSTOMER.getID(),b.getOldFNumber());
if(!stringResultBean.getSuccess()){
return rb.setMsg("反审核失败!");
}
try{
ResultBean<String> save = save(b,custId);
ResultBean<String> save = updateCustomer(b,custId);
if(!save.getSuccess()){
log.info("客户保存失败!:{}");
return rb.setMsg("客户保存失败!");
@ -146,18 +179,17 @@ public class BdCustomerService extends FinKingDeeService {
return rb.setMsg("客户审核失败!");
}
log.info("客户审核成功!");
ResultBean<String> resultBean3=allocate(KingDeeBillId.ORG_ORGANIZATIONS.getID(),custId,b.getTOrgIds());
ResultBean<String> resultBean3=allocate(KingDeeBillId.BD_CUSTOMER.getID(),custId,b.getTOrgIds());
if(!resultBean3.getSuccess()){
log.info("客户分配失败!");
return rb.setMsg("客户分配失败!");
}
log.info("客户分配成功!");
list_r.add(save.getData());
return rb.success().setData(save.getData()).setMsg("客户保存成功!");
}catch (Exception e){
e.printStackTrace();
return rb.setMsg("客户保存失败!");
}
}
return rb.success().setData(JSONObject.toJSONString(list_r));
}
/**
@ -166,12 +198,12 @@ public class BdCustomerService extends FinKingDeeService {
* @return
* @throws Exception
*/
private ResultBean<String> save(BdCustomer b,String fcustid) {
private ResultBean<String> updateCustomer(BdCustomer b, String fcustid) {
Map<String, Object> stringObjectMap = BeanUtil.beanToMap(b);
Map<String, String> mapParams = createMapParams(stringObjectMap);
mapParams.put("IsDeleteEntry","False");
mapParams.put("fields","FName,FNumber,FDescription");
mapParams.put("fields","FName,FNumber,FDescription,FShortName");
mapParams.put("FCUSTID",fcustid);
String kingDeeData = BdCustomerCastToKingDeeBillFields.getKingDeeData(mapParams);
ResultBean<String> rb=ResultBean.fireFail();

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdcustomer/data_model.json

@ -7,6 +7,7 @@
"FUseOrgId": {
"FNumber": "100"
},
"FShortName": "@KD_FShortName",
"FName": "@KD_FName",
"FCOUNTRY": {
"FNumber": "China"

19
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockService.java

@ -50,11 +50,15 @@ public class SalOutStockService extends FinKingDeeService {
JSONArray materialStocks = (JSONArray)result2.get("MaterialStock");
JSONObject materialStock = (JSONObject)materialStocks.get(0);
boolean IsBatchManage = (boolean) materialStock.get("IsBatchManage");
if(!IsBatchManage){//是否启用批号
f.setFlot("");//没有启用批号
}else{
f.setFlot(f.getFMaterialID());//没有启用批号
}
if(!IsBatchManage){//是否启用批号
f.setFlot("");//没有启用批号
}else{
f.setFlot(f.getFMaterialID());//没有启用批号
}
String fStockID = f.getFStockID();
if(!"ARZTCK".equals(fStockID)){//如果不是在途仓库 设置成安瑞正式仓库
f.setFStockID("ARZSCK");
}
}
//业务表的主表数据集合
@ -82,7 +86,8 @@ public class SalOutStockService extends FinKingDeeService {
List<Map<String, String>> vehicleListMap = createVehicleLists(fEntity);
String kingDeeData = SalOutStockCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_,vehicleListMap);
// ResultBean<String> stringResultBean = accessKingDeeInterface(KingDeeBillId.BD_MATERIAL.getID(),kingDeeData, KingDeeBillUrl.SAVE_URL.getURL());
ResultBean<String> stringResultBean = accessKingDeeInterface(KingDeeBillId.SAL_OUTSTOCK.getID(), kingDeeData, KingDeeBillUrl.SAVE_URL.getURL());
ResultBean<String> stringResultBean = accessKingDeeInterface(KingDeeBillId.SAL_OUTSTOCK.getID(),
kingDeeData, KingDeeBillUrl.SAVE_URL.getURL());
String data = stringResultBean.getData();
JSONObject jsonObject = JSONObject.parseObject(data.toString());
JSONObject result = (JSONObject)jsonObject.get("Result");
@ -91,7 +96,7 @@ public class SalOutStockService extends FinKingDeeService {
log.info("result:{}",result);
log.info("result2:{}",result2);
int id = (int)result.get("Id");
ResultBean<String> submit = submit(id+"",KingDeeBillId.SAL_OUTSTOCK.getID());
ResultBean<String> submit = submit(KingDeeBillId.SAL_OUTSTOCK.getID(),id+"");
if (!submit.getSuccess()) return rb.setCode(KingDeeCode.SUBMIT.getCode()).setData(submit.getData());
/*ResultBean<String> audit = audit(data,KingDeeBillId.SAL_OUTSTOCK.getID());
if (!audit.getSuccess()) return rb.setCode(KingDeeCode.AUDIT.getCode()).setData(audit.getData());*/

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json

@ -19,7 +19,7 @@
"FNumber": "@KD_FSaleOrgId"
},
"FStockID": {
"FNumber": ""
"FNumber": "@KD_FStockID"
},
"FStockStatusID": {
"FNumber": ""

15
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java

@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl;
import com.yxt.anrui.fin.api.kingdee.KingDeeCode;
import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial;
import com.yxt.anrui.fin.api.kingdee.stkInstockNumber.FinStkInstockNumber;
import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
@ -134,7 +135,19 @@ public class STKInStockService extends FinKingDeeService {
//准备 物料列表的数据 ForEntryBill
List<Map<String, String>> vehicleListMap = createVehicleLists(fInStockEntry);
String kingDeeData =STKInStockCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_,vehicleListMap);
return accessKingDeeInterface(KingDeeBillId.STK_INSTOCK.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL());
//accessKingDeeInterface(KingDeeBillId.STK_INSTOCK.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL());
ResultBean<String> stringResultBean = accessKingDeeInterface(KingDeeBillId.STK_INSTOCK.getID(), kingDeeData, KingDeeBillUrl.SAVE_URL.getURL());
String data = stringResultBean.getData();
JSONObject jsonObject = JSONObject.parseObject(data.toString());
JSONObject result = (JSONObject)jsonObject.get("Result");
JSONObject result2 = (JSONObject)result.get("Result");
log.info("ApPayBillService:{}",data);
log.info("result:{}",result);
log.info("result2:{}",result2);
int id = (int)result.get("Id");
ResultBean<String> submit = submit(KingDeeBillId.STK_INSTOCK.getID(),id+"");
if (!submit.getSuccess()) return submit;
return stringResultBean;
}
/**

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectService.java

@ -54,9 +54,9 @@ public class StkTransferDirectService extends FinKingDeeService {
log.info("StkTransferDirect:{}",data);
log.info("result2:{}",result2);
int id = (int)result.get("Id");
ResultBean<String> submit = submit(id+"",KingDeeBillId.STK_TRANSFERDIRECT.getID());
ResultBean<String> submit = submit(KingDeeBillId.STK_TRANSFERDIRECT.getID(),id+"");
if (!submit.getSuccess()) return rb.setCode(KingDeeCode.SUBMIT.getCode()).setData(submit.getData());
ResultBean<String> audit = audit(id+"",KingDeeBillId.STK_TRANSFERDIRECT.getID());
ResultBean<String> audit = audit(KingDeeBillId.STK_TRANSFERDIRECT.getID(),id+"");
if (!audit.getSuccess()) return rb.setCode(KingDeeCode.AUDIT.getCode()).setData(audit.getData());
return stringResultBean;
} catch (Exception e) {

13
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexFeign.java

@ -4,6 +4,7 @@ import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@ -26,11 +27,21 @@ public interface AppIndexFeign {
@ApiOperation(value = "App首页待办待阅的数量")
@ResponseBody
@GetMapping("/homeWorkBadge")
ResultBean<AppIndexWorkNumVo> selectHomeWorkNum(@RequestParam("userSid") String userSid,@RequestParam("orgPath") String orgPath);
ResultBean<AppIndexWorkNumVo> selectHomeWorkNum(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath);
@ApiOperation(value = "App首页子应用的待办数量")
@ResponseBody
@GetMapping("/homeAppBadge")
ResultBean<List<AppIndexAppNumVo>> selectAppNum(@RequestParam("userSid") String userSid, @RequestParam(value = "orgPath", required = false) String orgPath);
@ApiOperation(value = "移动端各插件的应用")
@ResponseBody
@GetMapping("/getBusinessList")
ResultBean<List<AppIndexNewVo>> getBusinessList(@RequestParam("userSid") String userSid, @RequestParam("appSid") String appSid);
@ApiOperation(value = "移动端各插件的应用数量")
@ResponseBody
@GetMapping("/getBusinessNum")
ResultBean<List<AppIndexNumVo>> getBusinessNum(@SpringQueryMap AppIndexNumQuery query);
}

10
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexFeignFallBack.java

@ -27,4 +27,14 @@ public class AppIndexFeignFallBack implements AppIndexFeign {
public ResultBean<List<AppIndexAppNumVo>> selectAppNum(String userSid,String orgPath) {
return null;
}
@Override
public ResultBean<List<AppIndexNewVo>> getBusinessList(String userSid, String appSid) {
return null;
}
@Override
public ResultBean<List<AppIndexNumVo>> getBusinessNum(AppIndexNumQuery query) {
return null;
}
}

33
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexNewListVo.java

@ -0,0 +1,33 @@
package com.yxt.anrui.portal.api.index;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/10/26 14:38
* @Description
*/
@Data
public class AppIndexNewListVo implements Vo {
private static final long serialVersionUID = -2242568632369452117L;
@ApiModelProperty("菜单sid")
private String sid;
@ApiModelProperty("应用名称")
private String name;
@ApiModelProperty("图标")
private String icon;
@ApiModelProperty("待办数量")
private String num;
@ApiModelProperty("跳转参数")
private String json;
@ApiModelProperty("排序")
private String sortNo;
@ApiModelProperty("跳转路由")
private String moduleAction;
@ApiModelProperty("分类")
private String classification;
}

22
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexNewVo.java

@ -0,0 +1,22 @@
package com.yxt.anrui.portal.api.index;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2022/10/26 14:37
* @Description
*/
@Data
public class AppIndexNewVo implements Vo {
private static final long serialVersionUID = 3045438801481395314L;
@ApiModelProperty("应用分组")
private String title;
private List<AppIndexNewListVo> apps;
}

20
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexNumQuery.java

@ -0,0 +1,20 @@
package com.yxt.anrui.portal.api.index;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/10/26 17:48
* @Description
*/
@Data
public class AppIndexNumQuery {
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("组织机构sid")
private String orgPath;
@ApiModelProperty("appSid")
private String appSid;
}

19
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexNumVo.java

@ -0,0 +1,19 @@
package com.yxt.anrui.portal.api.index;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/10/26 17:39
* @Description
*/
@Data
public class AppIndexNumVo implements Vo {
private static final long serialVersionUID = -5388012244856879195L;
@ApiModelProperty("应用sid")
private String sid;
@ApiModelProperty("数量")
private String num;
}

2
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenu.java

@ -32,4 +32,6 @@ public class SysMobileMenu extends BaseEntity {
@ApiModelProperty("父级sid")
private String psid;
private String json;
}

5
anrui-portal/anrui-portal-biz/pom.xml

@ -30,6 +30,11 @@
<groupId>com.yxt.anrui</groupId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<artifactId>anrui-scm-api</artifactId>
<groupId>com.yxt.anrui.scm</groupId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<artifactId>anrui-crm-api</artifactId>
<groupId>com.yxt.anrui</groupId>

2
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java

@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
"com.yxt.anrui.portal"
})
@EnableDiscoveryClient
@EnableFeignClients(basePackages = {"com.yxt.anrui.crm","com.yxt.anrui.flowable","com.yxt.messagecenter","com.yxt.anrui.terminal","com.yxt.anrui.base"})
@EnableFeignClients(basePackages = {"com.yxt.anrui.crm", "com.yxt.anrui.flowable", "com.yxt.messagecenter", "com.yxt.anrui.terminal", "com.yxt.anrui.base", "com.yxt.anrui.scm"})
public class PortalApplication {
public static void main(String[] args) {

74
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java

@ -0,0 +1,74 @@
package com.yxt.anrui.portal.biz.index;
import lombok.Getter;
/**
* @Author dimengzhe
* @Date 2022/10/26 21:32
* @Description
*/
public class AppIndexEnum {
@Getter
public static enum AppVersionSubAppSid {
/**
* 供应链
*/
GYL("98ff0724-5df4-4fc7-ab6d-3996e7706acd", "供应链"),
YW("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028", "业务");
/**
* code值
*/
private final String code;
/**
* 备注
*/
private final String remarks;
/**
* 构造器
*
* @param code code值
* @param remarks 备注
*/
private AppVersionSubAppSid(String code, String remarks) {
this.code = code;
this.remarks = remarks;
}
}
@Getter
public static enum AppMenu {
/**
* 验车
*/
YC("1b993770-0f1f-475e-b153-756ac95f09cf", "验车"),
YK("25b3dfb2-d3df-47c3-b689-8c38a7785391", "移库"),
PK("608e72d3-9f34-4b44-85c4-d6be41de8f76", "盘库"),
XJ("ae160247-195e-4f2c-a167-ae50a2e50c81", "巡检"),
SC("92659535-38f6-4456-a45a-ab5e9ced3fac", "收车");
/**
* code值
*/
private final String code;
/**
* 备注
*/
private final String remarks;
/**
* 构造器
*
* @param code code值
* @param remarks 备注
*/
private AppMenu(String code, String remarks) {
this.code = code;
this.remarks = remarks;
}
}
}

21
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java

@ -4,10 +4,7 @@ import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo;
import com.yxt.anrui.portal.api.banner.BannerVo;
import com.yxt.anrui.portal.api.formnotice.FormNoticeQuery;
import com.yxt.anrui.portal.api.formnotice.FormNoticeVo;
import com.yxt.anrui.portal.api.index.AppIndexAppNumVo;
import com.yxt.anrui.portal.api.index.AppIndexFeign;
import com.yxt.anrui.portal.api.index.AppIndexVo;
import com.yxt.anrui.portal.api.index.AppIndexWorkNumVo;
import com.yxt.anrui.portal.api.index.*;
import com.yxt.anrui.portal.biz.appsubsetversion.AppSubsetVersionService;
import com.yxt.anrui.portal.biz.banner.BannerService;
import com.yxt.anrui.portal.biz.flow.FlowableService;
@ -61,6 +58,8 @@ public class AppIndexRest implements AppIndexFeign {
@Autowired
private AppScmBaseInfoFeign appScmBaseInfoFeign;
@Autowired
private AppIndexService appIndexService;
@Override
public ResultBean<AppIndexVo> index(String userSid) {
@ -137,11 +136,11 @@ public class AppIndexRest implements AppIndexFeign {
}
@Override
public ResultBean<AppIndexWorkNumVo> selectHomeWorkNum(String userSid,String orgPath) {
public ResultBean<AppIndexWorkNumVo> selectHomeWorkNum(String userSid, String orgPath) {
ResultBean<AppIndexWorkNumVo> rb = ResultBean.fireFail();
AppIndexWorkNumVo vo = new AppIndexWorkNumVo();
// 待办数量
vo.setNotWorkNum(flowableService.getTodoNum(userSid,orgPath).getData());
vo.setNotWorkNum(flowableService.getTodoNum(userSid, orgPath).getData());
// 待阅数量
vo.setNotReadNum(messageListFeign.selectUnReadCount("", userSid).getData());
return rb.success().setData(vo);
@ -192,4 +191,14 @@ public class AppIndexRest implements AppIndexFeign {
});
return rb.success().setData(appIndexAppNumVos);
}
@Override
public ResultBean<List<AppIndexNewVo>> getBusinessList(String userSid, String appSid) {
return appIndexService.getBusinessList(userSid, appSid);
}
@Override
public ResultBean<List<AppIndexNumVo>> getBusinessNum(AppIndexNumQuery query) {
return appIndexService.getBusinessNum(query);
}
}

121
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java

@ -0,0 +1,121 @@
package com.yxt.anrui.portal.biz.index;
import com.yxt.anrui.portal.api.index.AppIndexNewVo;
import com.yxt.anrui.portal.api.index.AppIndexNumQuery;
import com.yxt.anrui.portal.api.index.AppIndexNumVo;
import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenu;
import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleVo;
import com.yxt.anrui.portal.biz.sysmobilemenu.SysMobileMenuService;
import com.yxt.anrui.portal.biz.sysmobilemenurole.SysMobileMenuRoleService;
import com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleService;
import com.yxt.anrui.scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryFeign;
import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
import com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExamineFeign;
import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionFeign;
import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventoryFeign;
import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionFeign;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* @Author dimengzhe
* @Date 2022/10/26 14:43
* @Description
*/
@Service
public class AppIndexService {
@Autowired
private SysUserRoleService sysUserRoleService;
@Autowired
private SysMobileMenuRoleService sysMobileMenuRoleService;
@Autowired
private SysMobileMenuService sysMobileMenuService;
@Autowired
private ScmVehicleExamineFeign scmVehicleExamineFeign;
@Autowired
private ScmVehicleEnterlibraryFeign scmVehicleEnterlibraryFeign;
@Autowired
private ScmVehicleGressionFeign scmVehicleGressionFeign;
@Autowired
private ScmVehicleInventoryFeign scmVehicleInventoryFeign;
@Autowired
private ScmVehiclePatrolinspectionFeign scmVehiclePatrolinspectionFeign;
public ResultBean<List<AppIndexNewVo>> getBusinessList(String userSid, String appSid) {
ResultBean<List<AppIndexNewVo>> rb = ResultBean.fireFail();
if (StringUtils.isBlank(userSid) || StringUtils.isBlank(appSid)) {
return rb.setData(new ArrayList<>());
}
//查询该用户的所有的角色
List<SysUserRoleVo> userRole = sysUserRoleService.selectByUserSid(userSid);
List<String> roleSids = userRole.stream().map(s -> s.getRoleSid()).collect(Collectors.toList());
//根据appSid和角色sid查询移动端菜单
List<AppIndexNewVo> appIndexNewVos = getApp(roleSids, appSid);
return rb.success().setData(appIndexNewVos);
}
private List<AppIndexNewVo> getApp(List<String> roleSids, String appSid) {
return sysMobileMenuRoleService.getApp(roleSids, appSid);
}
public ResultBean<List<AppIndexNumVo>> getBusinessNum(AppIndexNumQuery query) {
ResultBean<List<AppIndexNumVo>> rb = ResultBean.fireFail();
String appSid = query.getAppSid();
String userSid = query.getUserSid();
String orgPath = query.getOrgPath();
AppToDoNumQuery appToDoNumQuery = new AppToDoNumQuery();
appToDoNumQuery.setUserSid(userSid);
appToDoNumQuery.setOrgPath(orgPath);
//根据appSid查询菜单的信息
List<SysMobileMenu> sysMobileMenus = sysMobileMenuService.getMenu(appSid);
List<AppIndexNumVo> list = new ArrayList<>();
if (AppIndexEnum.AppVersionSubAppSid.GYL.getCode().equals(appSid)) {
//供应链
for (SysMobileMenu menu : sysMobileMenus) {
AppIndexNumVo appIndexNumVo = new AppIndexNumVo();
appIndexNumVo.setSid(menu.getSid());
//验车
if (AppIndexEnum.AppMenu.YC.getCode().equals(menu.getSid())) {
String num = scmVehicleExamineFeign.getToDoNum(appToDoNumQuery).getData();
appIndexNumVo.setNum(num);
}
//收车
if (AppIndexEnum.AppMenu.SC.getCode().equals(menu.getSid())) {
String num = scmVehicleEnterlibraryFeign.getToDoNum(appToDoNumQuery).getData();
appIndexNumVo.setNum(num);
}
//移库
if (AppIndexEnum.AppMenu.YK.getCode().equals(menu.getSid())) {
String num = scmVehicleGressionFeign.getToDoNum(appToDoNumQuery).getData();
appIndexNumVo.setNum(num);
}
//盘库
if (AppIndexEnum.AppMenu.PK.getCode().equals(menu.getSid())) {
String num = scmVehicleInventoryFeign.getToDoNum(appToDoNumQuery).getData();
appIndexNumVo.setNum(num);
}
//巡检
if (AppIndexEnum.AppMenu.XJ.getCode().equals(menu.getSid())) {
String num = scmVehiclePatrolinspectionFeign.getToDoNum(appToDoNumQuery).getData();
appIndexNumVo.setNum(num);
}
list.add(appIndexNumVo);
}
} else if (AppIndexEnum.AppVersionSubAppSid.YW.getCode().equals(appSid)) {
//业务
}
return rb.success().setData(list);
}
}

2
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuMapper.java

@ -17,4 +17,6 @@ import java.util.List;
public interface SysMobileMenuMapper extends BaseMapper<SysMobileMenu> {
//插件列表及应用列表
List<SysMobileMenuVo> listAll(@Param("path") String path, @Param("linkSid") String linkSid);
List<SysMobileMenu> getMenu(String appSid);
}

25
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuMapper.xml

@ -43,16 +43,35 @@
</collection>
</resultMap>
<select id="mobileMenuList" resultMap="childrenMap">
select title appName, titleGroup versionName, DATE_FORMAT(modifyTime, '%Y-%m-%d') as modifyTime, path as sourceAction, sortNo, sid, iconUrl
select title appName,
titleGroup versionName,
DATE_FORMAT(modifyTime, '%Y-%m-%d') as modifyTime,
path as sourceAction,
sortNo,
sid,
iconUrl
from sys_mobile_menu
where linkSid = #{appSid} and psid = '0'
where linkSid = #{appSid}
and psid = '0'
order by sortNo asc
</select>
<select id="childrenList" resultMap="childrenMap">
select title appName, titleGroup versionName, DATE_FORMAT(modifyTime, '%Y-%m-%d') as modifyTime, path as sourceAction, sortNo, sid, iconUrl
select title appName,
titleGroup versionName,
DATE_FORMAT(modifyTime, '%Y-%m-%d') as modifyTime,
path as sourceAction,
sortNo,
sid,
iconUrl
from sys_mobile_menu
where pSid = #{sid}
order by sortNo asc
</select>
<select id="getMenu" resultType="com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenu">
select *
from sys_mobile_menu
where linkSid = #{appSid}
</select>
</mapper>

4
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuService.java

@ -64,4 +64,8 @@ public class SysMobileMenuService extends MybatisBaseService<SysMobileMenuMapper
vo.setList(list);
return rb.success().setData(vo);
}
public List<SysMobileMenu> getMenu(String appSid) {
return baseMapper.getMenu(appSid);
}
}

12
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleMapper.java

@ -1,6 +1,8 @@
package com.yxt.anrui.portal.biz.sysmobilemenurole;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.anrui.portal.api.index.AppIndexNewListVo;
import com.yxt.anrui.portal.api.index.AppIndexNewVo;
import com.yxt.anrui.portal.api.sysmobilemenurole.SysMobileMenuRole;
import com.yxt.anrui.portal.api.sysmobilemenurole.SysMobileMenuRoleVo;
import org.apache.ibatis.annotations.Mapper;
@ -42,4 +44,14 @@ public interface SysMobileMenuRoleMapper extends BaseMapper<SysMobileMenuRole> {
* @return
*/
int deleteByRoleSid(String roleSid);
/**
* 移动端插件下的应用按应用类别分类
*
* @param appSid 插件appSid
* @return
*/
List<AppIndexNewVo> getApp( @Param("appSid") String appSid);
List<AppIndexNewListVo> appRoleMenu(@Param("path") String path, @Param("roleSids") List<String> roleSids, @Param("titleGroup") String titleGroup, @Param("appSid") String appSid);
}

34
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleMapper.xml

@ -28,4 +28,38 @@
from sys_mobile_menu_role
where roleSid = #{roleSid}
</delete>
<select id="getApp" resultType="com.yxt.anrui.portal.api.index.AppIndexNewVo">
select titleGroup as title
from sys_mobile_menu
where linkSid = #{appSid}
group by titleGroup
</select>
<!-- <resultMap id="appRoleMenu" type="com.yxt.anrui.portal.api.index.AppIndexNewVo">
<result column="title" jdbcType="VARCHAR" property="title"/>
<collection property="apps" ofType="com.yxt.anrui.portal.api.index.AppIndexNewListVo"
select="apps" column="{appSid = appSid,title = title,prefixPath = prefixPath}">
</collection>
</resultMap>-->
<select id="appRoleMenu" resultType="com.yxt.anrui.portal.api.index.AppIndexNewListVo">
select smm.title name,
if(length(smm.iconUrl) > 0, concat(#{path}, smm.iconUrl), '') as icon,
smm.sid,
smm.titleGroup classification,
smm.sortNo,
smm.path moduleAction,
smm.json
from sys_mobile_menu smm
left join sys_mobile_menu_role smmr on smmr.menuSid = smm.sid
left join sys_user_role sr on sr.sid = smmr.roleSid
where smm.linkSid = #{appSid}
and smmr.roleSid in
<foreach collection="roleSids" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
and smm.titleGroup = #{titleGroup}
order by smm.sortNo asc
</select>
</mapper>

20
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleService.java

@ -1,6 +1,8 @@
package com.yxt.anrui.portal.biz.sysmobilemenurole;
import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo;
import com.yxt.anrui.portal.api.index.AppIndexNewListVo;
import com.yxt.anrui.portal.api.index.AppIndexNewVo;
import com.yxt.anrui.portal.api.sysmobilemenurole.SysMobileMenuRole;
import com.yxt.anrui.portal.api.sysmobilemenurole.SysMobileMenuRoleDto;
import com.yxt.anrui.portal.api.sysmobilemenurole.SysMobileMenuRoleVo;
@ -15,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
@ -125,4 +128,21 @@ public class SysMobileMenuRoleService extends MybatisBaseService<SysMobileMenuRo
}
return rb.success();
}
public List<AppIndexNewVo> getApp(List<String> roleSids, String appSid) {
String path = fileUploadComponent.getUrlPrefix();
List<AppIndexNewVo> appIndexNewVos = baseMapper.getApp(appSid);
appIndexNewVos.removeAll(Collections.singleton(null));
if (!appIndexNewVos.isEmpty()) {
for (AppIndexNewVo vo : appIndexNewVos) {
String titleGroup = vo.getTitle();
List<AppIndexNewListVo> apps = baseMapper.appRoleMenu(path, roleSids, titleGroup, appSid);
apps.removeAll(Collections.singleton(null));
if (!apps.isEmpty()) {
vo.setApps(apps);
}
}
}
return appIndexNewVos;
}
}

11
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleService.java

@ -3,17 +3,16 @@ package com.yxt.anrui.portal.biz.sysuserrole;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
import com.yxt.anrui.portal.api.sysuserrole.SysUserRole;
import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleDto;
import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleQuery;
import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleVo;
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 com.yxt.anrui.portal.api.sysuserrole.SysUserRole;
import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleQuery;
import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleVo;
import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleDto;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java

@ -55,7 +55,7 @@ import org.springframework.web.bind.annotation.*;
fallback = ScmVehicleExamineFeignFallback.class)
public interface ScmVehicleExamineFeign {
@ApiOperation("根据条件分页查询数据的列表 ")
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ResponseBody
public ResultBean<PagerVo<ScmVehicleExamineVo>> listPage(@RequestBody PagerQuery<ScmVehicleExamineQuery> pq);

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@ -654,7 +654,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
if (depositUseRuleKey.equals("002")) {
if (deposit > 0) {
finPaymentrecordDto.setCost(price - deposit / num);//付款金额
finPaymentrecordDto.setPayRemark("订金使用规则为" + outsourcingApplicationDetailsVo.getDepositUseRuleValue() + "," + "订金为" + (deposit / num));
finPaymentrecordDto.setPayRemark("本车使用订金" + (deposit / num) + "元。");
} else {
finPaymentrecordDto.setCost(price);//付款金额
}
@ -665,7 +665,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
finPaymentrecordDto.setCost(price);//付款金额
} else if (i == 1) {
finPaymentrecordDto.setCost(price - deposit);
finPaymentrecordDto.setPayRemark("此台车为末台车" + "," + "订金为" + deposit);
finPaymentrecordDto.setPayRemark("本车为末台车,使用订金" + deposit + "元。");
}
}

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoDto.java

@ -1,5 +1,6 @@
package com.yxt.anrui.terminal.api.autoservice.distributor;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -17,8 +18,10 @@ public class DisBaseInfoDto implements Dto {
@ApiModelProperty(value = "所属经销商")
@NotBlank(message = "参数错误:所属经销商")
@JsonProperty("distributorNamep")
private String pDistributorName;
@ApiModelProperty(value = "所属经销商sid",example = "0")
@JsonProperty("distributorSidp")
private String pDistributorSid;
@ApiModelProperty(value = "经销商")

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoVo.java

@ -15,10 +15,10 @@ public class DisBaseInfoVo implements Vo {
private static final long serialVersionUID = 542120074428670391L;
@ApiModelProperty(value = "所属经销商")
@JsonProperty("pDistributorName")
@JsonProperty("distributorNamep")
private String pDistributorName;
@ApiModelProperty(value = "所属经销商sid")
@JsonProperty("pDistributorSid")
@JsonProperty("distributorSidp")
private String pDistributorSid;
@ApiModelProperty(value = "经销商")

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java

@ -31,7 +31,7 @@ public interface DistributorFeign {
@ResponseBody
ResultBean<DisDetailsVo> getDistributorDetail(@PathVariable(value = "distributorSid") String distributorSid);
@ApiOperation("移动端-经销商初始化详情")
@ApiOperation("移动端-经销商初始化详情 ")
@GetMapping("/getDistributorInfo/{distributorSid}")
@ResponseBody
ResultBean<DisInitDetailsVo> getDistributorInfo(@PathVariable(value = "distributorSid") String sid);

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorQuery.java

@ -16,7 +16,8 @@ public class DistributorQuery implements Query {
private String userSid;
@ApiModelProperty(value = "名称")
private String name;
@ApiModelProperty(value = "当前经销商sid")
private String distributorSid;
@ApiModelProperty("机构sid")
private String orgPath;
}

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/intermediary/MiddlemanDetailsVo.java

@ -29,6 +29,10 @@ public class MiddlemanDetailsVo implements Vo {
@ApiModelProperty(value = "用户sid")
@JsonProperty("userSid")
private String createBySid;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("机构sid")
private String orgPath;
private String companySid;
}

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/intermediary/MiddlemanDto.java

@ -31,4 +31,8 @@ public class MiddlemanDto implements Dto {
@ApiModelProperty("用户sid")
@JsonProperty(value = "userSid")
private String createBySid;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("机构sid")
private String orgPath;
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/intermediary/MiddlemanQuery.java

@ -16,4 +16,6 @@ public class MiddlemanQuery implements Query {
private String userSid;
@ApiModelProperty(value = "姓名、所在单位、手机号码")
private String name;
@ApiModelProperty("机构sid")
private String orgPath;
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java

@ -49,7 +49,7 @@ import org.springframework.web.bind.annotation.*;
*/
@Api(tags = "巡检记录")
@FeignClient(
contextId = "anrui-scm-ScmVehiclePatrolinspection",
contextId = "anrui-terminal-ScmVehiclePatrolinspection",
name = "anrui-terminal",
path = "/supplychain/v1/inspection",
fallback = AppScmVehiclePatrolinspectionFeignFallback.class)

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/purchaseReturn/AppScmVehicleReturnFeign.java

@ -1,10 +1,8 @@
package com.yxt.anrui.terminal.api.supplychain.purchaseReturn;
import com.yxt.anrui.terminal.api.supplychain.modelAdjust.ModelModpriceQuery;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
@ -16,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
* @Description
*/
@FeignClient(
contextId = "anrui-scm-ScmVehicleReturn",
contextId = "anrui-terminal-ScmVehicleReturn",
name = "anrui-terminal",
path = "supplychain/v1/purchaseReturn",
fallback = AppScmVehicleReturnFeignFallback.class)

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleenterlibrary/AppScmVehicleEnterlibraryFeign.java

@ -48,7 +48,7 @@ import org.springframework.web.bind.annotation.*;
*/
@Api(tags = "入库单")
@FeignClient(
contextId = "scm-ScmVehicleEnterlibrary",
contextId = "terminal-ScmVehicleEnterlibrary",
name = "anrui-terminal",
path = "/supplychain/v1/carWarehousing",
fallback = AppScmVehicleEnterlibraryFeignFallback.class)

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppScmVehicleExamineFeign.java

@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
*/
@Api(tags = "验车单")
@FeignClient(
contextId = "scm-ScmVehicleExamine",
contextId = "terminal-ScmVehicleExamine",
name = "anrui-terminal",
path = "/supplychain/v1/carInspected",
fallback = AppScmVehicleExamineFeignFallback.class)

Loading…
Cancel
Save