pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeGeneralMapper.java
@@ -94,4 +94,10 @@ * @return */ List<VoTradeDetails> getTradeDetails(Map<?, ?> params); /** * 删除今天的总账 * @return */ int deleteTodayGeneral(); } pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
@@ -285,6 +285,10 @@ AND us2.name like CONCAT('%',#{inspector},'%') </if> <if test = "state != null"> AND ord.state = #{state} </if> <if test = "timeStart != null and timeStop != null"> AND ord.dispatch_time BETWEEN #{timeStart} AND #{timeStop} </if> @@ -341,6 +345,10 @@ AND us2.name like CONCAT('%',#{inspector},'%') </if> <if test = "state != null"> AND ord.state = #{state} </if> <if test = "timeStart != null and timeStop != null"> AND ord.dispatch_time BETWEEN #{timeStart} AND #{timeStop} </if> pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
@@ -366,4 +366,9 @@ </if> </trim> </select> <!-- 删除今天的总账--> <delete id="deleteTodayGeneral"> DELETE FROM se_general WHERE operate_date = DATE(NOW()) </delete> </mapper> pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/qo/QoWorkOrder.java
@@ -35,6 +35,11 @@ private Long inspectorId; /** * 状态：1-未完成，2-已完成 */ private Integer state; /** * 查询开始时间 */ private String timeStart; pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralCtrl.java
@@ -106,6 +106,8 @@ * @return */ public void add_general(){ //删除今天的总账 generalSv.deleteTodayGeneral(); // 获取未生成总账的交易日期列表（当天的交易记录不生成总账） List<Map<String, Object>> list_operateDate = Optional.ofNullable(generalSv.getDatesOfNotInGenerals()).orElse(new ArrayList<>()); if(list_operateDate.size() > 0) { pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java
@@ -366,4 +366,11 @@ return map_result; } /** * 删除今天的总账 */ public void deleteTodayGeneral() { int i = seGeneralMapper.deleteTodayGeneral(); } } pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java
@@ -1,8 +1,10 @@ package com.dy.pipIrrWechat.intake; import com.dy.common.aop.SsoAop; import com.dy.common.webUtil.BaseResponse; import com.dy.common.webUtil.BaseResponseUtils; import com.dy.common.webUtil.QueryResultVo; import com.dy.pipIrrGlobal.pojoPr.PrIntake; import com.dy.pipIrrGlobal.voPr.VoOnLineIntake; import com.dy.pipIrrGlobal.voRm.VoOpenClostWechat; import com.dy.pipIrrWechat.intake.qo.OnLineIntakesQO; @@ -112,4 +114,23 @@ return BaseResponseUtils.buildException(e.getMessage()); } } /** * 获得全部取水口 * @return */ @GetMapping(path = "all") public BaseResponse<QueryResultVo<List<PrIntake>>> all() { try { QueryResultVo<List<PrIntake>> res = this.intakeSv.selectAll(); if (res == null) { return BaseResponseUtils.buildErrorMsg("没有符合条件的取水口数据"); } else { return BaseResponseUtils.buildSuccess(res); } } catch (Exception e) { log.error("查询取水口异常", e); return BaseResponseUtils.buildException(e.getMessage()); } } } pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java
@@ -10,6 +10,7 @@ import com.dy.common.webUtil.QueryResultVo; import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper; import com.dy.pipIrrGlobal.daoRm.RmOpenCloseValveHistoryMapper; import com.dy.pipIrrGlobal.pojoPr.PrIntake; import com.dy.pipIrrGlobal.voPr.VoOnLineIntake; import com.dy.pipIrrGlobal.voRm.VoOpenClostWechat; import com.dy.pipIrrWechat.intake.qo.OnLineIntakesQO; @@ -246,4 +247,15 @@ rsVo.obj = rmOpenCloseValveHistoryMapper.getVcCardOpenClose(params); return rsVo; } /** * 得到所有取水口 * * @return 所有取水口集合 */ public QueryResultVo<List<PrIntake>> selectAll() { QueryResultVo<List<PrIntake>> rsVo = new QueryResultVo<>(); rsVo.obj = this.prIntakeMapper.selectAll(); return rsVo; } }
