diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java b/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java index 84dc9d69f..d334d3e59 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; +import com.glxp.api.constant.DeviceStatus; import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity; import com.glxp.api.entity.inv.DeviceInspectTaskEntity; import com.glxp.api.req.inv.FilterDeviceInspectTakeRequest; @@ -52,9 +53,9 @@ public class DeviceInspectTakeController { @PostMapping("/udiwms/inv/device/inspect/take/uploadDeviceInspecTake") public BaseResponse uploadDeviceInspecTake(@RequestBody DeviceInspectTaskEntity deviceInspectTaskEntity) { deviceInspectTaskEntity.setUpdateTime(new Date()); - if(deviceInspectTaskEntity.getStatus() == 1){ + if(deviceInspectTaskEntity.getStatus() == DeviceStatus.DEVICE_STATUS_TEMP_DURINGINSPECTTION){ deviceInspectTaskEntity.setStrartTime(new Date()); - }else{ + }else if (deviceInspectTaskEntity.getStatus() == DeviceStatus.DEVICE_STATUS_TEMP_INSPECTED){ deviceInspectTaskEntity.setEndTime(new Date()); } boolean falg=deviceInspectTaskService.updateById(deviceInspectTaskEntity); diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java new file mode 100644 index 000000000..39d200698 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java @@ -0,0 +1,95 @@ +package com.glxp.api.controller.inv; + +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageInfo; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity; +import com.glxp.api.req.inv.FilterDeviceRepairOrderDetailRequest; +import com.glxp.api.res.inv.DeviceRepairOrderDetailResponse; +import com.glxp.api.service.inv.DeviceRepairOrderDetailService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +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 DeviceRepairOrderDetailController { + + @Resource + private DeviceRepairOrderDetailService deviceRepairOrderDetailService; + + /** + * 查询设备报修单列表 + * + * @param filterDeviceRepairOrderDetailRequest + * @return + */ + @GetMapping("/udiwms/inv/device/repairDetail/order/filter") + public BaseResponse filterList(FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest) { + List list = deviceRepairOrderDetailService.filterList(filterDeviceRepairOrderDetailRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + @GetMapping("/udiwms/inv/device/repairDetail/order/filterByorderIdFk") + public BaseResponse filterByorderIdFk(String orderIdFk) { + List detailEntity = deviceRepairOrderDetailService.filterByorderIdFk(orderIdFk); + return ResultVOUtils.success(detailEntity); + + } + + + /** + * 添加设备报修单详情 + * + * @param filterDeviceRepairOrderDetailRequest + * @return + */ + @PostMapping("/udiwms/inv/device/repair/order/addDeviceRepairOrderDetail") + public BaseResponse addDeviceRepairOrderDetail(@RequestBody FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest) { + + DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity = new DeviceRepairOrderDetailEntity(); + BeanUtils.copyProperties(filterDeviceRepairOrderDetailRequest,deviceRepairOrderDetailEntity); + + deviceRepairOrderDetailService.addDeviceRepairOrderDetail(deviceRepairOrderDetailEntity); + return ResultVOUtils.success(deviceRepairOrderDetailEntity); + } + + /** + * 更新设备报修单信息详情 + * + * @param filterDeviceRepairOrderDetailRequest + * @return + */ + @PostMapping("/udiwms/inv/device/repair/order/updateDeviceRepairOrderDetail") + public BaseResponse updateDeviceRepairOrderDetail(@RequestBody FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest) { + + DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity = new DeviceRepairOrderDetailEntity(); + BeanUtils.copyProperties(filterDeviceRepairOrderDetailRequest,deviceRepairOrderDetailEntity); + deviceRepairOrderDetailService.updateDeviceRepairOrderDetail(deviceRepairOrderDetailEntity); + return ResultVOUtils.success(); + } + + + /** + * 删除报修单详情 + * + * @param id + * @return + */ + @GetMapping("/udiwms/inv/device/repair/order/deleteRepairOrderDetail") + public BaseResponse deleteRepairOrderDetail( String id) { + deviceRepairOrderDetailService.deleteRepairOrderDetail(id); + return ResultVOUtils.success(); + } + +} diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java b/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java new file mode 100644 index 000000000..49366c773 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java @@ -0,0 +1,15 @@ +package com.glxp.api.dao.inv; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity; +import com.glxp.api.req.inv.FilterDeviceRepairOrderDetailRequest; +import com.glxp.api.res.inv.DeviceRepairOrderDetailResponse; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface DeviceRepairOrderDetailMapper extends BaseMapper { + List filterList(FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest); + +} diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java index 19b83f221..f51a2ad9f 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java @@ -99,6 +99,12 @@ public class DeviceInspectTaskEntity implements Serializable { @TableField(value = "type") private Integer type; + @TableField(value = "repairType") + private Integer repairType; + + @TableField(value = "level") + private Integer level; + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderDetailEntity.java new file mode 100644 index 000000000..9bb3d9f3b --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderDetailEntity.java @@ -0,0 +1,55 @@ +package com.glxp.api.entity.inv; + +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.util.Date; + +@Data +@TableName(value = "device_repair_order_detail") +public class DeviceRepairOrderDetailEntity { + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @TableField(value = "orderIdFk") + private String orderIdFk; + + /** + * 项目编号 + */ + @TableField(value = "code") + private String code; + + /** + * 项目内容 + */ + @TableField(value = "content") + private String content; + + /** + * 项目类型：1：巡检；2：养护 + */ + @TableField(value = "`type`") + private Integer type; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; +} diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java b/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java index 3d82505ee..240f2a381 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java @@ -1,5 +1,6 @@ package com.glxp.api.req.inv; +import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @@ -61,4 +62,10 @@ public class FilterDeviceInspectTakeRequest extends ListPageRequest { private String yjjsEndDate; + private Integer repairType; + + + + + } diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderDetailRequest.java new file mode 100644 index 000000000..f3d36467c --- /dev/null +++ b/src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderDetailRequest.java @@ -0,0 +1,48 @@ +package com.glxp.api.req.inv; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.Date; + +/** + * 查询部门设备报修单接口参数 + */ +@Data +public class FilterDeviceRepairOrderDetailRequest extends ListPageRequest { + + private Long id; + + private String orderIdFk; + + /** + * 项目编号 + */ + private String code; + + /** + * 项目内容 + */ + private String content; + + /** + * 项目类型：1：巡检；2：养护 + */ + private Integer type; + + /** + * 备注 + */ + private String remark; + + /** + * 更新人 + */ + private String updateUser; + + /** + * 更新时间 + */ + private Date updateTime; + +} diff --git a/src/main/java/com/glxp/api/res/inv/DeviceInspectTakeResponse.java b/src/main/java/com/glxp/api/res/inv/DeviceInspectTakeResponse.java index 3ce7a8062..8f46ade58 100644 --- a/src/main/java/com/glxp/api/res/inv/DeviceInspectTakeResponse.java +++ b/src/main/java/com/glxp/api/res/inv/DeviceInspectTakeResponse.java @@ -109,6 +109,8 @@ public class DeviceInspectTakeResponse { private String inspectName; private Date expectedTime; private Integer type; + private Integer repairType; + private Integer level; diff --git a/src/main/java/com/glxp/api/res/inv/DeviceRepairOrderDetailResponse.java b/src/main/java/com/glxp/api/res/inv/DeviceRepairOrderDetailResponse.java new file mode 100644 index 000000000..30f419857 --- /dev/null +++ b/src/main/java/com/glxp/api/res/inv/DeviceRepairOrderDetailResponse.java @@ -0,0 +1,48 @@ +package com.glxp.api.res.inv; + +import lombok.Data; + +import java.util.Date; + +/** + * 设备报修单VO + */ +@Data +public class DeviceRepairOrderDetailResponse { + private Long id; + + private String orderIdFk; + + /** + * 项目编号 + */ + private String code; + + /** + * 项目内容 + */ + private String content; + + /** + * 项目类型：1：巡检；2：养护 + */ + private Integer type; + + /** + * 备注 + */ + private String remark; + + /** + * 更新人 + */ + private String updateUser; + + /** + * 更新时间 + */ + private Date updateTime; + + + +} diff --git a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java new file mode 100644 index 000000000..f76cd62c1 --- /dev/null +++ b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java @@ -0,0 +1,26 @@ +package com.glxp.api.service.inv; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity; +import com.glxp.api.req.inv.FilterDeviceRepairOrderDetailRequest; +import com.glxp.api.res.inv.DeviceRepairOrderDetailResponse; + +import java.util.List; + +public interface DeviceRepairOrderDetailService extends IService{ + + List filterList(FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest); + + List filterByorderIdFk(String orderIdFk); + + + + boolean addDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity); + + boolean updateDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity); + + boolean deleteRepairOrderDetail(String id); + + + +} diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java new file mode 100644 index 000000000..e614dd647 --- /dev/null +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java @@ -0,0 +1,56 @@ +package com.glxp.api.service.inv.impl; + +import cn.hutool.core.util.IdUtil; +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.DeviceRepairOrderDetailMapper; +import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity; +import com.glxp.api.req.inv.FilterDeviceRepairOrderDetailRequest; +import com.glxp.api.res.inv.DeviceRepairOrderDetailResponse; +import com.glxp.api.service.inv.DeviceRepairOrderDetailService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class DeviceRepairOrderDetailServiceImpl extends ServiceImpl implements DeviceRepairOrderDetailService{ + + @Resource + DeviceRepairOrderDetailMapper deviceRepairOrderDetailMapper; + @Override + public List filterList(FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest) { + if (null == filterDeviceRepairOrderDetailRequest) { + return Collections.emptyList(); + } + if (null != filterDeviceRepairOrderDetailRequest.getPage() && null != filterDeviceRepairOrderDetailRequest.getLimit()) { + PageHelper.offsetPage((filterDeviceRepairOrderDetailRequest.getPage() - 1) * filterDeviceRepairOrderDetailRequest.getLimit(), filterDeviceRepairOrderDetailRequest.getLimit()); + } + return deviceRepairOrderDetailMapper.filterList(filterDeviceRepairOrderDetailRequest); + } + + @Override + public List filterByorderIdFk(String orderIdFk) { + return deviceRepairOrderDetailMapper.selectList(new QueryWrapper().eq("orderIdFk", orderIdFk)); + + } + + @Override + public boolean addDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity) { + deviceRepairOrderDetailEntity.setId(IdUtil.getSnowflakeNextId()); + deviceRepairOrderDetailEntity.setType(3); + return deviceRepairOrderDetailMapper.insert(deviceRepairOrderDetailEntity)>0; + } + + @Override + public boolean updateDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity) { + return deviceRepairOrderDetailMapper.updateById(deviceRepairOrderDetailEntity)>0; + } + + @Override + public boolean deleteRepairOrderDetail(String id) { + return deviceRepairOrderDetailMapper.deleteById(id)>0; + } +} 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 84c4b3b51..9bc6ccb9f 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 @@ -2,18 +2,26 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; +import com.glxp.api.constant.DeviceStatus; +import com.glxp.api.constant.DeviceType; +import com.glxp.api.dao.inv.DeviceInspectPlanDao; +import com.glxp.api.dao.inv.DeviceInspectPlanDelectMapper; import com.glxp.api.dao.inv.DeviceRepairOrderDao; +import com.glxp.api.dao.inv.DeviceRepairOrderDetailMapper; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.inv.DeviceRepairOrderEntity; +import com.glxp.api.entity.inv.*; import com.glxp.api.req.inv.AddDeviceRepairOrderRequest; import com.glxp.api.req.inv.FilterDeviceRepairOrderRequest; import com.glxp.api.res.inv.DeviceRepairOrderResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.inv.DeviceInspectOrderService; +import com.glxp.api.service.inv.DeviceInspectTaskDetailService; +import com.glxp.api.service.inv.DeviceInspectTaskService; import com.glxp.api.service.inv.DeviceRepairOrderService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; @@ -22,6 +30,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; @@ -39,6 +48,15 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { private GennerOrderUtils gennerOrderUtils; @Resource private DeviceInspectOrderService deviceInspectOrderService; + @Resource + private DeviceInspectTaskService deviceInspectTaskService; + @Resource + private DeviceInspectPlanDelectMapper deviceInspectPlanDelectMapper; + @Resource + private DeviceInspectTaskDetailService deviceInspectTaskDetailService; + @Resource + private DeviceRepairOrderDetailMapper deviceRepairOrderDetailMapper; + @Override public List filterList(FilterDeviceRepairOrderRequest filterDeviceRepairOrderRequest) { @@ -67,7 +85,7 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { deviceRepairOrderEntity.setPlanTime(addDeviceRepairOrderRequest.getPlanTime()); deviceRepairOrderEntity.setUploadImage(addDeviceRepairOrderRequest.getUploadImage()); deviceRepairOrderDao.insert(deviceRepairOrderEntity); - return ResultVOUtils.success(); + return ResultVOUtils.success(deviceRepairOrderEntity); } @Override @@ -76,7 +94,7 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { BeanUtil.copyProperties(deviceRepairOrderEntity, repairOrderEntity, "id", "createTime", "createUser"); repairOrderEntity.setUpdateTime(new Date()); deviceRepairOrderDao.updateById(repairOrderEntity); - return ResultVOUtils.success(); + return ResultVOUtils.success(repairOrderEntity); } @Override @@ -92,27 +110,25 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { } @Override - public BaseResponse updateStatus(String orderId, Integer status,String repariName) { + public BaseResponse updateStatus(String orderId, Integer status, String repariName) { if (StrUtil.isBlank(orderId) || null == status) { return ResultVOUtils.paramVerifyFail(); } - AuthAdmin authAdmin=customerService.getUserBean(); + 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); -// } deviceRepairOrderEntity.setUpdateTime(date); deviceRepairOrderEntity.setAuditTime(date); - deviceRepairOrderEntity.setAuditUser(authAdmin.getId()+""); - if(null != repariName){ + deviceRepairOrderEntity.setAuditUser(authAdmin.getId() + ""); + if (null != repariName) { deviceRepairOrderEntity.setRepariName(repariName); } deviceRepairOrderDao.updateById(deviceRepairOrderEntity); + //生成计划主表 + DeviceInspectTaskEntity deviceInspectTaskEntity = getDeviceInspectTaskEntity(orderId); + //生成计划详情主表 + getDeviceInspectTaskDetailEntity(orderId, deviceInspectTaskEntity.getOrderId()); return ResultVOUtils.success(); } @@ -154,4 +170,55 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { return ResultVOUtils.success(); } + + //组装任务实体 + public DeviceInspectTaskEntity getDeviceInspectTaskEntity(String orderId) { + //查询保修单 + DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(orderId); + if (deviceRepairOrderEntity == null) { + return null; + } + String takeOrderId = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEVICE_INSPECT_TAKE_ORDER, "yyyyMMdd")); + DeviceInspectTaskEntity deviceInspectTaskEntity = new DeviceInspectTaskEntity(); + deviceInspectTaskEntity.setOrderId(takeOrderId); + deviceInspectTaskEntity.setPlanOrderIdFk(orderId); + deviceInspectTaskEntity.setDeptCode(deviceRepairOrderEntity.getDeptCode()); + deviceInspectTaskEntity.setInvCode(deviceRepairOrderEntity.getInvCode()); + deviceInspectTaskEntity.setCode(deviceRepairOrderEntity.getCode()); + deviceInspectTaskEntity.setStatus(DeviceStatus.DEVICE_STATUS_TEMP_SAVE); + deviceInspectTaskEntity.setType(DeviceType.TYPE_REPAIR); + deviceInspectTaskEntity.setLevel(deviceRepairOrderEntity.getUrgencyType()); + deviceInspectTaskEntity.setRepairType(deviceRepairOrderEntity.getRepairType()); + deviceInspectTaskEntity.setRemark(deviceRepairOrderEntity.getRemark()); + deviceInspectTaskEntity.setCreateTime(new Date()); + deviceInspectTaskEntity.setUpdateTime(new Date()); + deviceInspectTaskService.addDeviceInspectTask(deviceInspectTaskEntity); + return deviceInspectTaskEntity; + } + + //组装任务实体 + public List getDeviceInspectTaskDetailEntity(String orderId, String taskOrderIdFk) { + //查询报修详情单 + DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(orderId); + List deviceInspectTaskDetailEntityLis = new ArrayList<>(); + QueryWrapper ew = new QueryWrapper<>(); + ew.eq("orderIdFK", orderId); + List deviceRepairOrderDetailEntities = deviceRepairOrderDetailMapper.selectList(ew); + if (deviceRepairOrderDetailEntities == null && deviceRepairOrderDetailEntities.size() == 0) { + return null; + } + for (DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity : deviceRepairOrderDetailEntities) { + DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity = new DeviceInspectTaskDetailEntity(); + deviceInspectTaskDetailEntity.setProjectCode(deviceRepairOrderDetailEntity.getCode()); + deviceInspectTaskDetailEntity.setProjectContent(deviceRepairOrderDetailEntity.getContent()); + deviceInspectTaskDetailEntity.setStatus(1); + deviceInspectTaskDetailEntity.setUpdateTime(new Date()); + deviceInspectTaskDetailEntity.setTaskOrderIdFk(taskOrderIdFk); + deviceInspectTaskDetailEntityLis.add(deviceInspectTaskDetailEntity); + } + deviceInspectTaskDetailService.addDeviceInspectTaskDelectList(deviceInspectTaskDetailEntityLis); + return deviceInspectTaskDetailEntityLis; + } + + } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index e043ce625..debdb6ea4 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pzh?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://192.168.0.43:3306/udi_wms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: diff --git a/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml b/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml index 0caccb29c..78e2a0b5a 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml @@ -44,6 +44,8 @@ t.remark, t.remindTime, t.expectedTime, + t.repairType, + t.level, (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.inspectUser ) inspectName, @@ -69,6 +71,9 @@ AND t.level = #{level} + + AND t.repairType = #{repairType} + AND t.status = #{status} diff --git a/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml b/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml new file mode 100644 index 000000000..58eae9db2 --- /dev/null +++ b/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + id, orderIdFk, code, content, `type`, remark, updateUser, updateTime + + + + + + diff --git a/src/main/resources/schemas/schema_v2.2.sql b/src/main/resources/schemas/schema_v2.2.sql index 4cb5d8668..f86b25806 100644 --- a/src/main/resources/schemas/schema_v2.2.sql +++ b/src/main/resources/schemas/schema_v2.2.sql @@ -86,3 +86,6 @@ 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); INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) VALUES (2088, 0, '是否只校验批次号', 'only_vail_batch', '0', 0, 0, '是否只校验批次号(0：否；1：是)', NULL); + +CALL Pro_Temp_ColumnWork('device_inspect_task', 'repairType', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('device_inspect_task', 'level', 'tinyint', 1);