优化

王富生
1 parent b7151b25
Showing 12 changed files with 32 additions and 43 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanDetailReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
@@ -20,10 +20,10 @@ public class AppInspectionPlanDetailReqVO {
     @NotBlank(message = "批次号不能为空")
     private String batchNo;
-    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效")
+    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效;4:已终止")
     @NotNull(message = "完成状态不能为空")
     @Min(value = 1, message = "状态最小为1")
-    @Max(value = 3, message = "状态不能大于4")
+    @Max(value = 4, message = "状态不能大于4")
     private Integer finishState;
     @Schema(description = "公司ID")
@@ -34,8 +34,9 @@ public class AppInspectionPlanDetailReqVO {
     @Hidden
     private List<String> busiLineList;
-    @Schema(description = "系统时间")
+    @Schema(description = "部门")
     @Hidden
-    private LocalDateTime localDateTime;
+    private Long deptId;
+
 }
@@ -33,4 +33,8 @@ public class AppInspectionPlanPageReqVO extends PageParam {
     @Hidden
     private List<String> busiLineList;
+    @Schema(description = "部门")
+    @Hidden
+    private Long deptId;
+
 }
@@ -23,24 +23,18 @@ public class AppMaintainPlanDetailListByRoadPageReqVO extends PageParam {
     @NotNull
     private Long roadId;
-    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效")
+    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效；4:终止")
     @NotNull(message = "完成状态不能为空")
     @Min(value = 1, message = "状态最小为1")
-    @Max(value = 3, message = "状态不能大于4")
+    @Max(value = 4, message = "状态不能大于4")
     private Integer finishState;
     @Schema(description = "计划名称")
     private String planName;
-//    @Schema(description = "计划批次号列表")
-//    @Hidden
-//    private Set<String> batchNos;
     @Schema(description = "业务线")
     @Hidden
     private List<String> busiLineList;
-    @Schema(description = "系统时间")
-    @Hidden
-    private LocalDateTime localDateTime;
 }
@@ -42,5 +42,9 @@ public class AppMaintainPlanPagePlanTypeReqVO extends PageParam {
     @Hidden
     private List<String> busiLineList;
+    @Schema(description = "部门id")
+    @Hidden
+    private Long deptId;
+
 }
 \ No newline at end of file
@@ -37,4 +37,11 @@ public class AppMaintainPlanPageRoadReqVO extends PageParam {
     @Schema(description = "业务线")
     @Hidden
     private List<String> busiLineList;
+
+    @Schema(description = "部门id")
+    @Hidden
+    private Long deptId;
+
+
+
 }
 \ No newline at end of file
@@ -100,7 +100,7 @@ public class InspectionPlanDetailServiceImpl implements InspectionPlanDetailServ
             pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(",")));
         }
         pageReqVO.setCompanyId(companyId);
-        pageReqVO.setLocalDateTime(LocalDateTime.now());
+        pageReqVO.setDeptId(SecurityFrameworkUtils.getDeptId());
          /*2.明细*/
        return inspectionPlanDetailMapper.getInspectionPlanDetailForApp(pageReqVO);
@@ -368,7 +368,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
         if (CollectionUtils.isEmpty(roleIds)) {
             return new PageResult<>(null, 0L);
         }
-
+        pageReqVO.setDeptId(SecurityFrameworkUtils.getDeptId());
         pageReqVO.setRoleIds(new HashSet<>(roleIds));
         /*2.分页*/
         IPage<AppInspectionPlanRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
@@ -377,13 +377,13 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
             pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(",")));
         }
-        /*1.查询登录用户计划编码列表*/
         /*1.查询登录用户角色*/
         List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
         if (CollectionUtils.isEmpty(roleIds)) {
             new PageResult<>(null, 0L);
         }
         pageReqVO.setRoleIds(new HashSet<>(roleIds));
+        pageReqVO.setDeptId(SecurityFrameworkUtils.getDeptId());
         /*2.分页*/
         IPage<AppMaintainPlanPageRoadRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
         IPage<AppMaintainPlanPageRoadRespVO> page = maintainPlanMapper.appMaintainPlanRoadPage(mpPage, pageReqVO);
@@ -402,7 +402,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
         if (CollectionUtils.isEmpty(roleIds)) {
             return new PageResult<>(null, 0L);
         }
-
+        pageReqVO.setDeptId(SecurityFrameworkUtils.getDeptId());
         pageReqVO.setRoleIds(new HashSet<>(roleIds));
         /*2.分页*/
         IPage<AppMaintainPlanPagePlanTypeRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
@@ -38,6 +38,7 @@
         AND a.deleted = 0
         AND a.batch_no = #{req.batchNo}
         AND a.company_id = #{req.companyId}
+        AND a.dept_id = #{req.deptId}
         <if test="req.busiLineList != null and req.busiLineList.size() > 0">
             AND a.busi_line IN
             <foreach collection="req.busiLineList" item="busiLine" open="(" separator="," close=")">
@@ -45,19 +46,7 @@
             </foreach>
         </if>
         <!--状态 1:未完成;2:已完成;3:已失效-->
-        <if test="req.finishState == 3">
-            and b.finish_state = #{req.finishState}
-            <![CDATA[and b.end_time < #{req.localDateTime}]]>
-        </if>
-        <if test="req.finishState == 2">
-            and b.finish_state = #{req.finishState}
-        </if>
-        <if test="req.finishState == 1">
-            and b.finish_state = #{req.finishState}
-            <![CDATA[ and b.begin_time <= #{req.localDateTime}
-                      and b.end_time >= #{req.localDateTime}]]>
-        </if>
-
+        and b.finish_state = #{req.finishState}
     </select>
@@ -32,6 +32,7 @@
         AND a.dept_id = c.dept_id
         AND a.deleted = b.deleted
         AND a.deleted = 0
+        AND a.dept_id = #{req.deptId}
         <if test="req.roadName != null and req.roadName !=''">
             AND a.road_name LIKE CONCAT('%',#{req.roadName},'%')
         </if>
@@ -46,19 +46,7 @@
             AND a.batch_no= #{req.batchNo}
         </if>
         <!--状态 1:未完成;2:已完成;3:已失效-->
-        <if test="req.finishState == 3">
-            and a.finish_state = #{req.finishState}
-            <![CDATA[and c.end_time < #{req.localDateTime}]]>
-        </if>
-        <if test="req.finishState == 2">
-            and c.finish_state = #{req.finishState}
-        </if>
-        <if test="req.finishState == 1">
-            and c.finish_state = #{req.finishState}
-            <![CDATA[and c.end_time >= #{req.localDateTime}]]>
-            <![CDATA[and c.begin_time <= #{req.localDateTime}]]>
-
-        </if>
+        and a.finish_state = #{req.finishState}
     </select>
     <select id="getMaintainNotFinishPlanCommitDetail" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainNotFinishPlanDetailRespVO">
@@ -84,6 +72,5 @@
         AND a.plan_type_id = #{req.planTypeId}
         <!--状态 1:未完成;2:已完成;3:已失效-->
         and c.finish_state = #{req.finishState}
-        <![CDATA[and c.end_time >= #{req.localDateTime}]]>
     </select>
 </mapper>
@@ -33,6 +33,7 @@
         AND a.dept_id = c.dept_id
         AND a.deleted = b.deleted
         AND a.deleted = 0
+        AND a.dept_id = #{req.deptId}
         <if test="req.roadName != null and req.roadName !=''">
             AND a.road_name LIKE CONCAT('%',#{req.roadName},'%')
         </if>
@@ -75,6 +76,7 @@
         AND a.dept_id = d.dept_id
         AND a.deleted=c.deleted
         AND a.deleted=0
+        AND a.dept_id = #{req.deptId}
         AND a.plan_type_id = #{req.planTypeId}
         <if test="req.planName != null and req.planName !=''">
             AND a.plan_type_id LIKE CONCAT('%',#{req.planName},'%')