添加列表查询及详情

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/controller/BlHousingestateInfoController.java

@@ -121,4 +121,30 @@ public class BlHousingestateInfoController extends JeecgController<BlHousingesta
 		 return Result.ok(list);
 	 }
 
+
+	 /**
+	  * 小区新增会员详情列表
+	  */
+	 @RequestMapping(value = "/queryXzhyDetailList", method = RequestMethod.GET)
+	 public Result queryXzhyDetailList(Hy hy,
+									 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+		 Page<Hy> page = new Page<Hy>(pageNo, pageSize);
+		 IPage<Hy> list = service.queryXzhyDetailList(page,hy);
+		 return Result.ok(list);
+	 }
+
+
+	 /**
+	  * 小区新增会员详情列表
+	  */
+	 @RequestMapping(value = "/queryTdcsDetailList", method = RequestMethod.GET)
+	 public Result queryTdcsDetailList(Hy hy,
+									   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+		 Page<Hy> page = new Page<Hy>(pageNo, pageSize);
+		 IPage<Hy> list = service.queryTdcsDetailList(page,hy);
+		 return Result.ok(list);
+	 }
+
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/mapper/BlHousingestateInfoMapper.java

@@ -25,4 +25,7 @@ public interface BlHousingestateInfoMapper extends BaseMapper<BlHousingestateInf
 
     IPage<Hy> queryXqHyTdcsList(Page<Hy> page, @Param("hy")Hy hy);
 
+    IPage<Hy> queryXzhyDetailList(Page<Hy> page, @Param("hy")Hy hy);
+
+    IPage<Hy> queryTdcsDetailList(Page<Hy> page,@Param("hy") Hy hy);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/mapper/xml/BlHousingestateInfoMapper.xml

@@ -58,4 +58,47 @@
         order by cn desc
     </select>
 
+
+    <select id="queryXzhyDetailList" parameterType="org.jeecg.modules.zh.view.hy.entity.Hy" resultType="org.jeecg.modules.zh.view.hy.entity.Hy">
+        select
+        a.phone,a.register_date,a.deliveries,a.violations,a.delivered_at,a.status,b.name as housingestateName,c.content
+        from bl_user_info a
+        inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
+        left join bl_device_info c on a.imei = c.imei
+        <where>
+            <if test="hy.housingestateId != null and hy.housingestateId !=''">
+                and a.housingestate_id = #{hy.housingestateId}
+            </if>
+            <if test="hy.beginTime != null and hy.beginTime !=''">
+                and a.register_date  >= #{hy.beginTime}
+            </if>
+            <if test="hy.endTime != null and hy.endTime !=''">
+                and a.register_date  &lt;= #{hy.endTime}
+            </if>
+        </where>
+        
+    </select>
+
+    <select id="queryTdcsDetailList" parameterType="org.jeecg.modules.zh.view.hy.entity.Hy" resultType="org.jeecg.modules.zh.view.hy.entity.Hy">
+        select
+        a.phone,a.add_time,a.weight,a.invalid,b.name as housingestateName,d.content,a.cause
+        from bl_order_info a
+        inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
+        inner join bl_user_info c on a.phone = c.phone
+        inner join bl_device_info d on a.imei = d.imei
+        <where>
+            <if test="hy.housingestateId != null and hy.housingestateId !=''">
+                and a.housingestate_id = #{hy.housingestateId}
+            </if>
+            <if test="hy.beginTime != null and hy.beginTime !=''">
+                and a.add_time  >= #{hy.beginTime}
+            </if>
+            <if test="hy.endTime != null and hy.endTime !=''">
+                and a.add_time  &lt;= #{hy.endTime}
+            </if>
+        </where>
+        order by a.add_time desc
+
+    </select>
+
 </mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/service/IBlHousingestateInfoService.java

@@ -24,4 +24,7 @@ public interface IBlHousingestateInfoService extends IService<BlHousingestateInf
 
     IPage<Hy> queryXqHyXzList(Page<Hy> page,Hy hy);
 
+    IPage<Hy> queryXzhyDetailList(Page<Hy> page, Hy hy);
+
+    IPage<Hy> queryTdcsDetailList(Page<Hy> page, Hy hy);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/service/impl/BlHousingestateInfoServiceImpl.java

@@ -42,4 +42,14 @@ public class BlHousingestateInfoServiceImpl extends ServiceImpl<BlHousingestateI
         return baseMapper.queryXqHyXzList(page,hy);
     }
 
+    @Override
+    public IPage<Hy> queryXzhyDetailList(Page<Hy> page, Hy hy) {
+        return baseMapper.queryXzhyDetailList(page,hy);
+    }
+
+    @Override
+    public IPage<Hy> queryTdcsDetailList(Page<Hy> page, Hy hy) {
+        return baseMapper.queryTdcsDetailList(page,hy);
+    }
+
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/entity/Hy.java

@@ -32,5 +32,14 @@ public class Hy implements Serializable {
     private String updatedAt;//厂家更新时间
     private String deductMoney;//扣除金额
 
+    private String registerDate;//注册时间
+    private String deliveries;//投递次数
+    private String violations;//违规次数
+    private String deliveredAt;//最后投递时间
+    private String status;//用户状态：0:拉黑 1:正常
+    private String cause;//原因
+
+
+
 }
 

jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_config.properties

@@ -1,7 +1,7 @@
 #code_generate_project_path
 project_path=D:\\javacode
 #bussi_package[User defined]
-bussi_package=org.jeecg.modules.demo
+bussi_package=org.jeecg.modules.zh.view
 
 
 #default code path

jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_database.properties

@@ -1,9 +1,9 @@
 #mysql
 diver_name=com.mysql.jdbc.Driver
-url=jdbc:mysql://localhost:3306/jeecg-boot?useUnicode=true&characterEncoding=UTF-8
+url=jdbc:mysql://localhost:3306/zh_db?useUnicode=true&characterEncoding=UTF-8
 username=root
 password=root
-database_name=jeecg-boot
+database_name=zh_db
 
 #oracle
 #diver_name=oracle.jdbc.driver.OracleDriver