From 689b505e5cbf8589711320e317311f73cb1fd571 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:51:46 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/components/business/OperaTmsFactoryParamWindow.vue | 8 +++-
server/visits/dmvisit_admin/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 22 +++-------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/TotalOutQtyNumVO.java | 40 ++++++--------------
admin/src/views/business/tmsFactoryParam.vue | 5 +-
6 files changed, 30 insertions(+), 49 deletions(-)
diff --git a/admin/src/components/business/OperaTmsFactoryParamWindow.vue b/admin/src/components/business/OperaTmsFactoryParamWindow.vue
index c246c9c..1bb0181 100644
--- a/admin/src/components/business/OperaTmsFactoryParamWindow.vue
+++ b/admin/src/components/business/OperaTmsFactoryParamWindow.vue
@@ -15,7 +15,10 @@
<el-form-item label="鎬诲簱瀛橀噺锛堜竾鏀級" prop="num1">
<el-input v-model="form.num1" placeholder="璇疯緭鍏ユ�诲簱瀛橀噺锛堜竾鏀級" v-trim/>
</el-form-item>
- <el-form-item label="鎬诲嚭搴撹兘鍔涳紙涓囨敮锛�" prop="num2">
+ <el-form-item label="8灏忔椂鍑哄簱鑳藉姏锛堜竾鏀級" prop="num2">
+ <el-input v-model="form.param3" placeholder="璇疯緭鍏�8灏忔椂鍑哄簱鑳藉姏锛堜竾鏀級" v-trim/>
+ </el-form-item>
+ <el-form-item label="鏈�澶у嚭搴撹兘鍔涳紙涓囨敮锛�" prop="num2">
<el-input v-model="form.num2" placeholder="璇疯緭鍏ユ�诲嚭搴撹兘鍔涳紙涓囨敮锛�" v-trim/>
</el-form-item>
<el-form-item label="鎺掑簭鐮�" prop="sortnum">
@@ -41,7 +44,8 @@
name: '',
sortnum: '',
num1: '',
- num2: ''
+ num2: '',
+ param3: ''
},
// 楠岃瘉瑙勫垯
rules: {
diff --git a/admin/src/views/business/tmsFactoryParam.vue b/admin/src/views/business/tmsFactoryParam.vue
index 9e3ea9f..f2ec0a5 100644
--- a/admin/src/views/business/tmsFactoryParam.vue
+++ b/admin/src/views/business/tmsFactoryParam.vue
@@ -26,10 +26,11 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
+ <el-table-column prop="name" label="鍚嶇О" min-width="100px"></el-table-column>
<el-table-column prop="code" label="缂栫爜" min-width="100px"></el-table-column>
<el-table-column prop="num1" label="鎬诲簱瀛橀噺锛堜竾鏀級" min-width="100px"></el-table-column>
- <el-table-column prop="num2" label="鎬诲嚭搴撹兘鍔涳紙涓囨敮锛�" min-width="100px"></el-table-column>
+ <el-table-column prop="param3" label="8灏忔椂鍑哄簱鑳藉姏锛堜竾鏀級" min-width="100px"></el-table-column>
+ <el-table-column prop="num2" label="鏈�澶у嚭搴撹兘鍔涳紙涓囨敮锛�" min-width="100px"></el-table-column>
<el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
<el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
<el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
index 9dc10e9..2df12af 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: dev
+ active: pro
application:
name: visitsAdmin
# 瀹夊叏閰嶇疆
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/TotalOutQtyNumVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/TotalOutQtyNumVO.java
index c769dcc..bc19379 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/TotalOutQtyNumVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/TotalOutQtyNumVO.java
@@ -15,33 +15,17 @@
@Data
public class TotalOutQtyNumVO {
- @ApiModelProperty(value = "鏈懆鍑哄簱閲�(鐪佸唴)")
- private BigDecimal currentInWeekNum;
- @ApiModelProperty(value = "鏈懆鍑哄簱閲�(鐪佸)")
- private BigDecimal currentOutWeekNum;
- @ApiModelProperty(value = "涓婂懆鍑哄簱閲忥紙鐪佸唴锛�")
- private BigDecimal lastInWeekNum;
- @ApiModelProperty(value = "涓婂懆鍑哄簱閲忥紙鐪佸锛�")
- private BigDecimal lastOutWeekNum;
- @ApiModelProperty(value = "鏈湀鍑哄簱閲忥紙鐪佸唴锛�")
- private BigDecimal currentInMonthNum;
- @ApiModelProperty(value = "鏈湀鍑哄簱閲忥紙鐪佸锛�")
- private BigDecimal currentOutMonthNum;
- @ApiModelProperty(value = "涓婃湀鍑哄簱閲忥紙鐪佸唴锛�")
- private BigDecimal lastInMonthNum;
- @ApiModelProperty(value = "涓婃湀鍑哄簱閲忥紙鐪佸锛�")
- private BigDecimal lastOutMonthNum;
- @ApiModelProperty(value = "鍘诲勾鍚屾湀鍑哄簱閲�(鐪佸唴锛�")
- private BigDecimal sameInMonthNum;
- @ApiModelProperty(value = "鍘诲勾鍚屾湀鍑哄簱閲忥紙鐪佸锛�")
- private BigDecimal sameOutMonthNum;
- @ApiModelProperty(value = "鏈勾鍑哄簱閲�(鐪佸唴锛�")
- private BigDecimal currentInYearNum;
- @ApiModelProperty(value = "鏈勾鍑哄簱閲忥紙鐪佸锛�")
- private BigDecimal currentOutYearNum;
- @ApiModelProperty(value = "鍘诲勾鍑哄簱閲忥紙鐪佸唴锛�")
- private BigDecimal lastInYearNum;
- @ApiModelProperty(value = "鍘诲勾鍑哄簱閲忥紙鐪佸锛�")
- private BigDecimal lastOutYearNum;
+ @ApiModelProperty(value = "褰撳墠鍛ㄦ湡鍑哄簱閲�(鐪佸唴)")
+ private BigDecimal currentInNum;
+ @ApiModelProperty(value = "褰撳墠鍛ㄦ湡鍑哄簱閲�(鐪佸)")
+ private BigDecimal currentOutNum;
+ @ApiModelProperty(value = "涓婇殧澶╁懆鏈熷嚭搴撻噺锛堢渷鍐咃級")
+ private BigDecimal lastInNum;
+ @ApiModelProperty(value = "涓婁釜鍛ㄦ湡鍑哄簱閲忥紙鐪佸锛�")
+ private BigDecimal lastOutNum;
+ @ApiModelProperty(value = "鍘诲勾鍚屾湡鍑哄簱閲�(鐪佸唴锛�")
+ private BigDecimal sameInNum;
+ @ApiModelProperty(value = "鍘诲勾鍚屾湡鍑哄簱閲忥紙鐪佸锛�")
+ private BigDecimal sameOutNum;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 4fdc968..ac195f5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -2090,23 +2090,15 @@
* @return
*/
@Override
- public TotalOutQtyNumVO totalOutQtyNum(){
+ public TotalOutQtyNumVO totalOutQtyNum(int queryType){
TotalOutQtyNumVO data = new TotalOutQtyNumVO();
- data.setCurrentInYearNum(new BigDecimal(0));
- data.setCurrentInWeekNum(new BigDecimal(0));
- data.setCurrentInMonthNum(new BigDecimal(0));
- data.setLastInYearNum(new BigDecimal(0));
- data.setLastInMonthNum(new BigDecimal(0));
- data.setLastInWeekNum(new BigDecimal(0));
- data.setSameInMonthNum(new BigDecimal(0));
+ data.setCurrentInNum(new BigDecimal(0));
+ data.setLastInNum(new BigDecimal(0));
+ data.setSameInNum(new BigDecimal(0));
//---------鐪佸----------------
- data.setCurrentOutYearNum(new BigDecimal(0));
- data.setCurrentOutWeekNum(new BigDecimal(0));
- data.setCurrentOutMonthNum(new BigDecimal(0));
- data.setLastOutYearNum(new BigDecimal(0));
- data.setLastOutMonthNum(new BigDecimal(0));
- data.setLastOutWeekNum(new BigDecimal(0));
- data.setSameOutMonthNum(new BigDecimal(0));
+ data.setCurrentOutNum(new BigDecimal(0));
+ data.setLastOutNum(new BigDecimal(0));
+ data.setSameOutNum(new BigDecimal(0));
return data;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
index eba17aa..d408f01 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
@@ -101,5 +101,5 @@
List<WholeProvinceMapVO> mapYearAndMonthOutList();
- TotalOutQtyNumVO totalOutQtyNum();
+ TotalOutQtyNumVO totalOutQtyNum(int queryType);
}
--
Gitblit v1.9.3