1

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/PlanController.java

@@ -39,8 +39,8 @@ public class PlanController {
     private PlanSteelStampNumberService planSteelStampNumberService;
 
     @RequestMapping("/list")
-    public HttpRespMsg list(String date,String steelStampNumber,@RequestParam(defaultValue = "3") Integer planType,Integer deptId,Integer pageIndex,Integer pageSize){
-        return planService.getList(date,steelStampNumber,planType,deptId,pageIndex,pageSize);
+    public HttpRespMsg list(String date,String steelStampNumber,@RequestParam(defaultValue = "3") Integer planType,Integer deptId,Integer pageIndex,Integer pageSize,Integer isMob){
+        return planService.getList(date,steelStampNumber,planType,deptId,pageIndex,pageSize,isMob);
     }
     
     @RequestMapping("/getById")

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/PlanService.java

@@ -17,7 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
  */
 public interface PlanService extends IService<Plan> {
 
-    HttpRespMsg getList(String date, String steelStampNumber, Integer planType,Integer deptId,Integer pageIndex,Integer pageSize);
+    HttpRespMsg getList(String date, String steelStampNumber, Integer planType,Integer deptId,Integer pageIndex,Integer pageSize,Integer isMob);
 
     HttpRespMsg addOrUpdatePlan(Plan plan);
 

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/PlanServiceImpl.java

@@ -3,6 +3,7 @@ package com.management.platform.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -99,17 +100,17 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
     private String path;
 
     @Override
-    public HttpRespMsg getList(String date, String steelStampNumber, Integer planType,Integer deptId,Integer pageIndex,Integer pageSize) {
+    public HttpRespMsg getList(String date, String steelStampNumber, Integer planType,Integer deptId,Integer pageIndex,Integer pageSize,Integer isMob) {
         HttpRespMsg msg=new HttpRespMsg();
         User user = userMapper.selectById(request.getHeader("token"));
         Integer companyId = user.getCompanyId();
-        QueryWrapper<Plan> queryWrapper=new QueryWrapper();
+        LambdaQueryWrapper<Plan> queryWrapper = new LambdaQueryWrapper<>();
         DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        queryWrapper.eq("company_id",companyId);
+        queryWrapper.eq(Plan::getCompanyId,companyId);
         if(planType!=2){
-            queryWrapper.eq("plan_type",0);
+            queryWrapper.eq(Plan::getPlanType,0);
         }else {
-            queryWrapper.eq("plan_type",1);
+            queryWrapper.eq(Plan::getPlanType,1);
         }
         if(deptId!=null){
             //获取获取下级部门列表
@@ -117,14 +118,22 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
             List<Integer> ids = departmentList.stream().map(Department::getDepartmentId).distinct().collect(Collectors.toList());
             ids.add(-1);
             //同时可以查看下级部门的数据
-            queryWrapper.and(wrapper->wrapper.eq("station_id",deptId).or().in("station_id",ids));
+            queryWrapper.and(wrapper->wrapper.eq(Plan::getStationId,deptId).or().in(Plan::getStationId,ids));
         }
         if(!StringUtils.isEmpty(date)){
             LocalDate parse = LocalDate.parse(date,df);
-            queryWrapper.eq("start_date",parse);
+            queryWrapper.eq(Plan::getStartDate,parse);
         }else {
             LocalDate now = LocalDate.now();
-            queryWrapper.eq("start_date",(planType==0||planType==2)?now:now.plusDays(1));
+            if(planType==0&&isMob==1){
+                queryWrapper.and(wrapper->wrapper.eq(Plan::getStartDate,now).or().inSql(Plan::getId,"select ppt1.plan_id \n" +
+                        "from  plan_procedure_total ppt1\n" +
+                        "left join prod_procedure_team  ppt on ppt.plan_procedure_id=ppt1.id\n" +
+                        "where ppt.progress<100"));
+            }else {
+                queryWrapper.eq(Plan::getStartDate,(planType==0||planType==2)?now:now.plusDays(1));
+            }
+
         }
         //判断是否有查看全部数据的权限
         boolean canViewAll=false;
@@ -139,7 +148,7 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
         if(!canViewAll){
             /*作为工长看到的数据*/
             if(count(new QueryWrapper<Plan>().eq("foreman_id",user.getId()))>0){
-                queryWrapper.and(wrapper->wrapper.and(wr->wr.eq("foreman_id",user.getId()).eq("status",1)).or().eq("create_id",user.getId()));
+                queryWrapper.and(wrapper->wrapper.and(wr->wr.eq(Plan::getForemanId,user.getId()).eq(Plan::getStatus,1)).or().eq(Plan::getCreateId,user.getId()));
             }else {
                 /*作为组员可以查看的数据*/
                 List<ProdProcedureTeam> prodProcedureTeams = prodProcedureTeamService.list(new QueryWrapper<ProdProcedureTeam>().eq("company_id", companyId).eq("user_id", user.getId()));
@@ -151,7 +160,7 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                 }
                 collect.add(-1);
                 List<Integer> finalCollect = collect;
-                queryWrapper.and(wrapper->wrapper.in("id", finalCollect).or().eq("create_id",user.getId()));
+                queryWrapper.and(wrapper->wrapper.in(Plan::getId, finalCollect).or().eq(Plan::getCreateId,user.getId()));
             }
         }
         if(!StringUtils.isEmpty(steelStampNumber)){
@@ -160,9 +169,9 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
             List<PlanSteelStampNumber> list = planSteelStampNumberService.list(queryWrapperSSN);
             List<Integer> ids = list.stream().map(PlanSteelStampNumber::getPlanId).collect(Collectors.toList());
             ids.add(-1);
-            queryWrapper.in("id",ids);
+            queryWrapper.in(Plan::getId,ids);
         }
-        queryWrapper.orderByDesc("create_time").orderByDesc("start_date");
+        queryWrapper.orderByDesc(Plan::getCreateTime).orderByDesc(Plan::getStartDate);
         IPage<Plan> planIPage = planMapper.selectPage(new Page<>(pageIndex, pageSize), queryWrapper);
         List<Plan> records = planIPage.getRecords();
         List<Integer> ids = records.stream().map(Plan::getProductId).distinct().collect(Collectors.toList());

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/planView/todayPlan/todayPlan.vue

@@ -35,6 +35,7 @@ export default {
         pageIndex: 0,
         pageSize: 10000,
         planType: 0,
+        isMob:1
         // date: this.getNowFormatDate()
       })
       .then(res => {