ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
@@ -45,6 +45,6 @@ /** * 状态 */ private WorkOrderStatusEnum status = WorkOrderStatusEnum.DISTRIBUTED; private WorkOrderStatusEnum status; }
@@ -37,6 +37,8 @@ @Excel(name = "备注") private String remark; private Integer workOrderCount; public static YwUnitVO getVoByEntity(@NonNull YwUnit entity, YwUnitVO vo) { if(vo == null) { vo = new YwUnitVO(); ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
@@ -2,21 +2,20 @@ import com.ycl.platform.domain.form.*; import com.ycl.platform.domain.query.DistributeWorkOrderQuery; import com.ycl.platform.domain.query.WorkOrderQuery; import com.ycl.platform.domain.vo.DistributeWorkOrderVO; import com.ycl.system.domain.group.Update; import com.ycl.system.domain.group.Add; import org.springframework.validation.annotation.Validated; import lombok.RequiredArgsConstructor; import java.util.List; import org.springframework.validation.annotation.Validated; import jakarta.validation.constraints.NotEmpty; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.ycl.platform.service.WorkOrderService; import com.ycl.system.Result; import com.ycl.platform.domain.query.WorkOrderQuery; import com.ycl.system.domain.group.Add; import com.ycl.system.domain.group.Update; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import jakarta.validation.constraints.NotEmpty; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; /** * 工单 前端控制器 @@ -117,6 +116,12 @@ return workOrderService.distributeFast(data); } @PostMapping("/distribute/ids") @ApiOperation(value = "下发选择", notes = "下发选择") public Result selectedIdsDistribute(@RequestBody List<Integer> ids) { return workOrderService.selectedIdsDistribute(ids); } @GetMapping("/{id}") @ApiOperation(value = "详情", notes = "详情") public Result detail(@PathVariable("id") String id) { ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
@@ -75,6 +75,12 @@ return ywUnitService.all(); } @GetMapping("/work/list") @ApiOperation(value = "工单列表", notes = "工单列表") public Result workList() { return ywUnitService.workList(); } @PostMapping("/export") public void export(HttpServletResponse response, YwUnitQuery query) { ycl-server/src/main/java/com/ycl/platform/mapper/YwUnitMapper.java
@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.platform.domain.entity.YwUnit; import com.ycl.platform.domain.vo.YwUnitVO; import org.apache.ibatis.annotations.Mapper; import java.util.List; /** * 运维单位 Mapper 接口 @@ -15,4 +18,9 @@ @Mapper public interface YwUnitMapper extends BaseMapper<YwUnit> { /** * 运维单位列表统计 * @return 数据 */ List<YwUnitVO> workList(); } ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
@@ -127,4 +127,12 @@ * @return 工单运维审核记录 */ Result selectYwAuditingListByYwId(String id); /** * 批量下发 * @param ids id * @return 结果 */ Result selectedIdsDistribute(List<Integer> ids); } ycl-server/src/main/java/com/ycl/platform/service/YwUnitService.java
@@ -73,4 +73,10 @@ * @return */ List<YwUnitVO> export(YwUnitQuery query); /** * 列表 * @return */ Result workList(); } ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -13,6 +13,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.platform.domain.vo.WorkOrderVO; import com.ycl.platform.domain.query.WorkOrderQuery; import java.util.Arrays; import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -22,6 +24,7 @@ import enumeration.general.FastDistributeTypeEnum; import enumeration.general.NotifyTypeEnum; import enumeration.general.WorkOrderStatusEnum; import org.apache.commons.lang3.ArrayUtils; import org.springframework.stereotype.Service; import org.springframework.beans.BeanUtils; import org.springframework.transaction.annotation.Transactional; @@ -271,6 +274,17 @@ return Result.ok("操作成功"); } @Override public Result selectedIdsDistribute(List<Integer> ids) { new LambdaUpdateChainWrapper<>(baseMapper) .set(WorkOrder::getStatus, WorkOrderStatusEnum.DISTRIBUTED) .in(ArrayUtils.isNotEmpty(ids.toArray()), WorkOrder::getId, ids) .eq(WorkOrder::getStatus, WorkOrderStatusEnum.WAIT_DISTRIBUTE) // .eq(WorkOrder::getDeleted, 0) .update(); return Result.ok("操作成功"); } /** * 根据id查找 * @param id ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
@@ -211,6 +211,12 @@ } @Override public Result workList() { List<YwUnitVO> entities = baseMapper.workList(); return Result.ok().data(entities); } @Override public List<YwUnitVO> export(YwUnitQuery query) { // 分页条件查询你 IPage<YwUnit> page = new LambdaQueryChainWrapper<>(baseMapper) ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml
@@ -33,6 +33,20 @@ where id = #{id} </select> <select id="workList" resultType="com.ycl.platform.domain.vo.YwUnitVO"> SELECT a.*, COUNT(b.id) AS work_order_count FROM t_yw_unit a LEFT JOIN t_work_order b ON a.id = b.unit_id AND b.deleted = 0 AND b.status = 'WAIT_DISTRIBUTE' WHERE a.deleted = 0 GROUP BY a.id; </select> <insert id="insertYwUnit" parameterType="YwUnit" useGeneratedKeys="true" keyProperty="id"> insert into t_yw_unit <trim prefix="(" suffix=")" suffixOverrides=",">
