app养护计划明细提交

王富生
1 parent eda571c6
Showing 8 changed files with 15 additions and 9 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/AppMaintainPlanDetailController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanDetailMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailService.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml
@@ -57,7 +57,7 @@ public class MaintainPlanDetailRespVO {
     @Schema(description = "完成百分比", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("完成百分比")
-    private Double finishPercent;
+    private Integer finishPercent;
     @Schema(description = "完成状态 1:未完成;2:进行中；3:已完成", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("完成状态 1:未完成;2:进行中；3:已完成")
@@ -32,9 +32,12 @@ public class AppMaintainPlanDetailController {
     @Operation(summary = "app-获得养护计划明细")
     @Parameter(name = "road_id", description = "道路ID", required = true, example = "1024")
     @Parameter(name = "finish_state", description = "完成状态 1:未完成;2:已完成;3:已失效", required = true, example = "1024")
+    @Parameter(name = "plan_name", description = "计划名称", required = true, example = "1024")
    // @PreAuthorize("@ss.hasPermission('app:garden:maintain-plan-detail:road:query')")
-    public CommonResult<List<AppMaintainPlanDetailRespVO>> appMaintainPlanDetailListByRoad(@RequestParam("road_id") @NotNull Long roadId, @RequestParam("finish_state") Integer finishState) {
-        List<AppMaintainPlanDetailRespVO> list = maintainPlanDetailService.appMaintainPlanDetailListByRoad(roadId, finishState);
+    public CommonResult<List<AppMaintainPlanDetailRespVO>> appMaintainPlanDetailListByRoad(@RequestParam("road_id") @NotNull Long roadId,
+                                                                                           @RequestParam("finish_state") Integer finishState,
+                                                                                           @RequestParam("plan_name") String planName) {
+        List<AppMaintainPlanDetailRespVO> list = maintainPlanDetailService.appMaintainPlanDetailListByRoad(roadId, finishState, planName);
         return success(list);
     }
@@ -38,7 +38,7 @@ public class AppMaintainPlanDetailRespVO {
     private Integer planNum;
     @Schema(description = "完成百分比", requiredMode = Schema.RequiredMode.REQUIRED)
-    private Double finishPercent;
+    private Integer finishPercent;
     @Schema(description = "完成状态 1:未完成;2:进行中；3:已完成", requiredMode = Schema.RequiredMode.REQUIRED)
     private Integer finishState;
@@ -44,7 +44,7 @@ public class AppMaintainPlanPagePlanTypeRespVO {
     @Schema(description = "完成百分比", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("完成百分比")
-    private Double finishPercent;
+    private Integer finishPercent;
     @Schema(description = "完成状态 1:未完成;2:进行中；3:已完成", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("完成状态 1:未完成;2:进行中；3:已完成")
@@ -55,7 +55,7 @@ public interface MaintainPlanDetailMapper extends BaseMapperX&lt;MaintainPlanDetail
      * @return
      */
     List<AppMaintainPlanDetailRespVO> appMaintainPlanDetailListByRoad(@Param("busiLineList") List<String> busiLineList, @Param("roadId") Long roadId, @Param("companyId") Long companyId,
-                                                                      @Param("roleIds") List<Long> roleIds,  @Param("localDate") LocalDate now, @Param("finishState") Integer finishState);
+                                                                      @Param("roleIds") List<Long> roleIds,  @Param("localDate") LocalDate now, @Param("finishState") Integer finishState, @Param("planName") String planName);
 }
 \ No newline at end of file
@@ -65,6 +65,6 @@ public interface MaintainPlanDetailService {
      * @param roadId 道路ID
      * @return
      */
-    List<AppMaintainPlanDetailRespVO> appMaintainPlanDetailListByRoad(Long roadId, Integer finishState);
+    List<AppMaintainPlanDetailRespVO> appMaintainPlanDetailListByRoad(Long roadId, Integer finishState, String planName);
 }
 \ No newline at end of file
@@ -84,7 +84,7 @@ public class MaintainPlanDetailServiceImpl implements MaintainPlanDetailService 
     }
     @Override
-    public List<AppMaintainPlanDetailRespVO> appMaintainPlanDetailListByRoad(Long roadId, Integer finishState) {
+    public List<AppMaintainPlanDetailRespVO> appMaintainPlanDetailListByRoad(Long roadId, Integer finishState, String planName) {
         String busiLine = SecurityFrameworkUtils.getBusiLine();
         Long companyId = SecurityFrameworkUtils.getCompanyId();
         List<String> busiLineList = new ArrayList<>();
@@ -95,7 +95,7 @@ public class MaintainPlanDetailServiceImpl implements MaintainPlanDetailService 
         /*1.查询登录用户角色*/
         List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
         LocalDate now = LocalDate.now();
-       return maintainPlanDetailMapper.appMaintainPlanDetailListByRoad(busiLineList, roadId, companyId, roleIds, now, finishState);
+       return maintainPlanDetailMapper.appMaintainPlanDetailListByRoad(busiLineList, roadId, companyId, roleIds, now, finishState, planName);
     }
 }
 \ No newline at end of file
@@ -38,6 +38,9 @@
         AND a.deleted=0
         AND a.company_id = #{companyId}
         AND a.road_id = #{roadId}
+        <if test="planName != null and planName !=''">
+            AND a.plan_name LIKE CONCAT('%',#{planName},'%')
+        </if>
         <if test="roleIds != null and roleIds.size() > 0">
             AND b.role_id IN
             <foreach collection="roleIds" item="roleId" open="(" separator="," close=")">