autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-06 15:08:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Guoqs
2026-02-03 16:10:48 +08:00
parent 4aacf8b873
commit 1a1b72a469
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
View File

@@ -12,6 +12,7 @@ import com.jsowell.common.enums.BusinessType;
import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.enums.ykc.ReturnCodeEnum;
import com.jsowell.common.exception.BusinessException; import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.response.RestApiResponse;
import com.jsowell.common.util.SecurityUtils;
import com.jsowell.common.util.YKCUtils; import com.jsowell.common.util.YKCUtils;
import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.common.util.poi.ExcelUtil;
import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.OrderBasicInfo;
@@ -33,6 +34,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
import java.util.Objects;
/** /**
* 订单Controller * 订单Controller
@@ -94,6 +96,9 @@ public class OrderBasicInfoController extends BaseController {
// 为空表示没有权限，返回空数组 // 为空表示没有权限，返回空数组
return new AjaxResult(); return new AjaxResult();
} }
if (Objects.nonNull(SecurityUtils.getLoginUser())) {
dto.setParams(ImmutableMap.of("roleId", SecurityUtils.getLoginUser().getUserId()));
}
String deptId = authorizedMap.getDeptId(); String deptId = authorizedMap.getDeptId();
if (CollectionUtils.isNotEmpty(authorizedMap.getStationDeptIds())) { if (CollectionUtils.isNotEmpty(authorizedMap.getStationDeptIds())) {
// 为站点管理员 // 为站点管理员

3
jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
View File

@@ -2058,6 +2058,9 @@
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and t1.create_time <![CDATA[ <= ]]> #{endTime,jdbcType=VARCHAR} and t1.create_time <![CDATA[ <= ]]> #{endTime,jdbcType=VARCHAR}
</if> </if>
<if test="params != null and params.roleId != null and params.roleId > 2">
and t1.review_flag = '1'
</if>
<if test="startSettleTime != null and startSettleTime != ''"> <if test="startSettleTime != null and startSettleTime != ''">
and t1.settlement_time <![CDATA[ >= ]]> #{startSettleTime,jdbcType=VARCHAR} and t1.settlement_time <![CDATA[ >= ]]> #{startSettleTime,jdbcType=VARCHAR}
</if> </if>