养护计划明细提交

王富生
1 parent ebc559ff
Showing 9 changed files with 175 additions and 12 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanCommitController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitDetailRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommonUserVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanCommitDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanCommitMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitService.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
@@ -79,6 +79,14 @@ public class MaintainPlanCommitController {
         return success(BeanUtils.toBean(maintainPlanCommit, MaintainPlanCommitRespVO.class));
     }
+    @GetMapping("/get/plan-no")
+    @Operation(summary = "获取养护计划-共同处理人明细")
+    @Parameter(name = "plan_no", description = "计划编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('garden:maintain-plan-commit:query')")
+    public CommonResult<List<MaintainPlanCommitDetailRespVO>> getMaintainPlanCommitDetailByPlanNo(@RequestParam("plan_no") String planNo) {
+        return success( maintainPlanCommitService.getMaintainPlanCommitDetailByPlanNo(planNo));
+    }
+
     @GetMapping("/page")
     @Operation(summary = "获得养护计划明细分页")
     @PreAuthorize("@ss.hasPermission('garden:maintain-plan-commit:query')")
+package com.zteits.urbanops.module.garden.controller.admin.maintainplan.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 MaintainPlanCommitDetailRespVO {
+
+    @Schema(description = "批次号")
+    @ExcelProperty("批次号")
+    private String batchNo;
+
+    @Schema(description = "计划编码")
+    @ExcelProperty("计划编码")
+    private String planNo;
+
+    @Schema(description = "提交次序号")
+    @ExcelProperty("提交次序号")
+    private Integer sortNum;
+
+    @Schema(description = "业务线: yl-园林；wy-物业：sz-市政")
+    @ExcelProperty("业务线: yl-园林；wy-物业：sz-市政")
+    private String busiLine;
+
+
+    @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输  ;2009:补植;3001:绿地巡视;", example = "24742")
+    @ExcelProperty("养护类型")
+    private Integer planTypeId;
+
+    @Schema(description = "备注", example = "你猜")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "本次完成百分比", example = "98.00")
+    @ExcelProperty("本次完成百分比")
+    private Double finishPercent;
+
+    @Schema(description = "照片host", example = "aaa")
+    @ExcelProperty("照片host")
+    private String imgHost;
+
+    @Schema(description = "开始照片", example = "aaa")
+    @ExcelProperty("开始照片")
+    private List<String> beginImgList;
+
+    @Schema(description = "处理中照片", example = "aaa")
+    @ExcelProperty("处理中照片")
+    private List<String> processImgList;
+
+    @Schema(description = "结束照片", example = "aaa")
+    @ExcelProperty("结束照片")
+    private List<String> endImgList;
+
+    @Schema(description = "养护面积:单位m²", example = "20")
+    @ExcelProperty("养护面积:单位m²")
+    private Double opArea;
+    /**
+     * 操作时长
+     */
+    @Schema(description = "养护面积:单位m²", example = "20")
+    @ExcelProperty("养护面积:单位m²")
+    private Double opTime;
+    /**
+     * 完成时间
+     */
+    @Schema(description = "完成时间")
+    @ExcelProperty("完成时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime finishTime;
+
+    @Schema(description = "共同处理人", example = "张三,莉")
+    private List<MaintainPlanCommonUserVO> commonUsers;
+
+}
 \ No newline at end of file
@@ -27,9 +27,6 @@ public class MaintainPlanCommitPageReqVO extends PageParam {
     @Schema(description = "业务线: yl-园林；wy-物业：sz-市政")
     private String busiLine;
-    @Schema(description = "提交次序号")
-    private Integer sortNum;
-
     @Schema(description = "归属(一级部门id)", example = "2759")
     private Long companyId;
@@ -63,6 +60,4 @@ public class MaintainPlanCommitPageReqVO extends PageParam {
     @Schema(description = "提交人用户ID", example = "王五")
     private String userName;
-    private List<String> busiLineList;
-
 }
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 共同处理人
+ * @author 创建人：ZTEITS
+ * @version 创建时间：2021/5/27
+ */
+@Data
+public class MaintainPlanCommonUserVO {
+    @Schema(description = "提交人用户", example = "19167")
+    private Long userId;
+
+    @Schema(description = "提交人用户ID", example = "王五")
+    private String userName;
+
+}
@@ -39,6 +39,10 @@ public class MaintainPlanCommitDO extends BaseDO {
      */
     private String busiLine;
     /**
+     * 养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输  ;2009:补植;3001:绿地巡视;
+     */
+    private Integer planTypeId;
+    /**
      * 提交次序号
      */
     private Integer sortNum;
@@ -8,6 +8,8 @@ import org.apache.ibatis.annotations.Mapper;
 import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*;
 import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
 /**
  * 养护计划明细 Mapper
  *
@@ -21,7 +23,7 @@ public interface MaintainPlanCommitMapper extends BaseMapperX&lt;MaintainPlanCommit
      * @param reqDTO 查询条件
      * @return 分页结果
      */
-    IPage<MaintainPlanCommitRespVO> selectForPage(@Param("page") IPage<MaintainPlanCommitRespVO> page, @Param("req") MaintainPlanCommitPageReqVO req);
+    IPage<MaintainPlanCommitRespVO> selectForPage(@Param("page") IPage<MaintainPlanCommitRespVO> page, @Param("req") MaintainPlanCommitPageReqVO req, @Param("busiLineList") List<String> busiLineList);
 }
 \ No newline at end of file
@@ -51,6 +51,14 @@ public interface MaintainPlanCommitService {
     MaintainPlanCommitDO getMaintainPlanCommit(Long id);
     /**
+     * 获得养护计划明细列表
+     *
+     * @param planNo 计划编号
+     * @return 养护计划明细列表
+     */
+    List<MaintainPlanCommitDetailRespVO> getMaintainPlanCommitDetailByPlanNo(String planNo);
+
+    /**
      * 获得养护计划明细分页
      *
      * @param pageReqVO 分页查询
 package com.zteits.urbanops.module.garden.service.maintainplan;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.dal.dataobject.maintainplan.MaintainPlanCommonUserDO;
+import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanCommonUserMapper;
 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;
@@ -35,6 +39,9 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
     private MaintainPlanCommitMapper maintainPlanCommitMapper;
     @Resource
+    private MaintainPlanCommonUserMapper maintainPlanCommonUserMapper;
+
+    @Resource
     private DeptApi deptApi;
     @Override
@@ -83,6 +90,43 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
     }
     @Override
+    public List<MaintainPlanCommitDetailRespVO> getMaintainPlanCommitDetailByPlanNo(String planNo) {
+        List<MaintainPlanCommitDetailRespVO> respList = new ArrayList<>();
+        /*1.查询处理明细*/
+        List<MaintainPlanCommitDO> list = maintainPlanCommitMapper.selectList(new QueryWrapper<MaintainPlanCommitDO>().lambda()
+                .eq(MaintainPlanCommitDO::getPlanNo, planNo).eq(MaintainPlanCommitDO::getDeleted, 0));
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+
+        /*1.查询共同处理人*/
+        list.forEach(e -> {
+            MaintainPlanCommitDetailRespVO respVO = new MaintainPlanCommitDetailRespVO();
+            BeanUtils.copyProperties(e, respVO);
+            respVO.setBeginImgList(StrUtils.imgProcess(e.getBeginImg(), e.getImgHost()));
+            respVO.setProcessImgList(StrUtils.imgProcess(e.getProcessImg(), e.getImgHost()));
+            respVO.setEndImgList(StrUtils.imgProcess(e.getEndImg(), e.getImgHost()));
+
+            List<MaintainPlanCommonUserVO> commonUsers = new ArrayList<>();
+            List<MaintainPlanCommonUserDO> maintainPlanCommonUserList = maintainPlanCommonUserMapper.selectList(new QueryWrapper<MaintainPlanCommonUserDO>().lambda()
+                    .eq(MaintainPlanCommonUserDO::getPlanNo, e.getPlanNo())
+                    .eq(MaintainPlanCommonUserDO::getSortNum, e.getSortNum())
+                    .eq(MaintainPlanCommonUserDO::getDeleted, 0));
+            if (!CollectionUtils.isEmpty(maintainPlanCommonUserList)) {
+                for (MaintainPlanCommonUserDO commonUserDO : maintainPlanCommonUserList) {
+                    commonUsers.add(new MaintainPlanCommonUserVO()
+                            .setUserId(commonUserDO.getUserId())
+                            .setUserName(commonUserDO.getUserName()));
+                }
+                respVO.setCommonUsers(commonUsers);
+            }
+            respList.add(respVO);
+        });
+
+        return respList;
+    }
+
+    @Override
     public PageResult<MaintainPlanCommitRespVO> getMaintainPlanCommitPage(MaintainPlanCommitPageReqVO pageReqVO) {
         String busiLine = SecurityFrameworkUtils.getBusiLine();
         List<String> busiLineList = new ArrayList<>();
@@ -93,10 +137,9 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
                 busiLineList.addAll(Arrays.asList(busiLine.split(",")));
             }
         }
-        pageReqVO.setBusiLineList(busiLineList);
         //分页
         IPage<MaintainPlanCommitRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
-        IPage<MaintainPlanCommitRespVO> page = maintainPlanCommitMapper.selectForPage(mpPage, pageReqVO);
+        IPage<MaintainPlanCommitRespVO> page = maintainPlanCommitMapper.selectForPage(mpPage, pageReqVO, busiLineList);
         addDataInspectionPlan(page.getRecords());
         // 转换返回
         return new PageResult<>(page.getRecords(), page.getTotal());
@@ -27,7 +27,7 @@
             a.end_time,
             a.company_id,
             a.dept_id,
-            a.finish_percent,
+            a.finish_percent as finishPercent,
             c.role_name,
             c.finish_time,
             c.user_name
@@ -42,7 +42,7 @@
             and a.plan_no = #{req.planNo}
         </if>
         <if test="req.planName != null and req.planName !=''">
-            and a.plan_name = #{req.planName}
+            and b.plan_name = #{req.planName}
         </if>
         <if test="req.roadName != null and req.roadName !=''">
             AND b.road_name  LIKE CONCAT(#{req.roadName},'%')
@@ -50,9 +50,9 @@
         <if test="req.levelId != null">
             and b.level_id = #{req.levelId}
         </if>
-        <if test="req.busiLineList != null and req.busiLineList.size() > 0">
+        <if test="busiLineList != null and busiLineList.size() > 0">
             AND b.busi_line IN
-            <foreach collection="req.busiLineList" item="id" open="(" separator="," close=")">
+            <foreach collection="busiLineList" item="id" open="(" separator="," close=")">
                 #{id}
             </foreach>
         </if>