安全检查日常检查新增修改和删除

src/main/java/com/chinaitop/depot/storage/controller/StorageDailyController.java

@@ -118,4 +118,25 @@ public class StorageDailyController {
 
         return retMap;
     }
+
+    /**
+     * 根据主键id移除数据
+     * @param id
+     * @return
+     */
+    @RequestMapping(value="/remove", produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.POST)
+    @ApiOperation(value="根据主键id移除数据", notes = "根据主键id移除数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "数据ID", paramType = "form")
+    })
+    public Map<String, Object> remove(Integer id){
+        Map<String,Object> retMap = new HashMap<String,Object>();
+        if (null != id) {
+            storageDailyService.remove(id);
+            retMap.put("msg","success");
+        } else {
+            retMap.put("msg","error");
+        }
+        return retMap;
+    }
 }

src/main/java/com/chinaitop/depot/storage/controller/StorageQualitycheckController.java

@@ -100,8 +100,8 @@ public class StorageQualitycheckController {
         }
         
         // 等级.
-        if (qualitycheck.getLevel() != null) {
-            qualityCheck.setLevel(qualitycheck.getLevel());
+        if (qualitycheck.getLevelUpdate() != null) {
+            qualityCheck.setLevelUpdate(qualitycheck.getLevelUpdate());
         }
 
         //检验结果（0：合格 , 1 :不合格）
@@ -271,7 +271,7 @@ public class StorageQualitycheckController {
         if(StringUtils.isNoneBlank(warehouseId)){
             qualityCheck.setWarehouseId(Integer.valueOf(warehouseId));
         }
-        qualityCheck.setType("1");///查找验收质量管理的信息
+        qualityCheck.setTypeUpdate("1");///查找验收质量管理的信息
 
         qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
 
@@ -310,7 +310,7 @@ public class StorageQualitycheckController {
                 qualityCheckExample.setWarehouseId(warehouseId);
             }
             if(StringUtils.isNotBlank(type)){
-                qualityCheckExample.setType(type);//传入查找的质量类型
+                qualityCheckExample.setTypeUpdate(type);//传入查找的质量类型
             }
 
             if(StringUtils.isNotBlank(sealStatus)){
@@ -353,7 +353,7 @@ public class StorageQualitycheckController {
                 qualityCheckExample.setWarehouseId(warehouseId);
             }
             if(StringUtils.isNotBlank(type)){
-                qualityCheckExample.setType(type);//传入查找的质量类型
+                qualityCheckExample.setTypeUpdate(type);//传入查找的质量类型
             }
 
             if (id != null && !"".equals(id)) {
@@ -539,7 +539,7 @@ public class StorageQualitycheckController {
     	List<List<StorageQualitycheck>> list = new ArrayList<List<StorageQualitycheck>>();
         //根据后台传来的参数进行查找相应类型的类别0:初检 1：验收 2：质量普查 3：出库
         if (StringUtils.isNotBlank(checktype)){
-            qualityCheck.setType(checktype);
+            qualityCheck.setTypeUpdate(checktype);
         }
         
         qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据

src/main/java/com/chinaitop/depot/storage/model/StorageQualitycheck.java

@@ -51,6 +51,30 @@ public class StorageQualitycheck {
 
     private Integer levelUpdate;//等级
 
+    public String getTypeUpdate() {
+        return typeUpdate;
+    }
+
+    public void setTypeUpdate(String typeUpdate) {
+        this.typeUpdate = typeUpdate;
+    }
+
+    public Integer getLevelUpdate() {
+        return levelUpdate;
+    }
+
+    public void setLevelUpdate(Integer levelUpdate) {
+        this.levelUpdate = levelUpdate;
+    }
+
+    public String getNumberUpdate() {
+        return numberUpdate;
+    }
+
+    public void setNumberUpdate(String numberUpdate) {
+        this.numberUpdate = numberUpdate;
+    }
+
     private String capacity;//容量
 
     private String water;

src/main/java/com/chinaitop/depot/storage/service/StorageDailyService.java

@@ -28,4 +28,6 @@ public interface StorageDailyService {
      * @return
      */
     Map<String, Object> loadDataById(Integer id);
+
+    void remove(int id);
 }

src/main/java/com/chinaitop/depot/storage/service/impl/StorageDailyServiceImpl.java

@@ -6,6 +6,7 @@ import com.chinaitop.depot.storage.model.StorageDailycheck;
 import com.chinaitop.depot.storage.model.StorageDailycheckExample;
 import com.chinaitop.depot.storage.service.StorageDailyService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,13 @@ public class StorageDailyServiceImpl implements StorageDailyService {
 
     @Override
     public void save(StorageDailycheck dailycheck) {
-        storageDailycheckMapper.insertSelective(dailycheck);
+        if (dailycheck.getId() == null){
+            storageDailycheckMapper.insertSelective(dailycheck);// 新增数据
+        }else{
+            storageDailycheckMapper.updateByPrimaryKey(dailycheck);// 修改数据
+        }
+
+        //storageDailycheckMapper.insertSelective(dailycheck);
     }
 
     @Override
@@ -35,4 +42,11 @@ public class StorageDailyServiceImpl implements StorageDailyService {
         retMap.put("dailycheck",dailycheck);
         return retMap;
     }
+
+    @Override
+    @Transactional
+    public void remove(int id) {
+        // 逻辑删除数据
+        storageDailycheckMapper.deleteByPrimaryKey(id);
+    }
 }

src/main/java/com/chinaitop/depot/storage/service/impl/StorageFoodbasicInfoServiceImpl.java

@@ -95,7 +95,7 @@ public class StorageFoodbasicInfoServiceImpl implements StorageFoodbasicInfoServ
             foodbasicInfo.setImpurity(qualitycheck.getImpurity());//杂质
             foodbasicInfo.setUnsound(qualitycheck.getBadpart());//不完善粒
             foodbasicInfo.setWeight(qualitycheck.getCapacity());//容重
-            foodbasicInfo.setLevel(String.valueOf(qualitycheck.getLevel()));//粮食等级
+            foodbasicInfo.setLevel(String.valueOf(qualitycheck.getLevelUpdate()));//粮食等级
             foodbasicInfo.setInputYear(qualitycheck.getInputTime());//入仓时间
             foodbasicInfo.setGlutenWaterCount(qualitycheck.getGlutenWaterCount());//面筋吸水量
             foodbasicInfo.setEatScore(qualitycheck.getEatScore());//品尝评分值
@@ -325,7 +325,7 @@ public class StorageFoodbasicInfoServiceImpl implements StorageFoodbasicInfoServ
         sb.append(";收获年份:"+qualitycheckVo.getScnfName());
 
         //等级代码：粮情卡带出
-        Integer level=qualitycheck.getLevel();
+        Integer level=qualitycheck.getLevelUpdate();
         sb.append(";等级代码:"+level);
 
         // 生产年份：粮情卡带出

src/main/java/com/chinaitop/depot/storage/service/impl/StorageQualitycheckServiceImpl.java

@@ -232,7 +232,7 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
             StorageQualitycheck qualitycheck) {
         List<StorageQualitycheck> list = null;
         //5：第三方检查
-        qualitycheck.setType("5");
+        qualitycheck.setTypeUpdate("5");
 
         // 仓房id.
         if (qualitycheck.getHouseId() != null) {