Merge #59 into master from cc_2021104_twelve_points
fix:十二分问题修复
* cc_2021104_twelve_points: (58 commits squashed)
- fix:启用禁用规则合并
- Merge branch 'refs/heads/master' into cc_2021104_twelve_points
- fix:惩处规则列表新增描述字段
- fix:新增用户管辖门店列表接口
- fix:门店列表接口新增门店积分字段
- fix:查询问题修复；新增草稿状态
- fix:申请单审批补充审批人字段
- fix:修改门店积分限制0-12
- fix:积分流水接口修复；申请单查询接口添加日期筛选
- fix:惩处单查询提供惩处待处理、惩处已处理状态筛选
- fix:惩处单复议申请查询异常修复
- fix:小程序惩处单详情接口字段补充
- fix:查询字段补充
- fix
- fix:转义
- fix
- fix:新增撤销复议申请单接口
- fix:补充字段
- fix:补充字段
- fix:新增门店分数接口
- fix:申请单新增筛选条件
- fix:门店积分接口返回参数修改
- fix:小程序规则分页查询接口改为Post
- fix:问题修复
- fix:十二分导入
- fix:导入状态部分失败改为失败
- fix:字段补充
- fix:异步下Excel导入图片临时文件被清理的问题
- fix:扣分申请导入图片路径修改并使用CDN
- fix:导入图片上传oss文件类型修改为图片
- fix:批量审批
- fix:批量审批新增备注字段
- fix:字段补充
- Merge branch 'master' into cc_2021104_twelve_points
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCStoreController.java
- fix:字典项新增排序、编辑删除权限、关联字典项
- Merge branch 'master' into cc_2021104_twelve_points
- fix:十二分值-扣分列表申请复议截止日期格式
- fix:去除appealEndDate格式校验
- Merge remote-tracking branch 'origin/cc_20260128_dict_update' into cc_20260205_twelve_points_v2
- Merge branch 'cc_20260128_dict_update' into cc_2021104_twelve_points
- fix:字典回显包含已删除字典项
- Merge branch 'master' into cc_2021104_twelve_points
- Merge remote-tracking branch 'origin/cc_20260205_twelve_points_v2' into cc_2021104_twelve_points
- fix:去除惩处单审批阶段；复议申请单证明图片非必填
- fix:复议拒绝后惩处单直接生效
- fix:扣分申请单证明图片改为非必填
- fix
- fix:字段转义
- fix:惩处待处理包含带生效数据
- fix:字段转义
- fix:警告单金额和积分初始化为0
- fix
- fix:小程序接口字段转义
- Merge branch 'master' into cc_2021104_twelve_points
- fix:十二分审批记录展示待审批人
- fix
- fix:惩处单复议申请逾期检查改为延时队列
- Merge branch 'refs/heads/master' into cc_2021104_twelve_points
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/59
This commit is contained in:
王非凡
@@ -137,48 +137,13 @@ public class TpAuditRecordDAO {
|
||||
* @param applyId 申请单id
|
||||
* @return 审批记录列表
|
||||
*/
|
||||
public List<AuditInfoResponse> getAuditRecordList(Long applyId) {
|
||||
public List<TpAuditRecordDO> getAuditRecordList(Long applyId) {
|
||||
Example example = new Example(TpAuditRecordDO.class);
|
||||
example.createCriteria()
|
||||
.andEqualTo("applyId", applyId)
|
||||
.andNotEqualTo("auditStatus", 0)
|
||||
.andEqualTo("deleted", 0);
|
||||
example.setOrderByClause("create_time ASC");
|
||||
List<TpAuditRecordDO> recordList = tpAuditRecordMapper.selectByExample(example);
|
||||
List<AuditInfoResponse> result = new ArrayList<>();
|
||||
for (TpAuditRecordDO auditRecordDO : recordList) {
|
||||
AuditInfoResponse response = AuditInfoResponse.builder()
|
||||
.type(getAuditInfoType(auditRecordDO))
|
||||
.execute(auditRecordDO.getRecordType() - 1)
|
||||
.status(CommonConstants.INDEX_ZERO.equals(auditRecordDO.getAuditStatus()) ? 0 : 1)
|
||||
.createTime(auditRecordDO.getReceiveTaskTime())
|
||||
.remark(auditRecordDO.getRemark())
|
||||
.actualUserId(auditRecordDO.getHandlerUserId())
|
||||
.build();
|
||||
List<AuditInfoResponse.AuditUserInfoVO> auditUserList = Collections.singletonList(
|
||||
new AuditInfoResponse.AuditUserInfoVO(auditRecordDO.getHandlerUserId(), auditRecordDO.getHandlerUserName(), null)
|
||||
);
|
||||
response.setList(auditUserList);
|
||||
result.add(response);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private Integer getAuditInfoType(TpAuditRecordDO auditRecordDO) {
|
||||
if (CommonConstants.INDEX_ONE.equals(auditRecordDO.getRecordType())) {
|
||||
return OperationLogAuditEnum.SUBMIT_AUDIT.getCode();
|
||||
} else {
|
||||
switch (auditRecordDO.getAuditStatus()) {
|
||||
case 0:
|
||||
return OperationLogAuditEnum.WAIT_AUDIT.getCode();
|
||||
case 1:
|
||||
return OperationLogAuditEnum.PASS.getCode();
|
||||
case 2:
|
||||
return OperationLogAuditEnum.REFUSE.getCode();
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
return tpAuditRecordMapper.selectByExample(example);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.cool.store.mapper;
|
||||
|
||||
import com.cool.store.dto.UserRoleDTO;
|
||||
import com.cool.store.dto.openPreparation.UserNameDTO;
|
||||
import com.cool.store.dto.store.StoreUserDTO;
|
||||
import com.cool.store.entity.EnterpriseUserRole;
|
||||
import com.cool.store.entity.SysRoleDO;
|
||||
@@ -115,6 +116,8 @@ public interface SysRoleMapper {
|
||||
*/
|
||||
List<String> getPositionUserIds( @Param("positionIds") List<String> positionIds);
|
||||
|
||||
List<UserNameDTO> getPositionUsers(@Param("positionIds") List<String> positionIds);
|
||||
|
||||
List<EnterpriseUserRole> selectUserRoleBySourceAndUserId(@Param("source") String source ,
|
||||
@Param("userIdList") List<String> userIdList);
|
||||
|
||||
|
||||
@@ -296,6 +296,17 @@
|
||||
and eu.active = true
|
||||
</select>
|
||||
|
||||
<select id="getPositionUsers" resultType="com.cool.store.dto.openPreparation.UserNameDTO">
|
||||
select eu.user_id, eu.name from
|
||||
enterprise_user_role_${enterpriseId} eur
|
||||
left join enterprise_user_${enterpriseId} eu USING(user_id)
|
||||
where eur.role_id in
|
||||
<foreach collection="positionIds" item="roleId" open="(" separator="," close=")">
|
||||
#{roleId}
|
||||
</foreach>
|
||||
and eu.active = true
|
||||
</select>
|
||||
|
||||
<select id="selectUserByDingRole" resultType="java.lang.String">
|
||||
select b.user_id from sys_role_${enterpriseId} a
|
||||
left join enterprise_user_role_${enterpriseId} b on a.id=b.role_id
|
||||
|
||||
Reference in New Issue
Block a user