fix：“优化查询分销列表接口，优化查询做糖状态接口”

src/main/java/com/szwl/controller/TProportionController.java

@@ -56,8 +56,8 @@ public class TProportionController {
             LambdaQueryWrapper<TProportionCheck> query = Wrappers.lambdaQuery();
             if(admin.getType()>1){
                 query.eq(TProportionCheck::getAdminId,admin.getId());
-                query.in(TProportionCheck::getCheckType,"0","2","3");
             }
+            query.eq(TProportionCheck::getCheckType,"0");
             // 公司平台
             // 申泽平台管理员
             if (admin.getId() == 2738) {
@@ -99,10 +99,11 @@ public class TProportionController {
             return R.ok(iPage);
         }else {
             //已审核
-            LambdaQueryWrapper<TProportion> query = Wrappers.lambdaQuery();
+            LambdaQueryWrapper<TProportionCheck> query = Wrappers.lambdaQuery();
             if(admin.getType()>1){
-                query.eq(TProportion::getAdminId,admin.getId());
+                query.eq(TProportionCheck::getAdminId,admin.getId());
             }
+            query.in(TProportionCheck::getCheckType,"1","2","3");
             // 公司平台
             // 申泽平台管理员
             if (admin.getId() == 2738) {
@@ -111,7 +112,7 @@ public class TProportionController {
                         .eq(TAdmin::getCompanyType, "0");
                 List<Long> adminIds = adminService.list(adminQuery).stream()
                         .map(TAdmin::getId).collect(Collectors.toList());
-                query.in(TProportion::getAdminId,adminIds);
+                query.in(TProportionCheck::getAdminId,adminIds);
             }
             // 七云平台管理员
             if (admin.getId() == 2739) {
@@ -119,21 +120,21 @@ public class TProportionController {
                 adminQuery.eq(TAdmin::getCompanyType, "1");
                 List<Long> adminIds = adminService.list(adminQuery).stream()
                         .map(TAdmin::getId).collect(Collectors.toList());
-                query.in(TProportion::getAdminId,adminIds);
+                query.in(TProportionCheck::getAdminId,adminIds);
             }
-            query.orderByDesc(TProportion::getCreateDate);
-            Page<TProportion> page = new Page<>(current, size, true);
-            IPage<TProportion> iPage = tProportionService.page(page, query);
-            List<TProportion> records = iPage.getRecords();
+            query.orderByDesc(TProportionCheck::getCreateDate);
+            Page<TProportionCheck> page = new Page<>(current, size, true);
+            IPage<TProportionCheck> iPage = tProportionCheckService.page(page, query);
+            List<TProportionCheck> records = iPage.getRecords();
             if(records.size()>0){
-                for(TProportion proportion:records){
-                    if(proportion.getEquipmentId()!=null){
-                        TEquipment equipment = tEquipmentService.getById(proportion.getEquipmentId());
+                for(TProportionCheck proportionCheck:records){
+                    if(proportionCheck.getEquipmentId()!=null){
+                        TEquipment equipment = tEquipmentService.getById(proportionCheck.getEquipmentId());
                         if(equipment != null) {
                             if(StringUtils.isNotEmpty(equipment.getName())){
-                                proportion.setEquipmentName(equipment.getName());
+                                proportionCheck.setEquipmentName(equipment.getName());
                             }else {
-                                proportion.setEquipmentName(equipment.getClientId());
+                                proportionCheck.setEquipmentName(equipment.getClientId());
                             }
                         }
                     }

src/main/java/com/szwl/controller/TSugarDoController.java

@@ -124,18 +124,18 @@ public class TSugarDoController {
             }
             if(status.equals("1")){
                 return ResponseEntity.status(HttpStatus.OK)
-                        .body(new ResultMessage().setCode(true).setData("").setMessage("机器已接收到做糖指令："+sugarDo.getProductName()));
+                        .body(new ResultMessage().setCode(true).setData("1").setMessage("机器已接收到做糖指令："+ sugarDo.getProductName()));
             }
             if(status.equals("2")){
                 return ResponseEntity.status(HttpStatus.OK)
-                        .body(new ResultMessage().setCode(false).setData("").setMessage("机器异常无法做糖："+sugarDo.getNote()));
+                        .body(new ResultMessage().setCode(false).setData("2").setMessage("机器异常无法做糖："+ sugarDo.getNote()));
             }
         }else {
             return ResponseEntity.status(HttpStatus.OK)
-                    .body(new ResultMessage().setCode(false).setData("").setMessage("网络异常"));
+                    .body(new ResultMessage().setCode(false).setData("3").setMessage("网络异常"));
         }
         return ResponseEntity.status(HttpStatus.OK)
-                .body(new ResultMessage().setCode(true).setData("").setMessage("ERROR"));
+                .body(new ResultMessage().setCode(true).setData("4").setMessage("ERROR"));
     }
     @ApiOperation(value = "今日做糖列表")
     @GetMapping("/selectSugarList")