Explorar o código

修改维保计划接口增加期数

别傲 %!s(int64=5) %!d(string=hai) anos
pai
achega
2f97284532

+ 4 - 2
lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenancePlanService.java

@@ -60,8 +60,6 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
         put("planDate", "计划时间");
     }};
 
-    private QueryWrapper<MaintenancePlan> queryWrapper = new QueryWrapper<>();
-
     //保养类型 1.半月,2.季度,3.半年,4.全年
     private int[] maintenanceType = {1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 4};
 
@@ -83,6 +81,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
      * @date 2020/1/2 9:43 上午
      */
     public List<MaintenancePlan> detailList(MaintenanceDetailRequest request) {
+        QueryWrapper<MaintenancePlan> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<MaintenancePlan> lambdaQueryWrapper = queryWrapper.lambda();
         lambdaQueryWrapper.eq(MaintenancePlan::getMtCompanyId, request.getMtCompanyId());
         lambdaQueryWrapper.eq(MaintenancePlan::getProjectId, request.getProjectId());
@@ -201,6 +200,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
      * @date 2020/1/7 2:40 下午
      */
     public List<MaintenancePlan> findPlanList(MaintenanceModifyRequest request){
+        QueryWrapper<MaintenancePlan> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<MaintenancePlan> lambdaQueryWrapper = queryWrapper.lambda();
         lambdaQueryWrapper.eq(MaintenancePlan::getLiftId, request.getLiftId());
         lambdaQueryWrapper.eq(MaintenancePlan::getProjectId, request.getProjectId());
@@ -218,6 +218,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
      * @date 2020/1/8 10:33 上午
      */
     public List<MaintenancePlan> findAllPlanList(Long mtCompanyId, Long liftId) {
+        QueryWrapper<MaintenancePlan> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<MaintenancePlan> lambdaQueryWrapper = queryWrapper.lambda();
         lambdaQueryWrapper.eq(MaintenancePlan::getMtCompanyId,mtCompanyId);
         lambdaQueryWrapper.eq(MaintenancePlan::getLiftId,liftId);
@@ -296,6 +297,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
      * @date 2019/12/28 2:00 PM
      */
     public boolean removeMaintenancePlan(Long mtCompanyId, List<Long> liftList) {
+        QueryWrapper<MaintenancePlan> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<MaintenancePlan> lambdaQueryWrapper = queryWrapper.lambda();
         lambdaQueryWrapper.eq(MaintenancePlan::getMtCompanyId, mtCompanyId);
         lambdaQueryWrapper.in(MaintenancePlan::getLiftId, liftList);

+ 2 - 1
lift-business-service/src/main/resources/mapper/maintenance/MaintenancePlanMapper.xml

@@ -20,7 +20,8 @@
 		status
 	</sql>
 
-	<select id="findByCondition" resultType="cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenancePlanResponse" parameterType="cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenancePlanRequest">
+	<select id="findByCondition" resultType="cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenancePlanResponse"
+			parameterType="cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenancePlanRequest">
 		SELECT
 		mp.id                       AS id,
 		if(isnull(mp.id), '0', '1') AS status,