From f6aeadcf6cc2dfdd5f3983547114600bb0b5c69a Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 16 十月 2024 16:43:46 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml | 3 ++-
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java | 7 -------
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoMapCenter.java | 10 ++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/dict/DictSv.java | 5 +++++
pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml | 12 +++++++++---
5 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoMapCenter.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoMapCenter.java
index 24e2e9f..8109654 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoMapCenter.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoMapCenter.java
@@ -28,4 +28,14 @@
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
private BigDecimal lng;
+
+ /**
+ *鎵嬫満鍦板浘缂╂斁绾у埆
+ */
+ private Integer zoomMp;
+
+ /**
+ * PC鏈哄湴鍥剧缉鏀剧骇鍒�
+ */
+ private Integer zoomPc;
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
index 4dc85a0..00d6993 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
@@ -27,7 +27,9 @@
<settings>
<item1 item_name="lng" item_value="101.89878161146011" remarks="缁忓害"/>
<item2 item_name="lat" item_value="25.673963608371185" remarks="绾害"/>
- <item3 item_name="projectName" item_value="绠＄亴绯荤粺鍙婇珮鏁堟櫤鎱у井鐏屼簯鏈嶅姟绠＄悊骞冲彴杞欢绯荤粺" remarks="椤圭洰鍚嶇О"/>
+ <item3 item_name="zoomMp" item_value="12" remarks="鎵嬫満鍦板浘缂╂斁绾у埆"/>
+ <item4 item_name="zoomPc" item_value="19" remarks="PC鏈哄湴鍥剧缉鏀剧骇鍒�"/>
+ <item5 item_name="projectName" item_value="绠＄亴绯荤粺鍙婇珮鏁堟櫤鎱у井鐏屼簯鏈嶅姟绠＄悊骞冲彴杞欢绯荤粺" remarks="椤圭洰鍚嶇О"/>
</settings>
<waterTypes>
<item1 typeName="鐏屾簤鐢ㄦ按"/>
@@ -74,7 +76,9 @@
<settings>
<item1 item_name="lng" item_value="101.87345" remarks="缁忓害"/>
<item2 item_name="lat" item_value="25.70424" remarks="绾害"/>
- <item3 item_name="projectName" item_value="绠＄亴绯荤粺鍙婇珮鏁堟櫤鎱у井鐏屼簯鏈嶅姟绠＄悊骞冲彴杞欢绯荤粺" remarks="椤圭洰鍚嶇О"/>
+ <item3 item_name="zoomMp" item_value="12" remarks="鎵嬫満鍦板浘缂╂斁绾у埆"/>
+ <item4 item_name="zoomPc" item_value="19" remarks="PC鏈哄湴鍥剧缉鏀剧骇鍒�"/>
+ <item5 item_name="projectName" item_value="绠＄亴绯荤粺鍙婇珮鏁堟櫤鎱у井鐏屼簯鏈嶅姟绠＄悊骞冲彴杞欢绯荤粺" remarks="椤圭洰鍚嶇О"/>
</settings>
<waterTypes>
<item1 typeName="鐏屾簤鐢ㄦ按"/>
@@ -121,7 +125,9 @@
<settings>
<item1 item_name="lng" item_value="101.87345" remarks="缁忓害"/>
<item2 item_name="lat" item_value="25.70424" remarks="绾害"/>
- <item3 item_name="projectName" item_value="绠＄亴绯荤粺鍙婇珮鏁堟櫤鎱у井鐏屼簯鏈嶅姟绠＄悊骞冲彴杞欢绯荤粺" remarks="椤圭洰鍚嶇О"/>
+ <item3 item_name="zoomMp" item_value="12" remarks="鎵嬫満鍦板浘缂╂斁绾у埆"/>
+ <item4 item_name="zoomPc" item_value="19" remarks="PC鏈哄湴鍥剧缉鏀剧骇鍒�"/>
+ <item5 item_name="projectName" item_value="绠＄亴绯荤粺鍙婇珮鏁堟櫤鎱у井鐏屼簯鏈嶅姟绠＄悊骞冲彴杞欢绯荤粺" remarks="椤圭洰鍚嶇О"/>
</settings>
<waterTypes>
<item1 typeName="鐏屾簤鐢ㄦ按"/>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
index 8fbf4cd..9499940 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
@@ -250,7 +250,7 @@
<!--鑾峰彇鎸囧畾鏃ユ湡銆佹寚瀹氭敹閾跺憳銆佹寚瀹氭敮浠樻柟寮忓疄鏀堕噾棰濆悎璁�-->
<select id="getPaymentSums" resultType="java.lang.Float">
SELECT
- SUM(ope.trade_amount) AS tradeAmount
+ (SUM(ope.trade_amount) + SUM(ope.card_cost)) AS tradeAmount
FROM se_card_operate ope
<where>
AND ope.operate_valid = 2
@@ -305,6 +305,7 @@
INNER JOIN ba_user us ON us.id = ope.operator
<where>
AND ope.operate_type IN(1,2,3,4,5)
+ AND ope.operate_valid = 2
<if test = "cashierId != null and cashierId > 0">
AND us.id = #{cashierId}
</if>
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/dict/DictSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/dict/DictSv.java
index f59b604..5a2ecdb 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/dict/DictSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/dict/DictSv.java
@@ -56,9 +56,14 @@
BigDecimal lat = new BigDecimal(baSettingsMapper.getItemValue("lat"));
BigDecimal lng = new BigDecimal(baSettingsMapper.getItemValue("lng"));
+ Integer zoomMp = Integer.parseInt(baSettingsMapper.getItemValue("zoomMp"));
+ Integer zoomPc = Integer.parseInt(baSettingsMapper.getItemValue("zoomPc"));
+
VoMapCenter po = new VoMapCenter();
po.setLat(lat);
po.setLng(lng);
+ po.setZoomMp(zoomMp);
+ po.setZoomPc(zoomPc);
return po;
}
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
index c68002e..9392245 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
@@ -226,19 +226,12 @@
@SneakyThrows(IOException.class)
@RequestMapping(value = "/export", method = RequestMethod.GET)
public void export(HttpServletResponse response, QueryVo vo) {
- //setExcelRespProp(response, "鎺у埗鍣ㄥ垪琛�");
List<VoController> controllerList = controllerSv.export(vo);
ExcelUtil.setExcelRespProp(response, "鎺у埗鍣ㄥ垪琛�" + LocalDate.now());
EasyExcel.write(response.getOutputStream(), VoController.class)
.registerWriteHandler(new CellWriteHandler("鎺у埗鍣ㄥ垪琛�"))
.sheet("鎺у埗鍣�")
.doWrite(controllerList);
-
- //EasyExcel.write(response.getOutputStream())
- // .head(VoController.class)
- // .excelType(ExcelTypeEnum.XLSX)
- // .sheet("鎺у埗鍣ㄥ垪琛�")
- // .doWrite(memberList);
}
/**
--
Gitblit v1.8.0