diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java index 372dccf60d..a4c330bcf2 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java @@ -111,4 +111,6 @@ public class CommonContract extends BaseEntity { private String taskId; @ApiModelProperty("生成的合同的url") private String commonContractUrl; + + private String configSid; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractBuscenterVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractBuscenterVo.java index dbb7107f56..4e4b066971 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractBuscenterVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractBuscenterVo.java @@ -88,4 +88,6 @@ public class CommonContractBuscenterVo implements Vo { @ApiModelProperty("附件文件") private List pcCommonAppendixDtoList; + private String commonContractUrl; + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 50bd9585b7..a4fb65ad53 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1372,52 +1372,62 @@ public class CommonContractService extends MybatisBaseService future3 = pool.submit(() -> { - //新增合同信息 - CommonContract commonContract = new CommonContract(); - //合同编号 - commonContract.setContractNo(contractNo); - //合同类型 - if("现车".equals(appOrderDetailsVo.getOrderType())){ - commonContract.setContractTypeKey(CommonContractEnum.contractType.XC_CONTRACT.getCode()); - commonContract.setContractType(CommonContractEnum.contractType.XC_CONTRACT.getRemarks()); - }else{ - commonContract.setContractTypeKey(CommonContractEnum.contractType.DC_CONTRACT.getCode()); - commonContract.setContractType(CommonContractEnum.contractType.DC_CONTRACT.getRemarks()); - } - //客户sid - commonContract.setCustomerSid(appOrderDetailsVo.getCustomerSid()); - //业务员sid、业务员 - commonContract.setStaffSid(appOrderDetailsVo.getUserSid()); - commonContract.setStaffName(appOrderDetailsVo.getSellerName()); - //分公司sid - commonContract.setOrgSid(appOrderDetailsVo.getOrgSid()); - //业务表sid - commonContract.setBusSid(dto.getBusSid()); - //甲方名称、乙方名称、其他方名称、 - commonContract.setPartyA(createOrgName); - commonContract.setPartyB(customerName); - //签订日期、签订地点 - //订金、合同金额 - commonContract.setDeposit(new BigDecimal(depositTotal)); - commonContract.setContractAmount(depositTotal); - //合同附件 - //身份证信息附件 - //车型sid - commonContract.setModelSid(appOrderModelInfoVo.getModelSid()); - //车型名称 - commonContract.setModelName(appOrderModelInfoVo.getModelName()); - //车辆台数 - commonContract.setNum(Integer.valueOf(num).intValue()); - //车辆单价 - commonContract.setPrice(new BigDecimal(transactionPrice)); - //单台订金 - commonContract.setOneDeposit(new BigDecimal(depositInfo.getDeposit())); - commonContract.setCommonContractUrl(finalUrl); - save(commonContract); - return commonContract.getSid(); - }); + //根据销售订单sid查询合同表中是否存在 + CommonContractBuscenterVo commonContractBuscenterVo = baseMapper.selectByBusSid(dto.getBusSid()); + if (commonContractBuscenterVo == null) { + String finalUrl = url; + Future future3 = pool.submit(() -> { + //新增合同信息 + CommonContract commonContract = new CommonContract(); + //合同编号 + commonContract.setContractNo(contractNo); + //合同类型 + if ("现车".equals(appOrderDetailsVo.getOrderType())) { + commonContract.setContractTypeKey(CommonContractEnum.contractType.XC_CONTRACT.getCode()); + commonContract.setContractType(CommonContractEnum.contractType.XC_CONTRACT.getRemarks()); + } else { + commonContract.setContractTypeKey(CommonContractEnum.contractType.DC_CONTRACT.getCode()); + commonContract.setContractType(CommonContractEnum.contractType.DC_CONTRACT.getRemarks()); + } + //客户sid + commonContract.setCustomerSid(appOrderDetailsVo.getCustomerSid()); + //业务员sid、业务员 + commonContract.setStaffSid(appOrderDetailsVo.getUserSid()); + commonContract.setStaffName(appOrderDetailsVo.getSellerName()); + //分公司sid + commonContract.setOrgSid(appOrderDetailsVo.getOrgSid()); + //业务表sid + commonContract.setBusSid(dto.getBusSid()); + //甲方名称、乙方名称、其他方名称、 + commonContract.setPartyA(createOrgName); + commonContract.setPartyB(customerName); + //签订日期、签订地点 + commonContract.setCreateDate(new Date()); + commonContract.setAddress(""); + //订金 + commonContract.setDeposit(new BigDecimal(depositTotal)); + //合同金额 + commonContract.setContractAmount(depositTotal); + //合同附件 + //身份证信息附件 + //车型sid + commonContract.setModelSid(appOrderModelInfoVo.getModelSid()); + //车型名称 + commonContract.setModelName(appOrderModelInfoVo.getModelName()); + commonContract.setConfigSid(appOrderModelInfoVo.getConfigSid()); + //车辆台数 + commonContract.setNum(Integer.valueOf(num).intValue()); + //车辆单价 + commonContract.setPrice(new BigDecimal(transactionPrice)); + //单台订金 + commonContract.setOneDeposit(new BigDecimal(depositInfo.getDeposit())); + commonContract.setCommonContractUrl(finalUrl); + save(commonContract); + return commonContract.getSid(); + }); + } + + } catch (Exception e) { e.printStackTrace(); return rb.setMsg("生成文件失败"); diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 08efb09c2e..c3dd66e0d0 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -25,7 +25,7 @@ public enum ProcDefEnum { BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:4:495004"),//TODO BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:6:505004"), BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:1:497508"), - SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:7:515004"), //TODO + SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:6:510004"), //TODO FINCOSTAPPLY("费用申请","process_u0pahv0s:5:457512"), FINPAYAPPLY("付款申请","process_gin2tntb:3:457508"), BUSDELIVEREDAPPLY("出库申请","process_wgt1n66l:2:357504"), diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java index 84ed4479d2..f07876c1ea 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java @@ -94,7 +94,7 @@ public interface SysStaffinfoFeign { */ @ApiOperation("获取集团内全部员工姓名") @GetMapping("/getStaffName") - public ResultBean>> getStaffName(@RequestParam(value = "staffName", required = false) String staffName); + public ResultBean>> getStaffName(@RequestParam(value = "staffName", required = false) String staffName,@RequestParam(value = "deptSid") String deptSid); /** * 获取部门内全部员工姓名 diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java index 0faffcc255..28d4cce35d 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java @@ -54,7 +54,7 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign { } @Override - public ResultBean>> getStaffName(String staffName) { + public ResultBean>> getStaffName(String staffName,String deptSid) { return null; } 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 0e861a6711..ae3f0e87ab 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 @@ -118,12 +118,12 @@ public class SysOrganizationRest implements SysOrganizationFeign { } //删除关联关系中的所有主管与分管的人员关系 sysStaffOrgService.delZGAndFGByOrgSid(sid); - if (StringUtils.isNotBlank(zgStaffSid)) { + /*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()) { 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 efda60251c..cfce32800f 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 @@ -167,7 +167,7 @@ public class SysOrganizationService extends MybatisBaseService0){ - return rb.setMsg(sysStaffinfo.getName()+"已在本部门"); + return rb.setMsg(sysStaffinfo.getName()+"已在本部门，不能设置分管"); } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java index 733a34c28a..11ad8a6991 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java @@ -55,4 +55,8 @@ public interface SysRoleMapper extends BaseMapper { String getLevelType(String roleSid); String selectRoleSid(String userRoleSid); + + String selectByUserSid(String sid); + + List selectByUser(String userSid); } \ 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 0dae45a6e0..85eac117c7 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 @@ -77,4 +77,17 @@ left join sys_role ssr on ssp.sid = ssr.postSid where sr.sid = #{sid} + + + + \ 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 2330f70cd5..cd8d0b4bde 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 @@ -3,18 +3,15 @@ package com.yxt.anrui.portal.biz.sysrole; 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.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.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.sysrole.SysRole; -import com.yxt.anrui.portal.api.sysrole.SysRoleQuery; -import com.yxt.anrui.portal.api.sysrole.SysRoleVo; -import com.yxt.anrui.portal.api.sysrole.SysRoleDto; -import com.yxt.anrui.portal.api.sysrole.SysRoleFeign; - +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -157,4 +154,12 @@ public class SysRoleService extends MybatisBaseService { public String selectRoleSid(String userRoleSid) { return baseMapper.selectRoleSid(userRoleSid); } + + public String selectByUserSid(String sid) { + return baseMapper.selectByUserSid(sid); + } + + public List selectByUser(String userSid) { + return baseMapper.selectByUser(userSid); + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml index f501fea28d..e0966d0fbb 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml @@ -9,21 +9,21 @@ SELECT staff.sid, staff.name, staff.mobile, staff.pinYinName, staff.firstPinYinLabel, user.headImage FROM sys_staffinfo staff LEFT JOIN sys_user user - ON staff.sid = user.staffSid + ON staff.sid = user.staffSid ORDER BY staff.firstPinYinLabel = '#', staff.firstPinYinLabel ASC, staff.pinYinName @@ -68,14 +68,15 @@ FROM sys_staff_org org INNER JOIN sys_staffinfo staff ON org.staffSid = staff.sid LEFT JOIN sys_user user - ON staff.sid = user.staffSid + ON staff.sid = user.staffSid WHERE org.orgSid = #{sid} diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java index de51e31ec5..87d5139a13 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java @@ -135,9 +135,9 @@ public class SysStaffinfoRest implements SysStaffinfoFeign { } @Override - public ResultBean>> getStaffName(String staffName) { + public ResultBean>> getStaffName(String staffName,String deptSid) { ResultBean rb = ResultBean.fireFail(); - List> staffNameList = sysStaffinfoService.getStaffName(staffName); + List> staffNameList = sysStaffinfoService.getStaffName(staffName,deptSid); return rb.success().setData(staffNameList); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java index 8c2b4d2261..770f90ecaa 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java @@ -605,12 +605,13 @@ public class SysStaffinfoService extends MybatisBaseService> getStaffName(String staffName) { + public List> getStaffName(String staffName,String deptSid) { QueryWrapper> qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(staffName)) { - qw.like("name", staffName); + qw.like("ss.name", staffName); } - qw.eq("isDelete", 0); + qw.eq("ss.isDelete", 0); + qw.ne("sso.orgSid", deptSid); return baseMapper.getStaffName(qw); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java index 162e2dfe14..89a9592faa 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java @@ -54,6 +54,9 @@ public interface SysStaffOrgMapper extends BaseMapper { @Select("select * from sys_staff_org where staffSid=#{staffSid}") List getSysStaffOrgListByStaffSid(@Param("staffSid") String staffSid); + @Select("select * from sys_staff_org where staffSid=#{staffSid} and manageType = '3'") + List getSysStaffOrgListByStaff(@Param("staffSid") String staffSid); + /** * 根据员工sid更新员工信息 * diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java index 16fee5c9eb..1711acf2be 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java @@ -164,6 +164,10 @@ public class SysStaffOrgService extends MybatisBaseService getSysStaffOrgListByStaff(String staffSid) { + return baseMapper.getSysStaffOrgListByStaff(staffSid); + } + public String getSysStaffOrgSidListByStaffSid(String staffSid) { return baseMapper.getSysStaffOrgSidListByStaffSid(staffSid); } 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 66b97e66c1..792a819089 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 @@ -8,7 +8,6 @@ import com.yxt.anrui.crm.api.crmcustomer.CrmCustomer; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; import com.yxt.anrui.portal.api.sms.SmsFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganization; -import com.yxt.anrui.portal.api.sysrole.SysRoleQuery; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; @@ -327,7 +326,7 @@ public class SysUserService extends MybatisBaseService { } else { userInfoOneVo.setOrganizationName("无单位"); userInfoOneVo.setDepartmentName("无部门"); - List orgVoList = sysStaffOrgService.getSysStaffOrgListByStaffSid(user.getStaffSid()); + List orgVoList = sysStaffOrgService.getSysStaffOrgListByStaff(user.getStaffSid()); SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(user.getStaffSid()); userInfoOneVo.setPostSid(staffPostDetailsVo.getPostSid()); userInfoOneVo.setPostName(staffPostDetailsVo.getName()); @@ -337,7 +336,8 @@ public class SysUserService extends MybatisBaseService { userInfoOneVo.setDepartmentSid(sysStaffOrgVo.getOrgSid()); String psid = sysOrganizationService.fetchBySid(sysStaffOrgVo.getOrgSid()).getPsid(); String name = sysOrganizationService.fetchBySid(psid).getName(); - userInfoOneVo.setPNameAndDepartmentNameAndPostName(name + "-" + sysStaffOrgVo.getOrgName() + " " + userInfoOneVo.getPostName()); +// userInfoOneVo.setPNameAndDepartmentNameAndPostName(name + "-" + sysStaffOrgVo.getOrgName() + " " + userInfoOneVo.getPostName()); + userInfoOneVo.setPNameAndDepartmentNameAndPostName(name + "-" + sysStaffOrgVo.getOrgName()); userInfoOneVo.setOrganizationSid(sysStaffOrgVo.getOrgSid()); userInfoOneVo.setOrganizationName(sysStaffOrgVo.getOrgName()); userInfoOneVo.setOrgNamePath(sysStaffOrg.getOrgNamePath()); @@ -348,8 +348,8 @@ public class SysUserService extends MybatisBaseService { // 设置用户的角色sids List roleSids = this.getUserRoleSids(user.getSid()); userInfoOneVo.setRoleSids(roleSids); - if (userInfoOneVo.getRoleSids().contains("000003") || userInfoOneVo.getRoleSids().contains("000004")) { - } + String roleName = sysRoleService.selectByUserSid(user.getSid()); + userInfoOneVo.setRoleName(roleName); return userInfoOneVo; } @@ -385,12 +385,7 @@ public class SysUserService extends MybatisBaseService { * @return */ public List getUserRoleSids(String userSid) { - List list = new ArrayList<>(); - List orgTypeKeys = new ArrayList<>(); - SysRoleQuery roleQuery = new SysRoleQuery(); - //用户类别来区分是系统管理、单位管理员1、单位一般用户2、尚无单位用户 - roleQuery.setType(1); - return list; + return sysRoleService.selectByUser(userSid); } public SysUser fetchByUserName(String mobile) { diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java index 97b9927b07..15c4c2380b 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java @@ -26,6 +26,7 @@ package com.yxt.anrui.scm.api.scmvehiclegression; +import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -123,4 +124,7 @@ public class AppScmVehicleGressionDetailsVo implements Vo { @ApiModelProperty("调出方负责人用户sid") private String personUserSid; + @ApiModelProperty("车架号") + private List scmVehicleGressionVehs; + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java index fee108b20c..74a388848b 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java @@ -27,6 +27,7 @@ package com.yxt.anrui.scm.api.scmvehiclegression; import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -55,15 +56,15 @@ public class AppScmVehicleGressionDto implements Dto { private static final long serialVersionUID = -5753948406322577902L; private String sid; private String userSid; - @ApiModelProperty("车辆sid") - private String vehicleSid; - @ApiModelProperty("车架号") - private String vinNo; - @ApiModelProperty("车架号") - private List vins; +// @ApiModelProperty("车辆sid") +// private String vehicleSid; +// @ApiModelProperty("车架号") +// private String vinNo; +// @ApiModelProperty("车架号") +// private List vins; @ApiModelProperty("申请编号") private String applicantNo; -// @ApiModelProperty("申请人") + // @ApiModelProperty("申请人") // private String applicantName; // @ApiModelProperty("申请日期") // private String applicantDate; @@ -98,10 +99,13 @@ public class AppScmVehicleGressionDto implements Dto { private String proCardState; @ApiModelProperty("临牌状态") private String proCardStateKey; - @ApiModelProperty("临牌") - private String temporaryCard; - @ApiModelProperty("保单照片") - private List policyImage; +// @ApiModelProperty("临牌") +// private String temporaryCard; +// @ApiModelProperty("保单照片") +// private List policyImage; + + @ApiModelProperty("车架号") + private List scmVehicleGressionVehs; @ApiModelProperty("调出方负责人名称") private String staffName; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java index e1dc3442d8..bfdd483443 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java @@ -27,6 +27,7 @@ package com.yxt.anrui.scm.api.scmvehiclegression; import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -106,6 +107,9 @@ public class AppScmVehicleGressionInfoVo implements Vo { @ApiModelProperty("流程实例id") private String procInstId; + @ApiModelProperty("车架号") + private List scmVehicleGressionVehs; + @ApiModelProperty("保单照片") private List policyImage; @ApiModelProperty("现场照片") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehDto.java index 8a1cebafde..fe8e9092e5 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehDto.java @@ -51,17 +51,17 @@ public class ScmVehicleGressionVehDto implements Dto { private String sid; // sid - @ApiModelProperty("移位申请单sid") + @ApiModelProperty("移位申请单sid") private String mainSid; // 移位申请单sid - @ApiModelProperty("车辆sid") + @ApiModelProperty("车辆sid") private String vehSid; // 车辆sid - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vehVin; // 车架号 - @ApiModelProperty("买断状态key") + @ApiModelProperty("买断状态key") private String settlementStatus; // 买断状态key - @ApiModelProperty("买断状态value") + @ApiModelProperty("买断状态value") private String settlementStatusValue; // 买断状态value - @ApiModelProperty("临时牌照号码") + @ApiModelProperty("临时牌照号码") private String temporaryCardNo; // 临时牌照号码 } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index 90913744b8..995ee9b8fc 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -65,6 +65,8 @@ import com.yxt.anrui.scm.api.scmvehiclegression.flowable.GetNodeVo; import com.yxt.anrui.scm.api.scmvehiclegression.flowable.ScmCarTransferTaskQuery; import com.yxt.anrui.scm.api.scmvehiclegression.flowable.SubmitCarTransferDto; import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVeh; +import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehDto; +import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehVo; import com.yxt.anrui.scm.biz.scmexitpermit.ScmExitPermitService; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; import com.yxt.anrui.scm.biz.scmvehiclegressionveh.ScmVehicleGressionVehService; @@ -370,7 +372,8 @@ public class ScmVehicleGressionService extends MybatisBaseService scmVehicleGressionVehDtos = dto.getScmVehicleGressionVehs(); + if (scmVehicleGressionVehDtos == null) { return rb.setMsg("请选择车架号！"); } if (dto.getLocationSid().equals(dto.getTargetLocationSid())) { @@ -384,6 +387,7 @@ public class ScmVehicleGressionService extends MybatisBaseService stringStringMap = generateBillNo(userSid); String billNo = getApplyCode(dto); scmVehicleGression.setApplicantNo(billNo); -// if ("1".equals(dto.getProCardStateKey())) { -// scmVehicleGression.setTemporaryCard(dto.getTemporaryCard()); -// } else if ("0".equals(dto.getProCardStateKey())) { -// scmVehicleGression.setTemporaryCard(""); -// } -// if ("1".equals(dto.getInsuranceStateKey())) { // 如果保单状态为否 不保存保单照片 -// List factoryImage = dto.getPolicyImage(); -// if (factoryImage.size() <= 0) { -// return rb.setMsg("保单照片不能为空"); -// } -// scmFileService.deleteByLinkSidAndType(scmVehicleGression.getSid(), type); -// for (String s : factoryImage) { -// if (s.contains(fileUploadComponent.getUrlPrefix())) { -// s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); -// } -// ScmFile scmFile = new ScmFile(); -// scmFile.setAttachType(type); -// scmFile.setFileName("保单照片"); -// scmFile.setFilePath(s1); -// scmFile.setLinkSid(scmVehicleGression.getSid()); -// scmFileService.save(scmFile); -// } -// } else if ("0".equals(dto.getInsuranceStateKey())) { -// scmFileService.deleteByLinkSidAndType(scmVehicleGression.getSid(), type); -// } - save(scmVehicleGression); //存放车架号 - List vins = dto.getVins(); - if (vins != null) { - for (String vin : vins) { - ScmVehicleGressionVeh scmVehicleGressionVeh = new ScmVehicleGressionVeh(); - scmVehicleGressionVeh.setMainSid(scmVehicleGression.getSid()); - scmVehicleGressionVeh.setVehVin(vin); - BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(vin).getData(); - scmVehicleGressionVeh.setVehSid(baseVehicleVo.getSid()); - scmVehicleGressionVeh.setSettlementStatus(baseVehicleVo.getSettlementStatus()); - scmVehicleGressionVeh.setSettlementStatusValue(baseVehicleVo.getSettlementStatusValue()); - scmVehicleGressionVeh.setTemporaryCardNo(dto.getTemporaryCard()); - scmVehicleGressionVehService.save(scmVehicleGressionVeh); - } + for (ScmVehicleGressionVehDto scmVehicleGressionVehDto : scmVehicleGressionVehDtos) { + ScmVehicleGressionVeh scmVehicleGressionVeh = new ScmVehicleGressionVeh(); + BeanUtil.copyProperties(scmVehicleGressionVehDto, scmVehicleGressionVeh, "sid"); + vinNo = scmVehicleGressionVehDto.getVehVin(); + BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(vinNo).getData(); + scmVehicleGressionVeh.setVehSid(baseVehicleVo.getSid()); + scmVehicleGressionVeh.setMainSid(scmVehicleGression.getSid()); + scmVehicleGressionVehService.save(scmVehicleGressionVeh); } + save(scmVehicleGression); } else { scmVehicleGression = fetchBySid(dto.getSid()); if (scmVehicleGression == null) { @@ -452,19 +426,15 @@ public class ScmVehicleGressionService extends MybatisBaseService vins = dto.getVins(); - if (vins != null) { - for (String vin : vins) { - ScmVehicleGressionVeh scmVehicleGressionVeh = new ScmVehicleGressionVeh(); - scmVehicleGressionVeh.setMainSid(scmVehicleGression.getSid()); - scmVehicleGressionVeh.setVehVin(vin); - BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(vin).getData(); - scmVehicleGressionVeh.setVehSid(baseVehicleVo.getSid()); - scmVehicleGressionVeh.setSettlementStatus(baseVehicleVo.getSettlementStatus()); - scmVehicleGressionVeh.setSettlementStatusValue(baseVehicleVo.getSettlementStatusValue()); - scmVehicleGressionVeh.setTemporaryCardNo(dto.getTemporaryCard()); - scmVehicleGressionVehService.save(scmVehicleGressionVeh); - } + //存放车架号 + for (ScmVehicleGressionVehDto scmVehicleGressionVehDto : scmVehicleGressionVehDtos) { + ScmVehicleGressionVeh scmVehicleGressionVeh = new ScmVehicleGressionVeh(); + BeanUtil.copyProperties(scmVehicleGressionVehDto, scmVehicleGressionVeh, "sid"); + vinNo = scmVehicleGressionVehDto.getVehVin(); + BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(vinNo).getData(); + scmVehicleGressionVeh.setVehSid(baseVehicleVo.getSid()); + scmVehicleGressionVeh.setMainSid(scmVehicleGression.getSid()); + scmVehicleGressionVehService.save(scmVehicleGressionVeh); } } return rb.success().setData(scmVehicleGression.getSid()).setMsg("保存成功"); @@ -485,8 +455,10 @@ public class ScmVehicleGressionService extends MybatisBaseService vins = scmVehicleGressionVehService.fetchVoByMainSid(sid); - vo.setVins(vins); +// List vins = scmVehicleGressionVehService.fetchVoByMainSid(sid); +// vo.setVins(vins); + List scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(sid); + vo.setScmVehicleGressionVehs(scmVehicleGressionVehVos); vo.setApplicantName(data1.getName()); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); String format = simpleDateFormat.format(new Date()); @@ -517,6 +489,8 @@ public class ScmVehicleGressionService extends MybatisBaseService policyImage = new ArrayList<>(); List image = new ArrayList<>(); AppScmVehicleGressionDetailsVo vo = baseMapper.getCarTransfer(sid); + List scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(sid); + vo.setScmVehicleGressionVehs(scmVehicleGressionVehVos); if ("1".equals(vo.getInsuranceStateKey())) { vo.setInsuranceShow(true); } @@ -718,15 +692,18 @@ public class ScmVehicleGressionService extends MybatisBaseService vins = dto.getVins(); - for (String vin : vins) { - List sids = scmVehicleGressionVehService.fetchVoByVins(vin); - for (String sid : sids) { - List scmVehicleGressionVos = baseMapper.getlastTimeEqual(sid, dto.getTargetLocationSid()); - if (scmVehicleGressionVos.size() > 0) { - if (StringUtils.isNotBlank(scmVehicleGressionVos.get(0).getNodeState())) { - if (scmVehicleGressionVos.get(0).getNodeState().contains("已办结") || !(scmVehicleGressionVos.get(0).getNodeState().contains("终止")) || !(scmVehicleGressionVos.get(0).getNodeState().contains("申请"))) { - return rb.setMsg("该申请中" + vin + "已存在，请勿重复提交！"); + //存放车架号 + if (r == 1) { + List scmVehicleGressionVehDtos = dto.getScmVehicleGressionVehs(); + for (ScmVehicleGressionVehDto scmVehicleGressionVehDto : scmVehicleGressionVehDtos) { + List sids = scmVehicleGressionVehService.fetchVoByVins(scmVehicleGressionVehDto.getVehVin()); + for (String sid : sids) { + List scmVehicleGressionVos = baseMapper.getlastTimeEqual(sid, dto.getTargetLocationSid()); + if (scmVehicleGressionVos.size() > 0) { + if (StringUtils.isNotBlank(scmVehicleGressionVos.get(0).getNodeState())) { + if (scmVehicleGressionVos.get(0).getNodeState().contains("已办结") || !(scmVehicleGressionVos.get(0).getNodeState().contains("终止")) || !(scmVehicleGressionVos.get(0).getNodeState().contains("申请"))) { + return rb.setMsg("该申请中" + scmVehicleGressionVehDto.getVehVin() + "已存在，请勿重复提交！"); + } } } } @@ -771,7 +748,7 @@ public class ScmVehicleGressionService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); @@ -888,7 +865,7 @@ public class ScmVehicleGressionService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); - }else{ + } else { //推送车辆台账数据 VehicleGression vehicleGression = new VehicleGression(); List list = scmVehicleGressionVehService.fetchVoByMainSid(scmVehicleGression.getSid()); @@ -1166,13 +1143,24 @@ public class ScmVehicleGressionService extends MybatisBaseService list = scmVehicleGressionVehService.fetchVoByMainSid(sid); + if (list.size() > 0) { + for (String s : list) { + vin = s + "," + vin; + List vinSids = scmVehicleGressionVehService.fetchVoByVinSids(s); + for (String vinSid : vinSids) { + BaseVehicleSelectVo data = baseVehicleFeign.details(vinSid).getData(); + ExiCarConfigDetailVo exiCarConfigDetailVo = baseVehicleFeign.selectExiCarConfig(data.getModelSid(), data.getModelConfigSid(), data.getVehModelConfigSid()).getData(); + String model = exiCarConfigDetailVo.getVehicleAlias() + exiCarConfigDetailVo.getCarColor(); + modelName = model + "," + modelName; + } + } + } + temporaryExitPermitInfo.setVinNo(vin); + temporaryExitPermitInfo.setModelName(modelName); temporaryExitPermitInfo.setReason("存放地点变更"); temporaryExitPermitInfo.setCreatName(scmVehicleGression.getOperator()); temporaryExitPermitInfo.setCarryCarName("—"); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java index a70106eb7e..f03111cbe3 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java @@ -68,7 +68,7 @@ public interface ScmVehicleGressionVehMapper extends BaseMapper selectListVo(); @Select("select * from scm_vehicle_gression_veh where mainSid =#{mainSid} ") - List fetchVoByMainSid(@Param("mainSid") String mainSid); + List fetchVoByMainSid(@Param("mainSid") String mainSid); @Delete("delete from scm_vehicle_gression_veh where mainSid =#{sid}") void deleteByMainSid(@Param("sid") String sid); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java index a42af723ec..1484a45b77 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java @@ -107,8 +107,8 @@ public class ScmVehicleGressionVehService extends MybatisBaseService fetchVoByMainSid(String mainSid) { List list = new ArrayList<>(); - List vos = baseMapper.fetchVoByMainSid(mainSid); - for (ScmVehicleGressionVehDetailsVo vo : vos) { + List vos = baseMapper.fetchVoByMainSid(mainSid); + for (ScmVehicleGressionVehVo vo : vos) { list.add(vo.getVehVin()); } return list; @@ -126,4 +126,18 @@ public class ScmVehicleGressionVehService extends MybatisBaseService fetchVoByVinSids(String vin) { + List list = new ArrayList<>(); + List vos = baseMapper.fetchVoByVins(vin); + for (ScmVehicleGressionVehDetailsVo vo : vos) { + list.add(vo.getVehSid()); + } + return list; + } + + public List selectInfoVoByMainSid(String sid) { + List vos = baseMapper.fetchVoByMainSid(sid); + return vos; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js b/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js new file mode 100644 index 0000000000..192f55a191 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js @@ -0,0 +1,137 @@ +import request from '@/utils/request' + +export default { + // 单车返利核对（待核对）查询分页列表 + listPage: function(data) { + return request({ + url: '/scm/v1/scmspecialrebate/checkApplyGetSpecialRebate', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 单车返利核对（待核对）列表保存修改记录 + updateDate: function(data) { + return request({ + url: '/scm/v1/scmspecialrebate/save', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 单车返利核对（待核对）列表调整修改记录 + adjustment: function(data) { + return request({ + url: '/scm/v1/scmspecialrebate/adjustment', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 单车返利核对申请--点击添加--选择已核对单车返利信息 + checkApplyGetAlreadyUploadVehRebate: function(data) { + return request({ + url: '/scm/v1/scmspecialrebate/checkApplyGetAlreadyUploadSpecialRebate', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 核对审核申请分页列表 + pagelist: function(data) { + return request({ + url: '/scm/v1/scmspecialrebatecheckapply/listPage', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 删除 + delete: function(params) { + return request({ + url: '/scm/v1/scmspecialrebatecheckapply/delBySids', + method: 'DELETE', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 通过sid查询一条记录 + fetchDetailsBySid: function(data) { + return request({ + url: '/scm/v1/scmspecialrebatecheckapply/fetchDetailsBySid/' + data, + method: 'get' + }) + }, + // 专项返利核对审核申请保存 + save: function(data) { + return request({ + url: '/scm/v1/scmspecialrebatecheckapply/save', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 查看明细 + vehRebateWithDetails: function(data) { + return request({ + url: '/scm/v1/scmspecialrebatewith/specialRebateWithDetails/' + data, + method: 'get' + }) + }, + // 提交流程 + submitVehicleApply: function(params) { + return request({ + url: '/scm/v1/scmspecialrebatecheckapply/submitSpecialRebateCheckApply', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 代办任务同意办理 + complete: function(params) { + return request({ + url: '/scm/v1/scmspecialrebatecheckapply/complete', + method: 'post', + data: params + }) + }, + // 代办任务驳回任务 + reject: function(params) { + return request({ + url: '/scm/v1/scmspecialrebatecheckapply/reject', + method: 'post', + data: params + }) + }, + // 代办任务终止任务 + breakProcess: function(params) { + return request({ + url: '/scm/v1/scmspecialrebatecheckapply/breakProcess', + method: 'post', + data: params + }) + }, + // 代办任务撤回任务 + revokeProcess: function(params) { + return request({ + url: '/scm/v1/scmspecialrebatecheckapply/revokeProcess', + method: 'post', + data: params + }) + }, + + getNextNodesForSubmit: function(data) { + return request({ + url: '/scm/v1/scmspecialrebatecheckapply/getNextNodesForSubmit', + method: 'get', + params: data + }) + }, + getPreviousNodesForReject(data) { + return request({ + url: '/scm/v1/scmspecialrebatecheckapply/getPreviousNodesForReject', + method: 'get', + params: data + }) + } +} diff --git a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js index 3af9a6d60e..128073cc68 100644 --- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js +++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js @@ -477,18 +477,24 @@ const codemenu = [ name: 'ZhuanXiangFanLiGuanLi', meta: { title: '专项返利管理', noCache: true } }, - // { - // path: '/bikerebate/bicyclerebatewithholding', - // component: () => import('@/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue'), - // name: 'bicyclerebatewithholding', - // meta: { title: '单车返利预提', noCache: true } - // }, - // { - // path: '/bikerebate/bicyclerebatecheck', - // component: () => import('@/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue'), - // name: 'bicyclerebatetobechecked', - // meta: { title: '单车返利核对', noCache: true } - // } + { + path: '/specialrebate/specialrebatewithholding', + component: () => import('@/views/specialrebate/specialrebatewithholding/specialrebatewithholding.vue'), + name: 'ZhuanXiangFanLiYuTi', + meta: { title: '专项返利预提', noCache: true } + }, + { + path: '/specialrebate/specialrebatecheck', + component: () => import('@/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue'), + name: 'specialrebatetobechecked', + meta: { title: '专项返利核对', noCache: true } + }, + { + path: '/specialrebate/specialrebatedistribution', + component: () => import('@/views/specialrebate/specialrebatedistribution/specialrebatetobeallocated.vue'), + name: 'specialrebatetobeallocated', + meta: { title: '专项返利核对', noCache: true } + } ] }, // 入库管理 @@ -992,6 +998,49 @@ const codemenu = [ component: () => import('@/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue'), name: 'danchefanliheduiEdit' + }, + // 专项返利预提申请详情页面 + { + path: '/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo', + component: () => + import('@/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue'), + name: 'zhuanxiangfanliyutiDaiBanInfo' + }, + // 专项返利预提详情 + { + path: '/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo', + component: () => + import('@/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo.vue'), + name: 'zhuanxiangfanliyutiYiBanInfo' + }, + // 专项返利预提办理 + { + path: '/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit', + component: () => + import('@/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit.vue'), + name: 'zhuanxiangfanliyutiEdit' + }, + + // 专项返利核对申请详情页面 + { + path: '/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo', + component: () => + import('@/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue'), + name: 'zhuanxiangfanliheduiDaiBanInfo' + }, + // 专项返利核对详情 + { + path: '/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo', + component: () => + import('@/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue'), + name: 'zhuanxiangfanliheduiYiBanInfo' + }, + // 专项返利核对办理 + { + path: '/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit', + component: () => + import('@/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue'), + name: 'zhuanxiangfanliheduiEdit' } ] export default codemenu diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedAdd.vue new file mode 100644 index 0000000000..dffc52fd59 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedAdd.vue @@ -0,0 +1,172 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedInfo.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedInfo.vue new file mode 100644 index 0000000000..e945b240c7 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedInfo.vue @@ -0,0 +1,130 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/yiheduizhuanxiangfanli.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/yiheduizhuanxiangfanli.vue new file mode 100644 index 0000000000..ed19837ee0 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/yiheduizhuanxiangfanli.vue @@ -0,0 +1,331 @@ + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue new file mode 100644 index 0000000000..b0025f735e --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue @@ -0,0 +1,365 @@ + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue new file mode 100644 index 0000000000..7a8c80cdac --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue @@ -0,0 +1,564 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue new file mode 100644 index 0000000000..1cccce54de --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue @@ -0,0 +1,206 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue new file mode 100644 index 0000000000..36d55ed78f --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue @@ -0,0 +1,675 @@ + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedAdd.vue new file mode 100644 index 0000000000..985ea0c293 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedAdd.vue @@ -0,0 +1,172 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedInfo.vue new file mode 100644 index 0000000000..5bb3518bd3 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedInfo.vue @@ -0,0 +1,130 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/yiheduizhuanxiangfanli.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/yiheduizhuanxiangfanli.vue new file mode 100644 index 0000000000..87675d1afb --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/yiheduizhuanxiangfanli.vue @@ -0,0 +1,330 @@ + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue new file mode 100644 index 0000000000..f77773ca9b --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue @@ -0,0 +1,400 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue new file mode 100644 index 0000000000..5899ddd15d --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue @@ -0,0 +1,546 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue new file mode 100644 index 0000000000..f5599758c8 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue @@ -0,0 +1,276 @@ + + + + + diff --git a/anrui-system-ui/src/views/organizationManage/organizationManage.vue b/anrui-system-ui/src/views/organizationManage/organizationManage.vue index a8ee76fbe0..0c354650ea 100644 --- a/anrui-system-ui/src/views/organizationManage/organizationManage.vue +++ b/anrui-system-ui/src/views/organizationManage/organizationManage.vue @@ -347,7 +347,7 @@ export default { mounted() { this.getOrgTree() // this.getStaff() - this.getStaff2() + // this.getStaff2() // this.getPageList() }, methods: { @@ -417,11 +417,11 @@ export default { this.form.address = data.orgAddress || data.address this.form.dlxx = data.gisInfo || data.dlxx this.getStaff(data.sid) - this.getStaff2() + this.getStaff2(data.sid) }, editRow(row) { this.getStaff(row.sid) - this.getStaff2() + this.getStaff2(row.sid) this.dialogTitle = '编辑' this.isshow = 'edit' selectBySid(row.sid).then((response) => { @@ -456,7 +456,7 @@ export default { }, deit(data) { // 节点编辑保存 this.getStaff(data.sid) - this.getStaff2() + this.getStaff2(data.sid) console.log(data, 8888) this.dialogVisible = true // this.form = Object.assign({}, data) @@ -541,8 +541,8 @@ export default { // console.log('name:', this.temp.payType, 'key:', this.temp.payTypeKey) }, // 分管人员 - getStaff2() { - getStaffName().then(res => { + getStaff2(orgSid) { + getStaffName({ deptSid: orgSid }).then(res => { this.staffdata2 = res.data console.log('分管人员', this.staffdata2) }) diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java index 49146cafdc..aee49d4eb6 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java @@ -113,4 +113,7 @@ public class AppGressionDetailsVo implements Vo { @ApiModelProperty("现场照片") private List image; + @ApiModelProperty("车架号") + private List scmVehicleGressionVehs; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDto.java index 0f94ca66d0..c659ca0bb2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDto.java @@ -21,6 +21,9 @@ public class AppGressionDto implements Dto { @ApiModelProperty("流程实例id") private String procInsId;*/ + @ApiModelProperty("车架号") + private List scmVehicleGressionVehs; + @ApiModelProperty("用户sid") private String userSid; @@ -28,13 +31,13 @@ public class AppGressionDto implements Dto { @JsonProperty("applyId") private String applicantNo; - @ApiModelProperty("申请人名称") - @JsonProperty("applyNmae") - private String applicantName; - - @ApiModelProperty("申请日期") - @JsonProperty("applyDate") - private String applicantDate; +// @ApiModelProperty("申请人名称") +// @JsonProperty("applyNmae") +// private String applicantName; +// +// @ApiModelProperty("申请日期") +// @JsonProperty("applyDate") +// private String applicantDate; @ApiModelProperty("现存放地点") @JsonProperty("nowAddress") @@ -48,12 +51,12 @@ public class AppGressionDto implements Dto { @JsonProperty("nowAddressSid") private String locationSid; - @ApiModelProperty("车架号") - @JsonProperty("vin") - private String vinNo; - - @ApiModelProperty("车架号") - private List vins; +// @ApiModelProperty("车架号") +// @JsonProperty("vin") +// private String vinNo; +// +// @ApiModelProperty("车架号") +// private List vins; @ApiModelProperty("目标库") @JsonProperty("targetAddress") @@ -87,9 +90,9 @@ public class AppGressionDto implements Dto { @JsonProperty("insuranceStateKey") private String InsuranceStateKey; - @ApiModelProperty("保单照片") - @JsonProperty("policyImage") - private List policyImage; +// @ApiModelProperty("保单照片") +// @JsonProperty("policyImage") +// private List policyImage; @ApiModelProperty("临牌状态") private String proCardState; @@ -97,12 +100,12 @@ public class AppGressionDto implements Dto { @ApiModelProperty("临牌状态") private String proCardStateKey; - @ApiModelProperty("临牌") - @JsonProperty("proCard") - private String temporaryCard; - - @ApiModelProperty("现场照片") - private List image; +// @ApiModelProperty("临牌") +// @JsonProperty("proCard") +// private String temporaryCard; +// +// @ApiModelProperty("现场照片") +// private List image; @ApiModelProperty("现场地址") private String address; @@ -110,4 +113,12 @@ public class AppGressionDto implements Dto { @ApiModelProperty("经纬度") @JsonProperty("addressCode") private String locationCode; + + @ApiModelProperty("调出方负责人名称") + @JsonProperty("personName") + private String staffName; + + @ApiModelProperty("调出方负责人用户sid") + @JsonProperty("personSid") + private String personUserSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java index e9749fb8f5..2201e582a4 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java @@ -53,6 +53,9 @@ public class AppGressionInfoVo implements Vo { @ApiModelProperty("车架号") private List vins; // 车架号 + @ApiModelProperty("车架号") + private List scmVehicleGressionVehs; + @ApiModelProperty("目标库") @JsonProperty("targetAddress") private String targetLocation; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/VehicleGressionVehDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/VehicleGressionVehDto.java new file mode 100644 index 0000000000..67ebb06dfc --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/VehicleGressionVehDto.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.terminal.api.supplychain.scmvehiclegression; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class VehicleGressionVehDto implements Dto { + + private static final long serialVersionUID = 1981618379783367050L; + private String sid; // sid + + @ApiModelProperty("移位申请单sid") + private String mainSid; // 移位申请单sid + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid + @ApiModelProperty("车架号") + private String vehVin; // 车架号 + @ApiModelProperty("买断状态key") + private String settlementStatus; // 买断状态key + @ApiModelProperty("买断状态value") + private String settlementStatusValue; // 买断状态value + @ApiModelProperty("临时牌照号码") + private String temporaryCardNo; // 临时牌照号码 + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/VehicleGressionVehVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/VehicleGressionVehVo.java new file mode 100644 index 0000000000..7bc52f122b --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/VehicleGressionVehVo.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.terminal.api.supplychain.scmvehiclegression; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class VehicleGressionVehVo implements Vo { + + private static final long serialVersionUID = 6115486403760079153L; + + private String sid; // sid + + @ApiModelProperty("移位申请单sid") + private String mainSid; // 移位申请单sid + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid + @ApiModelProperty("车架号") + private String vehVin; // 车架号 + @ApiModelProperty("买断状态key") + private String settlementStatus; // 买断状态key + @ApiModelProperty("买断状态value") + private String settlementStatusValue; // 买断状态value + @ApiModelProperty("临时牌照号码") + private String temporaryCardNo; // 临时牌照号码 + +}