检测结果修改

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionResultController.java

@@ -135,17 +135,19 @@ public class JyjcInspectionResultController extends BaseController {
         return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.queryForJyjcInspectionResultPage(page, model, true));
     }
 
-    /**
-     * 检验结果-上传结果和编辑结果
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PutMapping(value = "/updateResult")
-    @ApiOperation(httpMethod = "PUT", value = "检验结果-上传结果和编辑结果", notes = "检验结果-上传结果和编辑结果")
-    public ResponseModel<JyjcInspectionResultModel> updateJyjcInspectionResult(@RequestBody JyjcInspectionResultModel model) {
-        return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.updateJyjcInspectionResult(model));
-    }
+
+	/**
+	 * 检验结果-上传结果和编辑结果
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/updateResult")
+	@ApiOperation(httpMethod = "PUT", value = "检验结果-上传结果和编辑结果", notes = "检验结果-上传结果和编辑结果")
+	public ResponseModel<JyjcInspectionResultModel> updateJyjcInspectionResult(@RequestBody Map<String, JyjcInspectionResultModel> model) {
+		JyjcInspectionResultModel inspectResult = model.get("inspectResult");
+		return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.updateJyjcInspectionResult(inspectResult));
+	}
 
 
     /**

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionResultServiceImpl.java

@@ -72,6 +72,9 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
     public Page<JyjcInspectionResultModel> queryForJyjcInspectionResultPage(Page<JyjcInspectionResultModel> page, JyjcInspectionResultModel model, boolean type) {
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(),
                 RequestContext.getToken())).toString(), ReginParams.class);
+        if (ObjectUtils.isEmpty(model)) {
+            model = new JyjcInspectionResultModel();
+        }
         if (type) {
             //检验检测单位分页查询
             model.setInspectionUnitCode(reginParams.getCompany().getCompanyCode());
@@ -134,7 +137,9 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
                 map.put("paramJson", mapParam);
             }
         }
-        return map;
+        Map<String, Object> resultMap = new HashMap<>();
+        resultMap.put("inspectResult", map);
+        return resultMap;
     }
 
     @Override