发货管理已发货电站列表接口修改

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PreparationMoneyMapper.java

@@ -24,18 +24,20 @@ import java.util.Map;
 public interface PreparationMoneyMapper extends BaseMapper<PreparationMoney> {
 
 
-    List<PeasantHousehold> getPeasantHouseholdData(@Param("sequenceNbr")  Long sequenceNbr,@Param("ownersName")  String ownersName, @Param("projectAddress")  String projectAddress);
+    List<PeasantHousehold> getPeasantHouseholdData(@Param("sequenceNbr") Long sequenceNbr, @Param("ownersName") String ownersName, @Param("projectAddress") String projectAddress);
 
-    @UserEmpower(field ={"regional_companies_code"} ,dealerField={"amos_unit_org_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    @UserEmpower(field = {"regional_companies_code"}, dealerField = {"amos_unit_org_code", "regional_companies_code"}, fieldConditions = {"eq", "in"}, relationship = "and")
     List<PreparationMoney> selectPageList(@Param(value = "dto") PreparationDto preparationDto);
 
-    @UserEmpower(field ={"regional_companies_code"} ,dealerField={"developer_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
-    List<Map<String,Object>> preparationStation (@Param(value = "preparationMoneyState")  String preparationMoneyState,
+    @UserEmpower(field = {"regional_companies_code"}, dealerField = {"developer_code", "regional_companies_code"}, fieldConditions = {"eq", "in"}, relationship = "and")
+    List<Map<String, Object>> preparationStation(@Param(value = "preparationMoneyState") String preparationMoneyState,
                                                  @Param(value = "ownersName") String ownersName,
                                                  @Param(value = "regionalCompaniesSeq") String regionalCompaniesSeq,
                                                  @Param(value = "developerId") String developerId,
                                                  @Param(value = "state") String state,
                                                  @Param(value = "province") String province,
-                                                 @Param(value = "projectAddress") String projectAddress);
+                                                 @Param(value = "projectAddress") String projectAddress,
+                                                 @Param(value = "startTime") String startTime,
+                                                 @Param(value = "endTime") String endTime);
 
 }

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

@@ -89,6 +89,12 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
         <if test="province != null and province != ''">
             and hygf_peasant_household.project_address like concat(concat('%',#{province}),'%')
         </if>
+        <if test="startTime != null and startTime != ''">
+            and hygf_preparation_money.delivery_time  &gt;= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and hygf_preparation_money.delivery_time &lt;= #{endTime}
+        </if>
         <if test="projectAddress != null and projectAddress != '' and projectAddress.contains('/'.toString())">
             AND concat_ws('/',hygf_peasant_household.project_address_name,hygf_peasant_household.project_address_detail)  LIKE CONCAT('%', #{projectAddress}, '%')
         </if>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PreparationMoneyController.java

@@ -346,9 +346,11 @@ public class PreparationMoneyController extends BaseController {
 			@RequestParam(value = "state",required = false) String state,
 			@RequestParam(value = "preparationMoneyState") String preparationMoneyState,
 			@RequestParam(value = "province",required = false) String province,
-			@RequestParam(value = "projectAddress",required = false) String projectAddress){
+			@RequestParam(value = "projectAddress",required = false) String projectAddress,
+			@RequestParam(value = "startTime",required = false) String startTime,
+			@RequestParam(value = "endTime",required = false) String endTime){
 
-		return ResponseHelper.buildResponse(preparationMoneyServiceImpl.preparationStation(current,size,preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state,province, projectAddress)) ;
+		return ResponseHelper.buildResponse(preparationMoneyServiceImpl.preparationStation(current,size,preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state,province, projectAddress, startTime, endTime)) ;
 	}
 
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java

@@ -1208,11 +1208,11 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
 
     }
 
-    public IPage<Map<String,Object>> preparationStation(Integer current, Integer size, String preparationMoneyState,String ownersName,String regionalcompaniesSeq,String developerId,String state,String province, String projectAddress){
+    public IPage<Map<String,Object>> preparationStation(Integer current, Integer size, String preparationMoneyState,String ownersName,String regionalcompaniesSeq,String developerId,String state,String province, String projectAddress, String startTime, String endTime){
 
 
          PageHelper.startPage(current,  size);
-         List<Map<String, Object>> resultPage = preparationMoneyMapper.preparationStation(preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state,province, projectAddress);
+         List<Map<String, Object>> resultPage = preparationMoneyMapper.preparationStation(preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state,province, projectAddress, startTime, endTime);
 
         if(resultPage != null && resultPage.size() > 0) {
             resultPage.forEach(e -> {