服务商任务

src/main/java/com/caimei365/user/controller/SellerApi.java

@@ -338,6 +338,14 @@ public class SellerApi {
         return sellerService.getTaskDetail(request, taskId, serviceProviderId, userId);
     }
 
+    @GetMapping("/provider/taskDetail")
+    public ResponseJson<ProviderTaskVo> getProviderTaskDetail(Integer taskId, Integer serviceProviderId) {
+        if (null == taskId || null == serviceProviderId) {
+            return ResponseJson.error(-1, "Id不能为空", null);
+        }
+        return sellerService.getProviderTaskDetail(taskId, serviceProviderId);
+    }
+
     @PostMapping("/pushTask")
     public ResponseJson taskAudit(TaskPushDto dto) {
         if (null == dto.getServiceProviderId()) {

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

@@ -193,4 +193,8 @@ public interface SellerMapper {
     void updateTaskAudit(TaskPushDto dto);
 
     List<ShopTaskVo> getShopTaskList(Integer shopId);
+
+    ProviderTaskVo getProviderTaskDetail(@Param("taskId") Integer taskId, @Param("serviceProviderId") Integer serviceProviderId);
+
+    void deleteTaskImages(TaskPushDto dto);
 }

src/main/java/com/caimei365/user/model/dto/TaskPushDto.java

@@ -2,12 +2,14 @@ package com.caimei365.user.model.dto;
 
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.List;
 
 @ApiModel("服务商任务提交")
 @Data
+@Accessors(chain = true)
 public class TaskPushDto  implements Serializable {
 
     private Integer id;

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

@@ -5,11 +5,21 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
+import java.util.List;
 
 @Accessors(chain = true)
 @Data
 public class ProviderTaskVo {
 
+    /**
+     * 提交审核备注
+     */
+    private String taskDesc;
+    /**
+     * 提交审核图片
+     */
+    private List<String> images;
+
     private Integer taskId;
     /**
      * 任务领取标记 0未领取 1已领取

src/main/java/com/caimei365/user/service/SellerService.java

@@ -179,4 +179,6 @@ public interface SellerService {
     ResponseJson taskAudit(TaskPushDto dto);
 
     ResponseJson<PageInfo<ShopTaskVo>> getShopTaskList(Integer shopId, int pageNum, int pageSize);
+
+    ResponseJson<ProviderTaskVo> getProviderTaskDetail(Integer taskId, Integer serviceProviderId);
 }

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

@@ -709,6 +709,10 @@ public class SellerServiceImpl implements SellerService {
     @Override
     public ResponseJson taskAudit(TaskPushDto dto) {
         sellerMapper.insertTaskAudit(dto);
+        /**
+         * 二次提交清空历史图片
+         */
+        sellerMapper.deleteTaskImages(dto);
         sellerMapper.insertTaskImages(dto);
         sellerMapper.updateTaskAudit(dto);
         return ResponseJson.success();
@@ -725,6 +729,12 @@ public class SellerServiceImpl implements SellerService {
         return ResponseJson.success(page);
     }
 
+    @Override
+    public ResponseJson<ProviderTaskVo> getProviderTaskDetail(Integer taskId, Integer serviceProviderId) {
+        ProviderTaskVo taskDetail = sellerMapper.getProviderTaskDetail(taskId, serviceProviderId);
+        return ResponseJson.success(taskDetail);
+    }
+
     /**
      * 机构编号
      *

src/main/resources/mapper/SellerMapper.xml

@@ -124,9 +124,10 @@
     </update>
 
     <update id="updateTaskAudit">
-        update provider_task_role set auditStatus = 1
+        update provider_task_role
+        set auditStatus = 1
         where taskId = #{taskId}
-        and serviceProviderId = #{serviceProviderId}
+          and serviceProviderId = #{serviceProviderId}
     </update>
 
     <delete id="deleteTemporaryClub">
@@ -135,6 +136,12 @@
         WHERE `id` = #{id}
     </delete>
 
+    <delete id="deleteTaskImages">
+        DELETE
+        FROM provider_task_audit_image
+        WHERE auditId IN (SELECT id FROM provider_task_audit WHERE taskId = #{taskId} AND serviceProviderId = #{serviceProviderId})
+    </delete>
+
     <select id="findOrderNum" resultType="integer">
         SELECT
         COUNT(*)
@@ -769,7 +776,7 @@
                cpt.endTime,
                cpt.topPic
         FROM provider_task_role ptr
-        LEFT JOIN cm_provider_task cpt ON ptr.taskId = cpt.id
+                 LEFT JOIN cm_provider_task cpt ON ptr.taskId = cpt.id
         WHERE cpt.delflag = 0
           AND ptr.serviceProviderId = #{serviceProviderId}
           AND ptr.receiveFlag = #{taskType}
@@ -790,16 +797,34 @@
                p.name as productName,
                p.mainImage
         from cm_provider_task cpt
-        left join product p on cpt.productId = p.productId
+                 left join product p on cpt.productId = p.productId
         where id = #{taskId}
     </select>
 
     <select id="getShopTaskList" resultType="com.caimei365.user.model.vo.ShopTaskVo">
-        select cpt.productId,p.name as productName,p.mainImage,COUNT(ptc.taskId) AS countNum
+        select cpt.productId, p.name as productName, p.mainImage, COUNT(ptc.taskId) AS countNum
         from cm_provider_task cpt
-        LEFT JOIN provider_task_click ptc ON cpt.id = ptc.taskId
-        left join product p on cpt.productId = p.productId
+                 LEFT JOIN provider_task_click ptc ON cpt.id = ptc.taskId
+                 left join product p on cpt.productId = p.productId
         where cpt.shopId = #{shopId}
     </select>
 
+    <resultMap id="providerTasks" type="com.caimei365.user.model.vo.ProviderTaskVo">
+        <result property="receiveFlag" column="receiveFlag"/>
+        <result property="auditStatus" column="auditStatus"/>
+        <result property="taskDesc" column="taskDesc"/>
+        <collection property="images" ofType="java.lang.String">
+            <result column="image"/>
+        </collection>
+    </resultMap>
+
+    <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
+        where ptr.taskId = #{taskId}
+          and ptr.serviceProviderId = #{serviceProviderId}
+    </select>
+
 </mapper>