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

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

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 
@@ -28,6 +29,6 @@ public class HygfReplenishmentDto  extends BaseDto {
     private String comment;
 
     @ApiModelProperty(value = "补货文件")
-    private String file;
+    private List<Object> file;
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/HygfReplenishment.java

@@ -41,6 +41,6 @@ public class HygfReplenishment extends BaseEntity {
      * 补货文件
      */
 	@TableField(value = "file" , typeHandler = FastjsonTypeHandler.class)
-    private List<Object> file;
+    private String file;
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PreparationMoney.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.hygf.api.dto.HygfReplenishmentDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -150,6 +151,9 @@ public class PreparationMoney extends BaseEntity {
     private List<PreparationMoneyLog> preparationMoneyLog;  //发货单流水
 
     @TableField(exist = false)
+    private List<HygfReplenishmentDto> files;  //发货单流水
+
+    @TableField(exist = false)
     private String instanceId;  //发货单流水
     //订单状态
     @TableField("order_status")

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

@@ -11,13 +11,11 @@ and hygf_peasant_household.developer_id=#{developerId}
 and hygf_peasant_household.regional_companies_seq=#{regionalCompaniesSeq}
 and hygf_peasant_household.survey_or_not=3 and  hygf_peasant_household.sequence_nbr not in
 (select hygf_document_station.station_id  from hygf_preparation_money RIGHT JOIN hygf_document_station
-on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nbr  where hygf_preparation_money.order_status ='待发货'
+on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nbr  where
+  hygf_document_station.station_id is not null
     <if test="ids!=null and ids !=''">
         and hygf_document_station.preparation_money_id !=#{ids}
-    </if>
-
-and hygf_document_station.station_id is not null
-)
+    </if>)
     <if test="peasantHouseholdNo!=null and peasantHouseholdNo !=''">
         and hygf_peasant_household.peasant_household_no like concat(concat("%",#{peasantHouseholdNo}),"%")
     </if>
@@ -70,7 +68,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/QiyuesuoController.java

@@ -108,17 +108,22 @@ public class QiyuesuoController extends BaseController {
 	@PostMapping(value = "/getContractTokengz/{sequenceNbr}")
 	public ResponseModel<Object> getContractSdkResponseSequenceNbr(@RequestBody ContractMiniappTicketRequest request,
 			@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-		QueryWrapper<SealDictionary> queryWrapper = new QueryWrapper();
-		queryWrapper.eq("amos_company_seq", sequenceNbr);
-		List<SealDictionary> sealDictionaryList = sealDictionaryMapper.selectList(queryWrapper);
-		if(CollectionUtils.isNotEmpty(sealDictionaryList)){
-			request.setUser(new User(sealDictionaryList.get(0).getSealedPhone(), "MOBILE"));
-		}
+		SealDictionary sealDictionary = sealDictionaryMapper.selectById(sequenceNbr);
+		request.setUser(new User(sealDictionary.getSealedPhone(), "MOBILE"));
 		SdkResponse<MiniappTicketResult> result = qiyuesuoService.getContractSdkResponse(request);
 		return ResponseHelper.buildResponse(result.getResult());
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@ApiOperation(httpMethod = "GET", value = "获取所有盖章人员", notes = "获取所有盖章人员")
+	@GetMapping(value = "/getAllUserByCompanySeq")
+	public ResponseModel<List<SealDictionary>> getAll(@RequestParam(value = "companySeq") Long companySeq) {
+		QueryWrapper<SealDictionary> queryWrapper = new QueryWrapper();
+		queryWrapper.eq("amos_company_seq", companySeq);
+		return ResponseHelper.buildResponse(sealDictionaryMapper.selectList(queryWrapper));
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "获取合同浏览令牌", notes = "获取合同浏览令牌")
 	@GetMapping(value = "/getContractTokenTicket/{sequenceNbr}")
 	public ResponseModel<Object> getContractTokenTicket(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {

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);
 	}