优化

王富生
1 parent 9a768976
Showing 4 changed files with 11 additions and 8 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AppGardenWorkOrderConvert.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
@@ -4,14 +4,16 @@ import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppIns
 import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDO;
 import com.zteits.urbanops.module.garden.dal.dataobject.road.RoadDO;
 import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderReqVO;
+import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+@Mapper
 public interface AppGardenWorkOrderConvert {
-    AppGardenWorkOrderConvert INSTANCE = Mappers.getMapper(AppGardenWorkOrderConvert.class);
+    public static final AppGardenWorkOrderConvert INSTANCE = Mappers.getMapper(AppGardenWorkOrderConvert.class);
     default AppGardenWorkOrderReqVO buildAppGardenWorkOrderReqVO(AppInspectionPlanCommitSaveReqVO createReqVO, InspectionPlanDO inspectionPlanDO, RoadDO roadDO, String planNo ) {
         AppGardenWorkOrderReqVO  orderReqVO = new AppGardenWorkOrderReqVO();
@@ -28,6 +28,7 @@ import com.zteits.urbanops.module.system.api.dept.DeptApi;
 import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO;
 import com.zteits.urbanops.module.system.api.permission.RoleApi;
 import com.zteits.urbanops.module.workorder.api.WorkOrderApi;
+import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderReqVO;
 import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderRespVO;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -98,10 +99,10 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ
             throw exception(INSPECTION_PLAN_NOT_EXISTS);
         }
         /*3.转工单*/
-        String taskId =  addWorkOrder(createReqVO, inspectionPlanDO);
+        String orderNO =  addWorkOrder(createReqVO, inspectionPlanDO);
         InspectionPlanCommitDO inspectionPlanCommit = getInspectionPlanCommitDO(createReqVO, inspectionPlanDO);
-        inspectionPlanCommit.setTransWorkNo(taskId);
+        inspectionPlanCommit.setTransWorkNo(orderNO);
         /*4.查询计划明细最大次数*/
         Long countNum = inspectionPlanCommitMapper.selectCount(new QueryWrapper<InspectionPlanCommitDO>().lambda()
                 .eq(InspectionPlanCommitDO::getPlanNo, createReqVO.getPlanNo()));
@@ -150,9 +151,10 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ
         }
         //查询道路信息
         RoadDO roadDO = roadMapper.selectOne(RoadDO::getId, inspectionPlanDO.getRoadId());
-        AppGardenWorkOrderRespVO workOrder = workOrderApi.createWorkOrder(AppGardenWorkOrderConvert.INSTANCE.buildAppGardenWorkOrderReqVO(createReqVO, inspectionPlanDO, roadDO, createReqVO.getPlanNo()));
+        AppGardenWorkOrderReqVO appGardenWorkOrderReqVO = AppGardenWorkOrderConvert.INSTANCE.buildAppGardenWorkOrderReqVO(createReqVO, inspectionPlanDO, roadDO, createReqVO.getPlanNo());
+        AppGardenWorkOrderRespVO workOrder = workOrderApi.createWorkOrder(appGardenWorkOrderReqVO);
         log.info("创建工单结果:{}", JSONObject.toJSONString(workOrder));
-        return workOrder.getTaskId();
+        return workOrder.getOrderNo();
     }
     private static InspectionPlanCommitDO getInspectionPlanCommitDO(AppInspectionPlanCommitSaveReqVO createReqVO, InspectionPlanDO inspectionPlanDO) {
@@ -65,7 +65,6 @@
         <if test="req.finishState == 4">
             AND b.finish_state = 4
         </if>
-
-
+         ORDER BY b.id desc
     </select>
 </mapper>
@@ -26,7 +26,7 @@
         b.begin_time,
         b.end_time
         FROM
-        garden_inspection_plan_detail b
+        garden_maintain_plan_detail b
         INNER JOIN garden_maintain_plan a ON b.batch_no = a.batch_no and a.deleted = b.deleted
         INNER JOIN (
         SELECT DISTINCT batch_no