Commit 6f16198f authored by fangxinjiang's avatar fangxinjiang

权限配置页面

parent 008ca5c0
...@@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema; ...@@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List;
/** /**
* @Author fxj * @Author fxj
...@@ -14,7 +15,8 @@ import java.time.LocalDateTime; ...@@ -14,7 +15,8 @@ import java.time.LocalDateTime;
*/ */
@Data @Data
public class CertRecordSearchVo extends TCertRecord { public class CertRecordSearchVo extends TCertRecord {
private String ids;
private List<String> idList;
/** /**
* 创建时间区间 [开始时间,结束时间] * 创建时间区间 [开始时间,结束时间]
......
...@@ -502,4 +502,6 @@ public class EmployeeProjectExportParamVO extends BaseEntity { ...@@ -502,4 +502,6 @@ public class EmployeeProjectExportParamVO extends BaseEntity {
*/ */
@Schema(description = "导出IDS") @Schema(description = "导出IDS")
private String ids; private String ids;
private List<String> exportFields;
} }
...@@ -51,7 +51,6 @@ import java.util.List; ...@@ -51,7 +51,6 @@ import java.util.List;
@RequiredArgsConstructor @RequiredArgsConstructor
@RequestMapping("/tcertrecord" ) @RequestMapping("/tcertrecord" )
@Tag(name = "证明开具记录表管理") @Tag(name = "证明开具记录表管理")
@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
public class TCertRecordController { public class TCertRecordController {
private final TCertRecordService tCertRecordService; private final TCertRecordService tCertRecordService;
...@@ -87,9 +86,9 @@ public class TCertRecordController { ...@@ -87,9 +86,9 @@ public class TCertRecordController {
* @return * @return
*/ */
@Operation(summary = "不分页查询", description = "不分页查询") @Operation(summary = "不分页查询", description = "不分页查询")
@GetMapping("/noPage" ) @PostMapping("/noPage" )
//@PreAuthorize("@pms.hasPermission('demo_tcertrecord_get')" ) //@PreAuthorize("@pms.hasPermission('demo_tcertrecord_get')" )
public R<List<TCertRecord>> getTCertRecordNoPage(CertRecordSearchVo searchVo) { public R<List<TCertRecord>> getTCertRecordNoPage(@RequestBody CertRecordSearchVo searchVo) {
setAuth(searchVo); setAuth(searchVo);
return R.ok(tCertRecordService.getTCertRecordNoPage(searchVo)); return R.ok(tCertRecordService.getTCertRecordNoPage(searchVo));
} }
......
...@@ -55,8 +55,8 @@ public class TCutsomerDataPermissonController { ...@@ -55,8 +55,8 @@ public class TCutsomerDataPermissonController {
* @return * @return
*/ */
@Operation(description = "导出的list") @Operation(description = "导出的list")
@GetMapping("/getList") @PostMapping("/getList")
public R<List<TCutsomerDataPermisson>> getTCutsomerDataPermissonList(TCutsomerDataPermisson tCutsomerDataPermisson) { public R<List<TCutsomerDataPermisson>> getTCutsomerDataPermissonList(@RequestBody TCutsomerDataPermisson tCutsomerDataPermisson) {
return new R<>(tCutsomerDataPermissonService.getTCutsomerDataPermissonList(tCutsomerDataPermisson)); return new R<>(tCutsomerDataPermissonService.getTCutsomerDataPermissonList(tCutsomerDataPermisson));
} }
......
...@@ -240,34 +240,30 @@ public class TEmployeeProjectController { ...@@ -240,34 +240,30 @@ public class TEmployeeProjectController {
/** /**
* 通过id批量删除项目档案 * 通过id批量删除项目档案
* @param ids
* @return R * @return R
*/ */
@Operation(summary = "通过id批量删除项目档案", description = "通过id批量删除项目档案") @Operation(summary = "通过id批量删除项目档案", description = "通过id批量删除项目档案")
@SysLog("通过id批量删除项目档案" ) @SysLog("通过id批量删除项目档案" )
@PostMapping("/deletebyIds" ) @PostMapping("/deletebyIds" )
@PreAuthorize("@pms.hasPermission('archives_temployeeproject_batchdel')" ) @PreAuthorize("@pms.hasPermission('archives_temployeeproject_batchdel')" )
public R<List<ErrorMessage>> removeByIds(@RequestParam String ids) { public R<List<ErrorMessage>> removeByIds(@RequestBody List<String> idList) {
return tEmployeeProjectService.batchRemoveByIds(ids); return tEmployeeProjectService.batchRemoveByIds(idList);
} }
/** /**
* 批量导出项目档案信息 * 批量导出项目档案信息
* @param projectDTO * @param projectDTO
* @param idstr
* @param exportFields
* @return R<List> * @return R<List>
* @Author huyc * @Author huyc
* @Date 2022-06-21 * @Date 2022-06-21
**/ **/
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, @RequestParam(name = "idstr", required = false)String idstr, public void export(HttpServletResponse response, @RequestBody EmployeeProjectExportParamVO projectDTO) {
@RequestBody List<String> exportFields, EmployeeProjectExportParamVO projectDTO) {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (user != null && Common.isNotNull(user.getId())) { if (user != null && Common.isNotNull(user.getId())) {
menuUtil.setAuthSql(user, projectDTO); menuUtil.setAuthSql(user, projectDTO);
} }
tEmployeeProjectService.listExportProject(response,projectDTO,idstr,exportFields); tEmployeeProjectService.listExportProject(response,projectDTO,projectDTO.getExportFields());
} }
/** /**
......
...@@ -150,21 +150,19 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> { ...@@ -150,21 +150,19 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
* @Date: 2022/6/22 12:30 * @Date: 2022/6/22 12:30
* @return: R * @return: R
**/ **/
R<List<ErrorMessage>> batchRemoveByIds(String ids); R<List<ErrorMessage>> batchRemoveByIds(List<String> ids);
IPage<TEmployeeProject> getTEmployeeProjectInfoPage(Page page, TEmployeeProject vo); IPage<TEmployeeProject> getTEmployeeProjectInfoPage(Page page, TEmployeeProject vo);
/** /**
* @param projectDTO * @param projectDTO
* @param idstr
* @param exportFields * @param exportFields
* @Description: 批量导出项目档案 * @Description: 批量导出项目档案
* @Author: huyc * @Author: huyc
* @Date: 2022/6/23 10:30 * @Date: 2022/6/23 10:30
* @return: R * @return: R
**/ **/
void listExportProject(HttpServletResponse response, EmployeeProjectExportParamVO projectDTO, void listExportProject(HttpServletResponse response, EmployeeProjectExportParamVO projectDTO, List<String> exportFields);
String idstr, List<String> exportFields);
/** /**
* @param employeeInfo * @param employeeInfo
* @Description: 新增项目档案 * @Description: 新增项目档案
......
...@@ -137,9 +137,8 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert ...@@ -137,9 +137,8 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert
@Override @Override
public List<TCertRecord> getTCertRecordNoPage(CertRecordSearchVo searchVo) { public List<TCertRecord> getTCertRecordNoPage(CertRecordSearchVo searchVo) {
LambdaQueryWrapper<TCertRecord> wrapper = buildQueryWrapper(searchVo); LambdaQueryWrapper<TCertRecord> wrapper = buildQueryWrapper(searchVo);
List<String> idList = Common.getList(searchVo.getIds()); if (Common.isNotNull(searchVo.getIdList())){
if (Common.isNotNull(idList)){ wrapper.in(TCertRecord::getId,searchVo.getIdList());
wrapper.in(TCertRecord::getId,idList);
} }
if (Common.isNotNull(searchVo.getAuthSql())) { if (Common.isNotNull(searchVo.getAuthSql())) {
if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains("a.")) { if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains("a.")) {
......
...@@ -1107,22 +1107,19 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1107,22 +1107,19 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
@Override @Override
@Transactional @Transactional
public R<List<ErrorMessage>> batchRemoveByIds(String ids) { public R<List<ErrorMessage>> batchRemoveByIds(List<String> ids) {
List<ErrorMessage> errorList = new ArrayList<>(); List<ErrorMessage> errorList = new ArrayList<>();
List<TEmployeeProject> updList = new ArrayList<>(); List<TEmployeeProject> updList = new ArrayList<>();
List<TEmployeeInfo> infoUpdList = new ArrayList<>(); List<TEmployeeInfo> infoUpdList = new ArrayList<>();
List<String> idsList; if (Common.isEmpty(ids)) {
if (!Common.isEmpty(ids)) {
idsList = Common.initStrToList(ids, CommonConstants.COMMA_STRING);
} else {
return R.failed(ErrorCodes.PARAM_NOT_EMPTY); return R.failed(ErrorCodes.PARAM_NOT_EMPTY);
} }
List<TEmployeeProject> list = new ArrayList<>(); List<TEmployeeProject> list = new ArrayList<>();
if (Common.isNotEmpty(idsList)) { if (Common.isNotEmpty(ids)) {
list = baseMapper.selectList(Wrappers.<TEmployeeProject>query().lambda().in(TEmployeeProject::getId, idsList) list = baseMapper.selectList(Wrappers.<TEmployeeProject>query().lambda().in(TEmployeeProject::getId, ids)
.eq(TEmployeeProject::getProjectStatus, CommonConstants.ZERO_INT)); .eq(TEmployeeProject::getProjectStatus, CommonConstants.ZERO_INT));
} }
if (Common.isNotEmpty(list)) { if (Common.isNotEmpty(list)) {
...@@ -1176,8 +1173,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1176,8 +1173,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
* @Date 10:55 2022/6/23 * @Date 10:55 2022/6/23
**/ **/
@Override @Override
public void listExportProject(HttpServletResponse response, EmployeeProjectExportParamVO searchVo, String idstr, List<String> exportFields) { public void listExportProject(HttpServletResponse response, EmployeeProjectExportParamVO searchVo, List<String> exportFields) {
searchVo.setIdList(Common.getList(idstr));
String fileName = "项目档案批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX; String fileName = "项目档案批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
// 根据用户传入确定要导出的字段 // 根据用户传入确定要导出的字段
Set<String> includeColumnFiledNames = new HashSet<>(exportFields); Set<String> includeColumnFiledNames = new HashSet<>(exportFields);
......
...@@ -57,9 +57,9 @@ public class OrderController { ...@@ -57,9 +57,9 @@ public class OrderController {
* @return {@link R<List<OrderListVO>>} * @return {@link R<List<OrderListVO>>}
*/ */
@Operation(summary = "订单列表不分页查询", description = "订单列表不分页查询") @Operation(summary = "订单列表不分页查询", description = "订单列表不分页查询")
@GetMapping("/getOrderList") @PostMapping("/getOrderList")
@PreAuthorize("@pms.hasPermission('order:order_getOrderList')") @PreAuthorize("@pms.hasPermission('order:order_getOrderList')")
public R<List<OrderListVO>> getOrderList(OrderListParam param) { public R<List<OrderListVO>> getOrderList(@RequestBody OrderListParam param) {
return tOrderService.getOrderList(param); return tOrderService.getOrderList(param);
} }
......
...@@ -171,12 +171,7 @@ public class SysBaseSetInfoController { ...@@ -171,12 +171,7 @@ public class SysBaseSetInfoController {
@PostMapping("/disableOrEnableById") @PostMapping("/disableOrEnableById")
@PreAuthorize("@pms.hasPermission('social_sysbasesetinfo_enable')") @PreAuthorize("@pms.hasPermission('social_sysbasesetinfo_enable')")
public R<Boolean> disableOrEnableById(@RequestParam String id, @RequestParam Integer status) { public R<Boolean> disableOrEnableById(@RequestParam String id, @RequestParam Integer status) {
SysBaseSetInfo baseSetInfo = sysBaseSetInfoService.getById(id); return sysBaseSetInfoService.updateByIdAsso(id,status);
if (null == baseSetInfo){
return R.failed("无对应ID的数据!");
}
baseSetInfo.setStatus(status);
return new R<>(sysBaseSetInfoService.updateById(baseSetInfo));
} }
} }
...@@ -384,17 +384,16 @@ public class TDispatchInfoController { ...@@ -384,17 +384,16 @@ public class TDispatchInfoController {
@Operation(description = "派单申请批量审核,传参派单ID hasPermission('wxhr:tdispatchinfo_addApplyAudit') auditStatus:1审核通过 2审核不通过") @Operation(description = "派单申请批量审核,传参派单ID hasPermission('wxhr:tdispatchinfo_addApplyAudit') auditStatus:1审核通过 2审核不通过")
@PostMapping("/addApplyAudit") @PostMapping("/addApplyAudit")
//@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_addApplyAudit')") //@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_addApplyAudit')")
public R<List<ErrorMessage>> addApplyAudit(@RequestParam(name = "ids", required = true) String ids, public R<List<ErrorMessage>> addApplyAudit(@RequestBody List<String> idList,
@RequestParam(name = "auditStatus", required = true) String auditStatus, @RequestParam(name = "auditStatus", required = true) String auditStatus,
@RequestParam(name = "auditRemark", required = false) String auditRemark, @RequestParam(name = "auditRemark", required = false) String auditRemark,
@RequestParam(name = "remark", required = false) String remark) { @RequestParam(name = "remark", required = false) String remark) {
return tDispatchInfoService.addApplyAudit(ids,auditStatus,auditRemark,remark); return tDispatchInfoService.addApplyAudit(idList,auditStatus,auditRemark,remark);
} }
/** /**
* 派单申请办理 * 派单申请办理
* hgw社保办理 * hgw社保办理
* @param ids
* @param handleStatus 1 办理成功 2 办理失败 * @param handleStatus 1 办理成功 2 办理失败
* @param handleRemark * @param handleRemark
* @param typeSub 0 社保 1 公积金 * @param typeSub 0 社保 1 公积金
...@@ -406,13 +405,13 @@ public class TDispatchInfoController { ...@@ -406,13 +405,13 @@ public class TDispatchInfoController {
@Operation(description = "派单批量办理,传参派单ID hasPermission('wxhr:tdispatchinfo_addApplyHandle') handleStatus 1 办理成功 2 办理失败") @Operation(description = "派单批量办理,传参派单ID hasPermission('wxhr:tdispatchinfo_addApplyHandle') handleStatus 1 办理成功 2 办理失败")
@PostMapping("/addApplyHandle") @PostMapping("/addApplyHandle")
//@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_addApplyHandle')") //@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_addApplyHandle')")
public R<List<ErrorMessage>> addApplyHandle(@RequestParam(name = "ids", required = true) String ids, public R<List<ErrorMessage>> addApplyHandle(@RequestBody List<String> idList,
@RequestParam(name = "typeSub", required = true) String typeSub, @RequestParam(name = "typeSub", required = true) String typeSub,
@RequestParam(name = "handleStatus", required = true) String handleStatus, @RequestParam(name = "handleStatus", required = true) String handleStatus,
@RequestParam(name = "handleRemark", required = false) String handleRemark, @RequestParam(name = "handleRemark", required = false) String handleRemark,
@RequestParam(name = "socialType", required = false) String socialType, @RequestParam(name = "socialType", required = false) String socialType,
@RequestParam(name = "remark", required = false) String remark) { @RequestParam(name = "remark", required = false) String remark) {
return tDispatchInfoService.addApplyHandle(ids,typeSub,handleStatus,handleRemark,socialType,remark); return tDispatchInfoService.addApplyHandle(idList,typeSub,handleStatus,handleRemark,socialType,remark);
} }
/** /**
......
...@@ -215,8 +215,8 @@ public class TPreDispatchInfoController { ...@@ -215,8 +215,8 @@ public class TPreDispatchInfoController {
@Operation(summary = "一键派单:按创建人查找正常未派单的数据", description = "一键派单:按创建人查找正常未派单的数据") @Operation(summary = "一键派单:按创建人查找正常未派单的数据", description = "一键派单:按创建人查找正常未派单的数据")
@PostMapping("/oneKeyToDispatch") @PostMapping("/oneKeyToDispatch")
@PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_dispatch')") @PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_dispatch')")
public R oneKeyToDispatch(@RequestParam String idStr) { public R oneKeyToDispatch(@RequestBody List<String> idList) {
return tPreDispatchInfoService.oneKeyToDispatch(idStr); return tPreDispatchInfoService.oneKeyToDispatch(idList);
} }
/** /**
......
...@@ -67,4 +67,5 @@ public interface SysBaseSetInfoService extends IService<SysBaseSetInfo> { ...@@ -67,4 +67,5 @@ public interface SysBaseSetInfoService extends IService<SysBaseSetInfo> {
**/ **/
Map<String, SysBaseSetInfo> getSysBaseSetInfoMap(String baseType); Map<String, SysBaseSetInfo> getSysBaseSetInfoMap(String baseType);
R<Boolean> updateByIdAsso(String id,int status);
} }
...@@ -74,9 +74,9 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> { ...@@ -74,9 +74,9 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
List<ErrorMessage> addBatchApplyAudit(List<String> idsList, YifuUser user, int flag, String auditStatus, String auditRemark, String remark); List<ErrorMessage> addBatchApplyAudit(List<String> idsList, YifuUser user, int flag, String auditStatus, String auditRemark, String remark);
R<List<ErrorMessage>> addApplyAudit(String ids, String auditStatus, String auditRemark, String remark); R<List<ErrorMessage>> addApplyAudit(List<String> ids, String auditStatus, String auditRemark, String remark);
R<List<ErrorMessage>> addApplyHandle(String ids, String typeSub, String handleStatus, String handleRemark, String socialType, String remark); R<List<ErrorMessage>> addApplyHandle(List<String> ids, String typeSub, String handleStatus, String handleRemark, String socialType, String remark);
void doexportSocialRecordRoster(HttpServletResponse response, SocialHandleSearchVo searchVo, String idStr, String[] exportFields); void doexportSocialRecordRoster(HttpServletResponse response, SocialHandleSearchVo searchVo, String idStr, String[] exportFields);
......
...@@ -88,8 +88,9 @@ public interface TPreDispatchInfoService extends IService<TPreDispatchInfo> { ...@@ -88,8 +88,9 @@ public interface TPreDispatchInfoService extends IService<TPreDispatchInfo> {
* @Author huyc * @Author huyc
* @Date 2022-07-18 * @Date 2022-07-18
* @return * @return
**/ *
R oneKeyToDispatch(String idStr); * @param idStr*/
R oneKeyToDispatch(List<String> idStr);
/** /**
* 修改预派单记录 * 修改预派单记录
......
...@@ -27,8 +27,10 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R; ...@@ -27,8 +27,10 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser; import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils; import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo; import com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion; import com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion;
import com.yifu.cloud.plus.v1.yifu.social.mapper.SysBaseSetInfoMapper; import com.yifu.cloud.plus.v1.yifu.social.mapper.SysBaseSetInfoMapper;
import com.yifu.cloud.plus.v1.yifu.social.mapper.SysHouseHoldInfoMapper;
import com.yifu.cloud.plus.v1.yifu.social.service.SysBaseSetInfoService; import com.yifu.cloud.plus.v1.yifu.social.service.SysBaseSetInfoService;
import com.yifu.cloud.plus.v1.yifu.social.service.SysPayProportionService; import com.yifu.cloud.plus.v1.yifu.social.service.SysPayProportionService;
import com.yifu.cloud.plus.v1.yifu.social.service.TForecastLibraryService; import com.yifu.cloud.plus.v1.yifu.social.service.TForecastLibraryService;
...@@ -55,8 +57,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper, ...@@ -55,8 +57,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
private final SysPayProportionService sysPayProportionService; private final SysPayProportionService sysPayProportionService;
private final TForecastLibraryService tForecastLibraryService; private final SysHouseHoldInfoMapper sysHouseHoldInfoMapper;
/** /**
* 基数设置表简单分页查询 * 基数设置表简单分页查询
* *
...@@ -267,4 +268,25 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper, ...@@ -267,4 +268,25 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
} }
return setInfoMap; return setInfoMap;
} }
@Override
public R<Boolean> updateByIdAsso(String id ,int status) {
SysBaseSetInfo baseSetInfo = baseMapper.selectById(id);
if (null == baseSetInfo){
return R.failed("无对应ID的数据!");
}
if (CommonConstants.ZERO_INT == status){
SysHouseHoldInfo holdInfo = sysHouseHoldInfoMapper.selectById(baseSetInfo.getDepartId());
if (Common.isNotNull(holdInfo) && CommonConstants.ONE_STRING.equals(holdInfo.getDelFlag())){
return R.failed("对应户已禁用,禁止启用基数!");
}
}
baseSetInfo.setStatus(status);
int res = baseMapper.updateById(baseSetInfo);
if (res >= 0){
return R.ok();
}else {
return R.failed(CommonConstants.RESULT_DATA_FAIL);
}
}
} }
...@@ -3123,13 +3123,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3123,13 +3123,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@ShardingTransactionType(TransactionType.BASE) @ShardingTransactionType(TransactionType.BASE)
@Override @Override
public R<List<ErrorMessage>> addApplyAudit(String ids, String auditStatus, String auditRemark, String remark) { public R<List<ErrorMessage>> addApplyAudit(List<String> ids, String auditStatus, String auditRemark, String remark) {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (null == user) { if (null == user) {
return R.failed(CommonConstants.USER_FAIL); return R.failed(CommonConstants.USER_FAIL);
} }
try { try {
if (!Common.isNotNull(ids)) { if (Common.isEmpty(ids)) {
return R.failed(DispatchConstants.DISPATCH_ID_NOT_EMPTY); return R.failed(DispatchConstants.DISPATCH_ID_NOT_EMPTY);
} }
int flag; int flag;
...@@ -3142,7 +3142,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3142,7 +3142,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} else { } else {
return R.failed("派单审核状态参数异常:0待审核 1审核通过 2审核不通过"); return R.failed("派单审核状态参数异常:0待审核 1审核通过 2审核不通过");
} }
List<ErrorMessage> errorInfo = addBatchApplyAudit(Common.initStrToList(ids, CommonConstants.COMMA_STRING), user, flag, auditStatus, Common.isNullToString(auditRemark),remark); List<ErrorMessage> errorInfo = addBatchApplyAudit(ids, user, flag, auditStatus, Common.isNullToString(auditRemark),remark);
return R.ok(errorInfo,"派单审核结果:"); return R.ok(errorInfo,"派单审核结果:");
} catch (Exception e) { } catch (Exception e) {
log.error("派单审核异常:" + e.getMessage()); log.error("派单审核异常:" + e.getMessage());
...@@ -3152,13 +3152,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3152,13 +3152,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@ShardingTransactionType(TransactionType.BASE) @ShardingTransactionType(TransactionType.BASE)
@Override @Override
public R<List<ErrorMessage>> addApplyHandle(String ids, String typeSub, String handleStatus, String handleRemark, String socialType, String remark) { public R<List<ErrorMessage>> addApplyHandle(List<String> ids, String typeSub, String handleStatus,
String handleRemark, String socialType, String remark) {
try { try {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (null == user) { if (null == user) {
return R.failed(CommonConstants.USER_FAIL); return R.failed(CommonConstants.USER_FAIL);
} }
if (!Common.isNotNull(ids)) { if (Common.isEmpty(ids)) {
return R.failed(DispatchConstants.DISPATCH_ID_NOT_EMPTY); return R.failed(DispatchConstants.DISPATCH_ID_NOT_EMPTY);
} }
int flag; int flag;
...@@ -3171,8 +3172,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3171,8 +3172,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} else { } else {
return R.failed("派单办理状态参数异常:0待办理 1办理通过 2办理不通过"); return R.failed("派单办理状态参数异常:0待办理 1办理通过 2办理不通过");
} }
List<ErrorMessage> errorInfo = addBatchApplyHandle(Common.initStrToList(ids, CommonConstants.COMMA_STRING) List<ErrorMessage> errorInfo = addBatchApplyHandle(ids, typeSub, user, flag, handleStatus,
, typeSub, user, flag, handleStatus, Common.isNullToString(handleRemark), socialType,remark); Common.isNullToString(handleRemark), socialType,remark);
if (errorInfo == null || errorInfo.isEmpty()) { if (errorInfo == null || errorInfo.isEmpty()) {
return R.ok(null,"办理成功!"); return R.ok(null,"办理成功!");
} else { } else {
......
...@@ -48,6 +48,7 @@ import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeSearchVo; ...@@ -48,6 +48,7 @@ import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeSearchVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeVo; import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeVo;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
......
...@@ -505,13 +505,12 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -505,13 +505,12 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
/** /**
* 一键派单 * 一键派单
* @param idStr
* @return * @return
* @Author huyc * @Author huyc
* @Date 2022-07-18 * @Date 2022-07-18
**/ **/
@Override @Override
public R oneKeyToDispatch(String idStr) { public R oneKeyToDispatch(List<String> idList) {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (null == user || null == user.getId()) { if (null == user || null == user.getId()) {
return R.failed(CommonConstants.USER_FAIL); return R.failed(CommonConstants.USER_FAIL);
...@@ -535,7 +534,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -535,7 +534,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
initSettleDomainMaps(settleDomainR, settleDomainNameMap, customerNameMap, settleIdAndCustomerIdMap); initSettleDomainMaps(settleDomainR, settleDomainNameMap, customerNameMap, settleIdAndCustomerIdMap);
// 获取当前创建人 截止到当前时间的 正常未派单 未删除的预派单数据 // 获取当前创建人 截止到当前时间的 正常未派单 未删除的预派单数据
List<TPreDispatchInfo> preList; List<TPreDispatchInfo> preList;
if (Common.isEmpty(idStr)) { if (Common.isEmpty(idList)) {
preList = baseMapper.selectList(Wrappers.<TPreDispatchInfo>query().lambda() preList = baseMapper.selectList(Wrappers.<TPreDispatchInfo>query().lambda()
.eq(TPreDispatchInfo::getCreateBy, user.getId()) .eq(TPreDispatchInfo::getCreateBy, user.getId())
.le(TPreDispatchInfo::getCreateTime, LocalDateTime.now()) .le(TPreDispatchInfo::getCreateTime, LocalDateTime.now())
...@@ -543,7 +542,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -543,7 +542,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
.eq(TPreDispatchInfo::getDispatchFlag, CommonConstants.ZERO_STRING) .eq(TPreDispatchInfo::getDispatchFlag, CommonConstants.ZERO_STRING)
.eq(TPreDispatchInfo::getPreStatus, CommonConstants.ZERO_STRING)); .eq(TPreDispatchInfo::getPreStatus, CommonConstants.ZERO_STRING));
} else { } else {
List<String> idList = Common.initStrToList(idStr, ",");
preList = baseMapper.selectList(Wrappers.<TPreDispatchInfo>query().lambda() preList = baseMapper.selectList(Wrappers.<TPreDispatchInfo>query().lambda()
.in(TPreDispatchInfo::getId, idList) .in(TPreDispatchInfo::getId, idList)
.eq(TPreDispatchInfo::getCreateBy, user.getId()) .eq(TPreDispatchInfo::getCreateBy, user.getId())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment