Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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

@@ -320,7 +320,33 @@ public class StatisticalReportController extends BaseRESTfulController {
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, report);
         return success(pageList);
     }
-
+    @ApiOperation(value="装机展示明细")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId", value = "477", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getLoaderForResultDetail")
+    public RESTfulResult getLoaderForResultDetail(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    String startTime,
+                                                    String endTime,
+                                                   String con
+    ){
+        if (con != null && !"undefined".equals(con)) {
+            mapValue.put("con",con);
+        }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
+        PageHelper.startPage(pageNum, pageSize);
+        //分页数据
+        List<Map<String, Object>> report = statisticalReportService.getLoaderForResultDetail(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, report);
+        return success(pageList);
+    }
 
 
 

src/main/java/com/steerinfo/dil/mapper/StatisticalReportMapper.java

@@ -45,8 +45,15 @@ public interface StatisticalReportMapper {
 
     //获取装机统计报表
     List<Map<String,Object>> getLoaderResult(Map<String,Object> map);
+
     //保卫部随机抽查车牌号
     List<Map<String, Object>>   getCapacityByDefend(Map<String, Object> map);
+
     //拼装车统计报表
     List<Map<String, Object>> getInwardReportForAssemble(Map<String, Object> mapValue);
+
+    //判断是否装机备注
+    List<Map<String,Object>> getCapacityRemark(Map<String,Object> map);
+
+    List<Map<String, Object>> getLoaderForResultDetail(Map<String, Object> mapValue);
 }

src/main/java/com/steerinfo/dil/service/IStatisticalReportService.java

@@ -50,5 +50,7 @@ public interface IStatisticalReportService {
 
     //查看内转拼装车统计报表
     List<Map<String, Object>> getInwardReportForAssemble(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> getLoaderForResultDetail(Map<String, Object> mapValue);
 }
 

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

@@ -148,6 +148,11 @@ public class StatisticalReportImpl implements IStatisticalReportService {
         List<Map<String, Object>> inwardReportResult = statisticalReportMapper.getInwardReportResult(mapValue);
         for (Map<String,Object>inwardReport:inwardReportResult
         ) {
+            if(DataChange.dataToBigDecimal(inwardReport.get("orderType")).intValue() == 10){
+                inwardReport.put("transRange","化工园区铁专线-焦化二厂");
+            }else{
+                inwardReport.put("transRange","化工园区铁专线-达钢厂区");
+            }
             BigDecimal netWeightSecond = DataChange.dataToBigDecimal(inwardReport.get("netWeightSecond"));
             BigDecimal netWeightFirst = DataChange.dataToBigDecimal(inwardReport.get("netWeightFirst"));
             BigDecimal netTract = netWeightSecond.subtract(netWeightFirst).divide(new BigDecimal(1), 2, 4);
@@ -205,4 +210,11 @@ public class StatisticalReportImpl implements IStatisticalReportService {
         return statisticalReportMapper.getInwardReportForAssemble(mapValue);
     }
 
+    @Override
+    public List<Map<String, Object>> getLoaderForResultDetail(Map<String, Object> mapValue) {
+        //判断是否含有装机备注
+
+        return statisticalReportMapper.getLoaderForResultDetail(mapValue);
+    }
+
 }

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

@@ -47,7 +47,7 @@ public class TmstruckSmsRusultServiceImpl  implements ITmstruckSmsRusultService
      * @return
      * @throws Exception
      */
-    public int addSmsResult(BigDecimal orderId) throws Exception {
+    public int addSmsResult(BigDecimal orderId,String content) throws Exception {
         //新增短信实绩
         TmstruckSmsRusult tmstruckSmsRusult=new TmstruckSmsRusult();
         tmstruckSmsRusult.setResultId(tmstruckSmsRusultMapper.selectMaxId());
@@ -55,7 +55,7 @@ public class TmstruckSmsRusultServiceImpl  implements ITmstruckSmsRusultService
         BigDecimal resultTotalId = utilsMapper.getTotalIdByOrderId(orderId);
         tmstruckSmsRusult.setTotalResultId(resultTotalId);
         tmstruckSmsRusult.setResultSendingTime(new Date());
-        tmstruckSmsRusult.setResultSmsContent("【达州钢铁】您好!您在达钢购买的钢材已发车.欲知详情，请前往https://wl.dasteel.cn:32322/views/#/地址，浏览车辆实时运输状态。退订");
+        tmstruckSmsRusult.setResultSmsContent(content);
         //新增短信实绩
         tmstruckSmsRusult.setInsertTime(new Date());
         tmstruckSmsRusultMapper.insertSelective(tmstruckSmsRusult);
@@ -79,7 +79,7 @@ public class TmstruckSmsRusultServiceImpl  implements ITmstruckSmsRusultService
             String code = (String) hashMap.get("code");
             System.out.println(hashMap.get("code"));
             if("SUCCESS".equals(code)){
-                return addSmsResult(orderId);
+                return addSmsResult(orderId,content);
             }else{
                 return 0;
             }

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

@@ -907,6 +907,7 @@
     </select>
     <select id="getInwardReportResult" resultType="java.util.LinkedHashMap">
             select * from (select oo.order_id                   "orderId",
+                                  oo.ORDER_TYPE "orderType",
            rm.material_name              "materialName",
            apo.purchase_order_no         "purchaseNo",
            rc.capacity_number            "capacityNo",
@@ -1007,6 +1008,8 @@
         on tlfr2.result_total_id = ttr.result_total_id
       left join rms_gatepost rg4
         on tlfr2.gatepost_id = rg4.gatepost_id
+      left join RMS_TRANS_RANGE RTR
+        on RTR.TRANS_RANGE_ID = AIR.LINE_ID
      where oo.order_type in (10,20)
        and ter1.segmen_sqe = 1
        and twr1.tare_segment_sqe = 2
@@ -1766,4 +1769,94 @@
             </foreach>
         </if>
     </select>
+    <select id="getCapacityRemark" resultType="java.util.Map" parameterType="java.util.Map">
+      select OO.ORDER_TYPE,
+             OO.ORDER_ID "orderId"
+      from OMSTRUCK_ORDER OO
+      LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+      ON OO.ORDER_ID=TTR.ORDER_ID
+      LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+      ON TLR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+      WHERE  TLR.CAPACITY_REMARK IS NOT NULL
+    </select>
+    <select id="getLoaderForResultDetail" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT *
+        FROM (
+                 SELECT
+                     DISTINCT RM.MATERIAL_NAME           "materialName",
+                                  OO.ORDER_NUMBER            "orderNumber",
+                                  RC.CAPACITY_NUMBER         "capacityNumber",
+                                  OOM.ORDER_MATERIAL_NUMBER  "orderMaterialNumber",
+                                  TLR.RESULT_LOAD_START_TIME "resultLoadStartTime",
+                                  TLR.RESULT_LOAD_END_TIME   "resultLoadEndTime",
+                                  TLR.RESULT_LOAD_DURATION   "resultLoadDuration",
+                                  RW.WAREHOUSE_NAME          "warehouseName",
+                                  TWR.RESULT_NET_WEIGHT     "resultNetWeight",
+                                  TLR.CAPACITY_REMARK "capacityRemark",
+                                  TLR.RESULT_ID "resultId"
+                          FROM TMSTRUCK_LOAD_RESULT TLR
+                          LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                          ON TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
+                          LEFT JOIN OMSTRUCK_ORDER OO
+                          ON OO.ORDER_ID = TTR.ORDER_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
+                          LEFT JOIN RMS_CAPACITY RC
+                          ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                          LEFT JOIN RMS_WAREHOUSE RW
+                          ON RW.WAREHOUSE_ID = TLR.LOADING_ID
+                          LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                          ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+                          WHERE  TLR.CAPACITY_REMARK IS NOT NULL
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = TLR.RESULT_LOAD_END_TIME
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TLR.RESULT_LOAD_END_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TLR.RESULT_LOAD_END_TIME
+        </if>
+        <if test="con != null">
+            and (instr(tlr.CAPACITY_REMARK, #{con}) > 0)
+        </if>
+        ORDER BY TLR.RESULT_LOAD_END_TIME,OO.ORDER_NUMBER DESC
+             )
+        <if test=" orderNumber != null">
+            and
+            <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                "orderNumber" like '%${item}%'
+            </foreach>
+        </if>
+        <if test=" materialName != null">
+            and
+            <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                "materialName" like '%${item}%'
+            </foreach>
+        </if>
+        <if test=" capacityNumber != null">
+            and
+            <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                "capacityNumber" like '%${item}%'
+            </foreach>
+        </if>
+        <if test=" resultLoadStartTime != null">
+            and
+            <foreach collection="resultLoadStartTime" item="item" open="(" separator="or" close=")">
+                "resultLoadStartTime" like '%${item}%'
+            </foreach>
+        </if>
+        <if test=" warehouseName != null">
+            and
+            <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">
+                "warehouseName" like '%${item}%'
+            </foreach>
+        </if>
+        <if test="capacityRemark != null">
+            and
+            <foreach collection="capacityRemark" item="item" open="(" separator="or" close=")">
+                "capacityRemark" like '%${item}%'
+            </foreach>
+        </if>
+    </select>
 </mapper>