From 59a1ef27660abf31f77be10eb057d1c5f50576c4 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 12 Jan 2023 14:38:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicle/AppCarConfigSummaryDto.java | 5 +++ .../busvehicleapply/BusVehicleApplyDto.java | 5 ++- .../BusVehicleApplyService.java | 41 ++++++++++-------- .../BusVehicleOfferService.java | 2 + .../BusSalesOrderVehicle.java | 2 + .../BusSalesOrderVehicleFeign.java | 5 +++ .../BusSalesOrderVehicleFeignFallback.java | 5 +++ .../BusSalesOrderVehicleMapper.java | 3 ++ .../BusSalesOrderVehicleMapper.xml | 4 ++ .../BusSalesOrderVehicleRest.java | 5 +++ .../BusSalesOrderVehicleService.java | 6 +++ .../fin/api/fincostapply/FinCostapplyDto.java | 4 +- .../biz/fincostapply/FinCostapplyService.java | 37 ++++++++-------- .../api/sysorganization/SysOrganization.java | 5 +++ .../sysorganization/SysOrganizationVo.java | 2 + .../portal/api/sysuser/SysMenuRoleVoList.java | 24 +++++++++++ .../portal/api/sysuser/SysUserFeign.java | 15 +++++++ .../api/sysuser/SysUserFeignFallback.java | 11 +++++ .../sysorganization/SysOrganizationRest.java | 23 ++++------ .../SysOrganizationService.java | 14 ++++-- .../portal/biz/sysrole/SysRoleMapper.java | 3 ++ .../portal/biz/sysrole/SysRoleMapper.xml | 5 +++ .../portal/biz/sysrole/SysRoleService.java | 5 +++ .../portal/biz/sysuser/SysUserMapper.java | 1 + .../anrui/portal/biz/sysuser/SysUserRest.java | 11 +++++ .../portal/biz/sysuser/SysUserService.java | 43 +++++++++++++++++++ 26 files changed, 230 insertions(+), 56 deletions(-) create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysMenuRoleVoList.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCarConfigSummaryDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCarConfigSummaryDto.java index 6cc102ee1b..31df701a22 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCarConfigSummaryDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCarConfigSummaryDto.java @@ -28,4 +28,9 @@ public class AppCarConfigSummaryDto implements Dto { @ApiModelProperty("车型名称") private String model; + @ApiModelProperty("选装") + private String choiceConfig; + @ApiModelProperty("换装") + private String changeConfig; + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java index 830abe2558..9b14876427 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java @@ -82,7 +82,10 @@ public class BusVehicleApplyDto implements Dto { @ApiModelProperty(value = "供应商sid") private String supplierSid; - @ApiModelProperty("申请人orgSidPath") + @ApiModelProperty("申请人orgSidPath：后端自己获取的") private String orgSidPath; + @ApiModelProperty("当前组织机构全路径sid") + private String orgPath; + } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index d5bfee2989..0b4af1c23a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -224,7 +224,12 @@ public class BusVehicleApplyService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); @@ -360,18 +365,23 @@ public class BusVehicleApplyService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); - if (!userVoResultBean.getSuccess()) { - return rb.setMsg(userVoResultBean.getMsg()); - } - //根据staffSid获取用户的组织全路径 - ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); - if (!staffOrgResultBean.getSuccess()) { - return rb.setMsg(staffOrgResultBean.getMsg()); - } //用户的组织全路径 - String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + String orgSidPath = ""; + if(StringUtils.isNotBlank(dto.getOrgPath())){ + orgSidPath = dto.getOrgPath(); + }else{ + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + } AtomicReference busVehicleApply = new AtomicReference<>(fetchBySid(dto.getSid())); int r = submitBusinessData(dto, busVehicleApply.get()); if (r == 3) { @@ -598,13 +608,6 @@ public class BusVehicleApplyService extends MybatisBaseService busApplyVo = baseManufacturerBankService.selectBankByApplySid(busVehicleApply.getCreateOrgSid()); - busApplyVo.removeAll(Collections.singleton(null)); - if (!busApplyVo.isEmpty()) { - finPaymentrecordDto.setReceiveBankAccount(busApplyVo.get(0).getNum()); - finPaymentrecordDto.setReceiveCompany(busApplyVo.get(0).getName()); - finPaymentrecordDto.setPayCode(busApplyVo.get(0).getCode()); - }*/ finPaymentrecordDto.setBusSid(r.getData()); finPaymentrecordFeign.save(finPaymentrecordDto); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferService.java index 9498ec6075..24de57df9d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferService.java @@ -52,6 +52,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; /** @@ -426,6 +427,7 @@ public class BusVehicleOfferService extends MybatisBaseService> fetchByVehSid(@PathVariable("vehSid") String vehSid); + + @ApiOperation("根据销售订单车辆表的sid更新临时号码") + @PostMapping("/updateTemporaryNo") + @ResponseBody + ResultBean updateTemporaryNo(@RequestParam("sid")String sid,@RequestParam("temporaryNo")String temporaryNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java index feb70122ea..edc7c1dd0f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java @@ -63,4 +63,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe return null; } + @Override + public ResultBean updateTemporaryNo(String sid, String temporaryNo) { + return null; + } + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java index acda2b12d6..c5bf9ad875 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java @@ -31,6 +31,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -96,4 +97,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper fetchByVehSid(String vehSid); List selectListBySids(String sid); + + int updateTemporaryNo(@Param("sid") String sid, @Param("temporaryNo") String temporaryNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index e46d247aac..2047234adc 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml @@ -63,4 +63,8 @@ + + + update bus_sales_order_vehicle set temporaryNo = #{temporaryNo} where sid = #{sid} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java index bfbf136cae..3ccfb1a410 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java @@ -73,5 +73,10 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign { return busSalesOrderVehicleService.fetchByVehSid(vehSid); } + @Override + public ResultBean updateTemporaryNo(String sid, String temporaryNo) { + return busSalesOrderVehicleService.updateTemporaryNo(sid,temporaryNo); + } + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index e948d34957..6708dd9d76 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -206,4 +206,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService sysPostVoResultBean = sysStaffPostFeign.selectPost(userVoResultBean.getData().getStaffSid()); - if (!sysPostVoResultBean.getSuccess()) { - return rb.setMsg(sysPostVoResultBean.getMsg()); - } - String roleSid = sysPostVoResultBean.getData(); - //根据组织架构、角色两个参数取相关符合条件的用户信息 - UserQuery userQuery = new UserQuery(); - userQuery.setRoleSid(roleSid); - userQuery.setOrgSidPath(orgSidPath); - List sysUserVos = sysUserFeign.getUserByRole(userQuery).getData(); - sysUserVos.removeAll(Collections.singleton(null)); - if (sysUserVos.isEmpty()) { - return rb.setMsg("下一环节没有用户"); - }*/ //根据员工的sid查询员工的角色 - String userSid = dto.getCreateBySid(); + /*String userSid = dto.getCreateBySid(); ResultBean> userRoleList = sysUserRoleFeign.getUserRoleSidByUserSid(userSid); UserRoleQuery userRoleQuery = new UserRoleQuery(); if (userRoleList.getData().size() > 0) { @@ -333,6 +324,16 @@ public class FinCostapplyService extends MybatisBaseService orgPathList = Arrays.asList(orgSidPath.split("/")); + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size()-1)).getData(); + if(sysOrganization == null){ + return rb.setMsg("当前所在的组织机构不存在"); + } + if(StringUtils.isBlank(sysOrganization.getManagerSid())){ + return rb.setMsg("当前所在的组织机构未设置主管人员"); + } + String nextNodeUserSids_ = sysOrganization.getManagerSid(); bv.setNextNodeUserSids(nextNodeUserSids_); if (r == 1) { ResultBean voResultBean = flowableFeign.startProcess(bv); diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganization.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganization.java index 5f25abb305..d04b56136e 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganization.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganization.java @@ -84,4 +84,9 @@ public class SysOrganization extends BaseEntity { @ApiModelProperty("其他编码") private String otherCode; + + @ApiModelProperty("主管人员sid") + private String managerSid; + @ApiModelProperty("主管人员姓名") + private String managerName; } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationVo.java index bbfefd8e24..b2848a42e0 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationVo.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationVo.java @@ -83,4 +83,6 @@ public class SysOrganizationVo implements Vo { private String orgLevelValue; @ApiModelProperty("其他编码") private String otherCode; + @ApiModelProperty("主管用户sid") + private String managerSid; } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysMenuRoleVoList.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysMenuRoleVoList.java new file mode 100644 index 0000000000..0f9484e77d --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysMenuRoleVoList.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.portal.api.sysuser; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/1/12 9:37 + * @Description + */ +@Data +public class SysMenuRoleVoList implements Vo { + private static final long serialVersionUID = 5964551098152631513L; + + @ApiModelProperty("角色sid") + private String roleSid; + @ApiModelProperty("角色名称") + private String roleName; + @ApiModelProperty("角色层级") + private String roleType; + @ApiModelProperty("角色层级value") + private String roleTypeValue; +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java index 1c689550b2..7f886c3713 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java @@ -3,6 +3,7 @@ package com.yxt.anrui.portal.api.sysuser; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; +import com.yxt.anrui.portal.api.sysuser.app.OrgList; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -232,4 +233,18 @@ public interface SysUserFeign { @ApiOperation(value = "查询是否需要更换密码") @GetMapping(value = "/selectPasswordByUserSid/{userSid}") ResultBean selectPasswordByUserSid(@PathVariable("userSid")String userSid); + + /** + * 查询该菜单是否允许创建，是否有提醒消息 + * @param menuSid 菜单sid + * @param orgPath 当前组织机构全路径sid + * @return + */ + @ApiOperation(value = "查询该菜单是否允许创建，是否有提醒消息") + @GetMapping(value = "/selectHaveMessage") + ResultBean selectHaveMessage(@RequestParam("menuSid")String menuSid,@RequestParam("orgPath")String orgPath); + + @ApiOperation(value = "根据用户sid获取当前用户所有的组织机构list") + @GetMapping(value = "/getOrgListByUserSid") + ResultBean> getOrgListByUserSid(@RequestParam("userSid")String userSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java index a021f1fcf0..3bf51460a1 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java @@ -1,6 +1,7 @@ package com.yxt.anrui.portal.api.sysuser; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo; +import com.yxt.anrui.portal.api.sysuser.app.OrgList; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -214,4 +215,14 @@ public class SysUserFeignFallback implements SysUserFeign { public ResultBean selectPasswordByUserSid(String userSid) { return null; } + + @Override + public ResultBean selectHaveMessage(String menuSid, String orgPath) { + return null; + } + + @Override + public ResultBean> getOrgListByUserSid(String userSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java index ed62652180..09bb9a1e5b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java @@ -5,7 +5,9 @@ import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.bddepartment.BdDepartment; import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations; import com.yxt.anrui.portal.api.sysorganization.*; +import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService; import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService; import com.yxt.anrui.portal.biz.sysuser.SysUserService; @@ -61,6 +63,7 @@ public class SysOrganizationRest implements SysOrganizationFeign { private RedisUtil redisUtil; @Resource private FinKingDeeFeign finKingDeeFeign; + private SysStaffinfoService sysStaffInfoService; @Override public ResultBean> listPage(@RequestBody PagerQuery pq) { @@ -121,29 +124,21 @@ public class SysOrganizationRest implements SysOrganizationFeign { String zgStaffSid = dto.getZgStaffSid(); //分管人员的sid String fgStaffSid = dto.getFgStaffSid(); - //查询分管人员中是否包含主管人员 - if (StringUtils.isNotBlank(fgStaffSid)) { - if (StringUtils.isNotBlank(zgStaffSid)) { - if (fgStaffSid.contains(zgStaffSid)) { - return rb.setMsg("同一个组织机构中主管分管的人员不能重复"); - } - } + if(StringUtils.isNotBlank(zgStaffSid)){ + SysStaffinfo sysStaffinfo = sysStaffInfoService.fetchBySid(zgStaffSid); + sysOrganization.setManagerName(sysStaffinfo.getName()); + SysUserVo sysUser = sysUserService.selectByStaffsid(zgStaffSid); + sysOrganization.setManagerSid(sysUser.getSid()); } //删除关联关系中的所有主管与分管的人员关系 sysStaffOrgService.delZGAndFGByOrgSid(sid); - /*if (StringUtils.isNotBlank(zgStaffSid)) { - ResultBean resultBean = sysOrganizationService.addSysStaffOrg(zgStaffSid, "1", sysOrganization); - if (!resultBean.getSuccess()) { - return rb.setMsg(resultBean.getMsg()); - } - }*/ if (StringUtils.isNotBlank(fgStaffSid)) { ResultBean resultBean = sysOrganizationService.addSysStaffOrg(fgStaffSid, "2", sysOrganization); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } } - sysOrganizationService.updateBySid(dto.toMap(), sid); + sysOrganizationService.updateById(sysOrganization); //修改金蝶组织信息 List orgOrganizationsList = new ArrayList<>(); if (0 == dto.getIsDept()){ diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java index 759aed25e2..31694c5582 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java @@ -7,12 +7,14 @@ import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandSelectQuery; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandSelectVo; +import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.bddepartment.BdDepartment; import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations; import com.yxt.anrui.portal.api.sysorganization.*; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService; import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService; import com.yxt.anrui.portal.biz.sysuser.SysUserService; @@ -27,7 +29,6 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import javax.annotation.Resource; import java.util.*; @@ -258,13 +259,20 @@ public class SysOrganizationService extends MybatisBaseService { String selectByUserSid(String sid); List selectByUser(String userSid); + + List selectRoleList(String menuSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml index 85eac117c7..80d0c8dc26 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml @@ -90,4 +90,9 @@ from sys_user_role where userSid = #{userSid} + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java index cd8d0b4bde..1fc5b4f02f 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java @@ -7,6 +7,7 @@ import com.yxt.anrui.portal.api.sysrole.SysRole; import com.yxt.anrui.portal.api.sysrole.SysRoleDto; import com.yxt.anrui.portal.api.sysrole.SysRoleQuery; import com.yxt.anrui.portal.api.sysrole.SysRoleVo; +import com.yxt.anrui.portal.api.sysuser.SysMenuRoleVoList; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -162,4 +163,8 @@ public class SysRoleService extends MybatisBaseService { public List selectByUser(String userSid) { return baseMapper.selectByUser(userSid); } + + public List selectRoleList(String menuSid) { + return baseMapper.selectRoleList(menuSid); + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java index dc0ea1d6e8..542a6d4d10 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo; +import com.yxt.anrui.portal.api.sysuser.SysMenuRoleVoList; import com.yxt.anrui.portal.api.sysuser.SysUser; import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo; import com.yxt.anrui.portal.api.sysuser.SysUserVo; 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 3e58488482..1faf291e3e 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 @@ -11,6 +11,7 @@ import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPost; import com.yxt.anrui.portal.api.systemlog.SystemLog; import com.yxt.anrui.portal.api.sysuser.*; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; +import com.yxt.anrui.portal.api.sysuser.app.OrgList; import com.yxt.anrui.portal.biz.sysorganization.SysOrganizationService; import com.yxt.anrui.portal.biz.syspost.SysPostService; import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService; @@ -633,4 +634,14 @@ public class SysUserRest implements SysUserFeign { public ResultBean selectPasswordByUserSid(String userSid) { return sysUserService.selectPasswordByUserSid(userSid); } + + @Override + public ResultBean selectHaveMessage(String menuSid, String orgPath) { + return sysUserService.selectHaveMessage(menuSid,orgPath); + } + + @Override + public ResultBean> getOrgListByUserSid(String userSid) { + return sysUserService.getOrgListByUserSid(userSid); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index 5e2370a928..aa6585969e 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -1151,4 +1151,47 @@ public class SysUserService extends MybatisBaseService { public int updateAppIdNull(String appId) { return baseMapper.updateAppIdNull(appId); } + + public ResultBean selectHaveMessage(String menuSid, String orgPath) { + ResultBean rb = ResultBean.fireFail(); + //根据orgPath 查询当前组织所管理的层级 + List orgPathsList = Arrays.asList(orgPath.split("/")); + String orgSid = orgPathsList.get(orgPathsList.size()-1); + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid); + if(sysOrganization == null){ + return rb.setMsg("当前所在组织机构不存在"); + } + //根据菜单sid查询所授权的角色 + List list = sysRoleService.selectRoleList(menuSid); + list.removeAll(Collections.singleton(null)); + if(!list.isEmpty()){ + List typeList = list.stream().map(v->v.getRoleType()).collect(Collectors.toList()); + if(StringUtils.isBlank(sysOrganization.getOrgLevelKey())){ + return rb.setMsg("当前组织未设置管理层级"); + } + if(!typeList.contains(sysOrganization.getOrgLevelKey())){ + return rb.setMsg("请检查当前菜单是否为目前机构层级对应的角色"); + } + + }else{ + return rb.setMsg("当前菜单未授权角色权限"); + } + return rb.success(); + } + + public ResultBean> getOrgListByUserSid(String userSid) { + ResultBean> rb = ResultBean.fireFail(); + SysUser sysUser = fetchBySid(userSid); + List sysStaffOrgVos = sysStaffOrgService.selectByStaffS(sysUser.getStaffSid()); + List orgList = new ArrayList<>(); + if (sysStaffOrgVos.size() > 0) { + for (SysStaffOrgVo vv : sysStaffOrgVos) { + OrgList orgList1 = new OrgList(); + orgList1.setOrgPath(vv.getOrgSidPath()); + orgList1.setOrgName(vv.getOrgNamePath()); + orgList.add(orgList1); + } + } + return rb.success().setData(orgList); + } } \ No newline at end of file From 39976aa4644092389a97bf89a35ee81b9f7b6b22 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 12 Jan 2023 16:55:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicle/AppCarConfigSummaryDto.java | 2 + .../BusVehicleInquiryService.java | 36 ++++-- .../bussalesorder/BusSalesOrderService.java | 4 +- .../BusSalesOrderModelMapper.xml | 2 +- .../FinCollectionConfirmationService.java | 119 +----------------- ...UncollectedReceivablesDetailedService.java | 3 + 6 files changed, 34 insertions(+), 132 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCarConfigSummaryDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCarConfigSummaryDto.java index 31df701a22..bd1fddcc38 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCarConfigSummaryDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCarConfigSummaryDto.java @@ -32,5 +32,7 @@ public class AppCarConfigSummaryDto implements Dto { private String choiceConfig; @ApiModelProperty("换装") private String changeConfig; + + private String orgPath; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java index 08969ddaf1..fcab38ddd9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java @@ -31,24 +31,26 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig; import com.yxt.anrui.base.api.basevehicle.AppCarConfigSummaryDto; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; -import com.yxt.anrui.base.api.busvehicleinquiry.*; +import com.yxt.anrui.base.api.busvehicleinquiry.BusVehicleInquiry; +import com.yxt.anrui.base.api.busvehicleinquiry.BusVehicleInquiryDto; +import com.yxt.anrui.base.api.busvehicleinquiry.BusVehicleInquiryQuery; +import com.yxt.anrui.base.api.busvehicleinquiry.BusVehicleInquiryVo; import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; -import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +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.app.AppUserOrgInfoVo; -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.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.xml.crypto.Data; -import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; @@ -76,6 +78,8 @@ public class BusVehicleInquiryService extends MybatisBaseService listPageVo(PagerQuery pq) { BusVehicleInquiryQuery query = pq.getParams(); @@ -132,12 +136,20 @@ public class BusVehicleInquiryService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + if(userVoResultBean.getData() != null){ + busVehicleInquiry.setInquirer(userVoResultBean.getData().getName()); + } + }else{ + String userSid = dto.getUserSid(); + AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData(); + busVehicleInquiry.setInquirer(data.getStaffName()); + busVehicleInquiry.setCreateOrgSid(data.getOrgSid()); + } busVehicleInquiry.setCreateTime(new Date()); BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(dto.getModelSid()); busVehicleInquiry.setBrandSid(baseVehicleModel.getCarBrand()); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 9b23ad7ee0..46ac0d3017 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -2790,7 +2790,7 @@ public class BusSalesOrderService extends MybatisBaseService imagess = Arrays.asList(imagesFile.split(",")); @@ -2980,6 +2980,8 @@ public class BusSalesOrderService extends MybatisBaseService finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "车款"); - finSelectedReceivablesDetailedVos1.removeAll(Collections.singleton(null)); - if (!finSelectedReceivablesDetailedVos1.isEmpty()) { - for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos1) { - //先推送客户 - BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), finSelectedReceivablesDetailedVo.getCustomerName(), finSelectedReceivablesDetailedVo.getCustomerPhone()); - ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer); - //往来单位 - arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber()); - //结算方式 - freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); - freceivebillentry.setFSETTLETYPEIDType("customerPayType"); - //收款金额 - freceivebillentry.setFRECTOTALAMOUNTFOR(finSelectedReceivablesDetailedVo.getSumAll()); - //登记日期 - freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); - //收款用途 - freceivebillentry.setFPURPOSEIDKey("001"); - freceivebillentry.setFPURPOSEIDType("cw_skyt"); - freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); - fEntityList.add(freceivebillentry); - //项目类别key、value - arReceivebill.setF_PAEZ_AssistantType("cw_sklb"); - FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailedVos1.get(0).getReceivablesSid()); - if ("1".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) { - arReceivebill.setF_PAEZ_AssistantKey("001"); - } else if ("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) { - arReceivebill.setF_PAEZ_AssistantKey("002"); - } - - arReceivebill.setFRECEIVEBILLENTRY(fEntityList); - ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill); - - } - }*/ - + //推送订金 if (finSelectedReceivablesDetailedVos2.size() > 0) { voListv = finSelectedReceivablesDetailedService.selectDetailsList(sid, 1, "订金"); //查询是否含有车架号 @@ -1617,38 +1581,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "订金"); - fEntityList = new ArrayList<>(); - freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); - finSelectedReceivablesDetailedVos2.removeAll(Collections.singleton(null)); - if (!finSelectedReceivablesDetailedVos2.isEmpty()) { - for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos2) { - //先推送客户 - BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), finSelectedReceivablesDetailedVo.getCustomerName(), finSelectedReceivablesDetailedVo.getCustomerPhone()); - ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer); - //往来单位 - arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber()); - //结算方式 - freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); - freceivebillentry.setFSETTLETYPEIDType("customerPayType"); - //收款金额 - freceivebillentry.setFRECTOTALAMOUNTFOR(finSelectedReceivablesDetailedVo.getSumAll()); - //登记日期 - freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); - //收款用途 - freceivebillentry.setFPURPOSEIDKey("002"); - freceivebillentry.setFPURPOSEIDType("cw_skyt"); - freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); - fEntityList.add(freceivebillentry); - arReceivebill.setFRECEIVEBILLENTRY(fEntityList); - //项目类别key、value - arReceivebill.setF_PAEZ_AssistantType("cw_sklb"); - arReceivebill.setF_PAEZ_AssistantKey("006"); - ResultBean resultBean2 = arReceivebillService.draftArReceivebill(arReceivebill); - } - }*/ //简易订单-订金收取 if (finSelectedReceivablesDetailedVos1.isEmpty() && finSelectedReceivablesDetailedVos2.isEmpty()) { //先推送客户 @@ -1769,56 +1702,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, auditState); - for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { - String sid1 = finSelectedReceivablesDetailedVo.getSid(); -// finSelectedReceivablesDetailedService.cashierConfirm(sid1); - //更新审核时间 - finSelectedReceivablesDetailedService.updateAuditDateBySid(sid1, "3"); - //认款金额 - BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); - totalSubscriptionMoney = totalSubscriptionMoney.add(subscriptionMoney); - String vin = finSelectedReceivablesDetailedVo.getVIN(); - String receivablesName = finSelectedReceivablesDetailedVo.getReceivablesName(); - String useOrgSid = finSelectedReceivablesDetailedVo.getUseOrgSid(); - FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName); - String sid2 = finUncollectedReceivablesDetailedVo.getSid(); - //应收未收款项-当前应收金额 - BigDecimal currentReceivableMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getCurrentReceivableMoney()); - //已选应收款项-认款金额 - BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney); - finUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract)); - FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto(); - BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto); - finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid()); - if (subtract.compareTo(BigDecimal.ZERO) == 0) { - int subscriptionState = 3; - finUncollectedReceivablesDetailedService.updateSubscriptionStateBySid(sid2, subscriptionState); - } else { - int subscriptionState = 2; - finUncollectedReceivablesDetailedService.updateSubscriptionStateBySid(sid2, subscriptionState); - } - } - FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid); - BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney(); - BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMoney); - if (subtract.compareTo(BigDecimal.ZERO) == 0) { - int paymentState = 3; - baseMapper.updatePaymentStateBySid(sid, paymentState); - } else { - int paymentState = 2; - baseMapper.updatePaymentStateBySid(sid, paymentState); - } - //更新余额 - BigDecimal balanceBigDecimal = confirmation.getBalance().subtract(totalSubscriptionMoney); - baseMapper.updateBalanceBySid(sid, balanceBigDecimal); - //删除临时表的数据 - ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);*/ return rb.success().setMsg("款项确认成功"); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index fa0308a606..c33c06d65d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -183,9 +183,12 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService if (resultBean.getData() != null) { String vinNo = resultBean.getData().getLinkNo(); String vinSid = resultBean.getData().getLinkSid(); + String temporaryNo = resultBean.getData().getTemporaryNo(); v.setVIN(vinNo); if(StringUtils.isNotBlank(vinNo)){ v.setVIN(vinNo.substring(vinNo.length()-8)); + }else{ + v.setVIN(temporaryNo); } } } From 383004f8c2b45e3b938b3f9d578091601b5f5325 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 13 Jan 2023 13:37:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 46ac0d3017..7c4e91fe82 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -2414,6 +2414,8 @@ public class BusSalesOrderService extends MybatisBaseService 0) { String imagesFile = images.stream().map(v -> v.replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(",")); int i = baseMapper.updateImages(imagesFile, sid); + }else{ + int i = baseMapper.updateImages("", sid); } //根据销售订单sid更新补充说明字段 int i = baseMapper.updateNodesBySid(dto.getRemarks(), sid);