renyu 3 年之前
父节点
当前提交
3f280dcd13

+ 2 - 0
src/main/java/com/chinaitop/depot/fumigation/controller/FumigationForRecordController.java

@@ -596,6 +596,7 @@ public class FumigationForRecordController {
596 596
             String xzzhr =(String)detail.get("xzzhr");
597 597
             Integer xzrs =(Integer)detail.get("xzrs");
598 598
             String xzczry =(String)detail.get("xzczry");
599
+            String processingInstructions =(String)detail.get("processingInstructions");
599 600
             fumigationForrecord.setLysf(lysf);
600 601
             fumigationForrecord.setDzfs(dzfs);
601 602
             fumigationForrecord.setEast(east);
@@ -609,6 +610,7 @@ public class FumigationForRecordController {
609 610
             fumigationForrecord.setXzzhr(xzzhr);
610 611
             fumigationForrecord.setXzrs(xzrs);
611 612
             fumigationForrecord.setXzczry(xzczry);
613
+            fumigationForrecord.setProcessingInstructions(processingInstructions);
612 614
             List<Map<String,Object>> pest =  (List<Map<String,Object>>)detail.get("pestVOS");
613 615
             if(!CollectionUtils.isEmpty(pest)){
614 616
                 String zyhc = "";

+ 5 - 3
src/main/java/com/chinaitop/depot/fumigation/mapper/TFumigationForrecordMapper.xml

@@ -1266,7 +1266,7 @@
1266 1266
         forrecord.delete_state*/
1267 1267
         forrecord.id planIds,
1268 1268
         forrecord.id,
1269
-        forrecord.create_time,
1269
+        to_char(forrecord.create_time,'yyyy-mm-dd') as create_time,
1270 1270
         forrecord.operation_supervisor,
1271 1271
         forrecord.position,
1272 1272
         forrecord.contact_phone,
@@ -1282,7 +1282,9 @@
1282 1282
         forrecord.organs_opinion,
1283 1283
         forrecord.creater,
1284 1284
         forrecord.org_id,
1285
-        forrecord.delete_state
1285
+        forrecord.delete_state,
1286
+        forrecord.out_person,
1287
+        forrecord.out_forrecord_time
1286 1288
     FROM
1287 1289
         t_fumigation_forrecord forrecord
1288 1290
     WHERE
@@ -1483,7 +1485,7 @@ WHERE
1483 1485
     record.lspz grain_kind,
1484 1486
     record.lssl grain_count,
1485 1487
     record.lysf grain_moisture,
1486
-    record.stow_way stow_way,
1488
+    record.stow_way use_drug_type,
1487 1489
     record.zyhc major_insect_pests,
1488 1490
     record.ckmd insect_density,
1489 1491
     record.yjmc drug_name,