diff --git a/src/main/java/com/glxp/api/common/req/UpdateRequest.java b/src/main/java/com/glxp/api/common/req/UpdateRequest.java index 570b0b295..f6ac58e2b 100644 --- a/src/main/java/com/glxp/api/common/req/UpdateRequest.java +++ b/src/main/java/com/glxp/api/common/req/UpdateRequest.java @@ -28,4 +28,19 @@ public class UpdateRequest { */ private String auditOpinion; + /** + * 维修人 + */ + private String repariName; + + /** + * 维修照片 + */ + private String repariImage; + + /** + * 维修说明 + */ + private String repariRemark; + } diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceProjectSetController.java b/src/main/java/com/glxp/api/controller/inv/DeviceProjectSetController.java new file mode 100644 index 000000000..a8c57ab71 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/inv/DeviceProjectSetController.java @@ -0,0 +1,99 @@ +package com.glxp.api.controller.inv; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.req.inv.DeviceProjectSetRequest; +import com.glxp.api.res.inv.DeviceProjectSetResponse; +import com.glxp.api.service.inv.DeviceProjectSetService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 维保设备接口 + */ +@Slf4j +@RestController +public class DeviceProjectSetController { + + @Resource + private DeviceProjectSetService deviceProjectSetService; + + /** + * 查询维保设备列表 + * + * @param deviceProjectSetRequest + * @return + */ + @GetMapping("/udiwms/inv/device/project/set/filter") + public BaseResponse filterList(DeviceProjectSetRequest deviceProjectSetRequest) { + + List list = deviceProjectSetService.filterList(deviceProjectSetRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + + /** + * 添加维保设备维护 + * + * @param deviceProjectSetRequest + * @return + */ + @PostMapping("/udiwms/inv/device/project/set/insertDevprojectSet") + public BaseResponse insertDevprojectSet(@RequestBody DeviceProjectSetRequest deviceProjectSetRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + //判断编码是否存在 + boolean b = deviceProjectSetService.chcekCode(deviceProjectSetRequest.getCode(), null); + if(b){ + return ResultVOUtils.error(999,"编码已存在!"); + } + deviceProjectSetService.insertDevprojectSet(deviceProjectSetRequest); + return ResultVOUtils.success("添加成功"); + } + + /** + * 更新维保设备维护信息 + * + * @param deviceProjectSetRequest + * @return + */ + @PostMapping("/udiwms/inv/device/project/set/updateDevprojectSet") + public BaseResponse updateDevprojectSet(@RequestBody DeviceProjectSetRequest deviceProjectSetRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + //判断编号是否存在 + boolean b = deviceProjectSetService.chcekCode(deviceProjectSetRequest.getCode(), deviceProjectSetRequest.getId() + ""); + if(b){ + return ResultVOUtils.error(999,"编码已存在!"); + } + + deviceProjectSetService.updateDevprojectSet(deviceProjectSetRequest); + return ResultVOUtils.success("更新成功"); + } + + + /** + * 删除维保设备维护 + * + * @param id + * @return + */ + @GetMapping("/udiwms/inv/device/project/set/deleteDevprojectSet") + public BaseResponse deleteDevprojectSet(String id) { + deviceProjectSetService.deleteDevprojectSet(id); + + return ResultVOUtils.success("删除成功"); + } + +} diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderController.java b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderController.java index 6321e960f..f8e1d8503 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderController.java @@ -96,9 +96,44 @@ public class DeviceRepairOrderController { if (null == updateRequest) { return ResultVOUtils.paramVerifyFail(); } - return deviceRepairOrderService.updateStatus(updateRequest.getOrderId(), updateRequest.getStatus()); + if(!"".equals(updateRequest.getRepariName()) && null !=updateRequest.getRepariName() ){ + return deviceRepairOrderService.updateStatus(updateRequest.getOrderId(), updateRequest.getStatus(),updateRequest.getRepariName()); + }else + return deviceRepairOrderService.updateStatus(updateRequest.getOrderId(), updateRequest.getStatus(),null); } + /** + * 开始任务 + * 更新报修单状态和维修时间 + * + * @param updateRequest + * @return + */ + @PostMapping("/udiwms/inv/device/repair/order/updateStatusAndTime") + public BaseResponse updateStatusAndTime(@RequestBody UpdateRequest updateRequest) { + if (null == updateRequest) { + return ResultVOUtils.paramVerifyFail(); + } + return deviceRepairOrderService.updateStatusAndTime(updateRequest.getOrderId(), updateRequest.getStatus()); + } + + /** + * 结束任务 + * 更新报修单状态 维修时间 维修照片 + * + * @param updateRequest + * @return + */ + @PostMapping("/udiwms/inv/device/repair/order/updateStatusAndImg") + public BaseResponse updateStatusAndImg(@RequestBody UpdateRequest updateRequest) { + if (null == updateRequest) { + return ResultVOUtils.paramVerifyFail(); + } + return deviceRepairOrderService.updateStatusAndImg(updateRequest.getOrderId(), updateRequest.getStatus(), + updateRequest.getRepariImage(),updateRequest.getRepariRemark()); + } + + /** * 删除报修单 * diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceProjectSetMapper.java b/src/main/java/com/glxp/api/dao/inv/DeviceProjectSetMapper.java index 126bb0179..47758a366 100644 --- a/src/main/java/com/glxp/api/dao/inv/DeviceProjectSetMapper.java +++ b/src/main/java/com/glxp/api/dao/inv/DeviceProjectSetMapper.java @@ -2,8 +2,15 @@ package com.glxp.api.dao.inv; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.inv.DeviceProjectSet; +import com.glxp.api.req.inv.DeviceProjectSetRequest; +import com.glxp.api.res.inv.DeviceProjectSetResponse; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface DeviceProjectSetMapper extends BaseMapper { -} \ No newline at end of file + + List filterList(DeviceProjectSetRequest deviceProjectSetRequest); + +} diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceProjectSet.java b/src/main/java/com/glxp/api/entity/inv/DeviceProjectSet.java index 0f2a0c10f..3de1658aa 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceProjectSet.java +++ b/src/main/java/com/glxp/api/entity/inv/DeviceProjectSet.java @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; @Data @TableName(value = "device_project_set") @@ -63,4 +64,4 @@ public class DeviceProjectSet implements Serializable { private Date createTime; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderEntity.java index 091ae25c4..3b3d75fa1 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderEntity.java @@ -43,7 +43,7 @@ public class DeviceRepairOrderEntity { private String code; /** - * 状态（0：新增；1：未审核；2：已审核；3。已处理） + * 状态（0：草稿；1：未审核；2：已审核；3：未处理 4：维修中 5：已处理） */ @TableField(value = "`status`") private Integer status; @@ -95,7 +95,7 @@ public class DeviceRepairOrderEntity { /** * 维修类型 1:自行维修；2：外部维修 */ - private String repairType; + private Integer repairType; /** * 紧急类型 1,正常；2,较急；3,特急 */ @@ -117,11 +117,11 @@ public class DeviceRepairOrderEntity { /** * 维修开始时间 */ - private String repariStartTime; + private Date repariStartTime; /** * 维修结束时间 */ - private String repariEndTime; + private Date repariEndTime; /** * 维修说明 */ diff --git a/src/main/java/com/glxp/api/req/inv/AddDeviceRepairOrderRequest.java b/src/main/java/com/glxp/api/req/inv/AddDeviceRepairOrderRequest.java index a1e10629b..45b817b62 100644 --- a/src/main/java/com/glxp/api/req/inv/AddDeviceRepairOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inv/AddDeviceRepairOrderRequest.java @@ -2,6 +2,8 @@ package com.glxp.api.req.inv; import lombok.Data; +import java.util.Date; + /** * 添加设备报修单参数 */ @@ -24,7 +26,7 @@ public class AddDeviceRepairOrderRequest { private String code; /** - * 状态（1：新增；2：未审核；3：已审核） + * 状态（0：草稿；1：未审核；2：已审核；3：未处理 4：维修中 5：已处理） */ private Integer status; @@ -38,4 +40,45 @@ public class AddDeviceRepairOrderRequest { */ private String remark; + + // ----------------------新增字段=------------------------------- + /** + * 维修类型 1:自行维修；2：外部维修 + */ + private Integer repairType; + /** + * 紧急类型 1,正常；2,较急；3,特急 + */ + private Integer urgencyType; + /** + * 计划完成日期 + */ + private Date planTime; + /** + * 报修图片 + */ + private String uploadImage; + + + /** + * 维修人 + */ + private String repariName; + /** + * 维修开始时间 + */ + private String repariStartTime; + /** + * 维修结束时间 + */ + private String repariEndTime; + /** + * 维修说明 + */ + private String repariRemark; + /** + * 维修图片 + */ + private String repariImage; + } diff --git a/src/main/java/com/glxp/api/req/inv/DeviceProjectSetRequest.java b/src/main/java/com/glxp/api/req/inv/DeviceProjectSetRequest.java new file mode 100644 index 000000000..35370cf35 --- /dev/null +++ b/src/main/java/com/glxp/api/req/inv/DeviceProjectSetRequest.java @@ -0,0 +1,55 @@ +package com.glxp.api.req.inv; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.Date; + +@Data +public class DeviceProjectSetRequest extends ListPageRequest { + private Integer id; + + /** + * 项目编号 + */ + private String code; + + /** + * 项目内容 + */ + private String content; + + /** + * 项目类型：1：巡检；2：养护 + */ + private Integer type; + + /** + * 备注 + */ + private String remak; + + /** + * 更新时间 + */ + private Date udpateTime; + + /** + * 更新人 + */ + private String updateUser; + + /** + * 创建人 + */ + private String createUser; + + /** + * 创建时间 + */ + private Date createTime; + + private String startTime; + private String endTime; + +} diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderRequest.java b/src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderRequest.java index 2c26ce6c2..c01a8cc8a 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderRequest.java @@ -3,6 +3,8 @@ package com.glxp.api.req.inv; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; +import java.util.List; + /** * 查询部门设备报修单接口参数 */ @@ -32,8 +34,15 @@ public class FilterDeviceRepairOrderRequest extends ListPageRequest { private String code; /** - * 状态（1：新增；2：未审核；3：已审核） + * 状态（0：草稿；1：未审核；2：已审核；3：未处理 4：维修中 5：已处理） */ private Integer status; + private List statusList; + + /** + * 维修人 + */ + private String repariName; + } diff --git a/src/main/java/com/glxp/api/res/inv/DeviceProjectSetResponse.java b/src/main/java/com/glxp/api/res/inv/DeviceProjectSetResponse.java new file mode 100644 index 000000000..43862670b --- /dev/null +++ b/src/main/java/com/glxp/api/res/inv/DeviceProjectSetResponse.java @@ -0,0 +1,60 @@ +package com.glxp.api.res.inv; + +import lombok.Data; + +import java.util.Date; + +@Data +public class DeviceProjectSetResponse { + private Integer id; + + /** + * 项目编号 + */ + private String code; + + /** + * 项目内容 + */ + private String content; + + /** + * 项目类型：1：巡检；2：养护 + */ + private Integer type; + + /** + * 备注 + */ + private String remak; + + /** + * 更新时间 + */ + private Date udpateTime; + + /** + * 更新人 + */ + private String updateUser; + + /** + * 更新人名称 + */ + private String updateUserName; + + /** + * 创建人 + */ + private String createUser; + /** + * 创建人名称 + */ + private String createUserName; + + /** + * 创建时间 + */ + private Date createTime; + +} diff --git a/src/main/java/com/glxp/api/res/inv/DeviceRepairOrderResponse.java b/src/main/java/com/glxp/api/res/inv/DeviceRepairOrderResponse.java index 264e2049b..4ac6041df 100644 --- a/src/main/java/com/glxp/api/res/inv/DeviceRepairOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inv/DeviceRepairOrderResponse.java @@ -33,7 +33,7 @@ public class DeviceRepairOrderResponse { private String code; /** - * 状态（0：新增；1：未审核；2：已审核） + * 状态（0：草稿；1：未审核；2：已审核；3：未处理 4：维修中 5：已处理） */ private Integer status; @@ -102,4 +102,49 @@ public class DeviceRepairOrderResponse { */ private String batchNo; + // ----------------------新增字段=------------------------------- + /** + * 维修类型 1:自行维修；2：外部维修 + */ + private Integer repairType; + /** + * 紧急类型 1,正常；2,较急；3,特急 + */ + private Integer urgencyType; + /** + * 计划完成日期 + */ + private Date planTime; + /** + * 报修图片 + */ + private String uploadImage; + + + /** + * 维修人 + */ + private String repariName; + + /** + * 维修人名称 + */ + private String repName; + /** + * 维修开始时间 + */ + private String repariStartTime; + /** + * 维修结束时间 + */ + private String repariEndTime; + /** + * 维修说明 + */ + private String repariRemark; + /** + * 维修图片 + */ + private String repariImage; + } diff --git a/src/main/java/com/glxp/api/service/inv/DeviceProjectSetService.java b/src/main/java/com/glxp/api/service/inv/DeviceProjectSetService.java index 1eac4ddd0..ef5303192 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceProjectSetService.java +++ b/src/main/java/com/glxp/api/service/inv/DeviceProjectSetService.java @@ -1,12 +1,77 @@ package com.glxp.api.service.inv; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.inv.DeviceProjectSetMapper; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.inv.DeviceProjectSet; +import com.glxp.api.req.inv.DeviceProjectSetRequest; +import com.glxp.api.res.inv.DeviceProjectSetResponse; +import com.glxp.api.service.auth.CustomerService; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; + import javax.annotation.Resource; +import java.util.Collections; +import java.util.Date; import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.inv.DeviceProjectSet; -import com.glxp.api.dao.inv.DeviceProjectSetMapper; + @Service public class DeviceProjectSetService extends ServiceImpl { + @Resource + DeviceProjectSetMapper deviceProjectSetMapper; + @Resource + CustomerService customerService; + + public List filterList(DeviceProjectSetRequest deviceProjectSetRequest) { + + if (null == deviceProjectSetRequest) { + return Collections.emptyList(); + } + if (null != deviceProjectSetRequest.getPage() && null != deviceProjectSetRequest.getLimit()) { + PageHelper.offsetPage((deviceProjectSetRequest.getPage() - 1) * deviceProjectSetRequest.getLimit(), deviceProjectSetRequest.getLimit()); + } + return deviceProjectSetMapper.filterList(deviceProjectSetRequest); + + } + + public boolean insertDevprojectSet(DeviceProjectSetRequest deviceProjectSetRequest) { + AuthAdmin user = customerService.getUserBean(); + DeviceProjectSet projectSet = new DeviceProjectSet(); + BeanUtils.copyProperties(deviceProjectSetRequest, projectSet); + projectSet.setCreateTime(new Date()); + projectSet.setCreateUser(user.getId()+""); + return deviceProjectSetMapper.insert(projectSet) > 0; + } + + public boolean deleteDevprojectSet(String id) { + + return deviceProjectSetMapper.deleteById(id) > 0; + } + + public boolean updateDevprojectSet(DeviceProjectSetRequest deviceProjectSetRequest) { + AuthAdmin user = customerService.getUserBean(); + DeviceProjectSet projectSet = new DeviceProjectSet(); + BeanUtils.copyProperties(deviceProjectSetRequest, projectSet); + projectSet.setUdpateTime(new Date()); + projectSet.setUpdateUser(user.getId()+""); + return deviceProjectSetMapper.updateById(projectSet) > 0; + } + + public boolean chcekCode(String code, String id) { + List list = null; + if (id != null && !"".equals(id)) { + list = deviceProjectSetMapper.selectList(new QueryWrapper().eq("code", code).ne("id", id)); + } else + list = deviceProjectSetMapper.selectList(new QueryWrapper().eq("code", code)); + if (list != null && list.size() > 0) { + return true; + } else + return false; + + } + + } diff --git a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderService.java b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderService.java index 73f2fc8ec..56dcc90ef 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderService.java +++ b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderService.java @@ -52,7 +52,12 @@ public interface DeviceRepairOrderService { * @param status * @return */ - BaseResponse updateStatus(String orderId, Integer status); + BaseResponse updateStatus(String orderId, Integer status,String repariName); + + BaseResponse updateStatusAndTime(String orderId, Integer status); + + BaseResponse updateStatusAndImg(String orderId, Integer status,String repariImage,String repariRemark); + /** * 删除设备报修单 diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java index 0fe6fde00..84c4b3b51 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java @@ -7,6 +7,7 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.dao.inv.DeviceRepairOrderDao; +import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.inv.DeviceRepairOrderEntity; import com.glxp.api.req.inv.AddDeviceRepairOrderRequest; import com.glxp.api.req.inv.FilterDeviceRepairOrderRequest; @@ -18,7 +19,6 @@ import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; @@ -62,6 +62,10 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { deviceRepairOrderEntity.setStatus(0); deviceRepairOrderEntity.setCreateTime(date); deviceRepairOrderEntity.setUpdateTime(date); + deviceRepairOrderEntity.setRepairType(addDeviceRepairOrderRequest.getRepairType()); + deviceRepairOrderEntity.setUrgencyType(addDeviceRepairOrderRequest.getUrgencyType()); + deviceRepairOrderEntity.setPlanTime(addDeviceRepairOrderRequest.getPlanTime()); + deviceRepairOrderEntity.setUploadImage(addDeviceRepairOrderRequest.getUploadImage()); deviceRepairOrderDao.insert(deviceRepairOrderEntity); return ResultVOUtils.success(); } @@ -88,20 +92,55 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { } @Override - public BaseResponse updateStatus(String orderId, Integer status) { + public BaseResponse updateStatus(String orderId, Integer status,String repariName) { if (StrUtil.isBlank(orderId) || null == status) { return ResultVOUtils.paramVerifyFail(); } + AuthAdmin authAdmin=customerService.getUserBean(); DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(orderId); deviceRepairOrderEntity.setStatus(status); Date date = new Date(); - if (status == 2) { - //审核通过，生成维保单 - deviceInspectOrderService.addByRepairOrderId(orderId); - deviceRepairOrderEntity.setAuditUser(customerService.getUserIdStr()); - deviceRepairOrderEntity.setAuditTime(date); - } +// if (status == 2) { +// //审核通过，生成维保单 +// deviceInspectOrderService.addByRepairOrderId(orderId); +// deviceRepairOrderEntity.setAuditUser(customerService.getUserIdStr()); +// deviceRepairOrderEntity.setAuditTime(date); +// } deviceRepairOrderEntity.setUpdateTime(date); + deviceRepairOrderEntity.setAuditTime(date); + deviceRepairOrderEntity.setAuditUser(authAdmin.getId()+""); + if(null != repariName){ + deviceRepairOrderEntity.setRepariName(repariName); + } + deviceRepairOrderDao.updateById(deviceRepairOrderEntity); + return ResultVOUtils.success(); + } + + @Override + public BaseResponse updateStatusAndTime(String orderId, Integer status) { + if (StrUtil.isBlank(orderId) || null == status) { + return ResultVOUtils.paramVerifyFail(); + } + DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(orderId); + deviceRepairOrderEntity.setStatus(status); + //插入开始时间 + deviceRepairOrderEntity.setRepariStartTime(new Date()); + + deviceRepairOrderDao.updateById(deviceRepairOrderEntity); + return ResultVOUtils.success(); + } + + @Override + public BaseResponse updateStatusAndImg(String orderId, Integer status, String repariImage, String repariRemark) { + if (StrUtil.isBlank(orderId) || null == status) { + return ResultVOUtils.paramVerifyFail(); + } + DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(orderId); + deviceRepairOrderEntity.setStatus(status); + //插入结束时间 + deviceRepairOrderEntity.setRepariEndTime(new Date()); + deviceRepairOrderEntity.setRepariImage(repariImage); + deviceRepairOrderEntity.setRepariRemark(repariRemark); deviceRepairOrderDao.updateById(deviceRepairOrderEntity); return ResultVOUtils.success(); } diff --git a/src/main/resources/mybatis/mapper/inv/DeviceProjectSetMapper.xml b/src/main/resources/mybatis/mapper/inv/DeviceProjectSetMapper.xml index bf97420b9..21edfe657 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceProjectSetMapper.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceProjectSetMapper.xml @@ -18,4 +18,30 @@ id, code, content, `type`, remak, udpateTime, updateUser, `createUser`, createTime - \ No newline at end of file + + + + + diff --git a/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDao.xml b/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDao.xml index a7bb8aa4a..6c095dbe7 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDao.xml @@ -13,17 +13,27 @@ t.deptCode, t.invCode, t.code, - t.status, + t.`status`, t.createUser, t.auditUser, t.msg, t.createTime, t.auditTime, t.remark, + t.repairType, + t.urgencyType, + t.planTime, + t.uploadImage, + t.repariStartTime, + t.repariEndTime, + t.repariName, + t.repariImage, + t.repariRemark, (select employeeName from auth_user where id = t.createUser) createUserName, (select employeeName from auth_user where id = t.auditUser) auditUserName, (select `name` from auth_dept where code = t.deptCode) deptName, (select `name` from auth_warehouse where code = t.invCode) invName, + (select employeeName from auth_user where id = t.repariName) repName, t1.deviceName, t1.ggxh, t1.batchNo @@ -39,12 +49,21 @@ AND t.invCode = #{invCode} + + AND t.repariName = #{repariName} + AND t.code like concat('%', #{code}, '%') AND t.status = #{status} + + and t.status in + + #{item} + + diff --git a/src/main/resources/schemas/schema_v2.2.sql b/src/main/resources/schemas/schema_v2.2.sql index 39627cec2..4642ce8a3 100644 --- a/src/main/resources/schemas/schema_v2.2.sql +++ b/src/main/resources/schemas/schema_v2.2.sql @@ -65,15 +65,15 @@ CREATE TABLE IF NOT EXISTS `device_project_set` SET FOREIGN_KEY_CHECKS = 1; -CALL Pro_Temp_ColumnWork('device_repair_order', 'repairType', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('device_repair_order', 'repairType', 'tinyint', 1); CALL Pro_Temp_ColumnWork('device_repair_order', 'urgencyType', 'tinyint', 1); CALL Pro_Temp_ColumnWork('device_repair_order', 'planTime', 'datetime', 1); -CALL Pro_Temp_ColumnWork('device_repair_order', 'uploadImage', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('device_repair_order', 'uploadImage', 'text', 1); CALL Pro_Temp_ColumnWork('device_repair_order', 'repariName', 'varchar(255)', 1); -CALL Pro_Temp_ColumnWork('device_repair_order', 'reparistartTime', 'varchar(255)', 1); -CALL Pro_Temp_ColumnWork('device_repair_order', 'repariEndTime', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('device_repair_order', 'reparistartTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('device_repair_order', 'repariEndTime', 'datetime', 1); CALL Pro_Temp_ColumnWork('device_repair_order', 'repariRemark', 'varchar(255)', 1); -CALL Pro_Temp_ColumnWork('device_repair_order', 'repariImage', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('device_repair_order', 'repariImage', 'text', 1); CALL Pro_Temp_ColumnWork('device_inspect_plan', 'startTime', 'datetime', 1); CALL Pro_Temp_ColumnWork('device_inspect_plan', 'endTime', 'datetime', 1); @@ -82,4 +82,4 @@ CALL Pro_Temp_ColumnWork('device_inspect_plan', 'frequencyUnit', 'tinyint', 1); CALL Pro_Temp_ColumnWork('device_inspect_plan', 'planStatus', 'tinyint', 1); CALL Pro_Temp_ColumnWork('device_inspect_plan', 'inspectUser', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('device_inspect_plan', 'lastTime', 'datetime', 1); -CALL Pro_Temp_ColumnWork('device_inspect_plan', 'nextTime', 'datetime', 1); \ No newline at end of file +CALL Pro_Temp_ColumnWork('device_inspect_plan', 'nextTime', 'datetime', 1);