diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java index ca5dee99..d5dc11ec 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java @@ -147,6 +147,10 @@ public class BmsCostCenterController { @PreAuthorize("hasRole('bms:costCenter:query')") public R getById(@PathVariable("id") String id){ BmsCostCenter bmsCostCenter = bmsCostCenterService.getById(id); + if(bmsCostCenter.getPid()!=null&&!bmsCostCenter.getPid().equals(0L)){ + BmsCostCenter parentCostCenter = bmsCostCenterService.getById(bmsCostCenter.getPid()); + bmsCostCenter.setParentNode(parentCostCenter); + } return R.ok(bmsCostCenter); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectFormController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectFormController.java index 49a165f4..39e1ebc6 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectFormController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectFormController.java @@ -9,6 +9,9 @@ import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.PageUtil; import com.qs.serve.common.util.CopierUtil; import com.qs.serve.common.util.StringUtils; +import com.qs.serve.modules.bms.entity.BmsSubject; +import com.qs.serve.modules.bms.service.BmsSubjectService; +import com.qs.serve.modules.bms.service.BmsSupplierService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; @@ -32,6 +35,7 @@ import java.util.List; public class BmsSubjectFormController { private BmsSubjectFormService bmsSubjectFormService; + private BmsSubjectService bmsSubjectService; /** @@ -103,6 +107,11 @@ public class BmsSubjectFormController { @PreAuthorize("hasRole('bms:subject:delete')") public R deleteById(@PathVariable("ids") String ids){ List idsLong = StringUtils.splitIdLong(ids); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.in(BmsSubject::getFormId,idsLong); + if(bmsSubjectService.count(lqw)>0){ + return R.error("表单被使用中，删除失败"); + } boolean result = bmsSubjectFormService.removeByIds(idsLong); return R.isTrue(result); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java index 2703365f..d633804b 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java @@ -68,6 +68,48 @@ public class BmsSupplierVisitAddressController { return R.ok(list); } + /** + * 翻页查询，过滤当前用户负责数据 + * @param param + * @return + */ + @PostMapping("/getListForVisit") + public R> getListForVisit(@Valid @RequestBody BmsSupplierVisitSo param){ + String userId = AuthContextUtils.getSysUserId(); + hisUserSupplierService.initByUserId(userId,false); + HisUserSupplier userSupplier = new HisUserSupplier(); + userSupplier.setUserId(userId); + userSupplier.setSupplierName(param.getSupplierName()); + userSupplier.setSupplierCode(param.getSupplierCode()); + userSupplier.setQueryAddress(param.getAddress()); + userSupplier.setQueryValue(param.getSearchValue()); + userSupplier.setLocalX(param.getLocalX()); + userSupplier.setLocalY(param.getLocalY()); + List list = hisUserSupplierMapper.selectHisUserSupplierAddressList(userSupplier); + List supplierIds = list.stream().map(HisUserSupplierAddressVo::getSupplierId).collect(Collectors.toList()); + if(CollectionUtil.isNotEmpty(supplierIds)){ + List supplierList = bmsSupplierService.listByIds(supplierIds); + for (HisUserSupplierAddressVo addressVo : list) { + for (BmsSupplier supplier : supplierList) { + if(addressVo.getSupplierId().equals(supplier.getId())){ + addressVo.setSupplierCode(supplier.getCode()); + addressVo.setSupplierName(supplier.getName()); + BmsSupplierVisitAddress visitAddress = bmsSupplierVisitAddressService.getById(addressVo.getAddressId()); + //BmsSupplierVisit visitInfo = bmsSupplierVisitService.getOne(new LambdaQueryWrapper().eq(BmsSupplierVisit::getSupplierId,supplier.getId()),false); + addressVo.setAddressInfo(visitAddress); + LambdaQueryWrapper visitInfoLqw = new LambdaQueryWrapper<>(); + visitInfoLqw.eq(BazVisitInfo::getTargetType, BazTargetTypeConsts.CUSTOMER); + visitInfoLqw.eq(BazVisitInfo::getTargetId,supplier.getId()); + visitInfoLqw.eq(BazVisitInfo::getUserId,userId); + BazVisitInfo visitInfo = bazVisitInfoService.getOne(visitInfoLqw,false); + addressVo.setVisitInfo(visitInfo); + break; + } + } + } + } + return R.ok(list); + } /** * 翻页查询，过滤当前用户负责数据 diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsCostCenter.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsCostCenter.java index bb76780e..22e908ef 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsCostCenter.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsCostCenter.java @@ -89,5 +89,9 @@ public class BmsCostCenter implements Serializable { @TableField(exist = false) List childNode; + /** 父级节点 */ + @TableField(exist = false) + private Object parentNode; + } diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsMasterUser.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsMasterUser.java index d607d840..4141527e 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsMasterUser.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsMasterUser.java @@ -52,32 +52,40 @@ public class BmsMasterUser implements Serializable { /** 渠道 */ @Length(max = 255,message = "渠道长度不能超过255字") + @TableField(condition = SqlCondition.LIKE) private String channelName; /** 渠道 */ @Length(max = 255,message = "渠道长度不能超过255字") + @TableField(condition = SqlCondition.LIKE) private String channelCode; /** 网点 */ @Length(max = 255,message = "网点长度不能超过255字") + @TableField(condition = SqlCondition.LIKE) private String pointName; /** 网点 */ @Length(max = 255,message = "网点长度不能超过255字") + @TableField(condition = SqlCondition.LIKE) private String pointCode; /** 用户 */ @Length(max = 255,message = "用户长度不能超过255字") + @TableField(condition = SqlCondition.LIKE) private String userCode; /** 用户 */ @Length(max = 255,message = "用户长度不能超过255字") + @TableField(condition = SqlCondition.LIKE) private String userName; /** 成本中心 */ + @TableField(condition = SqlCondition.LIKE) private String centerCode; /** 成本中心 */ + @TableField(condition = SqlCondition.LIKE) private String centerName; /** 备注 */ diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSubjectForm.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSubjectForm.java index ae66734b..d12baeea 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSubjectForm.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSubjectForm.java @@ -34,6 +34,7 @@ public class BmsSubjectForm implements Serializable { /** 标题 */ @NotBlank(message = "标题不能为空") @Length(max = 40,message = "标题长度不能超过40字") + @TableField(condition = SqlCondition.LIKE) private String title; /** 子标题 */ diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierBand.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierBand.java index 2cac7af2..f3c09ca7 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierBand.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierBand.java @@ -36,16 +36,19 @@ public class BmsSupplierBand implements Serializable { /** 开户银行 */ @NotBlank(message = "开户银行不能为空") @Length(max = 20,message = "开户银行长度不能超过20字") + @TableField(condition = SqlCondition.LIKE) private String cardBank; /** 银行卡号 */ @NotBlank(message = "银行卡号不能为空") @Length(max = 30,message = "银行卡号长度不能超过30字") + @TableField(condition = SqlCondition.LIKE) private String cardNum; /** 持卡人 */ @NotBlank(message = "持卡人不能为空") @Length(max = 20,message = "持卡人长度不能超过20字") + @TableField(condition = SqlCondition.LIKE) private String cardUser; /** 备注 */ diff --git a/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java b/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java index 846de8bd..4a0b4ba6 100644 --- a/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java +++ b/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java @@ -199,13 +199,19 @@ public class QmsGroupController { */ @LimitSubmit @GetMapping("/unfinishedList") - public R unfinishedList(String finished,String groupId){ + public R unfinishedList(String finished,String groupId,String code,String name){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); if(StringUtils.hasText(finished)){ lqw.eq(QmsGroupScope::getFinished,finished); }else { lqw.ne(QmsGroupScope::getFinished,-1); } + if(code!=null){ + lqw.like(QmsGroupScope::getUserCode,code); + } + if(name!=null){ + lqw.like(QmsGroupScope::getUserName,name); + } if(groupId!=null){ lqw.eq(QmsGroupScope::getGroupId,groupId); } diff --git a/src/main/java/com/qs/serve/modules/qms/entity/QmsGroupScope.java b/src/main/java/com/qs/serve/modules/qms/entity/QmsGroupScope.java index 1b2454da..b289a309 100644 --- a/src/main/java/com/qs/serve/modules/qms/entity/QmsGroupScope.java +++ b/src/main/java/com/qs/serve/modules/qms/entity/QmsGroupScope.java @@ -40,6 +40,8 @@ public class QmsGroupScope implements Serializable { /** 使用范围值 */ @Length(max = 32,message = "使用范围值长度不能超过32字") private String scopeValue; + private String userCode; + private String userName; /** 删除标识 */ @JsonIgnore diff --git a/src/main/java/com/qs/serve/modules/qms/service/impl/QmsGroupScopeServiceImpl.java b/src/main/java/com/qs/serve/modules/qms/service/impl/QmsGroupScopeServiceImpl.java index 5a502cc7..94a99f7f 100644 --- a/src/main/java/com/qs/serve/modules/qms/service/impl/QmsGroupScopeServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/qms/service/impl/QmsGroupScopeServiceImpl.java @@ -115,6 +115,8 @@ public class QmsGroupScopeServiceImpl extends ServiceImpl wxUserList = wxUserService.getBySysUserId(sysUser.getId()); @@ -132,6 +134,9 @@ public class QmsGroupScopeServiceImpl extends ServiceImpl wxUserList = wxUserService.getBySysUserId(groupScope.getScopeValue()); //发送推送