Merge remote-tracking branch 'origin/developer' into developerA

src/main/java/com/caimei365/user/mapper/SellerMapper.java

@@ -197,4 +197,8 @@ public interface SellerMapper {
     ProviderTaskVo getProviderTaskDetail(@Param("taskId") Integer taskId, @Param("serviceProviderId") Integer serviceProviderId);
 
     void deleteTaskImages(TaskPushDto dto);
+
+    void deleteTaskRole(TaskPushDto dto);
+
+
 }

src/main/java/com/caimei365/user/model/vo/ServiceProviderVo.java

@@ -1,6 +1,5 @@
 package com.caimei365.user.model.vo;
 
-import com.caimei365.user.model.po.ServiceProviderPo;
 import lombok.Data;
 
 /**
@@ -11,6 +10,8 @@ import lombok.Data;
  */
 @Data
 public class ServiceProviderVo{
+
+    private String linkMan;
     /**
      * 用户ID
      */

src/main/java/com/caimei365/user/service/impl/SellerServiceImpl.java

@@ -708,11 +708,13 @@ public class SellerServiceImpl implements SellerService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public ResponseJson taskAudit(TaskPushDto dto) {
-        sellerMapper.insertTaskAudit(dto);
         /**
          * 二次提交清空历史图片
          */
         sellerMapper.deleteTaskImages(dto);
+        sellerMapper.deleteTaskRole(dto);
+
+        sellerMapper.insertTaskAudit(dto);
         sellerMapper.insertTaskImages(dto);
         sellerMapper.updateTaskAudit(dto);
         return ResponseJson.success();

src/main/resources/mapper/SellerMapper.xml

@@ -142,6 +142,12 @@
         WHERE auditId IN (SELECT id FROM provider_task_audit WHERE taskId = #{taskId} AND serviceProviderId = #{serviceProviderId})
     </delete>
 
+    <delete id="deleteTaskRole">
+        DELETE from provider_task_audit
+        where taskId = #{taskId}
+        and serviceProviderId = #{serviceProviderId}
+    </delete>
+
     <select id="findOrderNum" resultType="integer">
         SELECT
         COUNT(*)
@@ -504,7 +510,7 @@
         WHERE csg.serviceId != #{serviceProviderId}
     </select>
     <select id="findServices" resultType="com.caimei365.user.model.vo.ServiceProviderVo">
-        SELECT csg.serviceId as serviceProviderId,s.name as name
+        SELECT csg.serviceId as serviceProviderId,s.name as name,s.linkMan as linkMan
         FROM cm_serviceteam_group csg
         LEFT JOIN cm_serviceteam_role csr ON csr.id=csg.teamId
         left join serviceprovider s on csg.serviceId=s.serviceProviderID
@@ -821,8 +827,8 @@
     <select id="getProviderTaskDetail" resultMap="providerTasks">
         select ptr.receiveFlag, ptr.auditStatus, pta.taskDesc, ptai.image
         from provider_task_role ptr
-                 left join provider_task_audit pta on ptr.taskId = pta.taskId
-                 left join provider_task_audit_image ptai on pta.id = ptai.auditId
+        left join provider_task_audit pta on ptr.taskId = pta.taskId
+        left join provider_task_audit_image ptai on pta.id = ptai.auditId
         where ptr.taskId = #{taskId}
           and ptr.serviceProviderId = #{serviceProviderId}
     </select>