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

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.14</version>
+	<version>v3.5.16</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 
@@ -132,15 +132,15 @@
 
 
 	<profiles>
-		<profile>
-			<id>dev</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<properties>
-				<profiles.active>dev</profiles.active>
-			</properties>
-		</profile>
+<!--		<profile>-->
+<!--			<id>dev</id>-->
+<!--			<activation>-->
+<!--				<activeByDefault>true</activeByDefault>-->
+<!--			</activation>-->
+<!--			<properties>-->
+<!--				<profiles.active>dev</profiles.active>-->
+<!--			</properties>-->
+<!--		</profile>-->
 		<profile>
 			<id>green</id>
 			<properties>

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

@@ -188,12 +188,18 @@ public class TaH5SampleController extends BaseController {
      * @param id 实体ID
      */
     @RequestMapping(value = "/admin/taH5Sample/{id}", method = RequestMethod.GET)
-    public ResponseBean taH5SampleGet(@PathVariable Integer id) {
+    public ResponseBean taH5SampleGet(@PathVariable Integer id, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaH5Sample taH5Sample = iTaH5SampleService.getById(id);
+            QueryWrapper<TaH5Demand> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("sample_id", id);
+            queryWrapper.ne("demand_status", CommConstant.STATUS_DELETE);
+            queryWrapper.eq("org_id", getOrgId(request));
+            Integer demandNum = iTaH5DemandService.count(queryWrapper);
             IPage<TaContact> taContactIPage = taContactService.taContactInfoBySampleId(String.valueOf(id), 1 , 10);
             taH5Sample.setTaContactList(taContactIPage.getRecords());
+            taH5Sample.setDemandNum(demandNum);
             responseBean.addSuccess(taH5Sample);
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/huiju/estateagents/sample/entity/TaH5Sample.java

@@ -129,4 +129,10 @@ public class TaH5Sample implements Serializable {
      */
     @TableField(exist = false)
     private String updateUserName;
+
+    /**
+     * 样例中需求单个数
+     */
+    @TableField(exist = false)
+    private Integer demandNum;
 }