feat: 代码合并

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

@@ -234,10 +234,6 @@ public class FsStoreOrderController extends BaseController
         task.setUserId(SecurityUtils.getUserId());
         exportTaskService.insertFsExportTask(task);
         param.setTaskId(task.getTaskId());
-        boolean checkPhone = isCheckPhone();
-        exportTaskService.exportStore1Data(param,checkPhone);
-
-
         exportTaskService.exportStore1Data(param);
 
         return new AjaxResult(200,"后台正在导出,请等待...任务ID:"+task.getTaskId(),task.getTaskId());

fs-service/src/main/java/com/fs/his/service/IFsExportTaskService.java

@@ -64,6 +64,7 @@ public interface IFsExportTaskService
     Integer isExportType1( Long userId);
 
     public void exportStore1Data(FsStoreOrderParam param,boolean isAdmin);
+    public void exportStore1Data(FsStoreOrderParam fsStoreOrder);
 
     public void exportStoreData(FsStoreOrderParam fsStoreOrder);
 

fs-service/src/main/java/com/fs/his/service/impl/FsExportTaskServiceImpl.java

@@ -130,6 +130,38 @@ public class FsExportTaskServiceImpl implements IFsExportTaskService
         return fsExportTaskMapper.isExportType1(userId);
     }
 
+    @Async
+    @Override
+    public void exportStore1Data(FsStoreOrderParam fsStoreOrder,boolean isAdmin) {
+        List<FsStoreOrderExportVO> list = fsStoreOrderMapper.selectFsStoreOrderListVOByExport(fsStoreOrder);
+        //对手机号脱敏
+        if (list != null) {
+            for (FsStoreOrderExportVO vo : list) {
+                vo.setFollowFrequency(6);
+                if (vo.getCycle()!=null){
+                    vo.setFollowCount(vo.getCycle()/ vo.getFollowFrequency());
+                }
+                if (vo.getUserPhone() != null &&  !isAdmin) {
+                    vo.setUserPhone(vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+                }
+                if (vo.getUserPhone() != null && isAdmin && vo.getUserPhone().length()>11) {
+                    vo.setUserPhone(PhoneUtil.decryptPhone(vo.getUserPhone()));
+                }
+                if (vo.getUserAddress() != null) {
+                    vo.setUserAddress(ParseUtils.parseAddress(vo.getUserAddress()));
+                }
+            }
+        }
+        ExcelUtil<FsStoreOrderExportVO> util = new ExcelUtil<FsStoreOrderExportVO>(FsStoreOrderExportVO.class);
+        AjaxResult result= util.exportExcel(list, "订单数据");
+        FsExportTask task=fsExportTaskMapper.selectFsExportTaskByTaskId(fsStoreOrder.getTaskId());
+        task.setFinishTime(new Date());
+        task.setStatus(1);
+        task.setFileUrl(result.get("msg").toString());
+        fsExportTaskMapper.updateFsExportTask(task);
+
+    }
+
     @Async(value = "threadPoolTaskExecutor")
     @Override
     public void exportStore1Data(FsStoreOrderParam fsStoreOrder) {