yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 1 year ago
parent
df12253f29 ba4015509b
commit
2fc9bb04fc
9 changed files with 75 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java
  2. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java
  3. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java
  4. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java
  5. 61
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
  6. 2
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparametermain/SysReportParameterMainQuery.java
  7. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainService.java
  8. 9
      anrui-system-ui/src/api/statisticalparameter/statisticalparameter.js
  9. 9
      anrui-system-ui/src/views/statisticalparameter/statisticalparameter.vue

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java
View File

@ -53,4 +53,8 @@ public interface BaseVehicleStateFeign {
ResultBean updateManageState(@RequestParam("busVinSid") String busSid);
@PostMapping("selectOneByBusSidAndOrderSid")
@ResponseBody
ResultBean<BaseVehicleState> selectOneByBusSidAndOrderSid(@RequestParam("busSid") String busSid,@RequestParam("orderSid") String orderSid);
}

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java
View File

@ -25,11 +25,14 @@ public interface BaseVehicleStateMapper extends BaseMapper<BaseVehicleState> {
BaseVehicleState selectOneQKKPByBusSid(String sid);
BaseVehicleState selectByBusSid(String busSid);
List<String> selectBusSidListByBusState(String busState);
List<String> selectBusSidListByBusState(String busState);
int updateBusStateByBusSid(@Param("busVinSid") String busVinSid, @Param("busState") String busState);
int updateManageState(String busSid);
@Select(" SELECT * FROM base_vehicle_state WHERE busSid = #{busSid} AND saleOrderSid = #{orderSid}")
BaseVehicleState selectOneByBusSidAndOrderSid(@Param("busSid") String busSid, @Param("orderSid") String orderSid);
}

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java
View File

@ -60,5 +60,10 @@ public class BaseVehicleStateRest implements BaseVehicleStateFeign {
return baseVehicleStateService.updateManageState(busSid);
}
@Override
public ResultBean<BaseVehicleState> selectOneByBusSidAndOrderSid(String busSid, String orderSid) {
return baseVehicleStateService.selectOneByBusSidAndOrderSid(busSid,orderSid);
}
}

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java
View File

@ -230,4 +230,10 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
int i = baseMapper.updateManageState(busSid);
return rb.success();
}
public ResultBean<BaseVehicleState> selectOneByBusSidAndOrderSid(String busSid, String orderSid) {
ResultBean rb = ResultBean.fireFail();
BaseVehicleState baseVehicleState = baseMapper.selectOneByBusSidAndOrderSid(busSid,orderSid);
return rb.success().setData(baseVehicleState);
}
}

61
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
View File

@ -28,6 +28,8 @@ package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.base.api.commoncontract.CommonContractVo;
@ -124,7 +126,8 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
private FinCompanyInvoicingService finCompanyInvoicingService;
@Autowired
private FinVehicleInvoiceService finVehicleInvoiceService;
@Autowired
private BaseVehicleStateFeign baseVehicleStateFeign;
@Autowired
private FinFundsCarriedForwardApplyService finFundsCarriedForwardApplyService;
@ -506,33 +509,41 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
if ((StringUtils.isNotBlank(svo.getBondAmounts()) && !("0.00").equals(svo.getBondAmounts()))
|| (StringUtils.isNotBlank(svo.getDepositPremium()) && !("0.00").equals(svo.getDepositPremium()))
|| (StringUtils.isNotBlank(svo.getDepositSettle()) && !("0.00").equals(svo.getDepositSettle()))) {
List<String> sidList = baseMapper.selectSidBybusVinSidAndConNo(record.getBusVinSid(), record.getContractNo());
List<BigDecimal> noSubscriptionMoneyList = new ArrayList<>();
List<Integer> noSubscriptionMoneyCheckList = new ArrayList<>();
if (null != sidList) {
for (String s : sidList) {
FinUncollectedReceivablesDetailed detailed = fetchBySid(s);
List<FinSelectedReceivablesDetailed> detaileds = finSelectedReceivablesDetailedService.fetchByReceivablesSid(s).getData();
BigDecimal sumCheck = new BigDecimal(0).setScale(2, RoundingMode.HALF_EVEN);
for (FinSelectedReceivablesDetailed selectedReceivablesDetailed : detaileds) {
BigDecimal subscriptionMoney = selectedReceivablesDetailed.getSubscriptionMoney();
sumCheck = sumCheck.add(subscriptionMoney);
BaseVehicleState vehicleState = baseVehicleStateFeign.selectOneByBusSidAndOrderSid(record.getBusVinSid(),salesOrderSid).getData();
if (null != vehicleState) {
if (StringUtils.isNotBlank(vehicleState.getFinState())) {
if (vehicleState.getFinState().equals("1")) {
record.setDownload(true);
}
BigDecimal reveivableMoneyCheck = new BigDecimal(detailed.getReveivableMoney());
BigDecimal noSubscriptionMoneyCheck = reveivableMoneyCheck.subtract(sumCheck);
noSubscriptionMoneyList.add(noSubscriptionMoneyCheck);
}
if (null != noSubscriptionMoneyList) {
for (BigDecimal money : noSubscriptionMoneyList) {
if (money.compareTo(BigDecimal.ZERO) > 0) {
noSubscriptionMoneyCheckList.add(1);
}
}
}
if (null == noSubscriptionMoneyCheckList || noSubscriptionMoneyCheckList.size() == 0 || noSubscriptionMoneyCheckList.isEmpty()) {
record.setDownload(true);
}
}
// List<String> sidList = baseMapper.selectSidBybusVinSidAndConNo(record.getBusVinSid(), record.getContractNo());
// List<BigDecimal> noSubscriptionMoneyList = new ArrayList<>();
// List<Integer> noSubscriptionMoneyCheckList = new ArrayList<>();
// if (null != sidList) {
// for (String s : sidList) {
// FinUncollectedReceivablesDetailed detailed = fetchBySid(s);
// List<FinSelectedReceivablesDetailed> detaileds = finSelectedReceivablesDetailedService.fetchByReceivablesSid(s).getData();
// BigDecimal sumCheck = new BigDecimal(0).setScale(2, RoundingMode.HALF_EVEN);
// for (FinSelectedReceivablesDetailed selectedReceivablesDetailed : detaileds) {
// BigDecimal subscriptionMoney = selectedReceivablesDetailed.getSubscriptionMoney();
// sumCheck = sumCheck.add(subscriptionMoney);
// }
// BigDecimal reveivableMoneyCheck = new BigDecimal(detailed.getReveivableMoney());
// BigDecimal noSubscriptionMoneyCheck = reveivableMoneyCheck.subtract(sumCheck);
// noSubscriptionMoneyList.add(noSubscriptionMoneyCheck);
// }
// if (null != noSubscriptionMoneyList) {
// for (BigDecimal money : noSubscriptionMoneyList) {
// if (money.compareTo(BigDecimal.ZERO) > 0) {
// noSubscriptionMoneyCheckList.add(1);
// }
// }
// }
// if (null == noSubscriptionMoneyCheckList || noSubscriptionMoneyCheckList.size() == 0 || noSubscriptionMoneyCheckList.isEmpty()) {
// record.setDownload(true);
// }
// }
}
}
}

2
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparametermain/SysReportParameterMainQuery.java
View File

@ -17,5 +17,7 @@ public class SysReportParameterMainQuery implements Query {
@ApiModelProperty("分公司名称")
private String useOrgName;
private String useOrgSid;
}

2
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainService.java
View File

@ -44,7 +44,7 @@ public class SysReportParameterMainService extends MybatisBaseService<SysReportP
qw.like("spm.useOrgName", query.getUseOrgName());
}
}
if (stringList.size() <= 2) {
if (StringUtils.isBlank(query.getUseOrgSid())) {
List<SysOrganizationVo> sysOrganizationVos = sysOrganizationService.selectOrgByPSid(sybOrgSid).getData();
if (!sysOrganizationVos.isEmpty()) {
for (SysOrganizationVo sysOrganizationVo : sysOrganizationVos) {

9
anrui-system-ui/src/api/statisticalparameter/statisticalparameter.js
View File

@ -43,3 +43,12 @@ export function getButtonPermissions(data) {
headers: { 'Content-Type': 'application/json' }
})
}
// 根据当前登录人orgSidPath(全路径sid)查询分公司
export function getOrgSidByPath(data) {
return request({
url: '/portal/v1/sysstafforg/getOrgSidByPath',
method: 'get',
params: data
})
}

9
anrui-system-ui/src/views/statisticalparameter/statisticalparameter.vue
View File

@ -61,7 +61,7 @@
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import { listPage, getButtonPermissions } from '@/api/statisticalparameter/statisticalparameter'
import { listPage, getButtonPermissions, getOrgSidByPath } from '@/api/statisticalparameter/statisticalparameter'
import statisticalparameterAdd from './statisticalparameterAdd'
export default {
@ -99,6 +99,7 @@ export default {
total: 0,
params: {
useOrgName: '',
useOrgSid: '',
orgPath: ''
}
}
@ -151,6 +152,11 @@ export default {
// 查询列表信息
getList() {
this.listLoading = true
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.listQuery.params.useOrgSid = res.data
}
})
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
listPage(this.listQuery).then(response => {
this.listLoading = false
@ -176,6 +182,7 @@ export default {
total: 0,
params: {
useOrgName: '',
useOrgSid: '',
orgPath: ''
}
}

Write Preview
Loading…
Cancel
Save