From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua

---
 src/main/java/com/ots/project/exam/service/impl/EntDemographyInfoServiceImpl.java |   67 ++++++++-------------------------
 1 files changed, 16 insertions(+), 51 deletions(-)

diff --git a/src/main/java/com/ots/project/exam/service/impl/EntDemographyInfoServiceImpl.java b/src/main/java/com/ots/project/exam/service/impl/EntDemographyInfoServiceImpl.java
index 777b6ad..32af7ed 100644
--- a/src/main/java/com/ots/project/exam/service/impl/EntDemographyInfoServiceImpl.java
+++ b/src/main/java/com/ots/project/exam/service/impl/EntDemographyInfoServiceImpl.java
@@ -1,5 +1,4 @@
 package com.ots.project.exam.service.impl;
-
 import com.ots.common.utils.DateUtils;
 import com.ots.common.utils.text.Convert;
 import com.ots.project.exam.domain.EntDemographyInfo;
@@ -7,89 +6,55 @@
 import com.ots.project.exam.service.IEntDemographyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.util.List;
 
-/**
- * 浜哄彛瀛︿俊鎭疭ervice涓氬姟灞傚鐞�
- *
- * @author ots
- * @date 2019-12-15
- */
 @Service
 public class EntDemographyInfoServiceImpl implements IEntDemographyInfoService {
     @Autowired
     private EntDemographyInfoMapper entDemographyInfoMapper;
-
-    /**
-     * 鏌ヨ浜哄彛瀛︿俊鎭�
-     *
-     * @param infoId 浜哄彛瀛︿俊鎭疘D
-     * @return 浜哄彛瀛︿俊鎭�
-     */
+    
     @Override
     public EntDemographyInfo selectEntDemographyInfoById(Long infoId) {
         return entDemographyInfoMapper.selectEntDemographyInfoById(infoId);
     }
-
-    /**
-     * 鏌ヨ浜哄彛瀛︿俊鎭垪琛�
-     *
-     * @param entDemographyInfo 浜哄彛瀛︿俊鎭�
-     * @return 浜哄彛瀛︿俊鎭�
-     */
+    
     @Override
     public List<EntDemographyInfo> selectEntDemographyInfoList(EntDemographyInfo entDemographyInfo) {
         return entDemographyInfoMapper.selectEntDemographyInfoList(entDemographyInfo);
     }
-
     @Override
     public List<EntDemographyInfo> selectEntDemographyAndParamList(EntDemographyInfo entDemographyInfo) {
         return entDemographyInfoMapper.selectEntDemographyAndParamList(entDemographyInfo);
     }
-
-    /**
-     * 鏂板浜哄彛瀛︿俊鎭�
-     *
-     * @param entDemographyInfo 浜哄彛瀛︿俊鎭�
-     * @return 缁撴灉
-     */
+    
     @Override
     public int insertEntDemographyInfo(EntDemographyInfo entDemographyInfo) {
         entDemographyInfo.setCreateTime(DateUtils.getNowDate());
         return entDemographyInfoMapper.insertEntDemographyInfo(entDemographyInfo);
     }
-
-    /**
-     * 淇敼浜哄彛瀛︿俊鎭�
-     *
-     * @param entDemographyInfo 浜哄彛瀛︿俊鎭�
-     * @return 缁撴灉
-     */
+    
     @Override
     public int updateEntDemographyInfo(EntDemographyInfo entDemographyInfo) {
         entDemographyInfo.setUpdateTime(DateUtils.getNowDate());
         return entDemographyInfoMapper.updateEntDemographyInfo(entDemographyInfo);
     }
-
-    /**
-     * 鍒犻櫎浜哄彛瀛︿俊鎭璞�
-     *
-     * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
-     * @return 缁撴灉
-     */
+    
     @Override
     public int deleteEntDemographyInfoByIds(String ids) {
         return entDemographyInfoMapper.deleteEntDemographyInfoByIds(Convert.toStrArray(ids));
     }
-
-    /**
-     * 鍒犻櫎浜哄彛瀛︿俊鎭俊鎭�
-     *
-     * @param infoId 浜哄彛瀛︿俊鎭疘D
-     * @return 缁撴灉
-     */
+    
     public int deleteEntDemographyInfoById(Long infoId) {
         return entDemographyInfoMapper.deleteEntDemographyInfoById(infoId);
     }
+
+    /**
+     * 鑾峰彇闂嵎璇█
+     * @param memberId
+     * @return
+     */
+    @Override
+    public String getlangType(Long memberId) {
+        return entDemographyInfoMapper.getlangType(memberId);
+    }
 }

--
Gitblit v1.9.1