量化积分列表查询修改

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java

@@ -21,23 +21,13 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
-import com.epmet.dto.IcFollowUpRecordDTO;
-import com.epmet.dto.result.IcMoveInListResultDTO;
-import com.epmet.dto.result.IcVaccineListResultDTO;
-import com.epmet.modules.partymember.entity.IcPartyMemberPointEntity;
-import com.epmet.modules.partymember.excel.IcPartyMemberExcel;
 import com.epmet.modules.partymember.excel.IcPartyMemberPointExcel;
 import com.epmet.modules.partymember.service.IcPartyMemberPointService;
 import com.epmet.resi.partymember.dto.partymember.IcPartyMemberPointDTO;
-import com.epmet.resi.partymember.dto.partymember.PartyMemberPointListCountDTO;
-import com.epmet.resi.partymember.dto.partymember.form.PartyMemberExportFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberPointEchoFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberPointListFormDTO;
-import com.epmet.resi.partymember.dto.partymember.result.IcPartyMemberResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointEchoResultDTO;
-import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointExportResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointListResultDTO;
-import jdk.nashorn.internal.parser.Token;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +35,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.PrintWriter;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java

@@ -14,26 +14,19 @@ import com.epmet.modules.partymember.entity.IcPartyMemberPointEntity;
 import com.epmet.modules.partymember.redis.IcPartyMemberPointRedis;
 import com.epmet.modules.partymember.service.IcPartyMemberPointService;
 import com.epmet.resi.partymember.dto.partymember.IcPartyMemberPointDTO;
-import com.epmet.resi.partymember.dto.partymember.PartyMemberPointListCountDTO;
-import com.epmet.resi.partymember.dto.partymember.form.PartyMemberExportFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberPointEchoFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberPointListFormDTO;
-import com.epmet.resi.partymember.dto.partymember.result.IcPartyMemberResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointEchoResultDTO;
-import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointExportResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointListResultDTO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import jdk.nashorn.internal.parser.Token;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.sql.Time;
 import java.time.Year;
 import java.util.Arrays;
-import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml

@@ -44,12 +44,10 @@
             AVG( a.WARN_POINT ) AS warnPoint
         FROM
             ic_party_member_point a
-        LEFT JOIN ic_party_member u ON a.PARTY_MEMBER_ID = u.id
-        AND a.DEL_FLAG = '0'
-        LEFT JOIN ic_party_org c ON c.id = u.sszb
-        AND c.DEL_FLAG = '0'
+            LEFT JOIN ic_party_member u ON a.PARTY_MEMBER_ID = u.id
+            LEFT JOIN ic_party_org c ON c.id = u.sszb
         <where>
-            u.DEL_FLAG = '0'
+            u.DEL_FLAG = '0' AND a.DEL_FLAG = '0' AND c.DEL_FLAG = '0'
             AND u.CUSTOMER_ID = #{customerId}
             <if test="name != null and name != ''">
                 AND u.NAME = #{name}