Browse Source

修改已办更改条件

xuefy 4 years ago
parent
commit
72904a2d2c

+ 10 - 4
sc-service/src/main/java/com/huyi/service/credit/controller/CreditHandleController.java

@@ -437,8 +437,11 @@ public class CreditHandleController extends BaseController {
         noticeLambdaQueryWrapper.eq(SysNotice::getStatus,"0");
         //融信编号
         noticeLambdaQueryWrapper.eq(SysNotice::getTableId,zfiId);
-        //待签收
-        noticeLambdaQueryWrapper.eq(SysNotice::getWorkType,"04");
+        List<String> typeList = new ArrayList<>();
+        typeList.add("03");
+        typeList.add("04");
+        //待签收,待盖章
+        noticeLambdaQueryWrapper.in(SysNotice::getWorkType,typeList);
         //待办
         noticeLambdaQueryWrapper.eq(SysNotice::getType,"00");
         SysNotice notice = new SysNotice();
@@ -540,8 +543,11 @@ public class CreditHandleController extends BaseController {
         noticeLambdaQueryWrapper.eq(SysNotice::getStatus,"0");
         //融信编号
         noticeLambdaQueryWrapper.eq(SysNotice::getTableId,zfiId);
-        //待签收
-        noticeLambdaQueryWrapper.eq(SysNotice::getWorkType,"04");
+        List<String> typeList = new ArrayList<>();
+        typeList.add("03");
+        typeList.add("04");
+        //待签收,待盖章
+        noticeLambdaQueryWrapper.in(SysNotice::getWorkType,typeList);
         //待办
         noticeLambdaQueryWrapper.eq(SysNotice::getType,"00");
         SysNotice notice = new SysNotice();

+ 5 - 1
sc-service/src/main/java/com/huyi/service/credit/controller/OwnMessageController.java

@@ -882,7 +882,11 @@ public class OwnMessageController extends BaseController {
         LambdaQueryWrapper<SysNotice> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SysNotice::getTableId,zfiId);
         queryWrapper.eq(SysNotice::getType,"00");
-        queryWrapper.eq(SysNotice::getWorkType,"03");
+        List<String> typeList = new ArrayList<>();
+        typeList.add("02");
+        typeList.add("03");
+        typeList.add("04");
+        queryWrapper.in(SysNotice::getWorkType,typeList);
         queryWrapper.eq(SysNotice::getStatus,"0");
         SysNotice notice = new SysNotice();
         notice.setStatus("1");