diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusToDoNumQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusToDoNumQuery.java new file mode 100644 index 0000000000..ff3e83bc0f --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusToDoNumQuery.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.buscenter.api.busvalcustfiling; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/3/3 10:38 + * @Description + */ +@Data +public class BusToDoNumQuery { + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织机构sid") + private String orgPath; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingFeign.java index 60161b5abd..ea26d2b39e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingFeign.java @@ -111,4 +111,9 @@ public interface BusValcustFilingFeign { @PostMapping("/selectByContractNoAndVinNo") @ResponseBody ResultBean selectByContractNoAndVinNo(@RequestParam("contractNo") String contractNo,@RequestParam("vinNo") String vinNo); + + @ApiOperation("手机端-查询本分公司下代办数量:切换机构") + @GetMapping("/getToDoNum") + @ResponseBody + public ResultBean getToDoNum(@SpringQueryMap BusToDoNumQuery appToDoNumQuery); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingFeignFallback.java index acb0caadec..51cdca4725 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingFeignFallback.java @@ -110,4 +110,9 @@ public class BusValcustFilingFeignFallback implements BusValcustFilingFeign { public ResultBean selectByContractNoAndVinNo(String contractNo, String vinNo) { return null; } + + @Override + public ResultBean getToDoNum(BusToDoNumQuery appToDoNumQuery) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingVo.java index fd98d765cb..b2051ae3a2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingVo.java @@ -83,4 +83,6 @@ public class BusValcustFilingVo implements Vo { private String procInstId; @ApiModelProperty("0高开,1低开") private String isGdk; + @ApiModelProperty("销售订单sid") + private String saleOrderSid; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 144014355e..5ac4fc7c25 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -1196,9 +1196,9 @@ public class BusDeliveredApplyService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); }); } catch (Exception e) { @@ -1816,7 +1816,7 @@ public class BusDeliveredApplyService extends MybatisBaseService) finalVariables.get("app")); messageFlowableQuery.setBusinessSid(query.getBusinessSid()); - messageFlowableQuery.setModuleName("出库申请"); + messageFlowableQuery.setModuleName("出库开票申请"); ResultBean> listResultBean2 = flowTaskFeign.getLatestTasks(finalBusDeliveredApply.getProcInstId()); String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_(); String nextName2 = listResultBean2.getData().get(0).getName_(); @@ -1825,7 +1825,7 @@ public class BusDeliveredApplyService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); }); } catch (Exception e) { @@ -2842,9 +2842,9 @@ public class BusDeliveredApplyService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); }); } catch (Exception e) { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 5eedec4232..043b28af0a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -75,8 +75,6 @@ and concat(IFNULL(bo.customerName , '') - , IFNULL(bo.staffName - , '') , ifnull(bo.billNo , '')) LIKE concat('%' , #{name} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.java index 4b13a582d3..905c7ef624 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.java @@ -73,4 +73,6 @@ public interface BusValcustFilingMapper extends BaseMapper { void updateGkBySid(@Param("ysMoney") String ysMoney, @Param("ssMoney") String ssMoney, @Param("remarks") String remarks, @Param("dtoSid") String dtoSid); void updateDkBySid(@Param("remarks") String remarks, @Param("dtoSid") String dtoSid); + + int getToDoNum(@Param("orgPath") String orgPath,@Param("userSid") String userSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.xml index 6e862417dd..f3bf2b0b96 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.xml @@ -19,7 +19,8 @@ bf.`ssMoney`, bf.`procDefId`, bf.`procInstId`, - bf.isGdk + bf.isGdk, + bo.sid AS saleOrderSid FROM bus_valcust_filing bf LEFT JOIN bus_sales_order bo @@ -79,4 +80,12 @@ set remarks = #{remarks} where sid = #{dtoSid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingRest.java index 5773f1626d..9dfcb8c98f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingRest.java @@ -26,6 +26,7 @@ package com.yxt.anrui.buscenter.biz.busvalcustfiling; import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.buscenter.api.busvalcustfiling.*; import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.*; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; @@ -38,12 +39,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFiling; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingQuery; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingVo; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingDetailsVo; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingDto; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingFeign; /** * Project: anrui-buscenter(价值客户备案申请)
@@ -144,4 +139,9 @@ public class BusValcustFilingRest implements BusValcustFilingFeign { public ResultBean selectByContractNoAndVinNo(String contractNo, String vinNo) { return busValcustFilingService.selectByContractNoAndVinNo(contractNo,vinNo); } + + @Override + public ResultBean getToDoNum(BusToDoNumQuery appToDoNumQuery) { + return busValcustFilingService.getToDoNum(appToDoNumQuery); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java index 8135047db2..3b5521fd9c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java @@ -46,6 +46,7 @@ import com.yxt.anrui.buscenter.api.busfile.BusFileDto; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; +import com.yxt.anrui.buscenter.api.busvalcustfiling.*; import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.BusValcustFilingNodeQuery; import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.BusValcustFilingNodeVo; import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.BusValcustFilingTaskQuery; @@ -84,6 +85,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; 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.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; @@ -100,12 +102,6 @@ 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.buscenter.api.busvalcustfiling.BusValcustFiling; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingQuery; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingVo; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingDetailsVo; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingDto; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -174,6 +170,8 @@ public class BusValcustFilingService extends MybatisBaseService listPageVo(PagerQuery pq) { BusValcustFilingQuery query = pq.getParams(); @@ -271,10 +269,10 @@ public class BusValcustFilingService extends MybatisBaseService busFileDtos = busFileService.getPathByLinkSid(sid); List fjImages = new ArrayList<>(); for (BusFileDto busFileDto : busFileDtos) { @@ -350,7 +355,7 @@ public class BusValcustFilingService extends MybatisBaseService appMap = new HashMap<>(); - appMap.put("sid",businessSid); + appMap.put("sid", businessSid); //需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。 variables.put("app", appMap); //流程定义id @@ -428,7 +433,7 @@ public class BusValcustFilingService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); - appMap.put("sid",businessSid); + appMap.put("sid", businessSid); variables.put("app", appMap); FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); if (StringUtils.isBlank(busValcustFiling.getProcDefId())) { @@ -483,7 +488,7 @@ public class BusValcustFilingService extends MybatisBaseService busBillVehicleVos = busBillVehicleService.fetchVehBySid(busBillApplication.getSid()); List busBillTrailerVos = busBillTrailerService.fetchByMainSid(busBillApplication.getSid()); @@ -508,10 +513,10 @@ public class BusValcustFilingService extends MybatisBaseService finBillVehicleVos = finBillVehicleFeign.fetchVehBySid(busValcustFiling.getBusSid()).getData(); List finBillTrailerVos = finBillTrailerFeign.fetchByMainSid(busValcustFiling.getBusSid()).getData(); @@ -733,7 +738,7 @@ public class BusValcustFilingService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); - appMap.put("sid",businessSid); + appMap.put("sid", businessSid); variables.put("app", appMap); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); @@ -838,7 +843,15 @@ public class BusValcustFilingService extends MybatisBaseService selectByContractNoAndVinNo(String contractNo, String vinNo) { ResultBean rb = ResultBean.fireFail(); - BusValcustFiling busValcustFiling = baseMapper.selectByContractNoAndVinNo(contractNo,vinNo); + BusValcustFiling busValcustFiling = baseMapper.selectByContractNoAndVinNo(contractNo, vinNo); return rb.success().setData(busValcustFiling); } + + public ResultBean getToDoNum(BusToDoNumQuery appToDoNumQuery) { + ResultBean rb = ResultBean.fireFail(); + String userSid = appToDoNumQuery.getUserSid(); + String orgPath = appToDoNumQuery.getOrgPath(); + int count = baseMapper.getToDoNum(orgPath, userSid); + return rb.success().setData(String.valueOf(count)); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue index 2c8dba40a3..529fbd9124 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue @@ -1,7 +1,7 @@ @@ -88,6 +92,7 @@ import ButtonBar from '@/components/ButtonBar' import valuablecustomerAdd from './valuablecustomerAdd.vue' import valuablecustomerInfo from './valuablecustomerInfo' import dingdanInfo from '@/components/publicPage/dingdanInfo' +import { getStorage } from '@/utils/auth' export default { name: 'ValuableCustomer', @@ -101,6 +106,9 @@ export default { }, data() { return { + url: '', + dialogHeight: '80%', + centerDialogVisible: false, btndisabled: false, btnList: [ { @@ -143,9 +151,40 @@ export default { this.getList() }, mounted() { + // 在外部vue的window上添加postMessage的监听,而且绑定处理函数handleMessage + window.addEventListener('message', this.handleMessage) this.$refs['btnbar'].setButtonList(this.btnList) }, methods: { + async handleMessage(event) { + var code = '' + if (event.data.params !== null && event.data.params !== undefined) { + code = event.data.params.code + } + if (code === 1) { + this.init() + this.centerDialogVisible = false + } else if (code === 2) { + this.dialogHeight = event.data.params.data + this.setIframeHeight(document.getElementById('iframe')) + } + }, + closeIt() { + this.url = '' + this.centerDialogVisible = false + }, + setIframeHeight(iframe) { + iframe.height = this.dialogHeight + }, + flowRecord(row) { + this.centerDialogVisible = true + var params = { + deployId: row.procDefId, + procInsId: row.procInstId, + token: getStorage() + } + this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) + }, // 搜索条件效果 clicksearchShow() { this.isSearchShow = !this.isSearchShow diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/valuablecustomer/valuablecustomerAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/valuablecustomer/valuablecustomerAdd.vue index 95dab81a6c..67103b04d1 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/valuablecustomer/valuablecustomerAdd.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/valuablecustomer/valuablecustomerAdd.vue @@ -23,7 +23,7 @@
销售合同编号
- {{ formobj.contractNo }} + {{ formobj.contractNo }}
车型
@@ -38,21 +38,21 @@
-
{{ formobj.isGdk === '0' ? '加装配置金额' : '销售让利金额' }}
+
{{ formobj.isGdk === '0' ? '单台加装配置金额' : '单台销售让利金额' }}
{{ formobj.money }}
-
应收手续费
+
单台应收手续费
{{ formobj.ysMoney }}
-
实收手续费
+
*单台实收手续费
-
手续费差额
+
单台手续费差额
{{ commissionmargin() }} @@ -199,6 +199,10 @@ export default { handleSubmit() { this.$refs['form_obj'].validate((valid) => { if (valid) { + if (this.formobj.isGdk === '0' && this.formobj.ssMoney === '') { + this.$message({ showClose: true, type: 'error', message: '实收手续费不能为空' }) + return + } if (this.image_list1.length > 0) { const aa = [] this.image_list1.forEach((e) => { diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/valuablecustomer/valuablecustomerInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/valuablecustomer/valuablecustomerInfo.vue index c2713ae68d..a0a221fd69 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/valuablecustomer/valuablecustomerInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/valuablecustomer/valuablecustomerInfo.vue @@ -19,7 +19,7 @@
销售合同编号
- {{ formobj.contractNo }} + {{ formobj.contractNo }}
车型
@@ -34,21 +34,21 @@
-
{{ formobj.isGdk === '0' ? '加装配置金额' : '销售让利金额' }}
+
{{ formobj.isGdk === '0' ? '单台加装配置金额' : '单台销售让利金额' }}
{{ formobj.money }}
-
应收手续费
+
单台应收手续费
{{ formobj.ysMoney }}
-
实收手续费
+
单台实收手续费
{{ formobj.ssMoney }}
-
手续费差额
+
单台手续费差额
{{ commissionmargin() }}
@@ -154,9 +154,9 @@ export default { text-align: right; } .span-sty { - width: 130px !important; + width: 140px !important; } .addinputInfo { - margin-left: 120px !important; + margin-left: 130px !important; } diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue index 36e3c2decc..212f7a5433 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue @@ -2,7 +2,7 @@
-
出库申请详情
+
出库开票申请详情
同 意 驳 回 @@ -10,7 +10,7 @@
-
出库申请
+
出库开票申请
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue index fc69292879..fc481d755f 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue @@ -10,7 +10,7 @@
-
出库申请
+
出库开票申请
@@ -331,7 +331,7 @@ export default { this.$nextTick(() => { this.$refs['dataForm'].clearValidate() }) - this.viewTitle = '【编辑】出库申请' + this.viewTitle = '【编辑】出库开票申请' this.arguments.outboundSid = sid getRetrievalApplyInfo(this.arguments).then((resp) => { if (resp.success) { diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuYiBanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuYiBanInfo.vue index 7a08a7b773..e04ed28a37 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuYiBanInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuYiBanInfo.vue @@ -2,13 +2,13 @@
-
出库申请详情
+
出库开票申请详情
撤回
-
出库申请
+
出库开票申请
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/jiazhikehubeianFlow/valuablecustomerDaiBan.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/jiazhikehubeianFlow/valuablecustomerDaiBan.vue index bc8a297c70..0fc76d7c18 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/jiazhikehubeianFlow/valuablecustomerDaiBan.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/jiazhikehubeianFlow/valuablecustomerDaiBan.vue @@ -23,7 +23,7 @@
销售合同编号
- {{ formobj.contractNo }} + {{ formobj.contractNo }}
车型
@@ -38,21 +38,21 @@
-
{{ formobj.isGdk === '0' ? '加装配置金额' : '销售让利金额' }}
+
{{ formobj.isGdk === '0' ? '单台加装配置金额' : '单台销售让利金额' }}
{{ formobj.money }}
-
应收手续费
+
单台应收手续费
{{ formobj.ysMoney }}
-
实收手续费
+
单台实收手续费
{{ formobj.ssMoney }}
-
手续费差额
+
单台手续费差额
{{ commissionmargin() }}
@@ -352,9 +352,9 @@ export default { text-align: right; } .span-sty { - width: 130px !important; + width: 140px !important; } .addinputInfo { - margin-left: 120px !important; + margin-left: 130px !important; } diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/jiazhikehubeianFlow/valuablecustomerEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/jiazhikehubeianFlow/valuablecustomerEdit.vue index f2218f41f4..7aecd13e20 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/jiazhikehubeianFlow/valuablecustomerEdit.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/jiazhikehubeianFlow/valuablecustomerEdit.vue @@ -22,7 +22,7 @@
销售合同编号
- {{ formobj.contractNo }} + {{ formobj.contractNo }}
车型
@@ -37,21 +37,21 @@
-
{{ formobj.isGdk === '0' ? '加装配置金额' : '销售让利金额' }}
+
{{ formobj.isGdk === '0' ? '单台加装配置金额' : '单台销售让利金额' }}
{{ formobj.money }}
-
应收手续费
+
单台应收手续费
{{ formobj.ysMoney }}
-
实收手续费
+
单台实收手续费
-
手续费差额
+
单台手续费差额
{{ commissionmargin() }} @@ -223,6 +223,10 @@ export default { handleSubmit() { this.$refs['form_obj'].validate((valid) => { if (valid) { + if (this.formobj.isGdk === '0' && this.formobj.ssMoney === '') { + this.$message({ showClose: true, type: 'error', message: '实收手续费不能为空' }) + return + } if (this.image_list1.length > 0) { const aa = [] this.image_list1.forEach((e) => { @@ -266,9 +270,9 @@ export default { text-align: right; } .span-sty { - width: 130px !important; + width: 140px !important; } .addinputInfo { - margin-left: 120px !important; + margin-left: 130px !important; } diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/jiazhikehubeianFlow/valuablecustomerYiBan.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/jiazhikehubeianFlow/valuablecustomerYiBan.vue index 5b98b21203..6bb1cfaf5d 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/jiazhikehubeianFlow/valuablecustomerYiBan.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/jiazhikehubeianFlow/valuablecustomerYiBan.vue @@ -19,7 +19,7 @@
销售合同编号
- {{ formobj.contractNo }} + {{ formobj.contractNo }}
车型
@@ -34,21 +34,21 @@
-
{{ formobj.isGdk === '0' ? '加装配置金额' : '销售让利金额' }}
+
{{ formobj.isGdk === '0' ? '单台加装配置金额' : '单台销售让利金额' }}
{{ formobj.money }}
-
应收手续费
+
单台应收手续费
{{ formobj.ysMoney }}
-
实收手续费
+
单台实收手续费
{{ formobj.ssMoney }}
-
手续费差额
+
单台手续费差额
{{ commissionmargin() }}
@@ -222,9 +222,9 @@ export default { text-align: right; } .span-sty { - width: 130px !important; + width: 140px !important; } .addinputInfo { - margin-left: 120px !important; + margin-left: 130px !important; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 14b48565a0..cfde0de6e4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -2484,7 +2484,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService getOrgSidByPath(@RequestParam("orgPath") String orgPath); + @GetMapping("/getOrgSidByPath2") + @ResponseBody + @ApiOperation("根据用户组织全路径获取用户的事业部sid") + ResultBean getOrgSidByPath2(@RequestParam("orgPath") String orgPath); + @PostMapping("/selAllByOrgPath") @ResponseBody @ApiOperation("根据分公司全路径和角色sid模糊查询本公司本角色下的所有员工userSid") diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java index 144c144455..aa3fd05235 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java @@ -100,6 +100,11 @@ public class SysStaffOrgFeignFallback implements SysStaffOrgFeign { return null; } + @Override + public ResultBean getOrgSidByPath2(String orgPath) { + return null; + } + @Override public ResultBean> selAllByOrgPath(String orgSidPath, String roleSid) { return null; diff --git a/anrui-portal/anrui-portal-biz/pom.xml b/anrui-portal/anrui-portal-biz/pom.xml index d0a1caa733..182567e5c9 100644 --- a/anrui-portal/anrui-portal-biz/pom.xml +++ b/anrui-portal/anrui-portal-biz/pom.xml @@ -136,6 +136,12 @@ activation 1.1.1 + + com.yxt.anrui + anrui-buscenter-api + 0.0.1-SNAPSHOT + compile + diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java index d1380c5bd4..d6bba6d94f 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java @@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; "com.yxt.anrui.portal" }) @EnableDiscoveryClient -@EnableFeignClients(basePackages = {"com.yxt.anrui.crm", "com.yxt.anrui.flowable", "com.yxt.messagecenter", "com.yxt.anrui.terminal", "com.yxt.anrui.base", "com.yxt.anrui.scm", "com.yxt.anrui.fin"}) +@EnableFeignClients(basePackages = {"com.yxt.anrui.crm", "com.yxt.anrui.flowable", "com.yxt.messagecenter", "com.yxt.anrui.terminal", "com.yxt.anrui.base", "com.yxt.anrui.scm", "com.yxt.anrui.fin", "com.yxt.anrui.buscenter"}) public class PortalApplication { public static void main(String[] args) { diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java index f7ac01a842..f030ef57e1 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java @@ -49,7 +49,9 @@ public class AppIndexEnum { PK("608e72d3-9f34-4b44-85c4-d6be41de8f76", "盘库"), XJ("ae160247-195e-4f2c-a167-ae50a2e50c81", "巡检"), SC("92659535-38f6-4456-a45a-ab5e9ced3fac", "收车"), - HTSH("f4d75ebc-cbab-4c44-bf93-2d38f70c1c15", "合同审核"); + HTSH("f4d75ebc-cbab-4c44-bf93-2d38f70c1c15", "合同审核"), + JZKHBA("6a80aa48-c988-4880-b0a0-f2a406d8cad5", "价值客户备案"), + ; /** * code值 diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java index e82326a3e5..e5d211fe4b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java @@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.api.commoncontract.CommonToDoNumQuery; +import com.yxt.anrui.buscenter.api.busvalcustfiling.BusToDoNumQuery; +import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingFeign; import com.yxt.anrui.portal.api.index.AppIndexNewListVo; import com.yxt.anrui.portal.api.index.AppIndexNewVo; import com.yxt.anrui.portal.api.index.AppIndexNumQuery; @@ -60,6 +62,8 @@ public class AppIndexService { @Autowired private CommonContractFeign commonContractFeign; + @Autowired + private BusValcustFilingFeign busValcustFilingFeign; public ResultBean> getBusinessList(String userSid, String appSid, String orgPath) { ResultBean> rb = ResultBean.fireFail(); @@ -120,7 +124,9 @@ public class AppIndexService { appToDoNumQuery.setUserSid(userSid); appToDoNumQuery.setOrgPath(orgPath); CommonToDoNumQuery commonToDoNumQuery = new CommonToDoNumQuery(); + BusToDoNumQuery busToDoNumQuery = new BusToDoNumQuery(); BeanUtil.copyProperties(appToDoNumQuery, commonToDoNumQuery); + BeanUtil.copyProperties(appToDoNumQuery, busToDoNumQuery); //根据appSid查询菜单的信息 List sysMobileMenus = sysMobileMenuService.getMenu(appSid); List list = new ArrayList<>(); @@ -170,6 +176,11 @@ public class AppIndexService { String num = commonContractFeign.getToDoNum(commonToDoNumQuery).getData(); appIndexNumVo.setNum(num); } + //价值客户 + if (AppIndexEnum.AppMenu.JZKHBA.getRemarks().equals(menu.getTitle())) { + String num = busValcustFilingFeign.getToDoNum(busToDoNumQuery).getData(); + appIndexNumVo.setNum(num); + } list.add(appIndexNumVo); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java index 2f2f689dd2..63f5512172 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java @@ -135,6 +135,11 @@ public class SysStaffOrgRest implements SysStaffOrgFeign { return sysStaffOrgService.getOrgSidByPath(orgPath); } + @Override + public ResultBean getOrgSidByPath2(String orgPath) { + return sysStaffOrgService.getOrgSidByPath2(orgPath); + } + @Override public ResultBean> selAllByOrgPath(String orgSidPath,String roleSid) { return sysStaffOrgService.selAllByOrgPath(orgSidPath,roleSid); 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 90c913ab5a..09cb54f7ee 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 @@ -325,4 +325,13 @@ public class SysStaffOrgService extends MybatisBaseService sysStaffOrgByUserVos = baseMapper.selAllByOrgPath(qw); return rb.success().setData(sysStaffOrgByUserVos); } + + public ResultBean getOrgSidByPath2(String orgPath) { + ResultBean rb = ResultBean.fireFail(); + //根据用户全路径获取分公司sid + List stringList = Arrays.asList(orgPath.split("/")); + String orgSid = stringList.get(stringList.size() - 2); + orgPath = sysOrganizationService.getOrgSid(orgSid); + return rb.success().setData(orgPath); + } } \ No newline at end of file diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java index 5368187727..80284c3064 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java @@ -18,8 +18,35 @@ import org.springframework.web.bind.annotation.ResponseBody; path = "v1/DailyReport", fallback = DailyReportFeignFallback.class) public interface DailyReportFeign { - + /** + * 按照生成日期, + * 分公司sid查询,按照分公司sid,品牌sid,车型sid,配置sid排序。 + * + * @param pagerQuery + * @return + */ @PostMapping("listPage") @ResponseBody ResultBean> listPage(PagerQuery pagerQuery); + + /** + * 按照生成日期、 + * 事业部sid查询,并按分公司sid,品牌sid,车型sid,配置sid排序 + * + * @param pagerQuery + * @return + */ + @PostMapping("listPage2") + @ResponseBody + ResultBean> listPage2(PagerQuery pagerQuery); + + /** + * 按照生成日期查询,按照事业部sid,品牌sid,车型sid,配置sid分组 + * + * @param pagerQuery + * @return + */ + @PostMapping("listPage3") + @ResponseBody + ResultBean> listPage3(PagerQuery pagerQuery); } diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportQuery.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportQuery.java index f0b0e038ba..8301a602ed 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportQuery.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportQuery.java @@ -1,6 +1,7 @@ package com.yxt.anrui.reportcenter.api.dailyreport; import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -11,4 +12,11 @@ import lombok.Data; @Data public class DailyReportQuery implements Query { private static final long serialVersionUID = -3990941897379861702L; + + @ApiModelProperty("生成日期开始") + private String createTimeStart; + @ApiModelProperty("生成日期结束") + private String createTimeEnd; + + private String orgPath; } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/pom.xml b/anrui-reportcenter/anrui-reportcenter-biz/pom.xml index e98f938cee..a6884a084f 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/pom.xml +++ b/anrui-reportcenter/anrui-reportcenter-biz/pom.xml @@ -31,6 +31,11 @@ yxt-common-base 0.0.1 + + anrui-portal-api + com.yxt.anrui + 0.0.1-SNAPSHOT + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/ReportcenterApplication.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/ReportcenterApplication.java index 06d7b62be4..32fc480298 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/ReportcenterApplication.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/ReportcenterApplication.java @@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; "com.yxt.anrui.reportcenter" }) @EnableDiscoveryClient -@EnableFeignClients(basePackages = {}) +@EnableFeignClients(basePackages = {"com.yxt.anrui.portal"}) public class ReportcenterApplication { public static void main(String[] args) { diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java new file mode 100644 index 0000000000..53a7d6cd93 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.reportcenter.biz.dailyreport; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.reportcenter.api.dailyreport.DailyReport; +import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/28 + **/ +@Mapper +public interface DailyReportMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage listPage3(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); +} diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml new file mode 100644 index 0000000000..fc8b9b85b0 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportRest.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportRest.java new file mode 100644 index 0000000000..fc6f0a6632 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportRest.java @@ -0,0 +1,47 @@ +package com.yxt.anrui.reportcenter.biz.dailyreport; + +import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportFeign; +import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportQuery; +import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/28 + **/ +@Api(tags = "报表") +@RestController +@RequestMapping("v1/DailyReport") +public class DailyReportRest implements DailyReportFeign { + + @Autowired + private DailyReportService dailyReportService; + + @Override + public ResultBean> listPage(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = dailyReportService.listPage(pagerQuery); + return rb.success().setData(pv); + } + + @Override + public ResultBean> listPage2(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = dailyReportService.listPage2(pagerQuery); + return rb.success().setData(pv); + } + + @Override + public ResultBean> listPage3(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = dailyReportService.listPage3(pagerQuery); + return rb.success().setData(pv); + } +} diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java new file mode 100644 index 0000000000..1535a4b0a3 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java @@ -0,0 +1,90 @@ +package com.yxt.anrui.reportcenter.biz.dailyreport; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.reportcenter.api.dailyreport.DailyReport; +import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportQuery; +import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo; +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.vo.PagerVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/28 + **/ +@Service +public class DailyReportService extends MybatisBaseService { + + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + + public PagerVo listPage(PagerQuery pagerQuery) { + DailyReportQuery query = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + //生成日期开始时间 + String createTimeStart = query.getCreateTimeStart(); + //生成日期结束时间 + String createTimeEnd = query.getCreateTimeEnd(); + qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createTimeStart + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')" + ); + if (StringUtils.isNotBlank(query.getOrgPath())) { + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); + qw.eq("useOrgSid", useOrgSid); + } + } + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public PagerVo listPage2(PagerQuery pagerQuery) { + DailyReportQuery query = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + //生成日期开始时间 + String createTimeStart = query.getCreateTimeStart(); + //生成日期结束时间 + String createTimeEnd = query.getCreateTimeEnd(); + qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createTimeStart + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')" + ); + //查询事业部 + if (StringUtils.isNotBlank(query.getOrgPath())) { + String busOrgSid = sysStaffOrgFeign.getOrgSidByPath2(query.getOrgPath()).getData(); + qw.eq("busOrgSid", busOrgSid); + } + } + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public PagerVo listPage3(PagerQuery pagerQuery) { + DailyReportQuery query = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + //生成日期开始时间 + String createTimeStart = query.getCreateTimeStart(); + //生成日期结束时间 + String createTimeEnd = query.getCreateTimeEnd(); + qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createTimeStart + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')" + ); + } + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.listPage3(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } +} diff --git a/anrui-riskcenter-ui/src/views/financialpolicyreporting/financialpolicyreportingAdd.vue b/anrui-riskcenter-ui/src/views/financialpolicyreporting/financialpolicyreportingAdd.vue index 5dabbf788d..96a333ba1b 100644 --- a/anrui-riskcenter-ui/src/views/financialpolicyreporting/financialpolicyreportingAdd.vue +++ b/anrui-riskcenter-ui/src/views/financialpolicyreporting/financialpolicyreportingAdd.vue @@ -68,7 +68,7 @@ {{ scope.row.period }} - + @@ -80,10 +80,10 @@ - + diff --git a/anrui-riskcenter-ui/src/views/financialpolicyreporting/financialpolicyreportingInfo.vue b/anrui-riskcenter-ui/src/views/financialpolicyreporting/financialpolicyreportingInfo.vue index e451a4bbf4..78b9155b3d 100644 --- a/anrui-riskcenter-ui/src/views/financialpolicyreporting/financialpolicyreportingInfo.vue +++ b/anrui-riskcenter-ui/src/views/financialpolicyreporting/financialpolicyreportingInfo.vue @@ -59,7 +59,7 @@ {{ scope.row.period }} - + @@ -71,10 +71,10 @@ - + diff --git a/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagement.vue b/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagement.vue index 6e620276ca..435078c46f 100644 --- a/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagement.vue +++ b/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagement.vue @@ -50,7 +50,7 @@ - + diff --git a/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementAdd.vue b/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementAdd.vue index ab3e86d716..356413bb9a 100644 --- a/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementAdd.vue +++ b/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementAdd.vue @@ -397,13 +397,13 @@ export default { diff --git a/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementInfo.vue b/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementInfo.vue index a50cb3b050..586084e267 100644 --- a/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementInfo.vue +++ b/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementInfo.vue @@ -136,10 +136,10 @@ export default {