电梯逻辑删除

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectLiftRelevanceService.java

@@ -44,11 +44,12 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
      * @date 2019/12/5 2:16 PM
      */
     public RestResponse logicDelete(ProjectLiftRelevance entry) {
+        entry.setDeleteFlag(1);
         boolean result = updateById(entry);
         if (!result) {
-            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+            return RestResponse.fail(MessageUtils.get("msg.logic.delete.fail"));
         }
-        return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
+        return RestResponse.success(null, MessageUtils.get("msg.logic.delete.success"));
     }
 
     /**

lift-business-service/src/main/resources/locale/response.properties

@@ -5,6 +5,8 @@ msg.add.success=\u65B0\u589E\u6210\u529F
 msg.add.fail=\u65B0\u589E\u5931\u8D25
 msg.modify.success=\u4FEE\u6539\u6210\u529F
 msg.modify.fail=\u4FEE\u6539\u5931\u8D25
+msg.logic.delete.success=\u5220\u9664\u6210\u529F
+msg.logic.delete.fail=\u5220\u9664\u5931\u8D25
 msg.add.batch.success=\u6279\u91CF\u65B0\u589E\u6210\u529F
 msg.add.batch.fail=\u6279\u91CF\u65B0\u589E\u5931\u8D25
 msg.modify.batch.success=\u6279\u91CF\u4FEE\u6539\u6210\u529F

lift-business-service/src/main/resources/mapper/lift/LiftMapper.xml

@@ -80,7 +80,7 @@
         LEFT JOIN project_lift_relevance plr ON pclr.mt_company_id = plr.mt_company_id and pclr.lift_id = plr.lift_id
         LEFT JOIN project p ON pclr.mt_company_id = p.mt_company_id and plr.project_id = p.id
         LEFT JOIN lift_brand lb ON l.lift_brand = lb.code
-		WHERE 1=1 AND plr.delete_flag = '0'
+		WHERE plr.delete_flag = '0'
         <if test="request.mtCompanyId!=null and request.mtCompanyId!=''">
 			AND pclr.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
         </if>
@@ -124,7 +124,7 @@
           LEFT JOIN lift_brand lb ON l.lift_brand = lb.code
 		  LEFT JOIN user_info ui ON plr.worker_id = ui.user_id
           LEFT JOIN platform_company_lift_relevance pclr ON plr.lift_id = pclr.lift_id AND pclr.id = plr.relevance_id
-        WHERE 1=1 AND plr.delete_flag = '0'
+        WHERE plr.delete_flag = '0'
 		<if test="request.mtCompanyId!=null and request.mtCompanyId!=''">
 			AND plr.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
 		</if>
@@ -151,8 +151,7 @@
 		LEFT JOIN lift_brand lb ON l.lift_brand = lb.code
 		LEFT JOIN user_info ui ON plr.worker_id = ui.user_id
 		LEFT JOIN platform_company_lift_relevance pclr ON plr.lift_id = pclr.lift_id AND pclr.id = plr.relevance_id
-		WHERE 1=1
-		AND pclr.lift_company_status != '1'
+		WHERE pclr.lift_company_status != '1'
         AND plr.delete_flag = '0'
 		<if test="request.mtCompanyId!=null and request.mtCompanyId!=''">
 			AND plr.mt_company_id != #{request.mtCompanyId,jdbcType=BIGINT}