ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java
@@ -5,6 +5,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import com.ruoyi.common.core.domain.R; @@ -51,7 +52,7 @@ * 文件上传请求 */ @PostMapping("uploadOSS") public R<String> uploadOSS(MultipartFile file) public R<String> uploadOSS(@RequestPart("file")MultipartFile file) { try { ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/OBSUploadUtils.java
@@ -80,8 +80,8 @@ if (ossClient != null) { ossClient.shutdown(); } return result.getResponse().getErrorResponseAsString(); } return result.getResponse().getErrorResponseAsString(); } } ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskPageVo.java
@@ -26,6 +26,10 @@ @ApiModelProperty("任务内容") private String taskContent; @ApiModelProperty("处理内容") private String dealContent; @ApiModelProperty("今日标记") private Integer todayFlag;
@@ -6,8 +6,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.utils.bean.BeanUtils; import com.ruoyi.shop.domain.pojo.shop.ShopRelTag; import com.ruoyi.shop.domain.pojo.shop.ShopRelUser; import com.ruoyi.shop.domain.pojo.shop.ShopStaff; import com.ruoyi.shop.mapper.shop.ShopStaffMapper; import com.ruoyi.shop.service.shop.ShopRelUserService; import com.ruoyi.shop.service.shop.ShopService; import com.ruoyi.shop.service.shop.ShopStaffService; import com.ruoyi.system.api.RemoteMemberService; import com.ruoyi.system.api.domain.dto.MerEditUserDto; @@ -30,7 +33,11 @@ @Service public class ShopStaffServiceImpl extends ServiceImpl<ShopStaffMapper, ShopStaff> implements ShopStaffService { @Resource private ShopService shopService; @Resource private ShopRelUserService shopRelUserService; /** * * @param userId @@ -54,7 +61,12 @@ MerStaffInfoVo merStaffInfoVo = new MerStaffInfoVo(); ShopStaff shopStaff = this.getByUserId(userId); BeanUtils.copyProperties(shopStaff,merStaffInfoVo); ShopRelUser shopRelUser = shopRelUserService.getByUserId(userId); Shop shop = shopService.getByShopId(shopRelUser.getShopId()); merStaffInfoVo.setShopName(shop.getShopName()); merStaffInfoVo.setShopAddress(shop.getShopAddress()); merStaffInfoVo.setShopServicePhone(shop.getShopServicePhone()); merStaffInfoVo.setBusinessTime(shop.getBusinessStartTime()+"-"+shop.getBusinessEndTime()); return merStaffInfoVo; }
@@ -17,8 +17,10 @@ SELECT task_id taskId, task_date taskDate, task_content taskContent task_content taskContent, tmtr.follow_content dealContent FROM t_agency_task tat LEFT JOIN t_member_task_record tmtr ON tmt.task_id = tmtr.task_id WHERE del_flag = 0 AND shop_id = #{param.shopId} AND agency_id = #{param.agencyId} <if test="param.taskStatus!=null and param.taskStatus == 0"> AND task_status = 0 AND task_date < #{param.nowDay} ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskMapper.xml
@@ -81,12 +81,14 @@ <select id="pageMerMemberTask" resultType="com.ruoyi.shop.domain.vo.MerMemberTaskPageVo"> SELECT task_id taskId, task_date taskDate, task_content taskContent, tmt.task_id taskId, tmt.task_date taskDate, tmt.task_content taskContent, tmtr.follow_content dealContent, CASE WHEN task_date = #{param.today} THEN 1 ELSE 0 END todayFlag FROM t_member_task WHERE del_flag = 0 AND shop_id = #{param.shopId} AND user_id = #{param.memberUserId} FROM t_member_task tmt LEFT JOIN t_member_task_record tmtr ON tmt.task_id = tmtr.task_id WHERE tmt.del_flag = 0 AND tmt.shop_id = #{param.shopId} AND tmt.user_id = #{param.memberUserId} ORDER BY todayFlag,task_date DESC </select> </mapper>
