1

jyzb-biz/src/main/java/com/junmp/jyzb/controller/OutAndInboundController.java

@@ -77,7 +77,7 @@ public class OutAndInboundController {
 //    }
     @PostMapping("/ShowRecordsByOrderId")
     @ApiOperation("出入库以及记账过程")
-    public ApiRes<List<OrderLogDto>> ShowRecordsByOrderId(@RequestBody @Validated(ValidationApi.page.class) LogSummaryReq req){
+    public ApiRes<List<OrderLogDto>> ShowRecordsByOrderId(@RequestBody @Validated(ValidationApi.detail.class) LogSummaryReq req){
         return ApiRes.success(orderLogService.ShowRecordsByOrderId(req));
     }
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java

@@ -262,14 +262,14 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         if (list.size()>0){
             for (CabinetBoxPolice boxPolice:list) {
 
-                if (boxPolice.getContainType()==1){
-                    soloList.add(boxPolice.getCabinetBoxId());
-                    soloName = soloName + boxPolice.getCabinetName()+"，";
-
-                }else {
-                    publicList.add(boxPolice.getCabinetBoxId());
-                    publicName = publicName + boxPolice.getCabinetName()+"，";
-                }
+//                if (boxPolice.getContainType()==1){
+//                    soloList.add(boxPolice.getCabinetBoxId());
+//                    soloName = soloName + boxPolice.getCabinetName()+"，";
+//
+//                }else {
+//                    publicList.add(boxPolice.getCabinetBoxId());
+//                    publicName = publicName + boxPolice.getCabinetName()+"，";
+//                }
             }
             policemanDto.setPublicBoxList(publicList);
             policemanDto.setSoloBoxList(soloList);
@@ -663,12 +663,12 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             for (CabinetBoxReq boxReq:boxList ) {
                 CabinetBoxPolice cabinetBoxPolice = new CabinetBoxPolice();
                 cabinetBoxPolice.setPoliceId(req.getId());
-                cabinetBoxPolice.setCabinetId(boxReq.getCabinetId());
+//                cabinetBoxPolice.setCabinetId(boxReq.getCabinetId());
                 cabinetBoxPolice.setCabinetBoxId(boxReq.getId());
                 cabinetBoxPolice.setCreateTime(DateTimeUtil.getCurrentDateTime());
-                cabinetBoxPolice.setCabinetName(boxReq.getCabinetName());
-                cabinetBoxPolice.setNum(boxReq.getNum());
-                cabinetBoxPolice.setContainType(boxReq.getContainType());
+//                cabinetBoxPolice.setCabinetName(boxReq.getCabinetName());
+//                cabinetBoxPolice.setNum(boxReq.getNum());
+//                cabinetBoxPolice.setContainType(boxReq.getContainType());
                 cabinetBoxPoliceList.add(cabinetBoxPolice);
 
                 //调岗警员绑定第一个单警柜以后，不管之后他是否还有单警柜，我都默认是不绑了。