pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
@@ -401,7 +401,7 @@ rmCommandHistory.setResult((byte) 1); rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory); if(openType == 1) { if(openType != null && openType == 1) { irIntakeOperateMapper.updateByCommandId(comId, (byte)1, null); } pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
@@ -259,7 +259,7 @@ Byte openType = automaticClose.getOpenType(); Long comId = new IDLongGenerator().generate(); if(openType == 1) { if(openType != null && openType == 1) { IrIntakeOperate irIntakeOperate = new IrIntakeOperate(); irIntakeOperate.setPlanId(planId); irIntakeOperate.setOperateType((byte)1); pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanCtrl.java
@@ -281,18 +281,27 @@ } /** * 获取灌溉计划列表 * @param vo * 终止灌溉计划 * @param planSimple * @param bindingResult * @return */ //@GetMapping(path = "/getIrrigatePlans") //public BaseResponse<QueryResultVo<List<VoIrrigatePlan>>> getIrrigatePlans(QoIrrigatePlan vo) { // try { // QueryResultVo<List<VoIrrigatePlan>> res = irrigatePlanSv.getIrrigatePlans(vo); // return BaseResponseUtils.buildSuccess(res); // } catch (Exception e) { // log.error("获取轮灌组记录异常", e); // return BaseResponseUtils.buildException(e.getMessage()); //@PostMapping(path = "terminatePlan", consumes = MediaType.APPLICATION_JSON_VALUE) //@Transactional(rollbackFor = Exception.class) //public BaseResponse<Boolean> terminatePlan(@RequestBody @Valid PlanSimple planSimple, BindingResult bindingResult){ // if(bindingResult != null && bindingResult.hasErrors()){ // return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); // } // // Long planId = planSimple.getPlanId(); // Long operatorId = planSimple.getOperatorId(); // // IrIrrigatePlan iIrrigatePlan = new IrIrrigatePlan(); // iIrrigatePlan.setId(planId); // iIrrigatePlan.setExecutingState((byte)3); // if(irrigatePlanSv.updatePlan(iIrrigatePlan) == 0){ // return BaseResponseUtils.buildErrorMsg("终止计划状态失败"); // } // //} } pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
@@ -60,6 +60,15 @@ } /** * 修改灌溉计划 * @param po * @return */ public Integer updatePlan(IrIrrigatePlan po) { return irrigatePlanMapper.updateByPrimaryKeySelective(po); } /** * 获取未完成的计划列表,小程序计划列表页使用 * @return */