feat: update something

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmTaskService.java

@@ -102,14 +102,13 @@ public interface WmTaskService extends IService<WmTask> {
 
     List<Map<String, Object>> getTaskListByIdsZdJs(WmTask wmTask);
 
+    R<?> getWmTaskList(Page page, WmTask wmTask);
 
-    R getWmTaskList(Page page, WmTask wmTask);
-
-    R approvalTask(WmTask wmTask);
+    R<?> approvalTask(WmTask wmTask);
 
     Map<String, Timestamp> getMaxCreateTime(@Param("query") WmTask wmTask);
 
-    R saveTaskSettle(WmTask wmTask);
+    R<?> saveTaskSettle(WmTask wmTask);
 
     /**
      * 患者教育-处方上传
@@ -117,9 +116,9 @@ public interface WmTaskService extends IService<WmTask> {
      * @param wmTask 任务对象
      * @return 是否成功状态
      */
-    R saveTaskPrescription(WmTask wmTask);
+    R<?> saveTaskPrescription(WmTask wmTask);
 
-    R updateTaskSettle(WmTask wmTask);
+    R<?> updateTaskSettle(WmTask wmTask);
 
     IPage<Map<String, Object>> selectSettleTask(Page page, WmTask wmTask);
 
@@ -127,7 +126,7 @@ public interface WmTaskService extends IService<WmTask> {
 
     Boolean newCheckUserTaskSubScore(String userId, LocalDate createDate);
 
-    R getTaskInfo(String taskId);
+    R<?> getTaskInfo(String taskId);
 
     /**
      * 查询调查信息审核数据

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskServiceImpl.java

@@ -46,6 +46,7 @@ import com.qunzhixinxi.hnqz.common.data.datascope.DataScope;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.IOUtils;
@@ -54,6 +55,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
@@ -91,7 +93,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @Slf4j
-@AllArgsConstructor
+@RequiredArgsConstructor
 public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> implements WmTaskService {
 
     private final WmTaskMapper wmTaskMapper;
@@ -106,13 +108,19 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
     private final WmScoreTaskTypeService wmScoreTaskTypeService;
     private final WmTaskTypeService taskTypeService;
     private final SysUserService userService;
-    private final WmDaHospitalService wmDaHospitalService;
-    private final WmDaPharmacyService wmDaPharmacyService;
-    private final WmDaDistributionService wmDaDistributionService;
     private final RedisTemplate<String, Object> redisTemplate;
     private final UpmsConfig upmsConfig;
     private final SysCheckChainManager checkChainManager;
 
+    @Resource
+    private WmDaHospitalService wmDaHospitalService;
+
+    @Resource
+    private WmDaPharmacyService wmDaPharmacyService;
+
+    @Resource
+    private WmDaDistributionService wmDaDistributionService;
+
     @Override
     public List<WmTask> listTask(QueryWrapper wrappers) {
         return wmTaskMapper.selectListByScope(wrappers, new DataScope());