From 94eb7d8c68ab299163b8eb13a1c1df929255377e Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期一, 07 八月 2023 00:22:47 +0800
Subject: [PATCH] 15645
---
zhang-content/src/main/java/com/ruoyi/mapper/ZfPropertyMapper.java | 5 +
zhang-content/src/main/java/com/ruoyi/service/ZYearInfoService.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZYearInfoController.java | 5 +
zhang-content/src/main/java/com/ruoyi/service/ZHonorService.java | 3
zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java | 10 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java | 5 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java | 5 +
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java | 9 ++
zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java | 9 ++
zhang-content/src/main/java/com/ruoyi/service/impl/ZHonorServiceImpl.java | 11 ++
zhang-content/src/main/java/com/ruoyi/mapper/ZPropertyMapper.java | 6 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorController.java | 5 +
zhang-content/src/main/java/com/ruoyi/mapper/ZSecretMapper.java | 6 +
zhang-content/src/main/java/com/ruoyi/mapper/ZfCollectionMapper.java | 5 +
zhang-content/src/main/java/com/ruoyi/service/ZPropertyService.java | 1
zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java | 9 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java | 5 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java | 5 +
zhang-content/src/main/java/com/ruoyi/mapper/ZfDoctorMapper.java | 5 +
zhang-content/src/main/java/com/ruoyi/service/ZfEconomyService.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java | 5 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java | 5 +
zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java | 3
zhang-content/src/main/java/com/ruoyi/service/ZfDoctorService.java | 3
zhang-content/src/main/java/com/ruoyi/service/ZSecretService.java | 1
zhang-content/src/main/java/com/ruoyi/service/ZfCollectionService.java | 2
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 9 ++
zhang-content/src/main/java/com/ruoyi/domain/health/KidneyDisease.java | 2
zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java | 11 ++
zhang-content/src/main/java/com/ruoyi/mapper/ZfEconomyMapper.java | 5 +
zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java | 11 ++
ruoyi-admin/src/main/resources/application-druid.yml | 4
zhang-content/src/main/java/com/ruoyi/mapper/ZHonorMapper.java | 6 +
zhang-content/src/main/java/com/ruoyi/mapper/ZYearInfoMapper.java | 5 +
34 files changed, 182 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java
index 01a0d56..6e909fe 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java
@@ -50,6 +50,11 @@
return zHonorService.selectDataList(zHonor,pageNum,pageSize);
}
+ @GetMapping("/type")
+ public AjaxResult listType(){
+ return zHonorService.listType();
+ }
+
/**
* 鏍规嵁id鏌ヨ
*/
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
index e3c2398..1aacbf0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
@@ -49,6 +49,11 @@
return zPropertyService.selectDataList(zProperty,pageNum,pageSize);
}
+ @GetMapping("/type")
+ public AjaxResult listType(){
+ return zPropertyService.listType();
+ }
+
/**
* 鏍规嵁id鏌ヨ
*/
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
index 2d130bd..9ceeac3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
@@ -48,6 +48,11 @@
return zSecretService.selectDataList(zSecret,pageNum,pageSize);
}
+ @GetMapping("/type")
+ public AjaxResult listType(){
+ return zSecretService.listType();
+ }
+
/**
* 鏍规嵁id鏌ヨ
*/
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZYearInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZYearInfoController.java
index 2d2fe22..f70c6f7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZYearInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZYearInfoController.java
@@ -48,6 +48,11 @@
return zYearInfoService.selectDataList(zYearInfo,pageNum,pageSize);
}
+ @GetMapping("/type")
+ public AjaxResult listType(){
+ return zYearInfoService.listType();
+ }
+
/**
* 鏍规嵁id鏌ヨ
*/
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java
index 0bcede8..aaea9bd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java
@@ -49,6 +49,11 @@
return zfCollectionService.selectDataList(zfCollection, pageNum, pageSize);
}
+ @GetMapping("/type")
+ public AjaxResult listType(){
+ return zfCollectionService.listType();
+ }
+
/**
* 鏍规嵁id鏌ヨ
*/
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorController.java
index bfadebf..9e60a80 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorController.java
@@ -46,6 +46,11 @@
return zfDoctorService.selectDoctorList(zfDoctor, pageNum, pageSize);
}
+ @GetMapping("/type")
+ public AjaxResult listType(){
+ return zfDoctorService.listType();
+ }
+
/**
* 鑾峰彇瀵煎叆妯℃澘
*/
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java
index ec151a4..2334f5b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java
@@ -47,6 +47,11 @@
return zfEconomyService.selectDataList(zfEconomy, pageNum, pageSize);
}
+ @GetMapping("/type")
+ public AjaxResult listType(){
+ return zfEconomyService.listType();
+ }
+
/**
* 鑾峰彇瀵煎叆妯℃澘
*/
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java
index 9582c55..3b12569 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java
@@ -45,6 +45,11 @@
return zfPropertyService.selectDataList(zfProperty, pageNum, pageSize);
}
+ @GetMapping("/type")
+ public AjaxResult listType(){
+ return zfPropertyService.listType();
+ }
+
/**
* 鑾峰彇瀵煎叆妯℃澘
*/
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index b2e66b2..045d564 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,8 +6,8 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://47.93.189.255:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# url: jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# url: jdbc:mysql://47.93.189.255:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: ZhangApp123!
# password: 123456
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/health/KidneyDisease.java b/zhang-content/src/main/java/com/ruoyi/domain/health/KidneyDisease.java
index cd5e354..abe5375 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/health/KidneyDisease.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/health/KidneyDisease.java
@@ -11,7 +11,7 @@
@Data
public class KidneyDisease {
private Integer diabetes = 0;//绯栧翱鐥�
- private Integer renalFailure = 0;//绯栧翱鐥�
+ private Integer renalFailure = 0;//鑲惧姛鑳借“绔�
private Integer acuteNephritis = 0;//鎬ユ�ц偩鐐�
private Integer chronicNephritis = 0;//鎱㈡�ц偩鐐�
private Integer urinaryCalculus = 0;//娉屽翱绯荤粺缁撶煶
diff --git a/zhang-content/src/main/java/com/ruoyi/mapper/ZHonorMapper.java b/zhang-content/src/main/java/com/ruoyi/mapper/ZHonorMapper.java
index f182f75..6b4cc86 100644
--- a/zhang-content/src/main/java/com/ruoyi/mapper/ZHonorMapper.java
+++ b/zhang-content/src/main/java/com/ruoyi/mapper/ZHonorMapper.java
@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.domain.ZHonor;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
* <p>
@@ -16,4 +19,7 @@
@Mapper
public interface ZHonorMapper extends BaseMapper<ZHonor> {
+ @Select("select distinct name from z_honor")
+ List<String> listType();
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/mapper/ZPropertyMapper.java b/zhang-content/src/main/java/com/ruoyi/mapper/ZPropertyMapper.java
index 7754b67..f8e8562 100644
--- a/zhang-content/src/main/java/com/ruoyi/mapper/ZPropertyMapper.java
+++ b/zhang-content/src/main/java/com/ruoyi/mapper/ZPropertyMapper.java
@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.domain.ZProperty;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
* <p>
@@ -15,5 +18,6 @@
*/
@Mapper
public interface ZPropertyMapper extends BaseMapper<ZProperty> {
-
+ @Select("select distinct type from z_property")
+ List<String> listType();
}
diff --git a/zhang-content/src/main/java/com/ruoyi/mapper/ZSecretMapper.java b/zhang-content/src/main/java/com/ruoyi/mapper/ZSecretMapper.java
index 356ca8c..85ff65f 100644
--- a/zhang-content/src/main/java/com/ruoyi/mapper/ZSecretMapper.java
+++ b/zhang-content/src/main/java/com/ruoyi/mapper/ZSecretMapper.java
@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.domain.ZSecret;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
* <p>
@@ -16,4 +19,7 @@
@Mapper
public interface ZSecretMapper extends BaseMapper<ZSecret> {
+ @Select("select distinct type from z_secret")
+ List<String> listType();
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/mapper/ZYearInfoMapper.java b/zhang-content/src/main/java/com/ruoyi/mapper/ZYearInfoMapper.java
index 22ad0cd..fd9276b 100644
--- a/zhang-content/src/main/java/com/ruoyi/mapper/ZYearInfoMapper.java
+++ b/zhang-content/src/main/java/com/ruoyi/mapper/ZYearInfoMapper.java
@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.domain.ZYearInfo;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
* <p>
@@ -15,5 +18,7 @@
*/
@Mapper
public interface ZYearInfoMapper extends BaseMapper<ZYearInfo> {
+ @Select("select distinct type from z_year_info")
+ List<String> listType();
}
diff --git a/zhang-content/src/main/java/com/ruoyi/mapper/ZfCollectionMapper.java b/zhang-content/src/main/java/com/ruoyi/mapper/ZfCollectionMapper.java
index a11cbde..7209d94 100644
--- a/zhang-content/src/main/java/com/ruoyi/mapper/ZfCollectionMapper.java
+++ b/zhang-content/src/main/java/com/ruoyi/mapper/ZfCollectionMapper.java
@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.domain.ZfCollection;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
* <p>
@@ -16,4 +19,6 @@
@Mapper
public interface ZfCollectionMapper extends BaseMapper<ZfCollection> {
+ @Select("select distinct type from zf_collection")
+ List<String> listType();
}
diff --git a/zhang-content/src/main/java/com/ruoyi/mapper/ZfDoctorMapper.java b/zhang-content/src/main/java/com/ruoyi/mapper/ZfDoctorMapper.java
index 5a93f4e..77436b7 100644
--- a/zhang-content/src/main/java/com/ruoyi/mapper/ZfDoctorMapper.java
+++ b/zhang-content/src/main/java/com/ruoyi/mapper/ZfDoctorMapper.java
@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.domain.ZfDoctor;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
* <p>
@@ -15,5 +18,7 @@
*/
@Mapper
public interface ZfDoctorMapper extends BaseMapper<ZfDoctor> {
+ @Select("select distinct type from zf_doctor")
+ List<String> listType();
}
diff --git a/zhang-content/src/main/java/com/ruoyi/mapper/ZfEconomyMapper.java b/zhang-content/src/main/java/com/ruoyi/mapper/ZfEconomyMapper.java
index bd91a5e..9d40269 100644
--- a/zhang-content/src/main/java/com/ruoyi/mapper/ZfEconomyMapper.java
+++ b/zhang-content/src/main/java/com/ruoyi/mapper/ZfEconomyMapper.java
@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.domain.ZfEconomy;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
* <p>
@@ -15,5 +18,7 @@
*/
@Mapper
public interface ZfEconomyMapper extends BaseMapper<ZfEconomy> {
+ @Select("select distinct type from zf_economy")
+ List<String> listType();
}
diff --git a/zhang-content/src/main/java/com/ruoyi/mapper/ZfPropertyMapper.java b/zhang-content/src/main/java/com/ruoyi/mapper/ZfPropertyMapper.java
index c975c51..7049ec0 100644
--- a/zhang-content/src/main/java/com/ruoyi/mapper/ZfPropertyMapper.java
+++ b/zhang-content/src/main/java/com/ruoyi/mapper/ZfPropertyMapper.java
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.domain.ZfProperty;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
* @Version 1.0
@@ -12,6 +15,8 @@
@Mapper
public interface ZfPropertyMapper extends BaseMapper<ZfProperty>
{
+ @Select("select distinct type from zf_property")
+ List<String> listType();
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java b/zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java
index 9224c47..9106639 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java
@@ -32,4 +32,7 @@
// AjaxResult addData2(ZfProperty zfProperty);
AjaxResult importExcel(MultipartFile file);
+
+ AjaxResult listType();
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZHonorService.java b/zhang-content/src/main/java/com/ruoyi/service/ZHonorService.java
index a9e863d..abd0ac5 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZHonorService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZHonorService.java
@@ -27,4 +27,7 @@
List<ZHonor> selectCondition(ZHonor zHonor);
List<ZHonor> selectByIds(Long[] ids);
+
+ AjaxResult listType();
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZPropertyService.java b/zhang-content/src/main/java/com/ruoyi/service/ZPropertyService.java
index 98b29a3..1cc6c34 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZPropertyService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZPropertyService.java
@@ -29,4 +29,5 @@
List<ZProperty> selectByCondition();
+ AjaxResult listType();
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZSecretService.java b/zhang-content/src/main/java/com/ruoyi/service/ZSecretService.java
index 73d3119..cf95319 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZSecretService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZSecretService.java
@@ -29,4 +29,5 @@
List<ZSecret> selectByCondition();
+ AjaxResult listType();
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZYearInfoService.java b/zhang-content/src/main/java/com/ruoyi/service/ZYearInfoService.java
index 0f3154e..b92e695 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZYearInfoService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZYearInfoService.java
@@ -25,4 +25,6 @@
AjaxResult importExcel(MultipartFile file);
AjaxResult mySave(ZYearInfo zYearInfo);
+
+ AjaxResult listType();
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfCollectionService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfCollectionService.java
index 302c174..73da51d 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfCollectionService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfCollectionService.java
@@ -32,4 +32,6 @@
AjaxResult updateData(ZfCollection zfCollection);
AjaxResult deleteData(Long[] ids);
+
+ AjaxResult listType();
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfDoctorService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfDoctorService.java
index 9a8bb68..3f6e2ea 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfDoctorService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfDoctorService.java
@@ -18,6 +18,8 @@
*/
public interface ZfDoctorService extends IService<ZfDoctor> {
+
+
AjaxResult selectDoctorList(ZfDoctor zfDoctor, Integer pageNum, Integer pageSize);
List<ZfDoctor> selectByCondition(ZfDoctor zfDoctor);
@@ -33,4 +35,5 @@
AjaxResult deleteData(Long[] ids);
+ AjaxResult listType();
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfEconomyService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfEconomyService.java
index 290715d..14cfc17 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfEconomyService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfEconomyService.java
@@ -31,4 +31,7 @@
AjaxResult updateData(ZfEconomy zfEconomy);
AjaxResult deleteData(Long[] ids);
+
+ AjaxResult listType();
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
index 4015611..4c460e2 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -49,6 +49,9 @@
@Resource
ZAuthorityService zAuthorityService;
+ @Resource
+ ZfPropertyMapper zfPropertyMapper;
+
// private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty) {
// LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>();
@@ -499,6 +502,12 @@
}
+ @Override
+ public AjaxResult listType() {
+ List<String> result = zfPropertyMapper.listType();
+ return AjaxResult.success(result);
+ }
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHonorServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHonorServiceImpl.java
index 11f3312..8363562 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHonorServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHonorServiceImpl.java
@@ -15,12 +15,14 @@
import com.ruoyi.domain.ZfCollection;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.ZHonorMapper;
+import com.ruoyi.mapper.ZYearInfoMapper;
import com.ruoyi.service.ZHonorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -40,6 +42,9 @@
@Autowired
ZHonorServiceImpl zHonorService;
+
+ @Resource
+ ZHonorMapper zHonorMapper;
private LambdaQueryWrapper<ZHonor> uniqueCondition(ZHonor zHonor){
LambdaQueryWrapper<ZHonor> lqw = new LambdaQueryWrapper<>();
@@ -106,6 +111,12 @@
}
@Override
+ public AjaxResult listType() {
+ List<String> result = zHonorMapper.listType();
+ return AjaxResult.success(result);
+ }
+
+ @Override
public AjaxResult mySave(ZHonor zHonor) {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java
index a243831..bd144ca 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java
@@ -20,6 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -38,6 +39,9 @@
@Autowired
ZPropertyServiceImpl zPropertyService;
+
+ @Resource
+ ZPropertyMapper zPropertyMapper;
private LambdaQueryWrapper<ZProperty> uniqueCondition(ZProperty zProperty) {
LambdaQueryWrapper<ZProperty> lqw = new LambdaQueryWrapper<>();
@@ -128,6 +132,12 @@
}
@Override
+ public AjaxResult listType() {
+ List<String> result = zPropertyMapper.listType();
+ return AjaxResult.success(result);
+ }
+
+ @Override
@Transactional
public AjaxResult importExcel(MultipartFile file) {
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java
index 18c3300..084bf4c 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java
@@ -14,12 +14,14 @@
import com.ruoyi.domain.ZSecret;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.mapper.ZSecretMapper;
+import com.ruoyi.service.ZHonorService;
import com.ruoyi.service.ZSecretService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -38,6 +40,9 @@
@Autowired
ZSecretServiceImpl zSecretService;
+
+ @Resource
+ ZSecretMapper zSecretMapper;
private LambdaQueryWrapper<ZSecret> uniqueCondition(ZSecret zSecret) {
LambdaQueryWrapper<ZSecret> lqw = new LambdaQueryWrapper<>();
@@ -130,6 +135,12 @@
}
@Override
+ public AjaxResult listType() {
+ List<String> result = zSecretMapper.listType();
+ return AjaxResult.success(result);
+ }
+
+ @Override
@Transactional
public AjaxResult importExcel(MultipartFile file) {
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java
index ef758c3..a6f5504 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java
@@ -17,8 +17,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -37,6 +39,9 @@
@Autowired
ZYearInfoServiceImpl zYearInfoService;
+
+ @Resource
+ ZYearInfoMapper zYearInfoMapper;
private LambdaQueryWrapper<ZYearInfo> uniqueCondition(ZYearInfo zYearInfo) {
LambdaQueryWrapper<ZYearInfo> lqw = new LambdaQueryWrapper<>();
@@ -115,6 +120,12 @@
}
@Override
+ public AjaxResult listType() {
+ List<String> result = zYearInfoMapper.listType();
+ return AjaxResult.success(result);
+ }
+
+ @Override
@Transactional
public AjaxResult importExcel(MultipartFile file) {
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
index e0f605e..1d4192b 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
@@ -53,6 +53,9 @@
@Resource
ZAuthorityService zAuthorityService;
+ @Resource
+ ZfCollectionMapper zfCollectionMapper;
+
private LambdaQueryWrapper<ZfCollection> buildCondition(ZfCollection zfCollection,List<Long> familyIdList) {
LambdaQueryWrapper<ZfCollection> lqw = new LambdaQueryWrapper<>();
lqw.orderByDesc(ZfCollection::getCreateTime);
@@ -430,6 +433,12 @@
}
}
+ @Override
+ public AjaxResult listType() {
+ List<String> result = zfCollectionMapper.listType();
+ return AjaxResult.success(result);
+ }
+
@Override
@Transactional
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
index e90659e..3507ba0 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
@@ -48,6 +48,9 @@
@Resource
ZAuthorityService zAuthorityService;
+ @Resource
+ ZfDoctorMapper zfDoctorMapper;
+
@Override
public AjaxResult selectDoctorList(ZfDoctor zfDoctor, Integer pageNum, Integer pageSize) {
// LambdaQueryWrapper<ZfDoctor> lqw = buildCondition(zfDoctor);
@@ -231,6 +234,12 @@
}
}
+ @Override
+ public AjaxResult listType() {
+ List<String> result = zfDoctorMapper.listType();
+ return AjaxResult.success(result);
+ }
+
// @Override
// public AjaxResult mySave(ZfDoctor zfDoctor) {
// //鍒ゆ柇鏄惁鏈夐噸澶嶆暟鎹�
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
index 66a01c0..ac8974a 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
@@ -52,6 +52,9 @@
@Resource
ZAuthorityService zAuthorityService;
+ @Resource
+ ZfEconomyMapper zfEconomyMapper;
+
private LambdaQueryWrapper<ZfEconomy> buildCondition(ZfEconomy zfEconomy,List<Long> familyIdList) {
LambdaQueryWrapper<ZfEconomy> lqw = new LambdaQueryWrapper<>();
lqw.orderByDesc(ZfEconomy::getCreateTime);
@@ -449,5 +452,11 @@
}
}
+ @Override
+ public AjaxResult listType() {
+ List<String> result = zfEconomyMapper.listType();
+ return AjaxResult.success(result);
+ }
+
}
--
Gitblit v1.9.1