diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/controller/BlHousingestateInfoController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/controller/BlHousingestateInfoController.java index ee0e15e..7496ad9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/controller/BlHousingestateInfoController.java +++ b/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 page = new Page(pageNo, pageSize); + IPage 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 page = new Page(pageNo, pageSize); + IPage list = service.queryTdcsDetailList(page,hy); + return Result.ok(list); + } + } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/mapper/BlHousingestateInfoMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/mapper/BlHousingestateInfoMapper.java index b400525..7e7a023 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/mapper/BlHousingestateInfoMapper.java +++ b/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 queryXqHyTdcsList(Page page, @Param("hy")Hy hy); + IPage queryXzhyDetailList(Page page, @Param("hy")Hy hy); + + IPage queryTdcsDetailList(Page page,@Param("hy") Hy hy); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/mapper/xml/BlHousingestateInfoMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/mapper/xml/BlHousingestateInfoMapper.xml index fbfa1da..ef97f5e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/mapper/xml/BlHousingestateInfoMapper.xml +++ b/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 + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/service/IBlHousingestateInfoService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/service/IBlHousingestateInfoService.java index c204980..3a7c15a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/service/IBlHousingestateInfoService.java +++ b/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 queryXqHyXzList(Page page,Hy hy); + IPage queryXzhyDetailList(Page page, Hy hy); + + IPage queryTdcsDetailList(Page page, Hy hy); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/service/impl/BlHousingestateInfoServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/service/impl/BlHousingestateInfoServiceImpl.java index e23c98e..9830102 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/service/impl/BlHousingestateInfoServiceImpl.java +++ b/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 queryXzhyDetailList(Page page, Hy hy) { + return baseMapper.queryXzhyDetailList(page,hy); + } + + @Override + public IPage queryTdcsDetailList(Page page, Hy hy) { + return baseMapper.queryTdcsDetailList(page,hy); + } + } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/entity/Hy.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/entity/Hy.java index ff2db92..aa84fe2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/entity/Hy.java +++ b/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;//原因 + + + } diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_config.properties b/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_config.properties index 8425aa3..f965f74 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_config.properties +++ b/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 diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_database.properties b/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_database.properties index 058ed18..fcb4dc5 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_database.properties +++ b/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