服务商任务bugfix

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

@@ -73,9 +73,10 @@ public class ProvidersApi {
      * @return
      */
     @GetMapping("/task/list")
-    public ResponseJson<PaginationVo<ProviderTask>> taskList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+    public ResponseJson<PaginationVo<ProviderTask>> taskList(String shopName,
+                                                             @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                              @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
-        return cmProvidersService.taskList(pageNum, pageSize);
+        return cmProvidersService.taskList(shopName, pageNum, pageSize);
     }
 
     @GetMapping("/task/detail")
@@ -131,7 +132,7 @@ public class ProvidersApi {
         if (null == taskId || null == serviceProviderId || null == auditStatus) {
             return ResponseJson.error("请校验参数！");
         }
-        return cmProvidersService.taskAudit(taskId, serviceProviderId,auditStatus);
+        return cmProvidersService.taskAudit(taskId, serviceProviderId, auditStatus);
     }
 
     /**

src/main/java/com/caimei365/manager/dao/CmRelatedImageMapper.java

@@ -4,7 +4,6 @@ import java.util.List;
 
 import com.caimei365.manager.entity.caimei.CmRelatedImage;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 /**
  * 相关图片Mapper接口
@@ -13,8 +12,7 @@ import org.apache.ibatis.annotations.Param;
  * @date 2023-12-12
  */
 @Mapper
-public interface CmRelatedImageMapper
-{
+public interface CmRelatedImageMapper {
     /**
      * 通过对象查询相关图片列表
      *
@@ -24,7 +22,6 @@ public interface CmRelatedImageMapper
     List<CmRelatedImage> getRelatedImageList(CmRelatedImage cmRelatedImage);
 
 
-
     /**
      * 通过Id查询相关图片对象
      *

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

@@ -122,7 +122,7 @@ public interface CmProvidersMapper {
 
     void assignTask(@Param("id") Integer id, @Param("strToList") List<String> strToList);
 
-    List<ProviderTask> taskList();
+    List<ProviderTask> taskList(String shopName);
 
     List<ServiceProviderModel> taskProviderList(@Param("taskId") Integer taskId, @Param("name") String name, @Param("mobile") String mobile);
 

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

@@ -98,7 +98,7 @@ public interface CmProvidersService {
 
     ResponseJson assignTask(Integer id, String serviceProviderIds);
 
-    ResponseJson<PaginationVo<ProviderTask>> taskList(int pageNum, int pageSize);
+    ResponseJson<PaginationVo<ProviderTask>> taskList(String shopName, int pageNum, int pageSize);
 
     ResponseJson<PaginationVo<ServiceProviderModel>> taskProviderList(Integer taskId, String name, String mobile, int pageNum, int pageSize);
 

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

@@ -86,7 +86,6 @@ public class CmProvidersContractServiceImpl implements CmProvidersContractServic
     @Override
     public int addCmProvidersContract(CmProvidersContract cmProvidersContract) {
         ServiceProviderModel cmProviders = cmProvidersMapper.getCmProvidersById(cmProvidersContract.getServiceProviderId());
-        log.info("cmProviders_------------->" + cmProviders.toString());
         String levelName = cmProviders.getServiceLevel() == 1 ? "一级" : cmProviders.getServiceLevel() == 2 ? "二级" : cmProviders.getServiceLevel() == 3 ? "三级" : cmProviders.getBrandName();
         BufferedImage realQrCodeImage = ImageUtils.createRealQrCode("https://www.caimei365.com/settlementInfo.html?id=" + cmProvidersContract.getServiceProviderId(), 1000);                //生成二维码
         cmProvidersMapper.updateCmProviders(new ServiceProviderModel()

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

@@ -127,7 +127,6 @@ public class CmProvidersServiceImpl implements CmProvidersService {
             cmProviders.setQualificationId(qualificationId);
             cmProviders.setStatus(90);
             cmProviders.setAddTime(new Date());
-            log.info("cmProviders--------->" + cmProviders.toString());
             cmProvidersMapper.addCmProviders(cmProviders);   //新增服务商
             String providersId = cmProviders.getServiceProviderId().toString();
             cmProviders.getContract().setServiceProviderId(Integer.valueOf(providersId));
@@ -157,7 +156,6 @@ public class CmProvidersServiceImpl implements CmProvidersService {
             for (CmRelatedImage infoRelatedImage : cmProviders.getInfoRelateds()) {
                 cmRelatedImageMapper.addCmRelatedImage(cmRelatedImage.setImage(infoRelatedImage.getImage()).setFileName(infoRelatedImage.getFileName()));       //新增服务资料文件
             }
-            log.info("cmProviders--------->" + cmProviders.toString());
             cmProvidersMapper.updateCmProviders(cmProviders);
             CmProvidersContract contract = cmProvidersContractMapper.getByCmProvidersContract(new CmProvidersContract().setServiceProviderId(cmProviders.getServiceProviderId()));
             contract.setFlag(false);//更改新增标识
@@ -346,9 +344,9 @@ public class CmProvidersServiceImpl implements CmProvidersService {
     }
 
     @Override
-    public ResponseJson<PaginationVo<ProviderTask>> taskList(int pageNum, int pageSize) {
+    public ResponseJson<PaginationVo<ProviderTask>> taskList(String shopName,int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<ProviderTask> tasks = cmProvidersMapper.taskList();
+        List<ProviderTask> tasks = cmProvidersMapper.taskList(shopName);
         PaginationVo<ProviderTask> page = new PaginationVo<>(tasks);
         return ResponseJson.success(page);
     }

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

@@ -453,7 +453,10 @@
                     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
+        <if test="shopName != null and shopName !=''">
+            where s.name like concat('%', #{shopName}, '%')
+        </if>
         order by addTime desc
     </select>