客户资料修改

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/entity/PriceBank.java

@@ -260,6 +260,12 @@ public class PriceBank implements Serializable {
 		@ApiModelProperty(value = "英文描述")
 		@TableField(exist = false)
 		private String cnameDescription;
+	/**
+	 * 供应商编码
+	 */
+		@ApiModelProperty(value = "供应商编码")
+		@TableField(exist = false)
+		private String corpCode;
 
 
 }

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

@@ -149,10 +149,15 @@
         WHERE
         dept.parent_id = #{param2} AND dept.is_deleted = 0
         and dept.status = 0
-        and dept.corp_type = #{param3}
         <if test="param1!=null and param1!=''">
             and dept.tenant_id = #{param1}
         </if>
+        <if test="param3 !=null and param3 != '' and param3 == 'KG'">
+            and (corp_type like '%KH%' or corp_type like '%GYS%')
+        </if>
+        <if test="param3 !=null and param3 != '' and param3 != 'KG'">
+            and dept.corp_type = #{param3}
+        </if>
         ORDER BY dept.sort
     </select>
     <select id="selectCorpsTypeCname" resultMap="corpsTypeResultMap">

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/PriceBankController.java

@@ -27,6 +27,8 @@ import lombok.AllArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
+import org.springblade.client.entity.CorpsDesc;
+import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.IGoodsDescClient;
 import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.core.excel.util.ExcelUtil;
@@ -61,6 +63,7 @@ public class PriceBankController extends BladeController {
 
 	private final IPriceBankService priceBankService;
 	private final IGoodsDescClient goodsDescClient;
+	private final ICorpsDescClient corpsDescClient;
 
 	/**
 	 * 详情
@@ -97,12 +100,19 @@ public class PriceBankController extends BladeController {
 		lambdaQueryWrapper.orderByDesc(PriceBank::getId);
 		IPage<PriceBank> pages = priceBankService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(pages.getRecords())){
-			pages.getRecords().stream().forEach(item ->{
+			for (PriceBank item : pages.getRecords()) {
 				R<GoodsDescVO> goodsDesc = goodsDescClient.selectGoodsMessage(item.getItemId());
-				if (goodsDesc != null && goodsDesc.getData() != null){
+				if (goodsDesc != null && goodsDesc.getData() != null) {
 					item.setCnameDescription(goodsDesc.getData().getCnameDescription());
 				}
-			});
+				if (item.getCorpId() != null) {
+					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());
+					if (corpMessage.isSuccess() && corpMessage.getData() != null){
+						item.setCorpCode(corpMessage.getData().getCode());
+					}
+
+				}
+			}
 		}
 		return R.data(pages);
 	}
@@ -137,6 +147,13 @@ public class PriceBankController extends BladeController {
 				if (goodsDesc != null && goodsDesc.getData() != null){
 					item.setCnameDescription(goodsDesc.getData().getCnameDescription());
 				}
+				if (item.getCorpId() != null) {
+					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());
+					if (corpMessage.isSuccess() && corpMessage.getData() != null){
+						item.setCorpCode(corpMessage.getData().getCode());
+					}
+
+				}
 			});
 		}
 		return R.data(pages);
@@ -207,6 +224,21 @@ public class PriceBankController extends BladeController {
 		lambdaQueryWrapper.eq(Func.isNotEmpty(priceBank.getBillType()),PriceBank::getBillType,priceBank.getBillType());
 		lambdaQueryWrapper.orderByDesc(PriceBank::getId);
 		List<PriceBank> list = priceBankService.list(lambdaQueryWrapper);
+		if (CollectionUtils.isNotEmpty(list)){
+			list.stream().forEach(item ->{
+				R<GoodsDescVO> goodsDesc = goodsDescClient.selectGoodsMessage(item.getItemId());
+				if (goodsDesc != null && goodsDesc.getData() != null){
+					item.setCnameDescription(goodsDesc.getData().getCnameDescription());
+				}
+				if (item.getCorpId() != null) {
+					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());
+					if (corpMessage.isSuccess() && corpMessage.getData() != null){
+						item.setCorpCode(corpMessage.getData().getCode());
+					}
+
+				}
+			});
+		}
 		return R.data(priceBankService.list(lambdaQueryWrapper));
 	}
 	/**