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; } 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="灌溉用水"/> 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> 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; } } 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); } /**
