修改

src/main/java/com/steerinfo/dil/controller/TmstruckMeasureCommissionController.java

@@ -2,7 +2,10 @@ package com.steerinfo.dil.controller;
 import com.steerinfo.dil.service.ITmstruckMeasureCommissionService;
 
 import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -35,17 +38,22 @@ public class TmstruckMeasureCommissionController extends BaseRESTfulController {
     @Autowired
     ITmstruckMeasureCommissionService tmstruckMeasureCommissionService;
 
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
     @ApiOperation(value="查询计量委托 ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getAllMeasureCommission/{type}")
-    public RESTfulResult getAllMeasureCommission(@PathVariable("type") Integer type, Integer orderType){
-        HashMap<String, Object> mapValue = new HashMap<>();
-        mapValue.put("type", type);
-        mapValue.put("orderType", orderType);
+    @PostMapping("/getAllMeasureCommission")
+    public RESTfulResult getAllMeasureCommission(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                String con){
+        mapValue.put("con", con);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
         List<Map<String, Object>> allMeasureCommission = tmstruckMeasureCommissionService.getAllMeasureCommission(mapValue);
-        return success(allMeasureCommission);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,allMeasureCommission);
+        return success(pageList);
     }
 
     @ApiOperation(value="发送计量委托给达兴能源 ")

src/main/java/com/steerinfo/dil/service/impl/TmstruckMeasureCommissionServiceImpl.java

@@ -12,6 +12,7 @@ import com.steerinfo.dil.service.ITmstruckMeasureCommissionService;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.HTTPRequestUtils;
 import com.steerinfo.dil.util.getRequestUtils;
+import com.steerinfo.dil.util.newFileTool;
 import io.swagger.models.auth.In;
 import org.apache.http.ParseException;
 import org.apache.poi.ss.formula.functions.T;
@@ -126,6 +127,20 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }
+                //写入文件
+                try{
+                    new Thread( new Runnable() {
+                        public void run(){
+                            try {
+                                newFileTool.newFile(sendUrl+":"+json.toJSONString(),"委托发送报文");
+                            } catch (IOException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    }).start();
+                }catch (Exception e) {
+                    e.printStackTrace();
+                }
                 System.out.println(sendUrl);
                 System.out.println("装货点已发送" + json);
                 MeasureJsonData measureJsonData = new MeasureJsonData();
@@ -153,7 +168,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
      */
     @Override
     public List<Map<String, Object>> getAllMeasureCommission(Map<String, Object> map) {
-        return null;
+        return tmstruckMeasureCommissionMapper.getMeasureCommission(map);
     }
 
     /**
@@ -649,6 +664,20 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         } catch (IOException e) {
             e.printStackTrace();
         }
+        //写入文件
+        try{
+            new Thread( new Runnable() {
+                public void run(){
+                    try {
+                        newFileTool.newFile(daGangUrl+"："+jsonObject.toJSONString(),"委托发送报文");
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }).start();
+        }catch (Exception e) {
+            e.printStackTrace();
+        }
         if(!"null".equals(jsonData)){
             System.out.println(jsonData);
             HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);
@@ -745,6 +774,20 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         } catch (IOException e) {
             e.printStackTrace();
         }
+        //写入文件
+        try{
+            new Thread( new Runnable() {
+                public void run(){
+                    try {
+                        newFileTool.newFile(daXingUrl+"："+jsonObject.toJSONString(),"委托发送报文");
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }).start();
+        }catch (Exception e) {
+            e.printStackTrace();
+        }
         if(!"null".equals(jsonData)){
             System.out.println(jsonData);
             HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);
@@ -936,6 +979,20 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         } catch (IOException e) {
             e.printStackTrace();
         }
+        //写入文件
+        try{
+            new Thread( new Runnable() {
+                public void run(){
+                    try {
+                        newFileTool.newFile(liuPiUrl+"："+jsonObject.toJSONString(),"委托发送报文");
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }).start();
+        }catch (Exception e) {
+            e.printStackTrace();
+        }
         if(!"null".equals(jsonData)){
             System.out.println(jsonData);
             HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);

src/main/java/com/steerinfo/dil/util/newFileTool.java

@@ -0,0 +1,34 @@
+package com.steerinfo.dil.util;
+
+import org.apache.commons.lang.time.FastDateFormat;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.Date;
+
+public class newFileTool {
+
+    public static int newFile(String jsonString,String type) throws IOException {
+        //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        FastDateFormat format = FastDateFormat.getInstance("yyyy-MM-dd");
+        String date  = format.format(new Date());
+        File file = new File("/shared/" + date + "-" + type + ".txt");
+        //File file = new File("/shared/test.txt");
+        FileWriter fileWriter = new FileWriter(file,true);
+        FastDateFormat format1 = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss");
+        fileWriter.append("\n");
+        fileWriter.append(format1.format(new Date()) + "-----------------------");
+        fileWriter.append("\n");
+        fileWriter.append(jsonString);
+        fileWriter.append("\n");
+        fileWriter.append(format1.format(new Date()) + "-----------------------");
+        fileWriter.append("\n");
+        fileWriter.flush();
+        fileWriter.close();
+        System.out.println(file);
+        System.out.println("文件存储完成");
+        return 1;
+    }
+
+}

src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -1962,8 +1962,15 @@
                     OO.ORDER_NUMBER "orderNo",
                     ACTP.PRICE_VALUE AS "priceValue",
                     BDO.DETAILS_AMOUNT AS "detailsAmount",
-                    RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
-                    RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "addressPlace",
+                    (CASE WHEN RRA_HISTORY.ADDRESS_PROVINCE is not null
+                    THEN '新地址：' || RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
+                    RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
+                    || '；旧地址：' || RRA_HISTORY.ADDRESS_PROVINCE || RRA_HISTORY.ADDRESS_DISTRICT ||
+                    RRA_HISTORY.ADDRESS_TOWN || RRP_HISTORY.ADDRESS_DELIVERY_ADDRESS
+                    ELSE
+                        RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
+                        RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
+                    END) "addressPlace",
                     RRP.PLACE_ID "placeId",
                     RRP.ADDRESS_DELIVERY_ADDRESS "place",
                     RRA.ADDRESS_ID "shipperAddressId",
@@ -2070,6 +2077,10 @@
                               ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
                     LEFT JOIN RMS_RECEIVE_ADDRESS RRA
                               ON RRA.ADDRESS_ID = RRP.ADDRESS_ID
+                    LEFT JOIN RMS_RECEIVE_PLACE RRP_HISTORY
+                        ON RRP_HISTORY.PLACE_ID = ASOM.HISTORY_SHIPPING_ADDRESS_ID
+                    LEFT JOIN RMS_RECEIVE_ADDRESS RRA_HISTORY
+                        ON RRA_HISTORY.ADDRESS_ID = RRP_HISTORY.ADDRESS_ID
                     LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
                               ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
                     LEFT JOIN RMS_CARRIER R_CARRIER
@@ -2365,9 +2376,15 @@
             ELSE TO_CHAR(ACTP2.PRICE_VALUE,'9999999990.99')
         END) AS "priceValue",
         TO_CHAR(BDO.DETAILS_AMOUNT,'9999999990.99') "detailsAmount",
+        (CASE WHEN RRA_HISTORY.ADDRESS_PROVINCE is not null
+        THEN '新地址：' || RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
+        RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
+        || '；旧地址：' || RRA_HISTORY.ADDRESS_PROVINCE || RRA_HISTORY.ADDRESS_DISTRICT ||
+        RRA_HISTORY.ADDRESS_TOWN || RRP_HISTORY.ADDRESS_DELIVERY_ADDRESS
+        ELSE
         RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
         RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
-          "addressPlace",
+        END) "addressPlace",
         --卸货城市
         RRA3.ADDRESS_PROVINCE || RRA3.ADDRESS_DISTRICT ||
         RRA3.ADDRESS_TOWN|| RRP3.ADDRESS_DELIVERY_ADDRESS "actualAddress",
@@ -2437,6 +2454,10 @@
         ON ASOM.ACTUALLY_ADDRESS_ID = RRP3.PLACE_ID
         LEFT JOIN RMS_RECEIVE_ADDRESS RRA3
         ON RRA3.ADDRESS_ID = RRP3.ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP_HISTORY
+        ON RRP_HISTORY.PLACE_ID = ASOM.HISTORY_SHIPPING_ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RRA_HISTORY
+        ON RRA_HISTORY.ADDRESS_ID = RRP_HISTORY.ADDRESS_ID
         LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
         ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
         LEFT JOIN RMS_CARRIER R_CARRIER
@@ -2640,9 +2661,15 @@
         OO.ORDER_NUMBER "orderNo",
         TO_CHAR(ACTP.PRICE_VALUE,'9999999990.99') AS "priceValue",
         TO_CHAR(BDO.DETAILS_AMOUNT,'9999999990.99') "detailsAmount",
+        (CASE WHEN RRA_HISTORY.ADDRESS_PROVINCE is not null
+        THEN '新地址：' || RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
+        RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
+        || '；旧地址：' || RRA_HISTORY.ADDRESS_PROVINCE || RRA_HISTORY.ADDRESS_DISTRICT ||
+        RRA_HISTORY.ADDRESS_TOWN || RRP_HISTORY.ADDRESS_DELIVERY_ADDRESS
+        ELSE
         RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
         RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
-        "addressPlace",
+        END) "addressPlace",
         --卸货城市
         RRA3.ADDRESS_PROVINCE || RRA3.ADDRESS_DISTRICT ||
         RRA3.ADDRESS_TOWN|| RRP3.ADDRESS_DELIVERY_ADDRESS  "actualAddress",
@@ -2712,6 +2739,10 @@
         ON ASOM.ACTUALLY_ADDRESS_ID = RRP3.PLACE_ID
         LEFT JOIN RMS_RECEIVE_ADDRESS RRA3
         ON RRA3.ADDRESS_ID = RRP3.ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP_HISTORY
+        ON RRP_HISTORY.PLACE_ID = ASOM.HISTORY_SHIPPING_ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RRA_HISTORY
+        ON RRA_HISTORY.ADDRESS_ID = RRP_HISTORY.ADDRESS_ID
         LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
         ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
         LEFT JOIN RMS_CARRIER R_CARRIER

src/main/resources/com/steerinfo/dil/mapper/TmstruckMeasureCommissionMapper.xml

@@ -355,65 +355,30 @@
     <select id="getMeasureCommission" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
         select
         TMC.COMMSSION_ID "commssionId",
-        <if test="orderTypee = 3">
-            APO.PURCHASE_ORDER_NO "purchaseOrderNo",
-            RS3.SUPPLIER_NAME "supplierName",
-        </if>
-        <if test="orderTypee = 1">
-            ASO.SALE_NUMBER "saleNumber",
-            RS1.SHIPPER_NAME "shipperName",
-        </if>
-        RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
         RM.MATERIAL_NAME "materialName",
         OO.ORDER_NUMBER "orderNumber",
         RC.CAPACITY_NUMBER "capacityNumber",
-        RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
-        OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
-        OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
-        TMC.COMMSSION_TYPE "commssionType",
-
+        TWR .RESULT_TARE_WEIGHT "resultTareWeight",
+        TWR .RESULT_TARE_WEIGHT_TIME "resultTareWeightTime",
+        TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
+        TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
+        TWR . RESULT_NET_WEIGHT "resultNetWeight",
         TMC.INSERT_TIME "insertTime"
         from TMSTRUCK_MEASURE_COMMISSION TMC
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TMC.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER OO
         on OO.ORDER_ID = TTR.ORDER_ID
-        <if test="orderTypee = 3">
-            left join AMS_PURCHASE_ORDER APO
-            on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
-            left join RMS_SUPPLIER RS3 -- 发货单位
-            on RS3.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
-            left join RMS_CONSIGNEE RCON -- 收货单位
-            on RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
-        </if>
-        <if test="orderTypee = 1">
-            left join AMS_SALE_ORDER ASO
-            on ASO.SALE_ORDER_ID = OO.ORDER_PLAN_ID
-            left join RMS_SHIPPER RS1 -- 发货单位
-            on RS1.SHIPPER_ID = ASO.SHIPPER_ID
-            left join RMS_CONSIGNEE RCON -- 收货单位
-            on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
-        </if>
-        <if test="type == 0">--计皮
-            left join TMSTRUCK_WEIGHT_RESULT TWR
-            on TWR.RESULT_TOTAL_ID = TMC.RESULT_TOTAL_ID
-            left join RMS_TRUCK_CALCULATE RTC
-            on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
-        </if>
-        <if test="type == 1">--计毛
-            left join TMSTRUCK_WEIGHT_RESULT TWR
-            on TWR.RESULT_TOTAL_ID = TMC.RESULT_TOTAL_ID
-            left join RMS_TRUCK_CALCULATE RTC
-            on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
-        </if>
+        left join TMSTRUCK_WEIGHT_RESULT TWR
+        on TWR.RESULT_TOTAL_ID = TMC.RESULT_TOTAL_ID
         left join RMS_CAPACITY RC
         on RC.CAPACITY_ID = OO.CAPACITY_ID
-        left join OMSTRUCK_ORDER_MATERIAL OOM
-        on OOM.ORDER_ID = OO.ORDER_ID
         left join RMS_MATERIAL RM
-        on RM.MATERIAL_ID = OOM.MATERIAL_ID
-        where TMC.COMMSSION_TYPE = #{type} and TTR.RESULT_TOTAL_ID = #{resultTotalId}
+        on RM.MATERIAL_ID = TWR.MATERIAL_ID
         <where>
+            <if test="con != null and con !=''.toString()">
+                OO.ORDER_NUMBER  || RC.CAPACITY_NUMBER LIKE CONCAT('%',CONCAT(#{con},'%'))
+            </if>
             <if test="purchaseOrderNo != null">
                 <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
                     "purchaseOrderNo" like '%${item}%'