diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java index 4223d5c6..83cb43f6 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java @@ -3,6 +3,7 @@ package com.op.device.controller; import com.op.common.core.web.domain.AjaxResult; import com.op.common.security.annotation.RequiresPermissions; import com.op.device.domain.*; +import com.op.device.domain.dto.PDADTO; import com.op.device.service.IDevicePDAService; import com.op.device.service.IEquRepairOrderService; import org.springframework.beans.factory.annotation.Autowired; @@ -26,22 +27,22 @@ public class DevicePDAController { /** * 获取今日巡检任务工单list - * @param userId + * @param pdadto * @return */ @GetMapping("/getTodayTask") - public AjaxResult getTodayTask(int userId) { - return devicePDAService.getTodayTask(userId); + public AjaxResult getTodayTask(PDADTO pdadto) { + return devicePDAService.getTodayTask(pdadto); } /** * 获取巡检记录 - * @param userId + * @param pdadto * @return */ @GetMapping("/getTaskRecord") - public AjaxResult getTaskRecord(int userId) { - return devicePDAService.getTaskRecord(userId); + public AjaxResult getTaskRecord(PDADTO pdadto) { + return devicePDAService.getTaskRecord(pdadto); } /** diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java index 6e4177a6..026a10b6 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java @@ -84,7 +84,7 @@ public class EquPlanController extends BaseController { * @param equEquipment * @return */ - @RequiresPermissions("device:plan:list") + @RequiresPermissions("device:inspectionPlan:list") @GetMapping("/getEquList") public TableDataInfo getEquList(EquEquipment equEquipment) { startPage(); @@ -95,7 +95,7 @@ public class EquPlanController extends BaseController { /** * 查询计划列表 */ - @RequiresPermissions("device:plan:list") + @RequiresPermissions("device:inspectionPlan:list") @GetMapping("/list") public TableDataInfo list(EquPlan equPlan) { startPage(); @@ -106,7 +106,7 @@ public class EquPlanController extends BaseController { /** * 导出计划列表 */ - @RequiresPermissions("device:plan:export") + @RequiresPermissions("device:inspectionPlan:export") @Log(title = "计划", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, EquPlan equPlan) { @@ -118,7 +118,7 @@ public class EquPlanController extends BaseController { /** * 获取计划详细信息 */ - @RequiresPermissions("device:plan:query") + @RequiresPermissions("device:inspectionPlan:query") @GetMapping(value = "/{planId}") public AjaxResult getInfo(@PathVariable("planId") String planId) { return success(equPlanService.selectEquPlanByPlanId(planId)); @@ -127,7 +127,7 @@ public class EquPlanController extends BaseController { /** * 新增计划 */ - @RequiresPermissions("device:plan:add") + @RequiresPermissions("device:inspectionPlan:add") @Log(title = "计划", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody EquPlan equPlan) { @@ -137,7 +137,7 @@ public class EquPlanController extends BaseController { /** * 修改计划 */ - @RequiresPermissions("device:plan:edit") + @RequiresPermissions("device:inspectionPlan:edit") @Log(title = "计划", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody EquPlan equPlan) { @@ -147,7 +147,7 @@ public class EquPlanController extends BaseController { /** * 删除计划 */ - @RequiresPermissions("device:plan:remove") + @RequiresPermissions("device:inspectionPlan:remove") @Log(title = "计划", businessType = BusinessType.DELETE) @DeleteMapping("/{planIds}") public AjaxResult remove(@PathVariable String[] planIds) { diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/dto/PDADTO.java b/op-modules/op-device/src/main/java/com/op/device/domain/dto/PDADTO.java new file mode 100644 index 00000000..591d88a6 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/dto/PDADTO.java @@ -0,0 +1,23 @@ +package com.op.device.domain.dto; + +// 手持传参dto +public class PDADTO { + private String userId; + private String planType; + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getPlanType() { + return planType; + } + + public void setPlanType(String planType) { + this.planType = planType; + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java index 23c57844..2f4e54d2 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java @@ -4,6 +4,8 @@ import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.device.domain.EquOrder; +import com.op.device.domain.dto.PDADTO; +import org.apache.ibatis.annotations.Param; /** * 计划工单Mapper接口 @@ -74,18 +76,13 @@ public interface EquOrderMapper { */ String selectCenterNameByCenterCode(String planWorkshop); - /** - * 获取今日巡检工单list - * @return - */ - List selectTodayTask(int userId); /** * 获取巡检记录 - * @param userId + * @param pdadto * @return */ - List selectTaskRecord(int userId); + List selectTaskRecord(PDADTO pdadto); /** * 通过id查询工单信息 @@ -107,4 +104,11 @@ public interface EquOrderMapper { */ @DS("#master") String changeLoopType(String planLoopType); + + /** + * 获取今日任务list + * @param pdadto + * @return + */ + List selectTodayTask(PDADTO pdadto); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java b/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java index b55238ad..ffe359e4 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java @@ -2,6 +2,7 @@ package com.op.device.service; import com.op.common.core.web.domain.AjaxResult; import com.op.device.domain.*; +import com.op.device.domain.dto.PDADTO; /** * PDAService @@ -15,14 +16,14 @@ public interface IDevicePDAService { * 获取今日巡检任务工单list * @return */ - AjaxResult getTodayTask(int userId); + AjaxResult getTodayTask(PDADTO pdadto); /** * 获取巡检记录 - * @param userId + * @param pdadto * @return */ - AjaxResult getTaskRecord(int userId); + AjaxResult getTaskRecord(PDADTO pdadto); /** * 获取任务详情 diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java index f146cefb..ec7ea9cf 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java @@ -9,6 +9,7 @@ import com.op.common.core.utils.uuid.IdUtils; import com.op.common.core.web.domain.AjaxResult; import com.op.common.security.utils.SecurityUtils; import com.op.device.domain.*; +import com.op.device.domain.dto.PDADTO; import com.op.device.mapper.*; import com.op.device.service.IDevicePDAService; import com.op.system.api.domain.SysUser; @@ -70,21 +71,21 @@ public class DevicePDAServiceImpl implements IDevicePDAService { */ @Override @DS("#header.poolName") - public AjaxResult getTodayTask(int userId) { - List orderList = equOrderMapper.selectTodayTask(userId); + public AjaxResult getTodayTask(PDADTO pdadto) { + List orderList = equOrderMapper.selectTodayTask(pdadto); return success(orderList); } /** * 获取巡检记录 * - * @param userId + * @param pdadto * @return */ @Override @DS("#header.poolName") - public AjaxResult getTaskRecord(int userId) { - List orderList = equOrderMapper.selectTaskRecord(userId); + public AjaxResult getTaskRecord(PDADTO pdadto) { + List orderList = equOrderMapper.selectTaskRecord(pdadto); return success(orderList); } @@ -150,6 +151,20 @@ public class DevicePDAServiceImpl implements IDevicePDAService { @DS("#header.poolName") public AjaxResult updateInspectionRecord(EquOrder equOrder) { + // 检验如果审核通过则不允许修改记录 + if (equOrder.getRepairCode() != null) { + if (!equOrder.getRepairCode().isEmpty()) { + EquRepairOrder repairOrder = equRepairOrderMapper.selectEquRepairOrderByRepairCode(equOrder.getRepairCode()); + if (repairOrder==null) { + return error(500,"未查询到报修单信息！"); + }else { + if (!repairOrder.getOrderStatus().equals("待审核")){ + return error(500,"报修单已审核,不可修改记录！"); + } + } + } + } + boolean hasError = false; EquOrderEqu equ = equOrder.getEqu(); @@ -180,13 +195,19 @@ public class DevicePDAServiceImpl implements IDevicePDAService { if (standard.getStandardType().equals("quantify")) { int up = standard.getActualValue().compareTo(standard.getDetailUpLimit()); int down = standard.getActualValue().compareTo(standard.getDetailDownLimit()); + standard.setDetailReach("1"); + standard.setErrorFlag("0"); if (!(up != 1 && down != -1)) { hasError = true; + standard.setErrorFlag("1"); + standard.setDetailReach("0"); } }else { // TODO 未达标 - if (standard.getDetailReach().equals("1")) { + standard.setErrorFlag("0"); + if (standard.getDetailReach().equals("0")) { hasError = true; + standard.setErrorFlag("1"); } } @@ -202,6 +223,10 @@ public class DevicePDAServiceImpl implements IDevicePDAService { equOrder.setUpdateBy(SecurityContextHolder.getUserName()); equOrder.setPlanPerson(SecurityContextHolder.getUserName()); equOrder.setPlanPerson(SecurityContextHolder.getUserName()); + if (equOrder.getTimeArray().size() > 0) { + equOrder.setOrderStart(equOrder.getTimeArray().get(0)); + equOrder.setOrderEnd(equOrder.getTimeArray().get(1)); + } boolean checkRepair = false; @@ -213,7 +238,8 @@ public class DevicePDAServiceImpl implements IDevicePDAService { } } - if (checkRepair && hasError) { + // 报修信息 + if (checkRepair && hasError ) { // 获取故障报修流水号 EquRepairOrder equRepairOrder = new EquRepairOrder(); String serialNum = String.format("%03d", equRepairOrderMapper.selectOrderCodeSerialNumber()); @@ -227,7 +253,6 @@ public class DevicePDAServiceImpl implements IDevicePDAService { equRepairOrder.setOrderId(IdUtils.fastSimpleUUID()); equRepairOrder.setCreateTime(DateUtils.getNowDate()); equRepairOrder.setCreateBy(SecurityUtils.getUsername()); - equRepairOrder.setOrderStatus("待审核"); // 报修来源 if (equOrder.getPlanType().equals("inspection")){ equRepairOrder.setOrderSource("巡检"); @@ -238,12 +263,23 @@ public class DevicePDAServiceImpl implements IDevicePDAService { if (equOrder.getPlanType().equals("maintenance")){ equRepairOrder.setOrderSource("保养"); } + equRepairOrder.setOrderStatus("待审核"); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String key = "#header.poolName"; equRepairOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); equRepairOrderMapper.insertEquRepairOrder(equRepairOrder); } + if (!hasError) { + // TODO 删除报修单 + if (equOrder.getRepairCode() != null) { + if (!equOrder.getRepairCode().isEmpty()) { + equRepairOrderMapper.deleteEquRepairOrderByRepairCode(equOrder.getRepairCode()); + equOrder.setRepairCode(""); + } + } + } + // 更新工单信息 equOrderMapper.updateEquOrder(equOrder); return success(); diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml index 2889a801..de310660 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml @@ -98,20 +98,6 @@ select top 1 workshop_name from base_equipment where del_flag = '0' and workshop_code = #{planWorkshop} - - - - + + + + insert into equ_order