医健宝充值流量页面修改

fs-admin/src/main/java/com/fs/his/controller/FsPatientController.java

@@ -67,6 +67,25 @@ public class FsPatientController extends BaseController
         return getDataTable(list);
     }
 
+    @GetMapping("/userList")
+    public TableDataInfo userList(FsPatientVO fsPatient)
+    {
+        startPage();
+        List<FsPatientVO> list = fsPatientService.selectFsPatientListVO(fsPatient);
+        for (FsPatientVO fsPatientVO : list){
+            if (fsPatientVO.getPhone()!=null){
+                fsPatientVO.setPhone(fsPatientVO.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+            }
+            if (fsPatientVO.getIdCard()!=null){
+                fsPatientVO.setIdCard(fsPatientVO.getIdCard().replaceAll("(\\d{4})\\d{10}(\\w{4})", "$1**********$2"));
+            }
+            if (fsPatientVO.getMobile()!=null){
+                fsPatientVO.setMobile(fsPatientVO.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+            }
+        }
+        return getDataTable(list);
+    }
+
     /**
      * 导出病人列表
      */

fs-service/src/main/java/com/fs/company/mapper/CompanyTrafficRecordMapper.java

@@ -2,13 +2,27 @@ package com.fs.company.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.company.domain.CompanyTrafficRecord;
+import com.fs.company.param.CompanyTrafficRecordQueryParam;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 @Mapper
 public interface CompanyTrafficRecordMapper extends BaseMapper<CompanyTrafficRecord> {
 
     @Select("SELECT SUM(ctr.balance) FROM company_traffic_record ctr inner join company c on ctr.company_id = c.company_id and c.dept_id = #{deptId}")
     Long calculateTotalTrafficByDeptId(@Param("deptId") Long deptId);
+
+    @Select({"<script>"+
+                "SELECT ctr.id,c.company_id,c.company_name,ctr.balance from company c " +
+                "LEFT JOIN company_traffic_record ctr on ctr.company_id = c.company_id " +
+                "WHERE c.is_del = 0 "+
+                "<if test = 'maps.companyIds != null'> " +
+                "and c.company_id IN " +
+                "<foreach collection='maps.companyIds'  item='item' index='index'  open='(' separator=',' close=')'> #{item} </foreach> "+
+                "</if> " +
+            "</script>"})
+    List<CompanyTrafficRecord> selectListWithUncharged(@Param("maps") CompanyTrafficRecordQueryParam record);
 }

fs-service/src/main/java/com/fs/company/param/CompanyTrafficRecordQueryParam.java

@@ -14,7 +14,4 @@ public class CompanyTrafficRecordQueryParam {
     private Long companyId;
     private List<Long> companyIds;
     private Long createBy;
-    private Date createTime;
-    private Date createTimeStart;
-    private Date createTimeEnd;
 }

fs-service/src/main/java/com/fs/company/service/impl/CompanyTrafficRecordLogServiceImpl.java

@@ -24,7 +24,8 @@ public class CompanyTrafficRecordLogServiceImpl extends ServiceImpl<CompanyTraff
                 .eq(record.getUserId() != null ,CompanyTrafficRecordLog::getUserId, record.getUserId())
                 .eq(record.getOperationType() != null ,CompanyTrafficRecordLog::getOperationType, record.getOperationType())
                 .eq(record.getCreateTime() != null ,CompanyTrafficRecordLog::getCreateTime, record.getCreateTime())
-                .between(record.getCreateTimeStart() != null && record.getCreateTimeEnd() != null,CompanyTrafficRecordLog::getCreateTime, record.getCreateTimeStart(), record.getCreateTimeEnd()));
+                .between(record.getCreateTimeStart() != null && record.getCreateTimeEnd() != null,CompanyTrafficRecordLog::getCreateTime, record.getCreateTimeStart(), record.getCreateTimeEnd())
+                .orderByDesc(CompanyTrafficRecordLog::getCreateTime));
     }
 
     @Override

fs-service/src/main/java/com/fs/company/service/impl/CompanyTrafficRecordServiceImpl.java

@@ -83,7 +83,16 @@ public class CompanyTrafficRecordServiceImpl extends ServiceImpl<CompanyTrafficR
         //redis获取剩余流量
         Object traffic = redisCache.getCacheObject(CompanyTrafficConstants.CACHE_KEY + ":" + companyTrafficRecord.getDeptId() + ":" + companyTrafficRecord.getCompanyId());
         if(traffic!=null) {
-            Long balance = ((Integer) traffic).longValue();
+            Long balance;
+            if(traffic instanceof Long) {
+                balance = (Long) traffic;
+            }else if(traffic instanceof Integer){
+                balance = ((Integer) traffic).longValue();
+            }else if(traffic instanceof String){
+                balance = Long.parseLong(traffic.toString());
+            }else{
+                throw new IllegalArgumentException("流量转换异常");
+            }
             long trafficAmount = companyTrafficRecord.getBalance() - balance;
             companyTrafficRecord.setBalance(balance);
             if (trafficAmount != 0) {
@@ -181,7 +190,9 @@ public class CompanyTrafficRecordServiceImpl extends ServiceImpl<CompanyTrafficR
     private void doRefresh(CompanyTrafficRecordChargeParam record, CompanyTrafficRecord companyTrafficRecord) {
         if (record.getCompany() != null && record.getCompany().getDeptId() != null) {
             // 更新缓存 key=CACHE_KEY:deptId:companyId  value=剩余流量
-            redisCache.setCacheObject(CompanyTrafficConstants.CACHE_KEY + ":" + record.getCompany().getDeptId() + ":" + record.getCompanyId(),
+
+            redisCache.deleteObject(CompanyTrafficConstants.CACHE_KEY + ":" + record.getCompany().getDeptId() + ":" + record.getCompanyId());
+            redisCache.incr(CompanyTrafficConstants.CACHE_KEY + ":" + record.getCompany().getDeptId() + ":" + record.getCompanyId(),
                     companyTrafficRecord.getBalance());
 
             // 计算该部门下所有公司流量总和
@@ -217,10 +228,7 @@ public class CompanyTrafficRecordServiceImpl extends ServiceImpl<CompanyTrafficR
 
     @Override
     public List<CompanyTrafficRecord> selectList(CompanyTrafficRecordQueryParam record) {
-        return baseMapper.selectList(new LambdaQueryWrapper<CompanyTrafficRecord>()
-                .eq(record.getCompanyId() != null,CompanyTrafficRecord::getCompanyId, record.getCompanyId())
-                .in(record.getCompanyIds() != null && !record.getCompanyIds().isEmpty(),CompanyTrafficRecord::getCompanyId, record.getCompanyIds())
-                .between(record.getCreateTimeStart() != null && record.getCreateTimeEnd() != null,CompanyTrafficRecord::getCreateTime, record.getCreateTimeStart(),record.getCreateTimeEnd()));
+        return baseMapper.selectListWithUncharged(record);
     }
 
     @Override