xxl-job

docker/shell.sh

@@ -32,7 +32,7 @@ function run(){
   # mypid=$(netstat -apn|grep 9001|awk '{print $7}'|cut -d/ -f1);
   # echo $mypid
   # kill -9 $mypid
-  docker run -it --name ins -p 8080:8080 --restart=always -v /usr/local/java/insAgency:/ins --mount type=bind,source=/nasData,destination=/nasData -v /usr/local/java/insAgency/logs:/ins/logs -d ins:latest
+  docker run -it --name ins -p 8080:8080 -p 9999:9999 --restart=always -v /usr/local/java/insAgency:/ins --mount type=bind,source=/nasData,destination=/nasData -v /usr/local/java/insAgency/logs:/ins/logs -d ins:latest
 }
 
 #入口

src/main/java/com/ydtech/config/XxlJobConfig.java

@@ -41,7 +41,6 @@ public class XxlJobConfig {
     @Bean
     public XxlJobSpringExecutor xxlJobExecutor() {
         XxlJobHelper.log(">>>>>>>>>>> xxl-job config init.>>>>>>>>>>>");
-        System.out.println("=============== xxl-job config init.===============");
 
         XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
         xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
@@ -55,4 +54,4 @@ public class XxlJobConfig {
 
         return xxlJobSpringExecutor;
     }
-}
+}

src/main/java/com/ydtech/modules/order/controller/InsOrdersController.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.admin.model.SysUserRole;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.ins.model.InsOrdersExcel;
 import com.ydtech.modules.ins.model.InsOrdersExcelVo;
@@ -76,7 +77,8 @@ public class InsOrdersController extends BaseController {
         if (StringUtils.isEmpty(deptId)) {
             deptId = getDeptId();
         }
-        return this.insOrdersService.getAgreementInsCompany(deptId);
+        String userId = getUserId();
+        return this.insOrdersService.getAgreementInsCompany(deptId, userId);
     }
 
     @PostMapping("/generateOrder")

src/main/java/com/ydtech/modules/order/service/InsOrdersService.java

@@ -29,7 +29,7 @@ public interface InsOrdersService extends IService<InsOrders> {
      * @param deptId 部门id
      * @return HttpResult
      */
-    HttpResult<List<PtlAgreementInsCompanyDto>> getAgreementInsCompany(String deptId);
+    HttpResult<List<PtlAgreementInsCompanyDto>> getAgreementInsCompany(String deptId, String userId);
 
     /**
      * 通过 vin 码查询订单

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -126,7 +126,14 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
 
     @Override
-    public HttpResult<List<PtlAgreementInsCompanyDto>> getAgreementInsCompany(String deptId) {
+    public HttpResult<List<PtlAgreementInsCompanyDto>> getAgreementInsCompany(String deptId, String userId) {
+        // 领导标志
+        SysUserRole userRole = sysUserRoleService.selectByUserId(userId);
+
+        if (Arrays.asList(SystemConstant.getSysRoleTeamLeader()).contains(userRole.getRoleId().toString())) { //团队长可查询下面所有人员订单
+            deptId = null;
+        }
+
         List<PtlAgreementInsCompanyDto> agreementCompany = ptlAgreementService.getAgreementCompany(deptId);
         return HttpResult.ok(agreementCompany);
     }

src/main/resources/mapper/modules/protocol/PtlAgreementMapper.xml

@@ -75,7 +75,10 @@
           and (paa.template_id is not null)
           and pa.id in (select distinct agreement_id
                         from ptl_agreement_dept
-                        where dept_id = #{deptId})
+                        <if test="deptId != null and deptId != ''">
+                            where dept_id = #{deptId}
+                        </if>
+                        )
           order by pa.serial_number
     </select>