需求

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CommonMapper.java

@@ -212,7 +212,8 @@ public interface CommonMapper {
      * @return
      */
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    public IPage<OrderBaseVO> orderBaseList(IPage page, @Param("ex") WorkOrderZfireParam zfireParamBean,@Param("adminUserType") Integer adminUserType);
+    public IPage<OrderBaseVO> orderBaseList(IPage page, @Param("ex") WorkOrderZfireParam zfireParamBean,@Param("adminUserType") Integer adminUserType
+            ,@Param("companyWechatId") String companyWechatId);
 
     /**
      * 考核项目配件列表

mall-server-api/src/main/java/com/gree/mall/manager/controller/comlist/ComListAllController.java

@@ -0,0 +1,28 @@
+package com.gree.mall.manager.controller.comlist;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gree.mall.manager.helper.ResponseHelper;
+import com.gree.mall.manager.logic.comlist.ComListAllLogic;
+import com.gree.mall.manager.logic.comlist.ComListLogic;
+import com.gree.mall.manager.plus.entity.ComDetailLog;
+import com.gree.mall.manager.plus.entity.ComList;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Slf4j
+@RestController
+@Api(value = "通用万能列表API", tags = {"中心文件下发API"})
+@RequestMapping(value = "/com/list", produces = "application/json; charset=utf-8")
+public class ComListAllController {
+
+    @Autowired
+    ComListAllLogic comListAllLogic;
+
+}

mall-server-api/src/main/java/com/gree/mall/manager/controller/comlist/ComListController.java

@@ -17,7 +17,7 @@ import javax.servlet.http.HttpServletResponse;
 
 @Slf4j
 @RestController
-@Api(value = "通用万能列表API", tags = {"通用万能列表API"})
+@Api(value = "通用万能列表API", tags = {"中心文件下发API"})
 @RequestMapping(value = "/com/list", produces = "application/json; charset=utf-8")
 public class ComListController {
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/comlist/ComListAllLogic.java

@@ -0,0 +1,10 @@
+package com.gree.mall.manager.logic.comlist;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class ComListAllLogic {
+
+}

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -112,7 +112,8 @@ public class OrderBaseLogic {
         FieldUtils.supplyParam(zfireParamBean, OrderBaseVO.class, commonLogic.getAdminUser());
         zfireParamBean.setAdminWebsitIds(zfireParamBean.getAdminWebsitIds());
 
-        IPage<OrderBaseVO> page = commonMapper.orderBaseList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean, adminUser.getType());
+        IPage<OrderBaseVO> page = commonMapper.orderBaseList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()),
+                zfireParamBean, adminUser.getType(),adminUser.getType().equals(1)?adminUser.getCompanyWechatId():null);
 
         //服务单标识
         if (zfireParamBean.getPageSize() != -1 && page.getTotal() > 0) {

mall-server-api/src/main/java/com/gree/mall/manager/schedule/SettlementSchedule.java

@@ -43,6 +43,7 @@ public class SettlementSchedule {
     /**到达提现时间变为可提现
      *
      */
+/*
     @Scheduled(fixedDelay = 60 * 1000)
     public void task() {
         settlementOrderService.lambdaUpdate()
@@ -51,6 +52,7 @@ public class SettlementSchedule {
                 .set(SettlementOrder::getStatus, SettlementStatusEnum.WAIT_ING.getKey()).update();
     }
 
+*/
 
     /**服务结束改为服务结束
      *

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -353,6 +353,9 @@
                 <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
                     #{item}
                 </foreach>
+            <if test="companyWechatId != null and companyWechatId != ''">
+                or a.company_wechat_id  =  #{companyWechatId}
+            </if>
             )
         </if>
         order by a.create_time desc,id desc