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

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

@@ -146,17 +146,6 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
         }
-        //修改项目信息
-        Project project = new Project();
-        project.setId(contracts.getProjectId());
-        project.setProjectName(extend.getProjectName());
-        project.setAddress(extend.getProjectAddress());
-        project.setNum(contracts.getLiftNum());
-        boolean projectResult = projectService.modify(project);
-        if (!projectResult) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
-        }
         //修改付款信息
         boolean paymentResult = paymentService.modifyBatchById(extend.getPaymentList());
         if (!paymentResult) {

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

@@ -24,30 +24,6 @@ public class MaintenanceRecordResponse {
      * 电梯id
      */
     private String liftId;
-    /**
-     * 补录标识
-     */
-    private String isRegular;
-    /**
-     * 安全防护项选择
-     */
-    private String safetyConfirm;
-    /**
-     * 保养项目
-     */
-    private String maintenanceOption;
-    /**
-     * 停梯时间
-     */
-    private LocalDate stopDate;
-    /**
-     * 主要负责人签名图片路径
-     */
-    private String signatureImg1;
-    /**
-     * 次要负责人签名图片路径
-     */
-    private String signatureImg2;
     /**
      * 电梯位置
      */
@@ -56,8 +32,4 @@ public class MaintenanceRecordResponse {
      * 项目名称
      */
     private String projectName;
-    /**
-     * 保养图片地址
-     */
-    private String imgUrl;
 }

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

@@ -1,26 +0,0 @@
-package cn.com.ty.lift.business.project.dao.entity.model.request;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @author bieao
- * @date 2020/1/11
- * @description 确认停止服务请求
- */
-@Data
-public class ProjectConfirmRequest {
-
-    /**
-     * 项目id
-     */
-    @NotNull(message = "notEmpty")
-    private Long projectId;
-
-    /**
-     * 维保公司id
-     */
-    @NotNull(message = "notEmpty")
-    private Long mtCompanyId;
-}

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

@@ -8,10 +8,13 @@ import cn.com.ty.lift.common.constants.CommonEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.Comparator;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -65,14 +68,44 @@ public class ProjectUserService extends ServiceImpl<ProjectUserMapper, ProjectUs
      * @description 修改项目组成员
      * @date 2020/1/11 10:43 上午
      */
+    @Transactional(rollbackFor = Exception.class)
     public boolean modify(ProjectUser projectUser){
         QueryWrapper<ProjectUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id", projectUser.getUserId());
         queryWrapper.eq("project_id", projectUser.getProjectId());
         queryWrapper.eq("user_role", CommonEnum.DefaultRole.MTWORK.getCode());
-        ProjectUser user = getOne(queryWrapper);
-        projectUser.setIsMonitor("0".equals(user.getIsMonitor()) ? "1" : "0");
-        return update(projectUser, queryWrapper);
+        ProjectUser entry = getOne(queryWrapper);
+        //如果该成员是维保工，升级成维保班长，若该项目组成员还有其他维保班长，则该维保班长设置为维保工
+        if ("0".equals(entry.getIsMonitor())) {
+            //设置为维保班长
+            entry.setIsMonitor("1");
+            boolean result = update(entry, queryWrapper);
+            if (!result) return false;
+            QueryWrapper<ProjectUser> wrapper = new QueryWrapper<>();
+            wrapper.eq("mt_company_id", projectUser.getMtCompanyId());
+            wrapper.eq("project_id", projectUser.getProjectId());
+            wrapper.eq("user_role", CommonEnum.DefaultRole.MTWORK.getCode());
+            List<ProjectUser> userList = list(wrapper);
+            Optional<ProjectUser> first = userList.stream().filter(user ->
+                    !user.getUserId().equals(entry.getUserId()) && user.getIsMonitor().equals("1")).findFirst();
+            if (first.isPresent()) {
+                ProjectUser user = first.get();
+                //设置另外的维保班长为维保工
+                user.setIsMonitor("0");
+                boolean ret = update(user, new QueryWrapper<ProjectUser>() {{
+                    eq("user_id", user.getUserId());
+                    eq("project_id", user.getProjectId());
+                    eq("user_role", CommonEnum.DefaultRole.MTWORK.getCode());
+                }});
+                if (ret) return true;
+                else TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            }
+            return true;
+        } else {
+            //设置为维保工
+            entry.setIsMonitor("0");
+            return update(entry, queryWrapper);
+        }
     }
 
     /**

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

@@ -60,6 +60,7 @@
 		LEFT JOIN user_info ui ON plr.worker_id = ui.user_id
 		LEFT JOIN region r ON p.region_id = r.id
 		WHERE plr.mt_company_id = #{request.mtCompanyId,jdbcType=VARCHAR}
+		AND pclr.lift_company_status != '1'
 		<if test="request.projectId!=null and request.projectId!=''">
 			AND p.id = #{request.projectId,jdbcType=BIGINT}
 		</if>

lift-business-service/src/main/resources/mapper/maintenance/MaintenanceRecordMapper.xml

@@ -54,17 +54,9 @@
 		SELECT  mr.work_date          AS workDate,
 				mr.type               AS type,
 				mr.lift_id            AS liftId,
-				mr.is_regular         AS isRegular,
-				mr.safety_confirm     AS safetyConfirm,
-				mr.maintenance_option AS maintenanceOption,
-				mr.stop_date          AS stopDate,
-				mr.signature_img1     AS signatureImg1,
-				mr.signature_img2     AS signatureImg2,
 				l.device_position     AS devicePosition,
-				p.project_name        AS projectName,
-				mri.img_url           AS imgUrl
+				p.project_name        AS projectName
 		FROM maintenance_record mr
-				LEFT JOIN mt_record_img mri ON mr.id = mri.mt_record_id
 				LEFT JOIN project p ON mr.project_id = p.id
 				LEFT JOIN lift l ON mr.lift_id = l.id
 		WHERE 1 = 1