修改

pom.xml

@@ -116,7 +116,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>BMSTRUCK_DETAILS_ORDER</param><!--运力-->
+                        <param>BMSTRUCK_STATEMENT</param><!--运力-->
                     </tables>
                 </configuration>
                 <executions>

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

@@ -65,11 +65,11 @@ public class BmstruckStatementController extends BaseRESTfulController {
         mapValue.put("userId",userId);
         mapValue.put("con",con);
         DataChange.queryDataByDateTimeYestDay(startTime, endTime, mapValue, sdfDateTime);//根时间段查询数据
-        List<Map<String, Object>> truckStatementList = bmstruckStatementService.getTruckStatementList(mapValue);
+        //List<Map<String, Object>> truckStatementList = bmstruckStatementService.getTruckStatementList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = bmstruckStatementService.getTruckStatementList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, truckStatementList, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

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

@@ -3,6 +3,7 @@ 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;
 
@@ -129,11 +130,17 @@ public class BmstruckStatement implements IBasePO<BigDecimal> {
     private String photo;
 
     /**
-     * 账单日期(STATEMENT_TIME,TIMESTAMP,7)
+     * 账单起始日期(STATEMENT_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="账单日期",required=false)
+    @ApiModelProperty(value="账单起始日期",required=false)
     private Date statementTime;
 
+    /**
+     * 账单结束日期(STATEMENT_END_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="账单结束日期",required=false)
+    private Date statementEndTime;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -314,6 +321,14 @@ public class BmstruckStatement implements IBasePO<BigDecimal> {
         this.statementTime = statementTime;
     }
 
+    public Date getStatementEndTime() {
+        return statementEndTime;
+    }
+
+    public void setStatementEndTime(Date statementEndTime) {
+        this.statementEndTime = statementEndTime;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -341,6 +356,7 @@ public class BmstruckStatement implements IBasePO<BigDecimal> {
         sb.append(", carrierId=").append(carrierId);
         sb.append(", photo=").append(photo);
         sb.append(", statementTime=").append(statementTime);
+        sb.append(", statementEndTime=").append(statementEndTime);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -111,7 +111,9 @@ public class BmstruckStatementServiceImpl implements IBmstruckStatementService {
         bmstruckStatement.setCarrierId(DataChange.dataToBigDecimal(companys.get(0).get("carrierId")));
         bmstruckStatement.setStatementExcludTax(excludeTax.setScale(2,BigDecimal.ROUND_HALF_UP));
         String statementTime=""+map.get("statementTime");
+        String statementEndTime = "" + map.get("statementEndTime");
         bmstruckStatement.setStatementTime(new Date(Long.parseLong(statementTime)));
+        bmstruckStatement.setStatementEndTime(new Date(Long.parseLong(statementEndTime)));
         bmstruckStatement.setPhoto(url);
         // 汽运账单主键
         BigDecimal statementId = bmstruckStatementMapper.selectStatementId();

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

@@ -23,18 +23,21 @@
         <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
         <result column="PHOTO" jdbcType="VARCHAR" property="photo" />
         <result column="STATEMENT_TIME" jdbcType="TIMESTAMP" property="statementTime" />
+        <result column="STATEMENT_END_TIME" jdbcType="TIMESTAMP" property="statementEndTime" />
     </resultMap>
     <sql id="columns">
-        STATEMENT_ID, STATEMENT_NUMBER, COST_ID, STATEMENT_PAYMENT_UNIT, STATEMENT_EXCLUD_TAX,
-    STATEMENT_INCLUD_TAX, STATEMENT_REMARK, STATEMENT_SETTLEMENT_STATUS, INSERT_USERNAME,
-    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, STATEMENT_TYPE,
-    EAS_AMOUNT, SUM_AMOUNT, CAR_NUM, CONSIGNEE_ID, CARRIER_ID, PHOTO, STATEMENT_TIME
+        STATEMENT_ID, STATEMENT_NUMBER, COST_ID, STATEMENT_PAYMENT_UNIT, STATEMENT_EXCLUD_TAX, 
+    STATEMENT_INCLUD_TAX, STATEMENT_REMARK, STATEMENT_SETTLEMENT_STATUS, INSERT_USERNAME, 
+    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, STATEMENT_TYPE, 
+    EAS_AMOUNT, SUM_AMOUNT, CAR_NUM, CONSIGNEE_ID, CARRIER_ID, PHOTO, STATEMENT_TIME, 
+    STATEMENT_END_TIME
     </sql>
     <sql id="columns_alias">
-        t.STATEMENT_ID, t.STATEMENT_NUMBER, t.COST_ID, t.STATEMENT_PAYMENT_UNIT, t.STATEMENT_EXCLUD_TAX,
-    t.STATEMENT_INCLUD_TAX, t.STATEMENT_REMARK, t.STATEMENT_SETTLEMENT_STATUS, t.INSERT_USERNAME,
-    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.STATEMENT_TYPE,
-    t.EAS_AMOUNT, t.SUM_AMOUNT, t.CAR_NUM, t.CONSIGNEE_ID, t.CARRIER_ID, t.PHOTO, t.STATEMENT_TIME
+        t.STATEMENT_ID, t.STATEMENT_NUMBER, t.COST_ID, t.STATEMENT_PAYMENT_UNIT, t.STATEMENT_EXCLUD_TAX, 
+    t.STATEMENT_INCLUD_TAX, t.STATEMENT_REMARK, t.STATEMENT_SETTLEMENT_STATUS, t.INSERT_USERNAME, 
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.STATEMENT_TYPE, 
+    t.EAS_AMOUNT, t.SUM_AMOUNT, t.CAR_NUM, t.CONSIGNEE_ID, t.CARRIER_ID, t.PHOTO, t.STATEMENT_TIME, 
+    t.STATEMENT_END_TIME
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM BMSTRUCK_STATEMENT
@@ -107,6 +110,9 @@
             <if test="statementTime != null">
                 and TO_CHAR(STATEMENT_TIME,'yyyy-MM-dd') = #{statementTime}
             </if>
+            <if test="statementEndTime != null">
+                and TO_CHAR(STATEMENT_END_TIME,'yyyy-MM-dd') = #{statementEndTime}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -174,9 +180,12 @@
             <if test="statementTime != null">
                 and TO_CHAR(STATEMENT_TIME,'yyyy-MM-dd') = #{statementTime}
             </if>
+            <if test="statementEndTime != null">
+                and TO_CHAR(STATEMENT_END_TIME,'yyyy-MM-dd') = #{statementEndTime}
+            </if>
         </where>
     </sql>
-    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
         delete from BMSTRUCK_STATEMENT
         where STATEMENT_ID = #{statementId,jdbcType=DECIMAL}
     </delete>
@@ -243,6 +252,9 @@
         <if test="statementTime != null">
             or TO_CHAR(STATEMENT_TIME,'yyyy-MM-dd') = '#{statementTime}'
         </if>
+        <if test="statementEndTime != null">
+            or TO_CHAR(STATEMENT_END_TIME,'yyyy-MM-dd') = '#{statementEndTime}'
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.BmstruckStatement">
         insert into BMSTRUCK_STATEMENT (STATEMENT_ID, STATEMENT_NUMBER, COST_ID,
@@ -252,7 +264,7 @@
                                         UPDATE_TIME, INSERT_UPDATE_REMARK, STATEMENT_TYPE,
                                         EAS_AMOUNT, SUM_AMOUNT, CAR_NUM,
                                         CONSIGNEE_ID, CARRIER_ID, PHOTO,
-                                        STATEMENT_TIME)
+                                        STATEMENT_TIME, STATEMENT_END_TIME)
         values (#{statementId,jdbcType=DECIMAL}, #{statementNumber,jdbcType=VARCHAR}, #{costId,jdbcType=DECIMAL},
                 #{statementPaymentUnit,jdbcType=VARCHAR}, #{statementExcludTax,jdbcType=DECIMAL},
                 #{statementIncludTax,jdbcType=DECIMAL}, #{statementRemark,jdbcType=VARCHAR}, #{statementSettlementStatus,jdbcType=VARCHAR},
@@ -260,7 +272,7 @@
                 #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{statementType,jdbcType=DECIMAL},
                 #{easAmount,jdbcType=DECIMAL}, #{sumAmount,jdbcType=DECIMAL}, #{carNum,jdbcType=DECIMAL},
                 #{consigneeId,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL}, #{photo,jdbcType=VARCHAR},
-                #{statementTime,jdbcType=TIMESTAMP})
+                #{statementTime,jdbcType=TIMESTAMP}, #{statementEndTime,jdbcType=TIMESTAMP})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.BmstruckStatement">
         insert into BMSTRUCK_STATEMENT
@@ -328,6 +340,9 @@
             <if test="statementTime != null">
                 STATEMENT_TIME,
             </if>
+            <if test="statementEndTime != null">
+                STATEMENT_END_TIME,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="statementId != null">
@@ -393,6 +408,9 @@
             <if test="statementTime != null">
                 #{statementTime,jdbcType=TIMESTAMP},
             </if>
+            <if test="statementEndTime != null">
+                #{statementEndTime,jdbcType=TIMESTAMP},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.BmstruckStatement">
@@ -416,7 +434,8 @@
             CONSIGNEE_ID = #{consigneeId,jdbcType=DECIMAL},
             CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
             PHOTO = #{photo,jdbcType=VARCHAR},
-            STATEMENT_TIME = #{statementTime,jdbcType=TIMESTAMP}
+            STATEMENT_TIME = #{statementTime,jdbcType=TIMESTAMP},
+            STATEMENT_END_TIME = #{statementEndTime,jdbcType=TIMESTAMP}
         where STATEMENT_ID = #{statementId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.BmstruckStatement">
@@ -482,10 +501,13 @@
             <if test="statementTime != null">
                 STATEMENT_TIME = #{statementTime,jdbcType=TIMESTAMP},
             </if>
+            <if test="statementEndTime != null">
+                STATEMENT_END_TIME = #{statementEndTime,jdbcType=TIMESTAMP},
+            </if>
         </set>
         where STATEMENT_ID = #{statementId,jdbcType=DECIMAL}
     </update>
-    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
         <include refid="select" />
         where STATEMENT_ID = #{statementId,jdbcType=DECIMAL}
     </select>
@@ -508,7 +530,8 @@
         INSERT_UPDATE_REMARK, STATEMENT_TYPE,
         EAS_AMOUNT, SUM_AMOUNT, CAR_NUM,
         CONSIGNEE_ID, CARRIER_ID, PHOTO,
-        STATEMENT_TIME)
+        STATEMENT_TIME, STATEMENT_END_TIME
+        )
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.statementId,jdbcType=DECIMAL},
@@ -520,7 +543,8 @@
         #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.statementType,jdbcType=DECIMAL},
         #{item.easAmount,jdbcType=DECIMAL}, #{item.sumAmount,jdbcType=DECIMAL}, #{item.carNum,jdbcType=DECIMAL},
         #{item.consigneeId,jdbcType=DECIMAL}, #{item.carrierId,jdbcType=DECIMAL}, #{item.photo,jdbcType=VARCHAR},
-        #{item.statementTime,jdbcType=TIMESTAMP} from dual
+        #{item.statementTime,jdbcType=TIMESTAMP}, #{item.statementEndTime,jdbcType=TIMESTAMP}
+        from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -610,6 +634,10 @@
         <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
             when #{item.statementId,jdbcType=DECIMAL} then #{item.statementTime,jdbcType=TIMESTAMP}
         </foreach>
+        ,STATEMENT_END_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.statementEndTime,jdbcType=TIMESTAMP}
+        </foreach>
         where STATEMENT_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.statementId,jdbcType=DECIMAL}
@@ -637,7 +665,7 @@
             BS.CAR_NUM "carNum",
             RC.CONSIGNEE_COMPANY_NAME "consigneeName",
             RCA.CARRIER_NAME "carrierName",
-            BS.STATEMENT_TIME "insertTime",
+            BS.STATEMENT_TIME || '--' || BS.STATEMENT_END_TIME "insertTime",
             BS.CONSIGNEE_ID "consigneeId",
             BS .CARRIER_ID "carrierId"
             FROM BMSTRUCK_STATEMENT BS
@@ -653,7 +681,7 @@
                 </if>
                 <if test="startDate != null">
                     and to_date(#{startDate}, 'yyyy-mm-dd') &lt;=  to_date(to_char(BS.STATEMENT_TIME,'yyyy-mm-dd'),'yyyy-mm-dd')
-                    and to_date(#{endDate}, 'yyyy-mm-dd') >=  to_date(to_char(BS.STATEMENT_TIME,'yyyy-mm-dd'),'yyyy-mm-dd')
+                    and to_date(#{endDate}, 'yyyy-mm-dd') >=  to_date(to_char(BS.STATEMENT_END_TIME,'yyyy-mm-dd'),'yyyy-mm-dd')
                 </if>
             </where>
         )