Merge remote-tracking branch 'origin/developer_bw' into developer_bw

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PowerStationDto.java

@@ -101,6 +101,6 @@ public class PowerStationDto  extends BaseDto {
     private String realScale;
     @ApiModelProperty(value = "省份")
     private String province;
-    @ApiModelProperty(value = "制单日期")
-    private String creatorTime;
+    @ApiModelProperty(value = "经销商首次确认时间")
+    private String firstSubmitDate;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PowerStationMapper.xml

@@ -35,7 +35,7 @@
         SUBSTRING_INDEX(ph.project_address_name, '/', 1) AS province,
         lc.stamp_status,
         lc.status,
-        hsi.creator_time
+        ps.kc_create_time  AS firstSubmitDate
     FROM
         hygf_power_station ps
             LEFT JOIN (
@@ -57,7 +57,6 @@
                       ON lc.peasant_household_id = ps.peasant_household_id
             LEFT JOIN hygf_peasant_household ph
                       ON ph.sequence_nbr = ps.peasant_household_id
-            LEFT JOIN (select sequence_nbr, creator_time from hygf_survey_information ) hsi on ph.survey_information_id = hsi.sequence_nbr
     WHERE
         ps.is_delete = 0
     <if test="powerStationCode != null and powerStationCode != ''">
@@ -88,10 +87,10 @@
         AND lc.status = #{status}
     </if>
     <if test="startTime != null and startTime != ''">
-        AND hsi.creator_time &gt;= #{startTime}
+        AND ps.kc_create_time &gt;= #{startTime}
     </if>
     <if test="endTime != null and endTime != ''">
-        AND hsi.creator_time &lt;= #{endTime}
+        AND ps.kc_create_time &lt;= #{endTime}
     </if>
     ORDER BY ps.rec_date DESC
 </select>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PreparationMoneyMapper.xml

@@ -39,10 +39,10 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
                 and hygf_preparation_money.delivery_state != '已作废' and hygf_preparation_money.delivery_state != '待发货'
             </if>
             <if test="dto.deliveryTimeStart != null and dto.deliveryTimeStart != ''">
-                and hygf_preparation_money.delivery_time &gt;= #{dto.deliveryTimeEnd}
+                and hygf_preparation_money.delivery_time &gt;= #{dto.deliveryTimeStart}
             </if>
             <if test="dto.deliveryTimeEnd != null and dto.deliveryTimeEnd != ''">
-                and hygf_preparation_money.delivery_time &lt;= > #{dto.deliveryTimeEnd}
+                and hygf_preparation_money.delivery_time &lt;= #{dto.deliveryTimeEnd}
             </if>
         </where>
         ORDER BY hygf_preparation_money.sequence_nbr DESC