app巡查计划明细提交

王富生
1 parent 7229a917
Showing 6 changed files with 203 additions and 1 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/AppInspectionPlanCommitController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanCommitRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanCommitMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitService.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml
+package com.zteits.urbanops.module.garden.controller.app.inspectionplan;
+
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanCommitRespVO;
+import com.zteits.urbanops.module.garden.service.inspectionplan.InspectionPlanCommitService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.constraints.NotBlank;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "APP管理 - 巡检计划提交明细")
+@RestController
+@RequestMapping("/app/garden/inspection-plan-commit/")
+@Validated
+public class AppInspectionPlanCommitController {
+
+    @Resource
+    private InspectionPlanCommitService inspectionPlanCommitService;
+
+    @GetMapping("/get/by/plan_no")
+    @Operation(summary = "获得巡检计划提交明细")
+    @Parameter(name = "plan_no", description = "计划编号", required = true, example = "1024")
+    //@PreAuthorize("@ss.hasPermission('garden:inspection-plan-commit:query')")
+    public CommonResult<List<AppInspectionPlanCommitRespVO>> appInspectionPlanCommitListByPlanNo(@RequestParam("plan_no") @NotBlank String planNo) {
+        List<AppInspectionPlanCommitRespVO> list = inspectionPlanCommitService.appInspectionPlanCommitListByPlanNo(planNo);
+        return success(list);
+    }
+}
+package com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 巡检计划提交明细 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class AppInspectionPlanCommitRespVO {
+
+    @Schema(description = "计划编码")
+    @ExcelProperty("计划编码")
+    private String planNo;
+
+    @Schema(description = "计划名称")
+    @ExcelProperty("计划名称")
+    private String planName;
+
+    @Schema(description = "排序号:第n次计划", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Integer sortNum;
+
+    @Schema(description = "业务线: yl-园林；wy-物业：sz-市政")
+    private String busiLine;
+
+    @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704")
+    private Long roadId;
+
+    @Schema(description = "道路", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704")
+    private String roadName;
+
+    @Schema(description = "计划属性:1:标准计划；2:临时计划", example = "1")
+    private Integer planAttr;
+
+    @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输  ;2009:补植;3001:绿地巡视;", example = "24742")
+    private Integer planTypeId;
+
+    @Schema(description = "计划次数")
+    private Integer planNum;
+
+    @Schema(description = "完成次数")
+    private Integer planFinishNum;
+
+    @Schema(description = "完成状态 1:未完成;2:已完成；", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Integer finishState;
+
+    @Schema(description = "图片地址host")
+    private String imgHost;
+
+    @Schema(description = "巡检照片")
+    private String img;
+
+    @Schema(description = "巡检照片")
+    private List<String> imgList;
+
+    @Schema(description = "巡检结果: 1:正常;2:异常")
+    private Integer inspectionState;
+
+    @Schema(description = "转交状态: 1:未转交;2:已转交")
+    private Integer transState;
+
+    @Schema(description = "转交问题单编码")
+    private String transWorkNo;
+
+    @Schema(description = "完成时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime finishTime;
+
+    @Schema(description = "提交人用户ID", example = "32294")
+    private Long userId;
+
+    @Schema(description = "提交人", example = "芋艿")
+    private String userName;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+
+
+}
 \ No newline at end of file
@@ -4,6 +4,7 @@ import java.util.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanCommitRespVO;
 import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanCommitDO;
 import org.apache.ibatis.annotations.Mapper;
 import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.*;
@@ -24,5 +25,9 @@ public interface InspectionPlanCommitMapper extends BaseMapperX&lt;InspectionPlanCo
      */
     IPage<InspectionPlanCommitRespVO> selectForPage(@Param("page") IPage<InspectionPlanCommitRespVO> page, @Param("req") InspectionPlanCommitPageReqVO reqDTO);
-
+    /*
+     * app 通过计划编码查询list
+     * @return 列表
+     */
+    List<AppInspectionPlanCommitRespVO> appInspectionPlanCommitListByPlanNo(@Param("planNo") String planNo, @Param("busiLineList") List<String> busiLineList);
 }
 \ No newline at end of file
 package com.zteits.urbanops.module.garden.service.inspectionplan;
 import java.util.*;
+
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanCommitRespVO;
 import jakarta.validation.*;
 import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.*;
 import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanCommitDO;
@@ -58,4 +60,12 @@ public interface InspectionPlanCommitService {
      */
     PageResult<InspectionPlanCommitRespVO> getInspectionPlanCommitPage(InspectionPlanCommitPageReqVO pageReqVO);
+    /**
+     * app获得巡检计划提交明细
+     *
+     * @param planNo 编号
+     * @return 巡检计划提交明细
+     */
+    List<AppInspectionPlanCommitRespVO> appInspectionPlanCommitListByPlanNo(String planNo);
+
 }
 \ No newline at end of file
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zteits.urbanops.framework.common.util.string.StrUtils;
 import com.zteits.urbanops.framework.mybatis.core.util.MyBatisUtils;
 import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanCommitRespVO;
 import com.zteits.urbanops.module.system.api.dept.DeptApi;
 import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO;
 import org.apache.commons.lang3.StringUtils;
@@ -103,6 +104,21 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ
         return new PageResult<>(imgProcess(page.getRecords()), page.getTotal());
     }
+    @Override
+    public List<AppInspectionPlanCommitRespVO> appInspectionPlanCommitListByPlanNo(String planNo) {
+        String busiLine = SecurityFrameworkUtils.getBusiLine();
+        List<String> busiLineList = new ArrayList<>();
+        if (StringUtils.isNotEmpty(busiLine)) {
+            busiLineList = Arrays.asList(busiLine.split(","));
+        }
+        List<AppInspectionPlanCommitRespVO> list = inspectionPlanCommitMapper.appInspectionPlanCommitListByPlanNo(planNo, busiLineList);
+
+        list.forEach(e -> {
+            e.setImgList(StrUtils.imgProcess(e.getImg(), e.getImgHost()));
+        });
+        return list;
+    }
+
     /**
      * 回填部门/公司/角色
      * @param list 分页对象
@@ -87,4 +87,49 @@
         order by a.id desc
     </select>
+
+    <select id="appInspectionPlanCommitListByPlanNo" resultType="com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanCommitRespVO">
+        SELECT
+            a.batch_no,
+            b.plan_no,
+            a.plan_name,
+            a.busi_line,
+            b.sort_num,
+            a.road_id,
+            a.road_name,
+            a.plan_attr,
+            a.plan_type_id,
+            a.rate,
+            a.cycle_id,
+            b.plan_num,
+            b.plan_finish_num,
+            b.finish_state,
+            c.img_host,
+            c.img,
+            c.inspection_state,
+            c.trans_state,
+            c.trans_work_no,
+            b.begin_time,
+            b.end_time,
+            c.user_id,
+            c.user_name,
+            c.finish_time,
+            c.remark
+        FROM
+            garden_inspection_plan a,
+            garden_inspection_plan_detail b,
+            garden_inspection_plan_commit c
+        WHERE a.batch_no = b.batch_no
+          AND b.plan_no=c.plan_no
+          AND a.dept_id =b.dept_id
+          AND a.deleted = b.deleted
+          AND a.deleted = 0
+          AND b.plan_no = #{planNo}
+        <if test="busiLineList != null and busiLineList.size() > 0">
+            AND a.busi_line IN
+            <foreach collection="busiLineList" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+    </select>
 </mapper>
 \ No newline at end of file