修改

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

@@ -275,4 +275,9 @@ public class ShipDynamicsController extends BaseRESTfulController {
     public RESTfulResult getDownShipDynamaics(@RequestBody(required = false)Map<String,Object> mapVal){
         return success(iShipDynamicsService.getDownShipDynamaics(mapVal));
     }
+
+    @PostMapping("/getWagonWork")
+    public RESTfulResult getWagonWork(@RequestBody(required = false) Map<String, Object> map){
+        return success(iShipDynamicsService.getWagonWork(map));
+    }
 }

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

@@ -5,6 +5,7 @@ import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.service.impl.TmsshipTotalResultServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -14,6 +15,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -42,6 +45,7 @@ public class TmsshipTotalResultController extends BaseRESTfulController {
     ColumnDataUtil columnDataUtil;
     @Autowired
     ESFeign esFeign;
+    private final SimpleDateFormat sdfDateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     /**
      * 展示水路货物运单列表
      * @param mapVal
@@ -103,5 +107,54 @@ public class TmsshipTotalResultController extends BaseRESTfulController {
     }
 
 
+    //批复车皮
+    @PostMapping("/addPleaseResult")
+    public RESTfulResult addPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return success(tmsshipTotalResultService.addPleaseResult(mapVal));
+    }
+
+    @PostMapping("/editPleaseResult")
+    public RESTfulResult editPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return success(tmsshipTotalResultService.editPleaseResult(mapVal));
+    }
+
+    @PostMapping("/getAllPleaseResult")
+    public RESTfulResult getAllPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer apiId,
+                                                 String con,
+                                                 String startTime,
+                                                 String endTime){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        mapVal.put("con",con);
+        if(startTime!=null && endTime!=null){
+            DataChange.queryDataByDateTime(startTime,endTime,mapVal,sdfDateTime);
+        }
+        List<Map<String, Object>> detailListTotal = tmsshipTotalResultService.getCapacity(mapVal);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = tmsshipTotalResultService.getAllPleaseResult(mapVal);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, detailListTotal, columnList);
+        return success(data);
+    }
 
+    @PostMapping("/getPleaseResult/{resultId}")
+    public RESTfulResult getPleaseResult(@PathVariable("resultId") BigDecimal resultId){
+        return success(tmsshipTotalResultService.getPleaseResult(resultId));
+    }
+
+    @PostMapping("/getRealNumber")
+    public RESTfulResult getRealNumber(@RequestBody(required = false) Map<String, Object> map){
+        DataChange.queryDataByDateTime(map.get("resultDate")+"",null,map,sdfDateTime);
+        return success(tmsshipTotalResultService.getRealNumber(map));
+    }
 }

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -16,5 +17,11 @@ public interface ShipDynamicsMapper {
 
     List<Map<String, Object>> getUnloadData(Map<String,Object> map);
 
+    List<Map<String, Object>> getLocationData(Map<String,Object> map);
+
     List<Map<String, Object>> getDownShipDynamaics(Map<String,Object> map);
+
+    Map<String,Object> getPleaseData(Map<String,Object> map);
+
+    BigDecimal getRealNumberMonth(Map<String,Object> map);
 }

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

@@ -0,0 +1,21 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmstrainPleaseResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TmstrainPleaseResultMapper extends IBaseMapper<TmstrainPleaseResult, Short> {
+    BigDecimal  selectMaxId();
+
+    Map<String, Object> getPleaseResult(Map<String, Object> map);
+
+    List<Map<String, Object>> getAllPleaseResult(Map<String, Object> mapVal);
+
+
+    BigDecimal getRealNumber(Map<String, Object> map);
+}

src/main/java/com/steerinfo/dil/model/TmstrainPleaseResult.java

@@ -0,0 +1,259 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="万州港火运批复表")
+public class TmstrainPleaseResult implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(RESULT_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 采购订单id(RAIL_PLAN_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="采购订单id",required=false)
+    private BigDecimal railPlanId;
+
+    /**
+     * 请车计划号(RESULT_PLEASE_PLAN_NO,VARCHAR,50)
+     */
+    @ApiModelProperty(value="请车计划号",required=false)
+    private String resultPleasePlanNo;
+
+    /**
+     * 日期(RESULT_DATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="日期",required=false)
+    private Date resultDate;
+
+    /**
+     * 批复车数(RESULT_APPROVE_NUMBER,DECIMAL,0)
+     */
+    @ApiModelProperty(value="批复车数",required=false)
+    private BigDecimal resultApproveNumber;
+
+    /**
+     * 落空车数(RESULT_VOID_NUMBER,DECIMAL,0)
+     */
+    @ApiModelProperty(value="落空车数",required=false)
+    private BigDecimal resultVoidNumber;
+
+    /**
+     * 实际车数(RESULT_REAL_NUMBER,DECIMAL,0)
+     */
+    @ApiModelProperty(value="实际车数",required=false)
+    private BigDecimal resultRealNumber;
+
+    /**
+     * 剩余车数(RESULT_SURPLUS_NUMBER,DECIMAL,0)
+     */
+    @ApiModelProperty(value="剩余车数",required=false)
+    private BigDecimal resultSurplusNumber;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="逻辑删除",required=false)
+    private BigDecimal deleted;
+
+    /**
+     * 请车批车类型：1：采购进口矿（万州港-达州站/万州港-老区轨道衡）3：采购国产矿  4：内转钢材到异地库(RESULT_TYPE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="请车批车类型：1：采购进口矿（万州港-达州站/万州港-老区轨道衡）3：采购国产矿  4：内转钢材到异地库",required=false)
+    private BigDecimal resultType;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.resultId;
+    }
+
+    @Override
+    public void setId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getResultId() {
+        return resultId;
+    }
+
+    public void setResultId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getRailPlanId() {
+        return railPlanId;
+    }
+
+    public void setRailPlanId(BigDecimal railPlanId) {
+        this.railPlanId = railPlanId;
+    }
+
+    public String getResultPleasePlanNo() {
+        return resultPleasePlanNo;
+    }
+
+    public void setResultPleasePlanNo(String resultPleasePlanNo) {
+        this.resultPleasePlanNo = resultPleasePlanNo == null ? null : resultPleasePlanNo.trim();
+    }
+
+    public Date getResultDate() {
+        return resultDate;
+    }
+
+    public void setResultDate(Date resultDate) {
+        this.resultDate = resultDate;
+    }
+
+    public BigDecimal getResultApproveNumber() {
+        return resultApproveNumber;
+    }
+
+    public void setResultApproveNumber(BigDecimal resultApproveNumber) {
+        this.resultApproveNumber = resultApproveNumber;
+    }
+
+    public BigDecimal getResultVoidNumber() {
+        return resultVoidNumber;
+    }
+
+    public void setResultVoidNumber(BigDecimal resultVoidNumber) {
+        this.resultVoidNumber = resultVoidNumber;
+    }
+
+    public BigDecimal getResultRealNumber() {
+        return resultRealNumber;
+    }
+
+    public void setResultRealNumber(BigDecimal resultRealNumber) {
+        this.resultRealNumber = resultRealNumber;
+    }
+
+    public BigDecimal getResultSurplusNumber() {
+        return resultSurplusNumber;
+    }
+
+    public void setResultSurplusNumber(BigDecimal resultSurplusNumber) {
+        this.resultSurplusNumber = resultSurplusNumber;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public BigDecimal getResultType() {
+        return resultType;
+    }
+
+    public void setResultType(BigDecimal resultType) {
+        this.resultType = resultType;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", resultId=").append(resultId);
+        sb.append(", railPlanId=").append(railPlanId);
+        sb.append(", resultPleasePlanNo=").append(resultPleasePlanNo);
+        sb.append(", resultDate=").append(resultDate);
+        sb.append(", resultApproveNumber=").append(resultApproveNumber);
+        sb.append(", resultVoidNumber=").append(resultVoidNumber);
+        sb.append(", resultRealNumber=").append(resultRealNumber);
+        sb.append(", resultSurplusNumber=").append(resultSurplusNumber);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", resultType=").append(resultType);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -16,4 +16,5 @@ public interface IShipDynamicsService {
 
     List<Map<String, Object>> getDownShipDynamaics(Map<String,Object> map);
 
+    List<Map<String, Object>> getWagonWork(Map<String, Object> map);
 }

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

@@ -1,6 +1,8 @@
 package com.steerinfo.dil.service;
 
 
+import com.steerinfo.framework.controller.RESTfulResult;
+
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
@@ -49,4 +51,13 @@ public interface ITmsshipTotalResultService{
      */
     List<Map<String, Object>> getCapacity(Map<String, Object> mapVal);
 
+    int editPleaseResult(Map<String, Object> mapVal);
+
+    List<Map<String, Object>> getAllPleaseResult(Map<String, Object> mapVal);
+
+    Map<String, Object> getPleaseResult(BigDecimal resultId);
+
+    int addPleaseResult(Map<String, Object> mapVal);
+
+    BigDecimal getRealNumber(Map<String, Object> map);
 }

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

@@ -7,8 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class ShipDynamicsServiceImpl implements IShipDynamicsService {
@@ -38,7 +37,45 @@ public class ShipDynamicsServiceImpl implements IShipDynamicsService {
 
     @Override
     public List<Map<String, Object>> getUnloadData(Map<String,Object> map){
-        return shipDynamicsMapper.getUnloadData(map);
+        List<Map<String, Object>> list=new ArrayList<>();
+        String startTime=map.get("startTime")+"";
+        String endTime=map.get("endTime")+"";
+        DataChange.queryDataByDateTime(startTime, endTime, map, sdfDateTime);//根据时间段查询数据
+        list.addAll(shipDynamicsMapper.getUnloadData(map));
+        list.addAll(shipDynamicsMapper.getLocationData(map));
+        boolean f1=false,f2=false,f3=false;
+        for(Map<String, Object> temp:list){
+            switch (temp.get("status").toString()){
+                case "已卸船数":
+                    f1=true;
+                    break;
+                case "待卸船数":
+                    f2=true;
+                    break;
+                case "在卸船数":
+                    f3=true;
+                    break;
+            }
+        }
+        if(!f1){
+            Map<String, Object> m=new HashMap<>();
+            m.put("status","已卸船数");
+            m.put("num",0);
+            list.add(m);
+        }
+        if(!f2){
+            Map<String, Object> m=new HashMap<>();
+            m.put("status","待卸船数");
+            m.put("num",0);
+            list.add(m);
+        }
+        if(!f3){
+            Map<String, Object> m=new HashMap<>();
+            m.put("status","在卸船数");
+            m.put("num",0);
+            list.add(m);
+        }
+        return list;
     }
 
     @Override
@@ -48,4 +85,29 @@ public class ShipDynamicsServiceImpl implements IShipDynamicsService {
         DataChange.queryDataByDateTime(startTime, endTime, map, sdfDateTime);//根据时间段查询数据
         return shipDynamicsMapper.getDownShipDynamaics(map);
     }
+
+    @Override
+    public List<Map<String, Object>> getWagonWork(Map<String, Object> map) {
+        String startTime=map.get("startTime")+"";
+        String endTime=map.get("endTime")+"";
+        DataChange.queryDataByDateTime(startTime, endTime, map, sdfDateTime);//根据时间段查询数据
+        //把当月时间放进去
+        SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM");
+        String monthDate = sdfDate.format(new Date());
+        map.put("monthDate",monthDate);
+        List<Map<String,Object>> list=new ArrayList<>();
+        //分别加到里面
+        Map<String,Object> pleaseData= shipDynamicsMapper.getPleaseData(map);
+        Map<String,Object> map1=new HashMap<>(),map2=new HashMap<>(),map3=new HashMap<>();
+        map1.put("dateType","点前剩余计划");
+        map1.put("num",pleaseData.get("surplusSum"));
+        map2.put("dateType","当日批复计划");
+        map2.put("num",pleaseData.get("approveSum"));
+        map3.put("dateType","月累计装车量");
+        map3.put("num",shipDynamicsMapper.getRealNumberMonth(map));
+        list.add(map1);
+        list.add(map2);
+        list.add(map3);
+        return list;
+    }
 }

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

@@ -1,16 +1,17 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.mapper.TmstrainPleaseResultMapper;
 import com.steerinfo.dil.model.TmsshipTotalResult;
 import com.steerinfo.dil.mapper.TmsshipTotalResultMapper;
+import com.steerinfo.dil.model.TmstrainPleaseResult;
 import com.steerinfo.dil.service.ITmsshipTotalResultService;
+import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * TmsshipTotalResult服务实现：
@@ -31,6 +32,9 @@ public class TmsshipTotalResultServiceImpl implements ITmsshipTotalResultService
     @Autowired
     TmsshipTotalResultMapper tmsshipTotalResultMapper;
 
+    @Autowired
+    TmstrainPleaseResultMapper tmstrainPleaseResultMapper;
+
     /**
      * 得到一个总实绩id
      * @param orderId
@@ -95,5 +99,57 @@ public class TmsshipTotalResultServiceImpl implements ITmsshipTotalResultService
         return tmsshipTotalResultMapper.getCapacity(mapVal);
     }
 
+    @Override
+    public int editPleaseResult(Map<String, Object> mapVal) {
+        TmstrainPleaseResult tmstrainPleaseResult=new TmstrainPleaseResult();
+        tmstrainPleaseResult.setResultId(DataChange.dataToBigDecimal(mapVal.get("resultId")));
+        if(mapVal.get("resultDate")!=null)
+            tmstrainPleaseResult.setResultDate(new Date((Long)(mapVal.get("resultDate"))));
+        if(mapVal.get("resultApproveNumber")!=null)
+            tmstrainPleaseResult.setResultApproveNumber(DataChange.dataToBigDecimal(mapVal.get("resultApproveNumber")));
+        if(mapVal.get("resultVoidNumber")!=null)
+            tmstrainPleaseResult.setResultVoidNumber(DataChange.dataToBigDecimal(mapVal.get("resultVoidNumber")));
+        if(mapVal.get("resultRealNumber")!=null)
+            tmstrainPleaseResult.setResultRealNumber(DataChange.dataToBigDecimal(mapVal.get("resultRealNumber")));
+        if(mapVal.get("resultSurplusNumber")!=null)
+            tmstrainPleaseResult.setResultSurplusNumber(DataChange.dataToBigDecimal(mapVal.get("resultSurplusNumber")));
+        if(mapVal.get("userId")!=null)
+            tmstrainPleaseResult.setUpdateUsername(mapVal.get("userId").toString());
+        if(mapVal.get("deleted")!=null)
+            tmstrainPleaseResult.setDeleted(DataChange.dataToBigDecimal(mapVal.get("deleted")));
+        tmstrainPleaseResult.setUpdateTime(new Date());
+        return tmstrainPleaseResultMapper.updateByPrimaryKeySelective(tmstrainPleaseResult);
+    }
+
+    @Override
+    public List<Map<String, Object>> getAllPleaseResult(Map<String, Object> mapVal) {
+        return tmstrainPleaseResultMapper.getAllPleaseResult(mapVal);
+    }
 
+    @Override
+    public Map<String, Object> getPleaseResult(BigDecimal resultId) {
+        Map<String,Object> map=new HashMap<>();
+        map.put("resultId",resultId);
+        return tmstrainPleaseResultMapper.getPleaseResult(map);
+    }
+
+    @Override
+    public int addPleaseResult(Map<String, Object> mapVal) {
+        TmstrainPleaseResult tmstrainPleaseResult=new TmstrainPleaseResult();
+        tmstrainPleaseResult.setResultId(tmstrainPleaseResultMapper.selectMaxId());
+        tmstrainPleaseResult.setResultDate(new Date((Long)(mapVal.get("resultDate"))));
+        tmstrainPleaseResult.setResultApproveNumber(DataChange.dataToBigDecimal(mapVal.get("resultApproveNumber")));
+        tmstrainPleaseResult.setResultVoidNumber(DataChange.dataToBigDecimal(mapVal.get("resultVoidNumber")));
+        tmstrainPleaseResult.setResultRealNumber(DataChange.dataToBigDecimal(mapVal.get("resultRealNumber")));
+        tmstrainPleaseResult.setResultSurplusNumber(DataChange.dataToBigDecimal(mapVal.get("resultSurplusNumber")));
+        tmstrainPleaseResult.setInsertTime(new Date());
+        tmstrainPleaseResult.setInsertUsername(mapVal.get("userId").toString());
+        tmstrainPleaseResult.setDeleted(new BigDecimal(0));
+        return tmstrainPleaseResultMapper.insert(tmstrainPleaseResult);
+    }
+
+    @Override
+    public BigDecimal getRealNumber(Map<String,Object> map) {
+        return tmstrainPleaseResultMapper.getRealNumber(map);
+    }
 }

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

@@ -102,6 +102,9 @@
             <if test="input !=null and input.toString()!=''">
                  DB.RESULT_FOREIGN_SHIP_NAME || rm.MATERIAL_NAME like concat('%',concat(#{input},'%'))
             </if>
+            <if test="oneDate != null">
+                and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  WOR.INSERT_TIME
+            </if>
             <if test="startDate != null">
                 and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  WOR.INSERT_TIME
                 and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= WOR.INSERT_TIME
@@ -121,9 +124,29 @@
                 LEFT JOIN TMSSHIP_UNLOAD_SHIP_RESULT TUSR ON TUSR.TOTAL_RESULT_ID = TTR.RESULT_ID
                 LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY OIC ON TTR.ORDER_ID = OIC.INSTRUCTIONS_CAPACITY_ID
                 LEFT JOIN RMS_CAPACITY RC ON OIC.CAPACITY_ID = RC.CAPACITY_ID
-        WHERE TUSR.DELETED=0
+        WHERE TUSR.DELETED=0 and TTR.SHIP_STATUS = 1
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  TUSR.INSERT_TIME
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  TUSR.INSERT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TUSR.INSERT_TIME
+        </if>
         GROUP BY TTR.SHIP_STATUS
     </select>
+    <select id="getLocationData" resultType="java.util.Map">
+        select  count(LOCATION_ID) "num",DECODE(LOCATION_VALUE, '等卸', '待卸船数','在卸','在卸船数') as "status"
+        from TMSSHIP_SHIP_LOCATION
+        where LOCATION_VALUE='等卸' or LOCATION_VALUE='待卸'
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  UPDATE_TIME
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  UPDATE_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= UPDATE_TIME
+        </if>
+        GROUP BY LOCATION_VALUE
+    </select>
 
     <select id="getDownShipDynamaics" resultType="java.util.Map">
         select
@@ -166,4 +189,21 @@
         </where>
         ORDER BY RP.PORT_NAME,ADN.NOTICE_DELIVERY_TIME DESC
     </select>
+    <select id="getPleaseData" resultType="java.util.Map">
+        select sum(RESULT_APPROVE_NUMBER) "approveSum",sum(RESULT_SURPLUS_NUMBER) "surplusSum" from TMSTRAIN_PLEASE_RESULT
+        where DELETED=0
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  RESULT_DATE
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  RESULT_DATE
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= RESULT_DATE
+        </if>
+    </select>
+    <select id="getRealNumberMonth" resultType="java.math.BigDecimal">
+        select count(TLT.RESULT_ID) from TMSTRAIN_LOADING_TEMP TLT,WMSH_OUTBOUND_RESULT WOR
+        where TLT.OUTBOUNT_ID=WOR.RESULT_ID
+          AND  #{monthDate} =  TO_CHAR(WOR.INSERT_TIME,'YYYY-MM')
+    </select>
+
 </mapper>

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

@@ -0,0 +1,516 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.TmstrainPleaseResultMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmstrainPleaseResult">
+    <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId" />
+    <result column="RAIL_PLAN_ID" jdbcType="DECIMAL" property="railPlanId" />
+    <result column="RESULT_PLEASE_PLAN_NO" jdbcType="VARCHAR" property="resultPleasePlanNo" />
+    <result column="RESULT_DATE" jdbcType="TIMESTAMP" property="resultDate" />
+    <result column="RESULT_APPROVE_NUMBER" jdbcType="DECIMAL" property="resultApproveNumber" />
+    <result column="RESULT_VOID_NUMBER" jdbcType="DECIMAL" property="resultVoidNumber" />
+    <result column="RESULT_REAL_NUMBER" jdbcType="DECIMAL" property="resultRealNumber" />
+    <result column="RESULT_SURPLUS_NUMBER" jdbcType="DECIMAL" property="resultSurplusNumber" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+    <result column="RESULT_TYPE" jdbcType="DECIMAL" property="resultType" />
+  </resultMap>
+  <sql id="columns">
+    RESULT_ID, RAIL_PLAN_ID, RESULT_PLEASE_PLAN_NO, RESULT_DATE, RESULT_APPROVE_NUMBER, 
+    RESULT_VOID_NUMBER, RESULT_REAL_NUMBER, RESULT_SURPLUS_NUMBER, INSERT_USERNAME, INSERT_TIME, 
+    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, RESULT_TYPE
+  </sql>
+  <sql id="columns_alias">
+    t.RESULT_ID, t.RAIL_PLAN_ID, t.RESULT_PLEASE_PLAN_NO, t.RESULT_DATE, t.RESULT_APPROVE_NUMBER, 
+    t.RESULT_VOID_NUMBER, t.RESULT_REAL_NUMBER, t.RESULT_SURPLUS_NUMBER, t.INSERT_USERNAME, 
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, 
+    t.RESULT_TYPE
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM TMSTRAIN_PLEASE_RESULT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM TMSTRAIN_PLEASE_RESULT t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="resultId != null">
+        and RESULT_ID = #{resultId}
+      </if>
+      <if test="railPlanId != null">
+        and RAIL_PLAN_ID = #{railPlanId}
+      </if>
+      <if test="resultPleasePlanNo != null and resultPleasePlanNo != ''">
+        and RESULT_PLEASE_PLAN_NO = #{resultPleasePlanNo}
+      </if>
+      <if test="resultDate != null">
+        and TO_CHAR(RESULT_DATE,'yyyy-MM-dd') = #{resultDate}
+      </if>
+      <if test="resultApproveNumber != null">
+        and RESULT_APPROVE_NUMBER = #{resultApproveNumber}
+      </if>
+      <if test="resultVoidNumber != null">
+        and RESULT_VOID_NUMBER = #{resultVoidNumber}
+      </if>
+      <if test="resultRealNumber != null">
+        and RESULT_REAL_NUMBER = #{resultRealNumber}
+      </if>
+      <if test="resultSurplusNumber != null">
+        and RESULT_SURPLUS_NUMBER = #{resultSurplusNumber}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+      <if test="resultType != null">
+        and RESULT_TYPE = #{resultType}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="resultId != null">
+        and RESULT_ID = #{resultId}
+      </if>
+      <if test="railPlanId != null">
+        and RAIL_PLAN_ID = #{railPlanId}
+      </if>
+      <if test="resultPleasePlanNo != null and resultPleasePlanNo != ''">
+        and RESULT_PLEASE_PLAN_NO LIKE '%${resultPleasePlanNo}%'
+      </if>
+      <if test="resultDate != null">
+        and TO_CHAR(RESULT_DATE,'yyyy-MM-dd') = #{resultDate}
+      </if>
+      <if test="resultApproveNumber != null">
+        and RESULT_APPROVE_NUMBER = #{resultApproveNumber}
+      </if>
+      <if test="resultVoidNumber != null">
+        and RESULT_VOID_NUMBER = #{resultVoidNumber}
+      </if>
+      <if test="resultRealNumber != null">
+        and RESULT_REAL_NUMBER = #{resultRealNumber}
+      </if>
+      <if test="resultSurplusNumber != null">
+        and RESULT_SURPLUS_NUMBER = #{resultSurplusNumber}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+      <if test="resultType != null">
+        and RESULT_TYPE = #{resultType}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from TMSTRAIN_PLEASE_RESULT
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from TMSTRAIN_PLEASE_RESULT
+    where 1!=1 
+      <if test="railPlanId != null">
+        or RAIL_PLAN_ID = #{railPlanId}
+      </if>
+      <if test="resultPleasePlanNo != null and resultPleasePlanNo != ''">
+        or RESULT_PLEASE_PLAN_NO = #{resultPleasePlanNo}
+      </if>
+      <if test="resultDate != null">
+        or TO_CHAR(RESULT_DATE,'yyyy-MM-dd') = '#{resultDate}'
+      </if>
+      <if test="resultApproveNumber != null">
+        or RESULT_APPROVE_NUMBER = #{resultApproveNumber}
+      </if>
+      <if test="resultVoidNumber != null">
+        or RESULT_VOID_NUMBER = #{resultVoidNumber}
+      </if>
+      <if test="resultRealNumber != null">
+        or RESULT_REAL_NUMBER = #{resultRealNumber}
+      </if>
+      <if test="resultSurplusNumber != null">
+        or RESULT_SURPLUS_NUMBER = #{resultSurplusNumber}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        or INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        or UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="deleted != null">
+        or DELETED = #{deleted}
+      </if>
+      <if test="resultType != null">
+        or RESULT_TYPE = #{resultType}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.TmstrainPleaseResult">
+    insert into TMSTRAIN_PLEASE_RESULT (RESULT_ID, RAIL_PLAN_ID, RESULT_PLEASE_PLAN_NO, 
+      RESULT_DATE, RESULT_APPROVE_NUMBER, RESULT_VOID_NUMBER, 
+      RESULT_REAL_NUMBER, RESULT_SURPLUS_NUMBER, 
+      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, 
+      RESULT_TYPE)
+    values (#{resultId,jdbcType=DECIMAL}, #{railPlanId,jdbcType=DECIMAL}, #{resultPleasePlanNo,jdbcType=VARCHAR}, 
+      #{resultDate,jdbcType=TIMESTAMP}, #{resultApproveNumber,jdbcType=DECIMAL}, #{resultVoidNumber,jdbcType=DECIMAL}, 
+      #{resultRealNumber,jdbcType=DECIMAL}, #{resultSurplusNumber,jdbcType=DECIMAL}, 
+      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, 
+      #{resultType,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstrainPleaseResult">
+    insert into TMSTRAIN_PLEASE_RESULT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="resultId != null">
+        RESULT_ID,
+      </if>
+      <if test="railPlanId != null">
+        RAIL_PLAN_ID,
+      </if>
+      <if test="resultPleasePlanNo != null">
+        RESULT_PLEASE_PLAN_NO,
+      </if>
+      <if test="resultDate != null">
+        RESULT_DATE,
+      </if>
+      <if test="resultApproveNumber != null">
+        RESULT_APPROVE_NUMBER,
+      </if>
+      <if test="resultVoidNumber != null">
+        RESULT_VOID_NUMBER,
+      </if>
+      <if test="resultRealNumber != null">
+        RESULT_REAL_NUMBER,
+      </if>
+      <if test="resultSurplusNumber != null">
+        RESULT_SURPLUS_NUMBER,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+      <if test="deleted != null">
+        DELETED,
+      </if>
+      <if test="resultType != null">
+        RESULT_TYPE,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="resultId != null">
+        #{resultId,jdbcType=DECIMAL},
+      </if>
+      <if test="railPlanId != null">
+        #{railPlanId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultPleasePlanNo != null">
+        #{resultPleasePlanNo,jdbcType=VARCHAR},
+      </if>
+      <if test="resultDate != null">
+        #{resultDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="resultApproveNumber != null">
+        #{resultApproveNumber,jdbcType=DECIMAL},
+      </if>
+      <if test="resultVoidNumber != null">
+        #{resultVoidNumber,jdbcType=DECIMAL},
+      </if>
+      <if test="resultRealNumber != null">
+        #{resultRealNumber,jdbcType=DECIMAL},
+      </if>
+      <if test="resultSurplusNumber != null">
+        #{resultSurplusNumber,jdbcType=DECIMAL},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=DECIMAL},
+      </if>
+      <if test="resultType != null">
+        #{resultType,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstrainPleaseResult">
+    update TMSTRAIN_PLEASE_RESULT
+    set RAIL_PLAN_ID = #{railPlanId,jdbcType=DECIMAL},
+      RESULT_PLEASE_PLAN_NO = #{resultPleasePlanNo,jdbcType=VARCHAR},
+      RESULT_DATE = #{resultDate,jdbcType=TIMESTAMP},
+      RESULT_APPROVE_NUMBER = #{resultApproveNumber,jdbcType=DECIMAL},
+      RESULT_VOID_NUMBER = #{resultVoidNumber,jdbcType=DECIMAL},
+      RESULT_REAL_NUMBER = #{resultRealNumber,jdbcType=DECIMAL},
+      RESULT_SURPLUS_NUMBER = #{resultSurplusNumber,jdbcType=DECIMAL},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      DELETED = #{deleted,jdbcType=DECIMAL},
+      RESULT_TYPE = #{resultType,jdbcType=DECIMAL}
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstrainPleaseResult">
+    update TMSTRAIN_PLEASE_RESULT
+    <set>
+      <if test="railPlanId != null">
+        RAIL_PLAN_ID = #{railPlanId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultPleasePlanNo != null">
+        RESULT_PLEASE_PLAN_NO = #{resultPleasePlanNo,jdbcType=VARCHAR},
+      </if>
+      <if test="resultDate != null">
+        RESULT_DATE = #{resultDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="resultApproveNumber != null">
+        RESULT_APPROVE_NUMBER = #{resultApproveNumber,jdbcType=DECIMAL},
+      </if>
+      <if test="resultVoidNumber != null">
+        RESULT_VOID_NUMBER = #{resultVoidNumber,jdbcType=DECIMAL},
+      </if>
+      <if test="resultRealNumber != null">
+        RESULT_REAL_NUMBER = #{resultRealNumber,jdbcType=DECIMAL},
+      </if>
+      <if test="resultSurplusNumber != null">
+        RESULT_SURPLUS_NUMBER = #{resultSurplusNumber,jdbcType=DECIMAL},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        DELETED = #{deleted,jdbcType=DECIMAL},
+      </if>
+      <if test="resultType != null">
+        RESULT_TYPE = #{resultType,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select" />
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into TMSTRAIN_PLEASE_RESULT 
+      (RESULT_ID, 
+      RAIL_PLAN_ID, RESULT_PLEASE_PLAN_NO, 
+      RESULT_DATE, RESULT_APPROVE_NUMBER, 
+      RESULT_VOID_NUMBER, RESULT_REAL_NUMBER, 
+      RESULT_SURPLUS_NUMBER, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK, 
+      DELETED, RESULT_TYPE)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.resultId,jdbcType=DECIMAL}, 
+      #{item.railPlanId,jdbcType=DECIMAL}, #{item.resultPleasePlanNo,jdbcType=VARCHAR}, 
+      #{item.resultDate,jdbcType=TIMESTAMP}, #{item.resultApproveNumber,jdbcType=DECIMAL}, 
+      #{item.resultVoidNumber,jdbcType=DECIMAL}, #{item.resultRealNumber,jdbcType=DECIMAL}, 
+      #{item.resultSurplusNumber,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR}, 
+      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}, 
+      #{item.deleted,jdbcType=DECIMAL}, #{item.resultType,jdbcType=DECIMAL} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update TMSTRAIN_PLEASE_RESULT
+     set
+       RESULT_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
+       </foreach>
+       ,RAIL_PLAN_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.railPlanId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_PLEASE_PLAN_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultPleasePlanNo,jdbcType=VARCHAR}
+       </foreach>
+       ,RESULT_DATE=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultDate,jdbcType=TIMESTAMP}
+       </foreach>
+       ,RESULT_APPROVE_NUMBER=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultApproveNumber,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_VOID_NUMBER=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultVoidNumber,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_REAL_NUMBER=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultRealNumber,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_SURPLUS_NUMBER=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultSurplusNumber,jdbcType=DECIMAL}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETED=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_TYPE=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultType,jdbcType=DECIMAL}
+       </foreach>
+     where RESULT_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.resultId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from TMSTRAIN_PLEASE_RESULT
+    where RESULT_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="selectMaxId" resultType="java.math.BigDecimal">
+    select seq_tmstrain_please.nextval from dual
+  </select>
+  <select id="getPleaseResult" resultType="java.util.Map">
+    select
+      RESULT_ID "resultId",
+      RAIL_PLAN_ID "railPlanId",
+      RESULT_DATE "resultDate",
+      RESULT_APPROVE_NUMBER "resultApproveNumber",
+      RESULT_VOID_NUMBER "resultVoidNumber",
+      RESULT_REAL_NUMBER "resultRealNumber",
+      RESULT_SURPLUS_NUMBER "resultSurplusNumber",
+      DELETED "deleted"
+    from TMSTRAIN_PLEASE_RESULT
+    where DELETED=0 and RESULT_ID=#{resultId}
+  </select>
+  <select id="getAllPleaseResult" resultType="java.util.Map">
+    select
+      RESULT_ID "resultId",
+      RAIL_PLAN_ID "railPlanId",
+      RESULT_DATE "resultDate",
+      RESULT_APPROVE_NUMBER "resultApproveNumber",
+      RESULT_VOID_NUMBER "resultVoidNumber",
+      RESULT_REAL_NUMBER "resultRealNumber",
+      RESULT_SURPLUS_NUMBER "resultSurplusNumber",
+      DELETED "deleted"
+    from TMSTRAIN_PLEASE_RESULT
+    where DELETED=0
+    <if test="oneDate != null">
+      and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  INSERT_TIME
+    </if>
+    <if test="startDate != null">
+      and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  INSERT_TIME
+      and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= INSERT_TIME
+    </if>
+  </select>
+  <select id="getRealNumber" resultType="java.math.BigDecimal">
+    select count(TLT.RESULT_ID) from TMSTRAIN_LOADING_TEMP TLT,WMSH_OUTBOUND_RESULT WOR
+    where TLT.OUTBOUNT_ID=WOR.RESULT_ID
+      AND  to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  WOR.INSERT_TIME
+      AND to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= WOR.INSERT_TIME
+  </select>
+</mapper>