客户资料修改

blade-service-api/blade-client-api/src/main/java/org/springblade/client/vo/CorpListVo.java

@@ -0,0 +1,49 @@
+package org.springblade.client.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客户详情视图实体类
+ *
+ * @author BladeX
+ * @since 2021-09-13
+ */
+@Data
+@ApiModel(value = "CorpsDescVO对象", description = "客户详情")
+public class CorpListVo {
+	/**
+	 * 主键
+	 */
+	@ApiModelProperty(value = "主键")
+	private Long id;
+	/**
+	 * 客户编号
+	 */
+	@ApiModelProperty(value = "客户编号")
+	private String code;
+	/**
+	 * 客户名称
+	 */
+	@ApiModelProperty(value = "客户名称")
+	private String cname;
+	/**
+	 * 英文名
+	 */
+	@ApiModelProperty(value = "英文名")
+	private String enname;
+	/**
+	 * 所属公司
+	 */
+	@ApiModelProperty(value = "所属公司")
+	private String belongtocompany;
+	/**
+	 * 所属公司中文名
+	 */
+	@ApiModelProperty(value = "所属公司中文名")
+	private String belongCompany;
+}

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescController.java

@@ -14,6 +14,8 @@ import org.springblade.client.corps.excel.CorpsExcel;
 import org.springblade.client.corps.excel.CorpsSupplierExcel;
 import org.springblade.client.corps.service.ICorpsDescService;
 import org.springblade.client.entity.CorpsDesc;
+import org.springblade.client.entity.GoodsDesc;
+import org.springblade.client.vo.CorpListVo;
 import org.springblade.client.vo.CorpsDescVO;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.datascope.annotation.DataAuth;
@@ -280,28 +282,29 @@ public class CorpsDescController extends BladeController {
 	@GetMapping("/corpsDescList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "所有客户信息", notes = "corpType必填")
-	public R<List<CorpsDescVO>> orderList(CorpsDescVO corpsDesc) {
+	public R<List<CorpListVo>> orderList(CorpsDescVO corpsDesc) {
 		if (StringUtils.isBlank(corpsDesc.getCorpType())) {
 			throw new SecurityException("缺少必要的参数，客户类型");
 		}
 		LambdaQueryWrapper<CorpsDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		if (Func.isNotEmpty(corpsDesc.getAdminProfiles())){
-			lambdaQueryWrapper.like(CorpsDesc::getAdminProfiles, corpsDesc.getAdminProfiles());
-			lambdaQueryWrapper.or();
-			lambdaQueryWrapper.eq(CorpsDesc::getAdminProfiles,' ');
-		}
+		lambdaQueryWrapper.like(Func.isNotEmpty(corpsDesc.getCname()), CorpsDesc::getCname, corpsDesc.getCname());
+		lambdaQueryWrapper.like(Func.isNotEmpty(corpsDesc.getCode()), CorpsDesc::getCode, corpsDesc.getCode());
+		lambdaQueryWrapper.eq(CorpsDesc::getIsDeleted, 0);
+		lambdaQueryWrapper.eq(CorpsDesc::getTenantId, SecureUtil.getTenantId());
 		if ("KG".equals(corpsDesc.getCorpType())) {
 			lambdaQueryWrapper.and(i -> i.like(CorpsDesc::getCorpType, "KH").or().like(CorpsDesc::getCorpType, "GYS"));
 		} else {
 			lambdaQueryWrapper.like(CorpsDesc::getCorpType, corpsDesc.getCorpType());
 		}
-		lambdaQueryWrapper.like(Func.isNotEmpty(corpsDesc.getCname()), CorpsDesc::getCname, corpsDesc.getCname());
-		lambdaQueryWrapper.like(Func.isNotEmpty(corpsDesc.getCode()), CorpsDesc::getCode, corpsDesc.getCode());
-		lambdaQueryWrapper.eq(CorpsDesc::getIsDeleted, 0);
-		lambdaQueryWrapper.eq(CorpsDesc::getTenantId, SecureUtil.getTenantId());
+		if (Func.isNotEmpty(corpsDesc.getAdminProfiles())){
+			lambdaQueryWrapper.and(i ->i.like(CorpsDesc::getAdminProfiles,corpsDesc.getAdminProfiles()).or().eq(CorpsDesc::getAdminProfiles,' '));
+		}
+		if (StringUtils.isNotBlank(corpsDesc.getBelongtocompany())){
+			lambdaQueryWrapper.and(i ->i.eq(CorpsDesc::getBelongtocompany,corpsDesc.getBelongtocompany()).or().isNull(CorpsDesc::getBelongtocompany));
+		}
 		List<CorpsDesc> corpsDescList = corpsDescService.list(lambdaQueryWrapper);
 
-		List<CorpsDescVO> voList = BeanUtil.copy(corpsDescList, CorpsDescVO.class);
+		List<CorpListVo> voList = BeanUtil.copy(corpsDescList, CorpListVo.class);
 		voList.forEach(desc -> {
 			if (StringUtils.isNotBlank(desc.getBelongtocompany())) {
 				CorpsDesc company = corpsDescService.getById(desc.getBelongtocompany());

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsDescMapper.xml

@@ -146,6 +146,10 @@
             and (admin_profiles like CONCAT(CONCAT('%',  #{CorpsDesc.adminProfiles}), '%')
             or admin_profiles = '')
         </if>
+        <if test="CorpsDesc.belongtocompany!=null and CorpsDesc.belongtocompany != ''">
+            and (belongtocompany = #{CorpsDesc.belongtocompany}
+            or admin_profiles IS NULL)
+        </if>
         <if test="CorpsDesc.creditGrant!=null">
             and credit_grant = #{CorpsDesc.creditGrant}
         </if>

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -123,7 +123,8 @@ public class GoodsDescController extends BladeController {
 					 @RequestParam(name = "ename", required = false) String ename,
 					 @RequestParam(name = "code", required = false) String code,
 					 @RequestParam(name = "goodsTypeId", required = false) String goodsTypeId,
-					 @RequestParam(name = "belongToCorpId", required = false) String belongToCorpId) {
+					 @RequestParam(name = "belongToCorpId", required = false) String belongToCorpId,
+					 @RequestParam(name = "artsVision", required = false) String artsVision) {
 
 		LambdaQueryWrapper<GoodsDesc> goodsDescLambdaQueryWrapper = new LambdaQueryWrapper<>();
 
@@ -153,13 +154,17 @@ public class GoodsDescController extends BladeController {
 			}
 		}
 
-		goodsDescLambdaQueryWrapper
-			.like(!StringUtils.isBlank(cname), GoodsDesc::getCname, cname)
-			.like(!StringUtils.isBlank(ename), GoodsDesc::getEname, ename)
-			.like(!StringUtils.isBlank(code), GoodsDesc::getCode, code)
-			.eq(GoodsDesc::getTenantId, AuthUtil.getTenantId())
-			.eq(GoodsDesc::getType, 0)
-			.orderByDesc(GoodsDesc::getCreateTime);
+		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(cname), GoodsDesc::getCname, cname);
+		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(ename), GoodsDesc::getEname, ename);
+		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(code), GoodsDesc::getCode, code);
+		goodsDescLambdaQueryWrapper.eq(GoodsDesc::getTenantId, AuthUtil.getTenantId());
+		goodsDescLambdaQueryWrapper.eq(GoodsDesc::getType, 0);
+		if (StringUtils.isNotEmpty(artsVision)){
+			goodsDescLambdaQueryWrapper.eq(GoodsDesc::getArtsVision,artsVision);
+			goodsDescLambdaQueryWrapper.or();
+			goodsDescLambdaQueryWrapper.isNull(GoodsDesc::getArtsVision);
+		}
+		goodsDescLambdaQueryWrapper.orderByDesc(GoodsDesc::getCreateTime);
 		Page<GoodsDesc> page = new Page<>(current, size);
 		IPage<GoodsDesc> iPage = goodsDescService.page(page, goodsDescLambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(iPage.getRecords())) {