天津bug修改

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

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.*;
 
 /**
@@ -87,6 +88,8 @@ public class FumigationForRecordController {
         if(list.size() > 0){
             pageInfo.setStartRow(pageInfo.getStartRow()+1);
             pageInfo.setEndRow(pageInfo.getEndRow()+1);
+            pageInfo.setPageNum(pageNum);
+            pageInfo.setPageSize(pageSize);
         }
         return pageInfo;
     }
@@ -257,11 +260,16 @@ public class FumigationForRecordController {
         }
 
         if(ParameterUtil.isequal(stateType,"7")){
-            //如果是提交的话则除了保存还要把数据提交到市级来进行审批
-            Map<String, Object> dataMap = fumigationFroRecordService.getFroRecordByIds(uuid);
-            String url = reportPath+"/api/cbl-app/cbl/fumigation/insertFumigation";//市级接口
-            String strResult = HttpUtil.doPost(url,JSON.toJSONString(dataMap));
-            System.out.println(strResult);
+            try {
+                //如果是提交的话则除了保存还要把数据提交到市级来进行审批
+                Map<String, Object> dataMap = fumigationFroRecordService.getFroRecordByIds(uuid);
+                String url = reportPath+"/api/cbl-app/cbl/fumigation/insertFumigation";//市级接口
+                String strResult = HttpUtil.doPost(url,JSON.toJSONString(dataMap));
+            }catch (IOException e) {
+                e.printStackTrace();
+            } finally {
+                modelMap.put("status", "success");
+            }
         }
         modelMap.put("status", "success");
         return modelMap;
@@ -334,13 +342,16 @@ public class FumigationForRecordController {
                 fumigationPlanService.updateByExample(tFumigationPlan, example);
             }
         }
-
-        //如果是提交的话则除了保存还要把数据提交到市级来进行审批
-        Map<String, Object> dataMap = fumigationFroRecordService.getFroRecordByIds(forrecordId);
-        String url = reportPath+"/api/cbl-app/cbl/fumigation/insertFumigation";//市级接口
-//        dataMap.put("tyshxydm","91120118712878209L");
-        String strResult = HttpUtil.doPost(url,JSON.toJSONString(dataMap));
-        modelMap.put("status", "success");
+        try {
+            //如果是提交的话则除了保存还要把数据提交到市级来进行审批
+            Map<String, Object> dataMap = fumigationFroRecordService.getFroRecordByIds(forrecordId);
+            String url = reportPath+"/api/cbl-app/cbl/fumigation/insertFumigation";//市级接口
+            String strResult = HttpUtil.doPost(url,JSON.toJSONString(dataMap));
+        }catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            modelMap.put("status", "success");
+        }
         return modelMap;
     }
 

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

@@ -139,8 +139,8 @@ public class FumigationProcessController {
             modelMap.put("fumigationEdit",tFumigationPlan);//熏蒸方案数据
 
             Map<String, Object> pesticide = pesticidePlanService.finddrugNameById(tFumigationProcess.getFumigationId());
-            modelMap.put("drugName",pesticide.get("drugName"));//获取药剂名称
-            modelMap.put("reagentType",pesticide.get("reagentType"));//获取药剂名称
+            modelMap.put("drugName",pesticide.get("drugname"));//获取药剂名称
+            modelMap.put("reagentType",pesticide.get("reagenttype"));//获取药剂名称
 
 //            List<TQtdevinfoValue> tQtdevinfoValue = gasDetectionService.getList("","","","'"+tFumigationProcess.getDcsqtinfoId()+"'");
 //            modelMap.put("tQtdevinfoEdit",tQtdevinfoValue);//气体数据