fix

src/main/java/com/chinaitop/depot/fumigation/controller/FumigationForRecordController.java

@@ -517,7 +517,7 @@ public class FumigationForRecordController {
         JSONObject recordInfo = JSONObject.parseObject(forRecord);
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String xzzydh = (String)recordInfo.get("id");
-        String operationSupervisor = (String)recordInfo.get("operationSupervisor;");
+        String operationSupervisor = (String)recordInfo.get("operationSupervisor");
         String contactPhone = (String)recordInfo.get("contactPhone");
         String xzzydd=(String)recordInfo.get("operationLocaltion");
         String lyccdwfzr = (String)recordInfo.get("orgPerson");
@@ -532,11 +532,17 @@ public class FumigationForRecordController {
         String organsOpinion = (String)recordInfo.get("qlbspyj");
         String spsj = (String)recordInfo.get("qlbspsj");
         String spr =(String)recordInfo.get("qyfzr");
+        String position =(String)recordInfo.get("position");
+        String fhry =(String)recordInfo.get("position");
+
+
         List<Map<String,Object>> details = ( List<Map<String,Object>>)recordInfo.get("detailVOS");
         for (Map<String, Object> detail : details) {
             TFumigationForrecord fumigationForrecord = new TFumigationForrecord();
             String uuid = ParameterUtil.getCode();
+            fumigationForrecord.setFhry(fhry);
             fumigationForrecord.setId(uuid);
+            fumigationForrecord.setPosition(position);
             fumigationForrecord.setXzzydh(xzzydh);
             fumigationForrecord.setOperationSupervisor(operationSupervisor);
             fumigationForrecord.setContactPhone(contactPhone);
@@ -553,12 +559,13 @@ public class FumigationForRecordController {
             fumigationForrecord.setOrgansOpinion(organsOpinion);
             fumigationForrecord.setSpsj(format.parse(spsj));
             fumigationForrecord.setSpr(spr);
+            fumigationForrecord.setDeleteState("1");
             fumigationForrecord.setOutForrecordTime(format.parse(spsj));
             fumigationForrecord.setOutPerson(spr);
             String cfdm = (String)detail.get("cfbh");
             Map<String,Integer> info = fumigationFroRecordService.getByCfdm(cfdm);
-            Integer orgId = info.get("orgId");
-            Integer houseId = info.get("houseId");
+            Integer orgId = info.get("orgid");
+            Integer houseId = info.get("houseid");
             String cfmc = (String)detail.get("cfmc");
             BigDecimal lssl = new BigDecimal(ObjectUtils.toString(detail.get("kcsl")));
             String lspz = (String)detail.get("lspz");
@@ -576,14 +583,41 @@ public class FumigationForRecordController {
             BigDecimal kjdwyyl = new BigDecimal(ObjectUtils.toString(detail.get("spaceDosage")));
             BigDecimal zyyl = new BigDecimal(ObjectUtils.toString(detail.get("totalDosage")));
             String hcjcdh = (String)detail.get("pestNo");
-            List<Map<String,Object>> pest =  (List<Map<String,Object>>)detail.get("pestVOS");
 
+            BigDecimal lysf =new BigDecimal(ObjectUtils.toString(detail.get("lysf")));;
+            String dzfs =(String)detail.get("dzfs");
+            String east =(String)detail.get("east");
+            String west =(String)detail.get("west");
+            String south =(String)detail.get("south");
+            String north =(String)detail.get("north");
+            String yjyxq =(String)detail.get("yjyxq");
+            String lqr =(String)detail.get("lqr");
+            String lqsj =(String)detail.get("lqsj");
+            String xzzhr =(String)detail.get("xzzhr");
+            Integer xzrs =(Integer)detail.get("xzrs");
+            String xzczry =(String)detail.get("xzczry");
+            fumigationForrecord.setLysf(lysf);
+            fumigationForrecord.setDzfs(dzfs);
+            fumigationForrecord.setEast(east);
+            fumigationForrecord.setWest(west);
+            fumigationForrecord.setSouth(south);
+            fumigationForrecord.setStowWay(syff);
+            fumigationForrecord.setNorth(north);
+            fumigationForrecord.setYjyxq(format.parse(yjyxq));
+            fumigationForrecord.setLqr(lqr);
+            fumigationForrecord.setLqsj(format.parse(lqsj));
+            fumigationForrecord.setXzzhr(xzzhr);
+            fumigationForrecord.setXzrs(xzrs);
+            fumigationForrecord.setXzczry(xzczry);
+            List<Map<String,Object>> pest =  (List<Map<String,Object>>)detail.get("pestVOS");
             if(!CollectionUtils.isEmpty(pest)){
                 String zyhc = "";
                 String ckmd = "";
                 for (Map<String, Object> stringObjectMap : pest) {
                     TFumigationPesticide pesticide = new TFumigationPesticide();
+                    pesticide.setId(ParameterUtil.getCode());
                     pesticide.setRecordId(uuid);
+                    pesticide.setUseDrugType(syff);
                     if(stringObjectMap.get("pestType") !=null){
                         zyhc +=(String)stringObjectMap.get("pestType")+"#";
                         pesticide.setMajorInsectPests(Integer.valueOf((String)stringObjectMap.get("pestType")));
@@ -604,6 +638,9 @@ public class FumigationForRecordController {
                     if(stringObjectMap.get("pestResistance")!=null){
                         pesticide.setDrugResistance((String)stringObjectMap.get("pestResistance"));
                     }
+                    if(stringObjectMap.get("sealType")!=null){
+                        pesticide.setSealType((String)stringObjectMap.get("sealType"));
+                    }
                     pesticidePlanService.add(pesticide);
                 }
                 zyhc = zyhc.substring(0,zyhc.lastIndexOf("#"));
@@ -634,7 +671,7 @@ public class FumigationForRecordController {
                         personnel.setWorkTask(stringObjectMap.get("workTask"));
                     }
                     if(stringObjectMap.get("outside") !=null){
-                        personnel.setOutside(stringObjectMap.get("outside"));
+                        personnel.setOutside(stringObjectMap.get("outside").equals("1")?"是":"否");
                     }
                     fumigationFroRecordService.addPersonnel(personnel);
                 }