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

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

@@ -70,7 +70,7 @@ and hygf_document_station.station_id is not null
         <if test="developerCode!=null and developerCode !=''">
             and developer_code = #{developerCode}
         </if>
-        ORDER BY rec_date DESC
+        ORDER BY creation_time DESC
     </select>
     <select id="selectUserIsHouse" resultType="java.util.Map">
         SELECT

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

@@ -119,12 +119,13 @@ public class SurveyInformationController extends BaseController {
 	 * 勘察信息数据提交
 	 *
 	 * @return
+	 * @throws Exception 
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST",value = "勘察信息数据提交",   notes = "勘察信息数据提交")
 	@PostMapping(value = "/surveySubmit")
 	public ResponseModel<SurveyInfoAllDto> surveySubmit(@RequestBody SurveyInfoAllDto surveyInfoAllDto,
-																									@RequestParam(value = "operationType") String operationType) {
+																									@RequestParam(value = "operationType") String operationType) throws Exception {
 		SurveyInfoAllDto returnDto = surveyInformationServiceImpl.saveSurveyInfo(surveyInfoAllDto,operationType);
 		return ResponseHelper.buildResponse(returnDto);
 	}