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

src/main/java/com/huiju/estateagents/sample/controller/TaH5DemandController.java

@@ -149,7 +149,7 @@ public class TaH5DemandController extends BaseController {
             if (sampleContactList.size() > 0) {
                 List<TaContact> taContactList = taContactService.list(new QueryWrapper<TaContact>().in("contact_id", sampleContactList.stream().map(TaSampleContact::getContactId).collect(Collectors.toList())));
                 taH5Sample.setTaContactList(taContactList);
-                String[] smsParams = {taH5Demand.getDemandStatus().toString(), taH5Demand.getRemark()};
+                String[] smsParams = {taH5Sample.getSampleName(), taH5Demand.getOrgName() + taH5Demand.getOrderer() + taH5Demand.getPhone()};
                 for (TaContact taContact : taContactList){
                     sendSmsMessage(taContact.getPhone(), CommConstant.MESSAGE_CONTENT_OF_DEMAND, smsParams);
                 }

src/main/java/com/huiju/estateagents/sample/controller/TaH5SampleController.java

@@ -186,7 +186,10 @@ public class TaH5SampleController extends BaseController {
     public ResponseBean taH5SampleGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaH5SampleService.getById(id));
+            TaH5Sample taH5Sample = iTaH5SampleService.getById(id);
+            IPage<TaContact> taContactIPage = taContactService.taContactInfoBySampleId(String.valueOf(id), 1 , 10);
+            taH5Sample.setTaContactList(taContactIPage.getRecords());
+            responseBean.addSuccess(taH5Sample);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taH5SampleDelete -=- {}", e.toString());