1.划线切割反馈图号增加筛选

2.作业反馈人员查询条件改为按班组查询
2.划线切割反馈作业计划按照作业区查询

src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java

@@ -38,7 +38,6 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 @RestController
@@ -60,6 +59,11 @@ public class ZyjhController {
 
     private final MpDhsjServcie mpDhsjServcie;
 
+    @GetMapping("getBzryByBz")
+    public ResultBean<?> getBzryByBz(String zyq, String zt){
+        return new ResultBean<>(zyjhService.getBzryByBz(zyq,zt));
+    }
+
     /**
      * 抛丸导入
      */
@@ -162,8 +166,8 @@ public class ZyjhController {
      * 根据状态或班组长,获取作业计划,用于报工
      */
     @GetMapping("getYdjhByZtOrForeman")
-    public ResultBean<?> getYdjhByZtOrForeman(Integer zt,String foreman,String zyq){
+    public ResultBean<?> getYdjhByZtOrForeman(Integer zt,String foreman,String zyq,String userCode){
-        List<DmYdjh> list = zyjhService.getYdjhByZtOrForeman(zt, foreman,zyq);
+        List<DmYdjh> list = zyjhService.getYdjhByZtOrForeman(zt, foreman,userCode,zyq);
         return new ResultBean<>(list);
     }
 

src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java

@@ -68,7 +68,7 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
 
 
 
-    public List<DmYdjh> getYdjhByZtOrForeman(Integer zt,String foreman,String zyq){
+    public List<DmYdjh> getYdjhByZtOrForeman(Integer zt,String foreman,String userCode,String zyq){
         QueryWrapper<DmYdjh> wrapper = new QueryWrapper<DmYdjh>()
                 .ge("zt",11)
                 .ge(ObjUtil.isNotEmpty(zt),"zt",zt)
@@ -76,16 +76,22 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
 
         switch (zt){
             case 31:
-                wrapper.eq("pwpgry",foreman).isNull("pwfkry");
+//                wrapper.eq(!"1".equals(foreman),"pwpgry",foreman);
+//                wrapper.eq("1".equals(foreman),"pwpgry",userCode);
+                wrapper.isNull("pwfkry");
                 break;
             case 51:
-                wrapper.eq("hxpgry",foreman).isNull("hxfkry");
+//                wrapper.eq(!"1".equals(foreman),"hxpgry",foreman);
+//                wrapper.eq("1".equals(foreman),"hxpgry",userCode);
+                wrapper.isNull("hxfkry");
                 break;
             case 61:
-                wrapper.eq("qgpgry",foreman).isNull("qgfkry");
+//                wrapper.eq(!"1".equals(foreman),"qgpgry",foreman);
+//                wrapper.eq("1".equals(foreman),"qgpgry",userCode);
+                wrapper.isNull("qgfkry");
                 break;
         }
-        wrapper.orderByDesc("dc_ch","dc_pl,dc_fd,tzbh");
+        wrapper.orderByDesc("dc_ch","dc_pl,tzbh");
         return list(wrapper);
     }
 
@@ -138,6 +144,11 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
         return bzryService.list(Wrappers.<DmBzry>lambdaQuery()
                 .eq(DmBzry::getForeman, "1").eq(DmBzry::getZyq, zyq));
     }
+
+    public List<DmBzry> getBzryByBz(String zyq,String bz){
+        return bzryService.list(Wrappers.<DmBzry>lambdaQuery()
+                .eq(DmBzry::getResourcesCode, bz).eq(DmBzry::getZyq, zyq).orderByAsc(DmBzry::getUserName));
+    }
     /**
      * 获取所有未处理批次
      */