服务商任务

src/main/java/com/caimei365/manager/controller/caimei/providers/ProvidersApi.java

@@ -126,6 +126,14 @@ public class ProvidersApi {
         return cmProvidersService.taskProviderList(taskId, name, mobile, pageNum, pageSize);
     }
 
+    @GetMapping("/task/audit")
+    public ResponseJson taskAudit(Integer taskId, Integer serviceProviderId, Integer auditStatus) {
+        if (null == taskId || null == serviceProviderId || null == auditStatus) {
+            return ResponseJson.error("请校验参数！");
+        }
+        return cmProvidersService.taskAudit(taskId, serviceProviderId,auditStatus);
+    }
+
     /**
      * 修改服务商密码（协销功能合并）
      *

src/main/java/com/caimei365/manager/dao/providers/CmProvidersMapper.java

@@ -133,4 +133,6 @@ public interface CmProvidersMapper {
     ProviderTask getTaskDetail(Integer taskId);
 
     List<Product> getTaskProducts(@Param("name") String name, @Param("shopName") String shopName, @Param("productId") Integer productId);
+
+    void auditTask(@Param("taskId") Integer taskId, @Param("serviceProviderId") Integer serviceProviderId, @Param("auditStatus") Integer auditStatus);
 }

src/main/java/com/caimei365/manager/entity/caimei/providers/ProviderTask.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
+import java.util.List;
 
 @Accessors(chain = true)
 @Data

src/main/java/com/caimei365/manager/entity/caimei/providers/ServiceProviderModel.java

@@ -12,6 +12,9 @@ import java.util.List;
 @Data
 public class ServiceProviderModel {
 
+    private String taskDesc;
+
+    private List<String> images;
     /**
      * 任务提交审核状态 0未审核 1审核通过 2审核不通过
      */

src/main/java/com/caimei365/manager/service/caimei/providers/CmProvidersService.java

@@ -109,6 +109,8 @@ public interface CmProvidersService {
     ResponseJson<ProviderTask> taskDetail(Integer taskId);
 
     ResponseJson<PaginationVo<Product>> productList(String name, String shopName, Integer productId, int pageNum, int pageSize);
+
+    ResponseJson taskAudit(Integer taskId, Integer serviceProviderId, Integer auditStatus);
 }
 
 

src/main/java/com/caimei365/manager/service/caimei/providers/impl/CmProvidersServiceImpl.java

@@ -112,8 +112,7 @@ public class CmProvidersServiceImpl implements CmProvidersService {
     public int addCmProviders(ServiceProviderModel cmProviders) {
         if (null == cmProviders.getServiceProviderId()) {
             User user = new User();
-            user.setMobile(cmProviders.getMobile()).setBindMobile(cmProviders.getMobile()).setUserName(cmProviders.getLinkMan()).setName(cmProviders.getName()).setServiceProviderStatus(90)
-                    .setUserIdentity(1).setRegisterUserTypeID("-1").setRegisterTime(DateUtil.getDateTime()).setValidFlag("1").setPassword(Md5Util.md5(cmProviders.getPassword()));
+            user.setMobile(cmProviders.getMobile()).setBindMobile(cmProviders.getMobile()).setUserName(cmProviders.getLinkMan()).setName(cmProviders.getName()).setServiceProviderStatus(90).setUserIdentity(1).setRegisterUserTypeID("-1").setRegisterTime(DateUtil.getDateTime()).setValidFlag("1").setPassword(Md5Util.md5(cmProviders.getPassword()));
             userMapper.addUser(user);
             cmProviders.setUserId(Integer.valueOf(user.getUserID()));
             String qualificationId = "CMFW0" + cmProviders.getServiceLevel();
@@ -398,6 +397,13 @@ public class CmProvidersServiceImpl implements CmProvidersService {
         return ResponseJson.success(page);
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public ResponseJson taskAudit(Integer taskId, Integer serviceProviderId, Integer auditStatus) {
+        cmProvidersMapper.auditTask(taskId, serviceProviderId, auditStatus);
+        return ResponseJson.success();
+    }
+
 }
 
 

src/main/resources/mapper/providers/CmProvidersMapper.xml

@@ -411,8 +411,8 @@
     </insert>
 
     <insert id="addTask">
-        insert into cm_provider_task(shopId,productId, title, topPic, reward, content, addTime, startTime, endTime)
-        values (#{shopId}, #{productId},#{title}, #{topPic}, #{reward}, #{content}, now(), #{startTime}, #{endTime});
+        insert into cm_provider_task(shopId, productId, title, topPic, reward, content, addTime, startTime, endTime)
+        values (#{shopId}, #{productId}, #{title}, #{topPic}, #{reward}, #{content}, now(), #{startTime}, #{endTime});
     </insert>
 
     <insert id="assignTask">
@@ -453,15 +453,34 @@
                     WHEN NOW() BETWEEN startTime AND endTime THEN '2'
                     WHEN NOW() > endTime THEN '3' END) AS status
         from cm_provider_task spt
-        left join shop s on spt.shopId = s.shopId
+                 left join shop s on spt.shopId = s.shopId
         order by addTime desc
     </select>
 
-    <select id="taskProviderList"
-            resultType="com.caimei365.manager.entity.caimei.providers.ServiceProviderModel">
-        select sp.serviceProviderId, name, linkMan, userId, contractMobile as mobile, ptr.receiveFlag, ptr.auditStatus
+    <!-- 结果映射 -->
+    <resultMap id="providerTasks" type="com.caimei365.manager.entity.caimei.providers.ServiceProviderModel">
+
+        <result property="serviceProviderId" column="serviceProviderId"/>
+        <result property="name" column="name"/>
+        <result property="linkMan" column="linkMan"/>
+        <result property="userId" column="userId"/>
+        <result property="mobile" column="mobile"/>
+        <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="taskProviderList" resultMap="providerTasks">
+        select sp.serviceProviderId, sp.name, sp.linkMan, sp.userId, sp.contractMobile as mobile, ptr.receiveFlag,
+        ptr.auditStatus,pta.taskDesc,ptai.image
         from serviceprovider sp
         left join provider_task_role ptr on sp.serviceProviderId = ptr.serviceProviderId
+        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}
         <if test="mobile != null and mobile != ''">and sp.contractMobile = #{mobile}</if>
         <if test="name != null and name != ''">and sp.name like concat('%', #{name}, '%')</if>
@@ -575,6 +594,13 @@
         where id = #{id}
     </update>
 
+    <update id="auditTask">
+        update provider_task_role
+        set auditStatus = #{auditStatus}
+        where taskId = #{taskId}
+          and serviceProviderId = #{serviceProviderId}
+    </update>
+
     <delete id="delCmProvidersById" parameterType="String">
         delete
         from serviceprovider