ソースを参照

修改了“计量重量类型预处理 ”和“维修记录”接口

duyong 4 年 前
コミット
f925677d9d

+ 1 - 1
src/main/java/com/steerinfo/associate/maintenancerecord/controller/MaintenanceRecordController.java

@@ -128,7 +128,7 @@ public class MaintenanceRecordController extends BaseRESTfulController {
     @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
     //@RequiresPermissions("maintenancerecord:delete")
-    @DeleteMapping(value = "/deleteBacth")//String
+    @PutMapping(value = "/deleteBacth")//String
     public RESTfulResult deleteBacth(@RequestBody List<MaintenanceRecord> model){
         List<String> list = new ArrayList<>();
         for(MaintenanceRecord models: model){

+ 10 - 3
src/main/java/com/steerinfo/meterwork/meterworkprewgttype/controller/MeterWorkPreWgttypeController.java

@@ -81,9 +81,16 @@ public class MeterWorkPreWgttypeController extends BaseRESTfulController {
     //@RequiresPermissions("meterworkprewgttype:create")
     @Transactional
     @PostMapping(value = "/")
-    public RESTfulResult add(@RequestBody MeterWorkPreWgttype model,String preTrackScaleNo){
+    public RESTfulResult add(@RequestBody HashMap model){
         try {
-            HashMap map = meterWorkPreWgttypeService.addOrAbolish(model);
+            MeterWorkPreWgttype meterWorkPreWgttype = new MeterWorkPreWgttype();
+            meterWorkPreWgttype.setWeightTypeNo(model.get("weightTypeNo") == null?"":model.get("weightTypeNo").toString());
+            meterWorkPreWgttype.setWeightTypeName(model.get("weightTypeName") == null?"":model.get("weightTypeName").toString());
+            meterWorkPreWgttype.setCarNo(model.get("carNo") == null?"":model.get("carNo").toString());
+            meterWorkPreWgttype.setCreateManName(model.get("createManName") == null?"":model.get("createManName").toString());
+            meterWorkPreWgttype.setCreateManPhone(model.get("createManPhone") == null?"":model.get("createManPhone").toString());
+            String preTrackScaleNo = model.get("preTrackScaleNo") == null?"":model.get("preTrackScaleNo").toString();
+            HashMap map = meterWorkPreWgttypeService.addOrAbolish(meterWorkPreWgttype);
             if (preTrackScaleNo == "" || preTrackScaleNo.equals("")){
                 if (map.get("code").equals("0")){
                     return success();
@@ -94,7 +101,7 @@ public class MeterWorkPreWgttypeController extends BaseRESTfulController {
             }else{
                 PreTrackScale preTrackScale = new PreTrackScale();
                 preTrackScale.setPredictionNo(preTrackScaleNo);
-                preTrackScale.setCarNo(model.getCarNo());
+                preTrackScale.setCarNo(meterWorkPreWgttype.getCarNo());
                 int scale = preTrackScaleService.setPreIndex(preTrackScale);
                 if (map.get("code").equals("0") && scale > 0){
                     return success();