q

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

@@ -23,10 +23,7 @@ import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 import javax.annotation.Resource;
@@ -99,7 +96,7 @@ public class GrainSituationCardController {
 
     @ApiOperation("添加原粮转卡（粮情卡）")
     @PostMapping("/storage/add")
-    public Map<String, Object> add(GrainSituationCardVO grainSituationCardVO) {
+    public Map<String, Object> add(@RequestBody GrainSituationCardVO grainSituationCardVO) {
         Map<String, Object> modelMap = null;
 
         try {

src/main/java/com/chinaitop/depot/storage/mapper/GrainSituationCardMapper.xml

@@ -470,6 +470,12 @@
   <select id="selectByGrainsituationId"  resultMap="BaseResultMap1">
     SELECT
       cc.id,
+           cc.createdate,
+      cc.updatedate,
+      cc.fill_org_id,
+      cc.keep_org_id,
+      cc.storage_org_id,
+      cc.warehouse_sealing_record_id,
       cc.out_quantity,cc.design_capacity,
       Bs.storehouse_name ,cc.basic_storehouse_id,bua.ajmc,cc.basic_unit_aisle_id,bw.warehouse_name,cc.warehouse_id,
       cc.storehouse_type,cflx.enumname as "storehouseTypeName",

src/main/java/com/chinaitop/depot/storage/mapper/GrainSituationCardWarehouseRecordMapper.java

@@ -32,4 +32,6 @@ public interface GrainSituationCardWarehouseRecordMapper {
     void insert(GrainSituationCardWarehouseRecord record);
 
     BusinessQcQualityInspection findByqualityId(String id);
+
+    void delete(Integer id);
 }

src/main/java/com/chinaitop/depot/storage/mapper/GrainSituationCardWarehouseRecordMapper.xml

@@ -66,4 +66,8 @@
 
 
     </select>
+    <delete id="delete" parameterType="java.lang.Integer">
+        delete from grain_situation_card_warehouse_record
+        where grain_situation_card_id=#{id}
+    </delete>
 </mapper>

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

@@ -142,10 +142,19 @@ public class GrainSituationCardServiceImpl implements GrainSituationCardService
         grainSituationCardMapper.updateByPrimaryKey(grainSituationCardVO);
         List<GrainSituationCardWarehouseRecord> grainSituationCardWarehouseRecordList =
         grainSituationCardVO.getGrainSituationCardWarehouseRecordList();
-        for (GrainSituationCardWarehouseRecord record:grainSituationCardWarehouseRecordList) {
-            record.setGrainSituationCardId(grainSituationCardVO.getId());
-            grainSituationCardWarehouseRecordMapper.insert(record);
+
+        if(grainSituationCardWarehouseRecordList!=null){
+            grainSituationCardWarehouseRecordMapper.delete(grainSituationCardVO.getId());
+            for (GrainSituationCardWarehouseRecord record:grainSituationCardWarehouseRecordList) {
+                record.setGrainSituationCardId(grainSituationCardVO.getId());
+                record.setCreatedate(new Date());
+                record.setUpdatedate(new Date());
+                grainSituationCardWarehouseRecordMapper.insert(record);
+            }
+        }else{
+            grainSituationCardWarehouseRecordMapper.delete(grainSituationCardVO.getId());
         }
+
         modelMap.put("status", "success");
         return modelMap;
     }

src/main/java/com/chinaitop/depot/storage/utils/ExcelExporter.java

@@ -156,7 +156,7 @@ public class ExcelExporter {
                 cell.setCellStyle(headerCellStyle);
             }
 //            // 填充数据
-//            int rowNum = 1;
+            int rowNum = 1;
 //            for (Map<String, Object> record : jsonData) {
 //                Row row = sheet.createRow(rowNum++);
 //                row.createCell(0).setCellValue((String) record.get("zjbgdh"));
@@ -182,7 +182,7 @@ public class ExcelExporter {
 //                }
 //            }
 //        }
-
+//