Browse Source

发票内部接收

master
dimengzhe 2 years ago
parent
commit
4b0ca1f930
  1. 27
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusRecordsInvoiceVo.java
  2. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java
  3. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsQuery.java
  4. 19
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsVo.java
  5. 29
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/ConfirmRecordsQuery.java
  6. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareRest.java
  7. 61
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java
  8. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java
  9. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
  10. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  11. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.java
  12. 14
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml
  13. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java
  14. 127
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java
  15. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.java
  16. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.xml
  17. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationService.java
  18. 7
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java
  19. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java
  20. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/StateUpdateQuery.java
  21. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java
  22. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml
  23. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java
  24. 17
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java
  25. 4
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeign.java
  26. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeignFallback.java
  27. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleMapper.java
  28. 4
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleMapper.xml
  29. 5
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleRest.java
  30. 6
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleService.java
  31. 11
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryPlan/AppBusHandoverPrepareService.java

27
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusRecordsInvoiceVo.java

@ -1,6 +1,7 @@
package com.yxt.anrui.buscenter.api.bustransferrecords;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
@ -15,29 +16,31 @@ import java.util.List;
public class BusRecordsInvoiceVo implements Vo {
private static final long serialVersionUID = 5607692895870869172L;
private String vinSid;
//车架号
@ApiModelProperty("车架号")
private String vinNo;
//开票单位
@ApiModelProperty("开票单位")
private String invoiceTitle;
//开票类型
@ApiModelProperty("开票类型")
private String invoiceType;
//开票名称
@ApiModelProperty("开票名称")
private String invoicingName;
//开票金额
@ApiModelProperty("开票金额")
private String invoiceAmount;
//发票号
@ApiModelProperty("发票号")
private String invoiceNo;
//移交部门
@ApiModelProperty("移交部门")
private String transferDept;
//移交人
@ApiModelProperty("移交人")
private String transferName;
//移交备注
@ApiModelProperty("移交备注")
private String transferRemarks;
//发票图片
@ApiModelProperty("发票图片")
private List<String> filePathList = new ArrayList<>();
//接收说明
@ApiModelProperty("接收说明")
private String receiveRemarks;
//接收附件
@ApiModelProperty("接收附件")
private List<String> receiveFilesList = new ArrayList<>();
private String sid;
}

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java

@ -43,4 +43,8 @@ public interface BusTransferRecordsFeign {
@ApiOperation("根据来源sid删除")
@PostMapping("/delBySourceSid")
ResultBean delBySourceSid(@RequestParam("sourceSid") String sourceSid);
@ApiOperation("移交记录确认")
@PostMapping("/confirmRecords")
ResultBean confirmRecords(@RequestBody ConfirmRecordsQuery query);
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsQuery.java

@ -18,8 +18,6 @@ public class BusTransferRecordsQuery implements Query {
private String userSid;
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("角色sid")
private String roleSid;
@ApiModelProperty("类型:0待接收,1已接收")
private int type;

19
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsVo.java

@ -1,9 +1,12 @@
package com.yxt.anrui.buscenter.api.bustransferrecords;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @description:
* @author: dimengzhe
@ -39,4 +42,20 @@ public class BusTransferRecordsVo implements Vo {
private String transferRemarks;
@ApiModelProperty("sid")
private String sid;
@ApiModelProperty("接收部门")
private String receiveDept;
@ApiModelProperty("接收人")
private String receiveName;
@JsonIgnore
private String receiveSid;
@ApiModelProperty("接收电话")
private String receiveMobile;
@ApiModelProperty("接收时间")
private String receiveTime;
@ApiModelProperty("接收备注")
private String receiveRemarks;
@JsonIgnore
private String receiveFiles;
@ApiModelProperty("接收附件")
private List<String> receiveFilesList;
}

29
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/ConfirmRecordsQuery.java

@ -0,0 +1,29 @@
package com.yxt.anrui.buscenter.api.bustransferrecords;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @description: 移交记录确认
* @author: dimengzhe
* @date: 2023/6/8
**/
@Data
public class ConfirmRecordsQuery implements Query {
private static final long serialVersionUID = 7963240175962200277L;
@ApiModelProperty("sid")
private List<String> sidsList = new ArrayList<>();
@ApiModelProperty("接收说明")
private String receiveRemarks;
@ApiModelProperty("接收附件")
private List<String> receiveFilesList = new ArrayList<>();
@ApiModelProperty("当前登录人sid")
private String userSid;
@ApiModelProperty("全组织sid")
private String orgPath;
}

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareRest.java

@ -120,11 +120,6 @@ public class BusHandoverPrepareRest implements BusHandoverPrepareFeign {
return busHandoverPrepareService.saveState(dto);
}
/* @Override
public ResultBean saveState(AppStateDateDto dto) {
return busHandoverPrepareService.saveState(dto);
}*/
@Override
public ResultBean<AppInvoicingInfoVo> getInvoiceInfo(AppInvoicingInfoQuery query) {
return busHandoverPrepareService.getInvoiceInfo(query);

61
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java

@ -45,6 +45,7 @@ import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareV
import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitDto;
import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordEnum;
import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecords;
import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation;
import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandover;
import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService;
import com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleService;
@ -287,18 +288,6 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
return rb.success().setData(appBusHandoverPrepareInfoVo);
}
/**
* 修改交车准备 各资料状态修改
*
* @param dto
* @return
*/
/* public ResultBean saveState(AppStateDateDto dto) {
ResultBean rb = ResultBean.fireFail();
busHandoverPrepareVehicleService.saveState(dto);
return rb.success();
}*/
/**
* 获取交车准备 发票信息
*
@ -403,8 +392,6 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
}
vo.setPolicyList(policyList);
vo.setLicenceList(licenceList);
/* vo.setSid(query.getSid());
vo.setVin(query.getVin());*/
return rb.success().setData(vo);
}
@ -606,10 +593,24 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
handoverInformationVo.setSid(busHandoverPrepareVehicle.getSid());
BusVehicleInformationHandover busVehicleInformationHandover = busVehicleInformationHandoverService.getVehicleInformationInfo(busHandoverPrepareVehicle.getVinSid());
if (busVehicleInformationHandover != null) {
//根据随车资料主表sid查询随车资料的记录
List<HandoverInformationIntemVo> list = busVehicleInformationService.selectByMainSid(busVehicleInformationHandover.getSid());
list.removeAll(Collections.singleton(null));
handoverInformationVo.setRecordList(list);
List<BusVehicleInformation> busVehicleInformationList = busVehicleInformationService.selectByMainSids(busVehicleInformationHandover.getSid());
busVehicleInformationList.removeAll(Collections.singleton(null));
if(busVehicleInformationList.isEmpty()){
return rb.setMsg("该交车准备的车辆信息的随车资料未准备好");
}else{
//根据随车资料主表sid查询随车资料的记录
List<HandoverInformationIntemVo> list = busVehicleInformationService.selectByMainSid(busVehicleInformationHandover.getSid());
list.removeAll(Collections.singleton(null));
for (int i = 0; i < list.size(); i++) {
HandoverInformationIntemVo handoverInformationIntemVo = list.get(i);
if(StringUtils.isNotBlank(handoverInformationIntemVo.getRecTime())){
handoverInformationIntemVo.setShowBtn(false);
}else{
handoverInformationIntemVo.setShowBtn(true);
}
}
handoverInformationVo.setRecordList(list);
}
}
return rb.success().setData(handoverInformationVo);
}
@ -657,12 +658,24 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
busTransferRecords.setReceiveTime(new Date());
busTransferRecordsService.updateById(busTransferRecords);
}
//更新发票的移交状态为已移交
StateUpdateQuery stateUpdateQuery = new StateUpdateQuery();
stateUpdateQuery.setVinSid(busHandoverPrepareVehicle.getVinSid());
stateUpdateQuery.setTransferState(CertificState.TransferState.TRANSTATE_YYJ.getRemarks());
stateUpdateQuery.setTransferStateKey(CertificState.TransferState.TRANSTATE_YYJ.getCode());
finVehicleInvoiceFeign.updateYjState(stateUpdateQuery);
//查询发票的状态是否是移交中
ResultBean<FinVehicleInvoice> resultBean = finVehicleInvoiceFeign.selectByVinAndContractNo(busHandoverPrepareVehicle.getVinSid(), busHandoverPrepare.getContractNo());
if (resultBean.getData() != null) {
FinVehicleInvoice finVehicleInvoice = resultBean.getData();
if (CertificState.TransferState.TRANSTATE_YJZ.getCode().equals(finVehicleInvoice.getTransferStateKey())) {
//修改发票中的接收人、接收时间以及移交状态为已移交
StateUpdateQuery stateUpdateQuery = new StateUpdateQuery();
stateUpdateQuery.setVinSid(busHandoverPrepareVehicle.getVinSid());
stateUpdateQuery.setTransferState(CertificState.TransferState.TRANSTATE_YYJ.getRemarks());
stateUpdateQuery.setTransferStateKey(CertificState.TransferState.TRANSTATE_YYJ.getCode());
if (busTransferRecordsResultBean.getData() != null) {
BusTransferRecords busTransferRecords = busTransferRecordsResultBean.getData();
stateUpdateQuery.setReceiveName(busTransferRecords.getReceiveName());
stateUpdateQuery.setReceiveSid(busTransferRecords.getReceiveSid());
}
ResultBean resultBean1 = finVehicleInvoiceFeign.updateYjState(stateUpdateQuery);
}
}
} else if ("02".equals(dto.getKey())) {
//合格证确认:确认接收后,修改合格证的移交状态为已移交。

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@ -213,4 +213,6 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
BusSalesOrder selectDetailsByContractNo(String contractId);
BusSalesOrderDetailsVo selNewComSaleByVehSid(String vehSid);
BusSalesOrder selectByContractNos(String contractNo);
}

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@ -441,4 +441,8 @@
AND bsov.`linkSid` = #{vehSid}
ORDER BY bso.`createTime` DESC LIMIT 1
</select>
<select id="selectByContractNos" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder">
select * from bus_sales_order where contractNo = #{contractNo}
</select>
</mapper>

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -6585,4 +6585,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
BusSalesOrderDetailsVo busSalesOrderDetailsVo = baseMapper.selNewComSaleByVehSid(vehSid);
return rb.success().setData(busSalesOrderDetailsVo);
}
public BusSalesOrder selectByContractNos(String contractNo) {
return baseMapper.selectByContractNos(contractNo);
}
}

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.java

@ -10,6 +10,8 @@ import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @description:
* @author: dimengzhe
@ -17,7 +19,7 @@ import org.apache.ibatis.annotations.Param;
**/
@Mapper
public interface BusTransferRecordsMapper extends BaseMapper<BusTransferRecords> {
IPage<BusTransferRecordsVo> pagerList(IPage<BusTransferRecords> page, @Param(Constants.WRAPPER)QueryWrapper<BusTransferRecords> qw);
IPage<BusTransferRecordsVo> pagerList(IPage<BusTransferRecords> page, @Param(Constants.WRAPPER)QueryWrapper<BusTransferRecords> qw, @Param("list") List<String> roleSidList);
BusTransferRecords selectByVinSid(@Param("vinSid") String vinSid, @Param("userSid") String receiveUserSid,@Param("typeKey") String typeKey);

14
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml

@ -9,10 +9,22 @@
transferDept,
transferName,
transferRemarks,
DATE_FORMAT(createTime, '%Y-%m-%d') as createTime
DATE_FORMAT(createTime, '%Y-%m-%d') as createTime,
receiveSid,
receiveDept,
receiveName,
receiveFiles,
receiveRemarks,
DATE_FORMAT(receiveTime, '%Y-%m-%d') as receiveTime
from bus_transfer_records
<where>
${ew.sqlSegment}
<if test = "list != null and list.size() != 0">
and receiveRoleSid in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</where>
</select>

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java

@ -48,4 +48,9 @@ public class BusTransferRecordsRest implements BusTransferRecordsFeign {
public ResultBean delBySourceSid(String sourceSid) {
return busTransferRecordsService.delBySourceSid(sourceSid);
}
@Override
public ResultBean confirmRecords(ConfirmRecordsQuery query) {
return busTransferRecordsService.confirmRecords(query);
}
}

127
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java

@ -3,10 +3,20 @@ package com.yxt.anrui.buscenter.biz.bustransferrecords;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.common.enums.CertificState;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bustransferrecords.*;
import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
import com.yxt.anrui.fin.api.finvehicleinvoice.StateUpdateQuery;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUser;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeign;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -17,7 +27,9 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@ -35,19 +47,30 @@ public class BusTransferRecordsService extends MybatisBaseService<BusTransferRec
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private BusSalesOrderService busSalesOrderService;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private SysUserRoleFeign sysUserRoleFeign;
public PagerVo<BusTransferRecordsVo> pagerList(PagerQuery<BusTransferRecordsQuery> pq) {
QueryWrapper<BusTransferRecords> qw = new QueryWrapper<>();
BusTransferRecordsQuery pagerQuery = pq.getParams();
List<String> roleSidList = new ArrayList<>();
if (pagerQuery != null) {
if (pagerQuery.getType() == 0) {
qw.eq("receiveState", 0);
qw.isNull("receiveSid");
} else if (pagerQuery.getType() == 1) {
qw.eq("receiveState", 1);
//接收开始时间-接收结束时间
qw.apply(StringUtils.isNotBlank(pagerQuery.getReceiveTimeStart()), "date_format (receiveTime,'%Y-%m-%d') >= date_format('" + pagerQuery.getReceiveTimeStart() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(pagerQuery.getReceiveTimeEnd()), "date_format (receiveTime,'%Y-%m-%d') <= date_format('" + pagerQuery.getReceiveTimeEnd() + "','%Y-%m-%d')"
);
qw.eq("receiveSid", pagerQuery.getUserSid());
}
qw.eq("goodsTypeKey", BusTransferRecordEnum.FP.getCode());
//合同编号
@ -76,13 +99,16 @@ public class BusTransferRecordsService extends MybatisBaseService<BusTransferRec
qw.eq("useOrgSid", useOrgSid);
}
//接收角色sid
if (StringUtils.isNotBlank(pagerQuery.getRoleSid())) {
if (StringUtils.isNotBlank(pagerQuery.getUserSid())) {
//如果为销售专员的话不允许看到待接收的发票信息,销售专员的只能在交车准备里去确认。
qw.eq("receiveRoleSid", pagerQuery.getRoleSid());
ResultBean<List<String>> listResultBean = sysUserRoleFeign.selectByUserSid(pagerQuery.getUserSid());
if (!listResultBean.getData().isEmpty()) {
roleSidList = listResultBean.getData();
}
}
}
IPage<BusTransferRecords> page = PagerUtil.queryToPage(pq);
IPage<BusTransferRecordsVo> pagging = baseMapper.pagerList(page, qw);
IPage<BusTransferRecordsVo> pagging = baseMapper.pagerList(page, qw, roleSidList);
for (BusTransferRecordsVo record : pagging.getRecords()) {
String vinSid = record.getVinSid();
//根据合同编号和车辆sid查询开票相关
@ -95,6 +121,16 @@ public class BusTransferRecordsService extends MybatisBaseService<BusTransferRec
record.setInvoiceNo(finVehicleInvoice.getInvoiceNo());
record.setInvoiceType(finVehicleInvoice.getInvoiceType());
}
//查询接收人电话
ResultBean<SysUser> sysUserInfoVoResultBean = sysUserFeign.selectBySid(record.getReceiveSid());
if(sysUserInfoVoResultBean.getData() != null){
record.setReceiveMobile(sysUserInfoVoResultBean.getData().getMobile());
}
String receiveFile = record.getReceiveFiles();
if(StringUtils.isNotBlank(receiveFile)){
List<String> receiveFileList = Arrays.asList(receiveFile.split(",")).stream().map(v->fileUploadComponent.getUrlPrefix()+v).collect(Collectors.toList());
record.setReceiveFilesList(receiveFileList);
}
}
PagerVo<BusTransferRecordsVo> p = PagerUtil.pageToVo(pagging, null);
return p;
@ -135,9 +171,9 @@ public class BusTransferRecordsService extends MybatisBaseService<BusTransferRec
return rb.success().setData(busRecordsInvoiceVo);
}
public ResultBean<BusTransferRecords> selectByVinSid(String vinSid, String receiveUserSid,String type) {
public ResultBean<BusTransferRecords> selectByVinSid(String vinSid, String receiveUserSid, String type) {
ResultBean<BusTransferRecords> rb = ResultBean.fireFail();
BusTransferRecords BusTransferRecords = baseMapper.selectByVinSid(vinSid,receiveUserSid,type);
BusTransferRecords BusTransferRecords = baseMapper.selectByVinSid(vinSid, receiveUserSid, type);
return rb.success().setData(BusTransferRecords);
}
@ -146,4 +182,85 @@ public class BusTransferRecordsService extends MybatisBaseService<BusTransferRec
baseMapper.delBySourceSid(sourceSid);
return rb.success();
}
public ResultBean confirmRecords(ConfirmRecordsQuery query) {
ResultBean rb = ResultBean.fireFail();
//确认时,更新对应发票移交状态改为已移交。
//接收确认时,生成车辆对应销售专员的待接收记录,并给对应的销售专员发送站内信。销售专员可以在交车准备中确认接收发票。
List<String> sidsList = query.getSidsList();
if (!sidsList.isEmpty()) {
//更新对应发票移交状态为已移交-查询发票的是否已移交
for (int i = 0; i < sidsList.size(); i++) {
BusTransferRecords busTransferRecordss = new BusTransferRecords();
BusTransferRecords busTransferRecords = fetchBySid(sidsList.get(i));
BeanUtil.copyProperties(busTransferRecords, busTransferRecordss, "sid");
String receiveName = "";
//将移交状态修改为已移交,并修改接收人和接收日期为当前确认人
busTransferRecords.setReceiveSid(query.getUserSid());
ResultBean<SysUserInfoVo> sysResultBean = sysUserFeign.selectUserInfoByUserSid(query.getUserSid());
if (sysResultBean.getData() != null) {
SysUserInfoVo sysUserInfoVo = sysResultBean.getData();
busTransferRecords.setReceiveName(sysUserInfoVo.getStaffName());
busTransferRecords.setReceiveTime(new Date());
receiveName = sysUserInfoVo.getStaffName();
}
List<String> orgList = Arrays.asList(query.getOrgPath().split("/"));
busTransferRecords.setReceiveDeptSid(orgList.get(orgList.size() - 1));
ResultBean<SysOrganizationVo> sysOrganizationResultBean = sysOrganizationFeign.fetchBySid(orgList.get(orgList.size() - 1));
if (sysOrganizationResultBean.getData() != null) {
SysOrganizationVo sysOrganizationVo = sysOrganizationResultBean.getData();
busTransferRecords.setReceiveDept(sysOrganizationVo.getName());
}
busTransferRecords.setReceiveState(1);
busTransferRecords.setReceiveRemarks(query.getReceiveRemarks());
List<String> receiveFileList = query.getReceiveFilesList();
if (!receiveFileList.isEmpty()) {
receiveFileList = receiveFileList.stream().map(v -> v.replaceAll(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.toList());
String receiveFile = String.join(",", receiveFileList);
busTransferRecords.setReceiveFiles(receiveFile);
}
//查询发票的状态是否是移交中
ResultBean<FinVehicleInvoice> resultBean = finVehicleInvoiceFeign.selectByVinAndContractNo(busTransferRecords.getVinSid(), busTransferRecords.getContractNo());
if (resultBean.getData() != null) {
FinVehicleInvoice finVehicleInvoice = resultBean.getData();
if (CertificState.TransferState.TRANSTATE_YJZ.getCode().equals(finVehicleInvoice.getTransferStateKey())) {
//修改发票中的接收人、接收时间以及移交状态为已移交
StateUpdateQuery stateUpdateQuery = new StateUpdateQuery();
stateUpdateQuery.setVinSid(busTransferRecords.getVinSid());
stateUpdateQuery.setTransferState(CertificState.TransferState.TRANSTATE_YYJ.getRemarks());
stateUpdateQuery.setTransferStateKey(CertificState.TransferState.TRANSTATE_YYJ.getCode());
stateUpdateQuery.setReceiveName(receiveName);
stateUpdateQuery.setReceiveSid(query.getUserSid());
ResultBean resultBean1 = finVehicleInvoiceFeign.updateYjState(stateUpdateQuery);
}
}
//生成车辆对应销售专员的待接收记录
//查询该车辆的对应的销售专员
BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busTransferRecords.getContractNo());
String staffUserSid = busSalesOrder.getCreateBySid();
busTransferRecordss.setReceiveRoleSid("89d7f310-a221-405b-858e-dd650e0993d5");
busTransferRecordss.setReceiveSid(staffUserSid);
String orgPath = busSalesOrder.getOrgSidPath();
List<String> staffOrgPathList = Arrays.asList(orgPath.split("/"));
busTransferRecordss.setReceiveDeptSid(staffOrgPathList.get(staffOrgPathList.size() - 1));
ResultBean<SysOrganizationVo> sysOrganizationResultBean1 = sysOrganizationFeign.fetchBySid(staffOrgPathList.get(staffOrgPathList.size() - 1));
if (sysOrganizationResultBean1.getData() != null) {
SysOrganizationVo sysOrganizationVo = sysOrganizationResultBean1.getData();
busTransferRecordss.setReceiveDept(sysOrganizationVo.getName());
}
ResultBean<SysUserInfoVo> sysResultBean1 = sysUserFeign.selectUserInfoByUserSid(staffUserSid);
if (sysResultBean1.getData() != null) {
SysUserInfoVo sysUserInfoVo = sysResultBean1.getData();
busTransferRecordss.setReceiveName(sysUserInfoVo.getStaffName());
}
busTransferRecordss.setTransferDept(busTransferRecords.getReceiveDept());
busTransferRecordss.setTransferName(busTransferRecords.getReceiveName());
busTransferRecordss.setTransferSid(busTransferRecords.getReceiveSid());
busTransferRecordss.setTransferDeptSid(busTransferRecords.getReceiveDeptSid());
baseMapper.insert(busTransferRecordss);
baseMapper.updateById(busTransferRecords);
}
}
return rb.success();
}
}

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.java

@ -23,4 +23,6 @@ public interface BusVehicleInformationMapper extends BaseMapper<BusVehicleInform
List<HandoverInformationIntemVo> selectByMainSid(String sid);
int selectByMainSidUpdate(@Param("sid") String sid, @Param("date") Date date);
List<BusVehicleInformation> selectByMainSids(String sid);
}

6
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.xml

@ -21,10 +21,14 @@
</select>
<select id="selectByMainSid" resultType="com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationIntemVo">
select sid,vehicleHandoverData,recName,transferName,remarks,DATE_FORMAT(recTime,'%Y-%m-%d') AS recTime,ifnull(DATE_FORMAT(recTime,'%Y-%m-%d') AS recTime,true,false) as showBtn from bus_vehicle_information where handoverSid = #{sid}
select sid,vehicleHandoverData,recName,transferName,remarks,DATE_FORMAT(recTime,'%Y-%m-%d') AS recTime from bus_vehicle_information where handoverSid = #{sid}
</select>
<select id="selectByMainSidUpdate" resultType="int">
update bus_vehicle_information set recTime = #{date} where handoverSid = #{sid}
</select>
<select id="selectByMainSids" resultType="com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation">
select * from bus_vehicle_information where handoverSid = #{sid}
</select>
</mapper>

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationService.java

@ -31,4 +31,8 @@ public class BusVehicleInformationService extends MybatisBaseService<BusVehicleI
public int updateDate(String sid, Date date) {
return baseMapper.selectByMainSidUpdate(sid, date);
}
public List<BusVehicleInformation> selectByMainSids(String sid) {
return baseMapper.selectByMainSids(sid);
}
}

7
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java

@ -102,10 +102,15 @@ public interface FinVehicleInvoiceFeign {
@ApiOperation("根据合同号获取发票信息")
@PostMapping("/selectByContractNo")
@ResponseBody
ResultBean<List<FinVehicleInvoice>> selectByContractNo(@RequestParam("contractNo")String contractNo);
ResultBean<List<FinVehicleInvoice>> selectByContractNo(@RequestParam("contractNo") String contractNo);
@ApiOperation("修改发票的移交状态")
@PostMapping("/updateYjState")
@ResponseBody
ResultBean updateYjState(@RequestBody StateUpdateQuery query);
@ApiOperation("根据车辆和合同号查询发票信息")
@GetMapping("/selectByVinAndContractNo")
@ResponseBody
ResultBean<FinVehicleInvoice> selectByVinAndContractNo(@RequestParam("vinSid") String vinSid, @RequestParam("contractNo") String contractNo);
}

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java

@ -119,4 +119,9 @@ public class FinVehicleInvoiceFeignFallback implements FinVehicleInvoiceFeign {
return null;
}
@Override
public ResultBean<FinVehicleInvoice> selectByVinAndContractNo(String vinSid, String contractNo) {
return null;
}
}

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/StateUpdateQuery.java

@ -18,4 +18,9 @@ public class StateUpdateQuery implements Query {
private String transferStateKey;
@ApiModelProperty("移交状态value")
private String transferState;
@ApiModelProperty("接收人")
private String receiveSid;
@ApiModelProperty("接收时间")
private String receiveName;
}

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java

@ -62,4 +62,6 @@ public interface FinVehicleInvoiceMapper extends BaseMapper<FinVehicleInvoice> {
@Update("update fin_vehicle_invoice set transferStateKey = #{code},transferState = #{remarks} where sid = #{sid}")
void updateTransferState(@Param("sid") String sid,@Param("code") String code,@Param("remarks") String remarks);
FinVehicleInvoice selectByVinAndContractNo(@Param("vinSid") String vinSid, @Param("contractNo") String contractNo);
}

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml

@ -230,4 +230,8 @@
from fin_vehicle_invoice
where contractNo = #{contractNo}
</select>
<select id="selectByVinAndContractNo" resultType="com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice">
select * from fin_vehicle_invoice where vehicleSid = #{vinSid} and contractNo = #{contractNo}
</select>
</mapper>

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java

@ -235,4 +235,9 @@ public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign {
return finVehicleInvoiceService.updateYjState(query);
}
@Override
public ResultBean<FinVehicleInvoice> selectByVinAndContractNo(String vinSid, String contractNo) {
return finVehicleInvoiceService.selectByVinAndContractNo(vinSid,contractNo);
}
}

17
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java

@ -40,6 +40,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
@ -515,12 +516,26 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
public ResultBean updateYjState(StateUpdateQuery query) {
ResultBean rb = ResultBean.fireFail();
FinVehicleInvoice finVehicleInvoice = baseMapper.selectByVinSid(query.getVinSid());
FinVehicleInvoice finVehicleInvoice = baseMapper.selectByVinSidss(query.getVinSid());
if(finVehicleInvoice != null){
finVehicleInvoice.setTransferState(query.getTransferState());
finVehicleInvoice.setTransferStateKey(query.getTransferStateKey());
if(StringUtils.isNotBlank(query.getReceiveSid())){
finVehicleInvoice.setRecipientSid(query.getReceiveSid());
}
if(StringUtils.isNotBlank(query.getReceiveName())){
finVehicleInvoice.setRecipient(query.getReceiveName());
}
//接收日期
finVehicleInvoice.setTransferTime(new Date());
baseMapper.updateById(finVehicleInvoice);
}
return rb.success();
}
public ResultBean<FinVehicleInvoice> selectByVinAndContractNo(String vinSid, String contractNo) {
ResultBean<FinVehicleInvoice> rb = ResultBean.fireFail();
FinVehicleInvoice finVehicleInvoice = baseMapper.selectByVinAndContractNo(vinSid,contractNo);
return rb.success().setData(finVehicleInvoice);
}
}

4
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeign.java

@ -71,4 +71,8 @@ public interface SysUserRoleFeign {
@ApiOperation("根据角色sid查询用户id列表")
@GetMapping("/getUserIdListByRoleSid")
public ResultBean<List<String>> getUserIdListByRoleSid(@RequestParam("roleList") List<String> roleList);
@ApiOperation("查询用户的角色")
@GetMapping("/selectByUserSid")
ResultBean<List<String>> selectByUserSid(@RequestParam("userSid") String userSid);
}

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeignFallback.java

@ -78,4 +78,9 @@ public class SysUserRoleFeignFallback implements SysUserRoleFeign {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui_portal/sysuserrole/getUserIdByRoleSid无法访问");
}
@Override
public ResultBean<List<String>> selectByUserSid(String userSid) {
return null;
}
}

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

@ -55,4 +55,6 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
int deleteByRoleSid(String sids);
List<String> selectRoleSid(String userSid);
List<String> selectByUserSids(String userSid);
}

4
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleMapper.xml

@ -46,4 +46,8 @@
<select id="selectRoleSid" resultType="java.lang.String">
select distinct roleSid from sys_user_role where userSid = #{userSid}
</select>
<select id="selectByUserSids" resultType="java.lang.String">
select roleSid from sys_user_role where userSid = #{userSid}
</select>
</mapper>

5
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserrole/SysUserRoleRest.java

@ -110,4 +110,9 @@ public class SysUserRoleRest implements SysUserRoleFeign {
public ResultBean<List<String>> getUserIdListByRoleSid(List<String> roleList) {
return sysUserRoleService.getUserIdListByRoleSid(roleList);
}
@Override
public ResultBean<List<String>> selectByUserSid(String userSid) {
return sysUserRoleService.selectByUserSids(userSid);
}
}

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

@ -131,4 +131,10 @@ public class SysUserRoleService extends MybatisBaseService<SysUserRoleMapper, Sy
public List<String> selectRoleSid(String userSid) {
return baseMapper.selectRoleSid(userSid);
}
public ResultBean<List<String>> selectByUserSids(String userSid) {
ResultBean<List<String>> rb = ResultBean.fireFail();
List<String> list = baseMapper.selectByUserSids(userSid);
return rb.success().setData(list);
}
}

11
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryPlan/AppBusHandoverPrepareService.java

@ -29,6 +29,7 @@ package com.yxt.anrui.terminal.biz.autoservice.deliveryPlan;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareFeign;
import com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationVo;
import com.yxt.anrui.buscenter.api.bushandoverprepare.RemarkDto;
import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*;
import com.yxt.anrui.terminal.api.autoservice.deliveryPlan.*;
@ -204,7 +205,15 @@ public class AppBusHandoverPrepareService {
public ResultBean<PrepareVehicleInfoVo> getCarDataInfo(String sid) {
ResultBean<PrepareVehicleInfoVo> rb = ResultBean.fireFail();
return null;
ResultBean<HandoverInformationVo> resultBean = busHandoverPrepareFeign.getVehicleInformationInfo(sid);
PrepareVehicleInfoVo prepareVehicleInfoVo = new PrepareVehicleInfoVo();
if(resultBean.getData() != null){
HandoverInformationVo handoverInformationVo = resultBean.getData();
BeanUtil.copyProperties(handoverInformationVo,prepareVehicleInfoVo);
}else{
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(prepareVehicleInfoVo);
}
public ResultBean saveState(StateDateDto dto) {

Loading…
Cancel
Save