Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into wanghaicheng

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/controller/PaymentController.java

@@ -32,9 +32,9 @@ public class PaymentController {
     private PaymentService paymentService;
 
     /**
-     * @param request 付款列表查询条件
+     * @param request 收款列表查询条件
      * @return RestResponse 付款分页列表结果
-     * @description 查询付款列表
+     * @description 查询收款列表
      * @date 2020/2/20 3:10 下午
      */
     @PostMapping("list")
@@ -47,9 +47,9 @@ public class PaymentController {
     }
 
     /**
-     * @param request 付款详情查询条件
+     * @param request 收款详情查询条件
      * @return RestResponse 付款详情
-     * @description 查询付款详情
+     * @description 查询收款详情
      * @date 2020/2/24 10:47 上午
      */
     @PostMapping("detail")
@@ -62,9 +62,9 @@ public class PaymentController {
     }
 
     /**
-     * @param request 付款列表
+     * @param request 收款列表
      * @return 1.成功, 0.失败, 消息描述
-     * @description 批量修改付款信息
+     * @description 批量修改收款信息
      * @date 2020/2/24 10:47 上午
      */
     @PostMapping("batch/modify")

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/dao/entity/Payment.java

@@ -30,7 +30,7 @@ public class Payment extends BaseEntity {
 	private Long contractsId;
 
 	/**
-	 * 收付款事项   1：合同分期费
+	 * 收付款类型  (1:维保，2:大修)
 	 */
 	private Integer type;
 

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/dao/entity/model/request/PaymentRequest.java

@@ -4,6 +4,7 @@ import cn.com.ty.lift.common.model.PageRequest;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -28,7 +29,8 @@ public class PaymentRequest extends PageRequest {
      */
     private String contractCode;
     /**
-     * 付款类型 (1:维保，2:急修，3:大修)
+     * 付款类型  (1:维保，2:大修)
      */
+    @NotEmpty(message = "notEmpty")
     private String paymentType;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/dao/entity/model/response/PaymentResponse.java

@@ -44,7 +44,7 @@ public class PaymentResponse {
      */
     private BigDecimal unCollectedAmount;
     /**
-     * 收款人编号
+     * 收款人
      */
-    private Long cashierUser;
+    private String cashierUser;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/library/controller/LiftController.java

@@ -189,14 +189,14 @@ public class LiftController {
 
 
     /**
-     * @param projectLiftRelevance 关联表主键id
+     * @param request 关联表主键id
      * @return 1.成功, 0.失败, 消息描述
-     * @description 逻辑删除电梯
+     * @description 删除电梯
      * @date 2019/11/27 10:03 AM
      */
-    @PostMapping("logicDelete")
-    public RestResponse logicDelete(@RequestBody ProjectLiftRelevance projectLiftRelevance) {
-        return projectLiftRelevanceService.logicDelete(projectLiftRelevance);
+    @PostMapping("delete")
+    public RestResponse delete(@Valid @RequestBody LiftDeleteRequest request) {
+        return projectLiftRelevanceService.delete(request);
     }
 
     /**

lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/entity/model/request/LiftDeleteRequest.java

@@ -0,0 +1,24 @@
+package cn.com.ty.lift.business.library.dao.entity.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author bieao
+ * @date 2020/2/25
+ * @description 电梯删除
+ */
+@Data
+public class LiftDeleteRequest {
+    /**
+     * 项目电梯关联主键id
+     */
+    @NotNull(message = "notEmpty")
+    private Long id;
+    /**
+     * 公司电梯关联主键id
+     */
+    @NotNull(message = "notEmpty")
+    private Long relevanceId;
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/PlatformCompanyLiftRelevanceService.java

@@ -95,6 +95,16 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
         return baseMapper.count(mtCompanyId, projectStatus);
     }
 
+    /**
+     * @param id 主键id
+     * @return 是否成功
+     * @description 删除电梯
+     * @date 2020/2/25 4:08 下午
+     */
+    public boolean remove(Long id){
+        return removeById(id);
+    }
+
     /**
      * @param paramMap 电梯id，公司id
      * @return 是否存在

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

@@ -3,8 +3,10 @@ package cn.com.ty.lift.business.project.service;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.library.dao.entity.Lift;
 import cn.com.ty.lift.business.library.dao.entity.model.request.LiftBatchMoveRequest;
+import cn.com.ty.lift.business.library.dao.entity.model.request.LiftDeleteRequest;
 import cn.com.ty.lift.business.library.dao.entity.model.request.LiftExtensionRequest;
 import cn.com.ty.lift.business.library.dao.entity.model.request.LiftLockRequest;
+import cn.com.ty.lift.business.library.service.PlatformCompanyLiftRelevanceService;
 import cn.com.ty.lift.business.project.dao.entity.ProjectLiftRelevance;
 import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectLiftRelevanceRequest;
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectRelevanceResponse;
@@ -19,6 +21,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -35,16 +39,25 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
     @Resource
     private ProjectUserService projectUserService;
 
+    @Resource
+    private PlatformCompanyLiftRelevanceService platformService;
+
     /**
-     * @param entry 项目关联数据
+     * @param request 项目关联数据
      * @return RestResponse 状态码和返回消息
-     * @description 逻辑删除电梯
+     * @description 删除电梯
      * @date 2019/12/5 2:16 PM
      */
-    public RestResponse logicDelete(ProjectLiftRelevance entry) {
-        entry.setDeleteFlag(1);
-        boolean result = updateById(entry);
+    @Transactional(rollbackFor = Exception.class)
+    public RestResponse delete(LiftDeleteRequest request) {
+        boolean result = remove(request.getId());
         if (!result) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return RestResponse.fail(MessageUtils.get("msg.delete.fail"));
+        }
+        boolean ret = platformService.remove(request.getRelevanceId());
+        if (!ret) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return RestResponse.fail(MessageUtils.get("msg.delete.fail"));
         }
         return RestResponse.success(null, MessageUtils.get("msg.delete.success"));

lift-business-service/src/main/resources/mapper/contract/PaymentMapper.xml

@@ -52,6 +52,9 @@
 		<if test="request.projectName!=null and request.projectName!=''">
 			AND p.project_name LIKE CONCAT('%',#{request.projectName,jdbcType=VARCHAR},'%')
 		</if>
+		<if test="request.paymentType!=null and request.paymentType!=''">
+			AND pa.type = #{request.paymentType,jdbcType=VARCHAR}
+		</if>
 	</select>
 
 	<select id="queryContractDetailById" parameterType="cn.com.ty.lift.business.contract.dao.entity.model.request.PaymentRequest"