ZeroLiYi před 1 rokem
rodič
revize
e4ea4a241f

+ 1 - 6
src/main/java/com/chinaitop/depot/rp/controller/BusinessRpReportController.java

@@ -219,7 +219,6 @@ public class BusinessRpReportController {
219 219
     @ApiOperation(value="保存或修改轮换轮换计划", notes = "保存")
220 220
     public Map<String, Object> add(@RequestBody BusinessRpReport businessRpReport) {
221 221
         Map<String, Object> modelMap = new HashMap<String, Object>();
222
-
223 222
         try {
224 223
 
225 224
             modelMap = businessRpReportService.add(businessRpReport);
@@ -255,11 +254,7 @@ public class BusinessRpReportController {
255 254
      */
256 255
     @RequestMapping(value="/removeById",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.POST)
257 256
     @ApiOperation(value="删除轮换计划", notes = "保存")
258
-    @SuppressWarnings("unchecked")
259
-    @ApiImplicitParams({
260
-            @ApiImplicitParam(name = "id", value = "轮换计划上报主键Id", paramType = "Strting")
261
-    })
262
-    public Map<String, Object> removeById(Integer  id)
257
+    public Map<String, Object> removeById(@RequestParam("id")Integer  id)
263 258
             throws Exception {
264 259
         Map<String, Object> modelMap = new HashMap<>();
265 260
         try {

+ 2 - 3
src/main/java/com/chinaitop/depot/rp/mapper/BusinessRpOutboundMapper.xml

@@ -38,7 +38,7 @@
38 38
         <result column="form_warehouse_time" property="formWarehouseTime" />
39 39
         <result column="in_financial_verification" property="inFinancialVerification" />
40 40
         <result column="shnd" property="shnd" />
41
-        <result column="lssl" property="sealingQuantity" />
41
+        <result column="sealingQuantity" property="sealingQuantity" />
42 42
 
43 43
     </resultMap>
44 44
 
@@ -558,8 +558,7 @@
558 558
             gsc.lssl sealingQuantity,
559 559
             gsc.form_warehouse_time,
560 560
             gsc.in_financial_verification,
561
-            gsc.shnd,
562
-            gsc.lssl  sealingQuantity
561
+            gsc.shnd
563 562
 
564 563
         FROM
565 564
             depot_qh.grain_situation_card gsc

+ 4 - 4
src/main/java/com/chinaitop/depot/rp/service/impl/BusinessRpReportServiceImpl.java

@@ -207,10 +207,10 @@ public class BusinessRpReportServiceImpl implements BusinessRpReportService {
207 207
     public Map<String, Object> removeById(Integer id) {
208 208
         Map<String,Object> result = new HashMap<>();
209 209
         result.put("status", "error");
210
-//        if (businessRpReportMapper.selectByPrimaryKey(id) == null){
211
-//            result.put("msg", "数据不存在,已被删除");
212
-//            return result;
213
-//        }
210
+        if (businessRpReportMapper.selectByPrimaryKey(id) == null){
211
+            result.put("msg", "数据不存在,已被删除");
212
+            return result;
213
+        }
214 214
         //删除粮食品种与出入库关系表数据
215 215
         businessRpInboundMapper.deleteByReportId(id);
216 216
         businessRpOutboundMapper.deleteByReportId(id);