feat: 添加需求

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

@@ -29,6 +29,7 @@ import com.fs.erp.dto.ErpOrderQueryResponse;
 import com.fs.erp.dto.df.BspOrderResponse;
 import com.fs.erp.dto.df.DFConfigVo;
 import com.fs.erp.service.IErpOrderService;
+import com.fs.framework.web.service.PermissionService;
 import com.fs.framework.web.service.TokenService;
 import com.fs.his.config.FsSysConfig;
 import com.fs.his.domain.*;
@@ -47,6 +48,7 @@ import com.fs.system.domain.SysConfig;
 import com.fs.system.mapper.SysConfigMapper;
 import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -70,6 +72,7 @@ import static com.fs.his.utils.PhoneUtil.*;
  * @author fs
  * @date 2023-06-13
  */
+@Slf4j
 @RestController
 @RequestMapping("/his/storeOrder")
 public class FsStoreOrderController extends BaseController
@@ -127,6 +130,8 @@ public class FsStoreOrderController extends BaseController
     @PostMapping("/list")
     public TableDataInfo list(@RequestBody FsStoreOrderParam fsStoreOrder)
     {
+        log.info("查询订单列表 {}",fsStoreOrder);
+
         PageHelper.startPage(fsStoreOrder);
         if (fsStoreOrder.getUserPhoneMk()!=null&& !fsStoreOrder.getUserPhoneMk().isEmpty()){
             fsStoreOrder.setUserPhone(encryptPhone(fsStoreOrder.getUserPhoneMk()));
@@ -220,6 +225,8 @@ public class FsStoreOrderController extends BaseController
         task.setUserId(SecurityUtils.getUserId());
         exportTaskService.insertFsExportTask(task);
         param.setTaskId(task.getTaskId());
+
+
         exportTaskService.exportStore1Data(param);
 
         return new AjaxResult(200,"后台正在导出,请等待...任务ID:"+task.getTaskId(),task.getTaskId());

fs-common/src/main/java/com/fs/common/enums/SecurityResourceConstant.java

@@ -0,0 +1,17 @@
+package com.fs.common.enums;
+
+/**
+ * 安全资源常量
+ */
+public class SecurityResourceConstant {
+
+    /**
+     * 处方订单 - 查看完整电话
+     */
+    public static final String STORE_ORDER_QUERY_PHONE = "his:storeOrder:queryPhone";
+
+    /**
+     * 处方订单 - 查看完整地址
+     */
+    public static final String STORE_ORDER_QUERY_EMAIL = "his:storeOrder:queryAddress";
+}

fs-service/src/main/java/com/fs/his/param/FsStoreOrderParam.java

@@ -152,7 +152,9 @@ public class FsStoreOrderParam extends BaseEntity implements Serializable {
     /** $column.columnComment */
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date finishTime;
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date sTime;
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date eTime;
     private Date paysTime;
     private Date payeTime;

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

@@ -37,6 +37,8 @@ public class FsExportTaskServiceImpl implements IFsExportTaskService
     @Autowired
 
     FsStorePaymentMapper fsStorePaymentMapper;
+
+
     /**
      * 查询导出任务
      *
@@ -121,6 +123,8 @@ public class FsExportTaskServiceImpl implements IFsExportTaskService
         List<FsStoreOrderExportVO> list = fsStoreOrderMapper.selectFsStoreOrderListVOByExport(fsStoreOrder);
         //对手机号脱敏
         if (list != null) {
+
+
             for (FsStoreOrderExportVO vo : list) {
                 vo.setFollowFrequency(6);
                 if (vo.getCycle()!=null){