切换查询CV销售名称

src/main/java/cn/com/uitech/authorization/controller/IntegrateController.java

 package cn.com.uitech.authorization.controller;
-
         import cn.com.uitech.authorization.mapper.SuperTableInfoMapper;
         import cn.com.uitech.authorization.pojo.dto.*;
         import cn.com.uitech.authorization.pojo.entity.*;
@@ -19,14 +18,11 @@ package cn.com.uitech.authorization.controller;
         import org.springframework.http.ResponseEntity;
         import org.springframework.util.CollectionUtils;
         import org.springframework.util.ObjectUtils;
-        import org.springframework.util.StringUtils;
         import org.springframework.validation.Errors;
         import org.springframework.web.bind.annotation.*;
         import org.springframework.web.client.RestTemplate;
-
         import javax.annotation.Resource;
         import java.util.*;
-
 @RestController
 @RequestMapping("/integrate")
 @Api(tags = "integrate 集成接口")
@@ -126,12 +122,12 @@ public class IntegrateController {
                 configurableBom.getCharacteristicList().forEach(characteristic -> {
                     // 封装部件信息
                     HashMap<String, Object> characteristicMap = new HashMap<>();
-                    characteristicMap.put("name", characteristic.getCharacteristicName());
+                    characteristicMap.put("name", characteristic.getUnisSalesCName());
                     // 封装配件信息
                     List<Map<String, Object>> values = new ArrayList<>();
                     characteristic.getCharacteristicValueList().forEach(characteristicValue -> {
                         HashMap<String, Object> characteristicValueMap = new HashMap<>();
-                        characteristicValueMap.put("name", characteristicValue.getCharacteristicValueName());
+                        characteristicValueMap.put("name", characteristicValue.getUnisSalesVName());
                         values.add(characteristicValueMap);
                     });
                     characteristicMap.put("values", values);
@@ -161,9 +157,9 @@ public class IntegrateController {
                     String characteristicValueName = (String) item.get("characteristicValueName");
                     CharacteristicValue characteristicValue = integrateService.findByCharacteristicValueName(characteristic.getCharacteristicCode(),characteristicValueName, selectorEntity.getSuperBomCode());
                     selectedValue.put("characteristicCode", characteristic.getCharacteristicCode());
-                    selectedValue.put("characteristicName", characteristic.getCharacteristicName());
+                    selectedValue.put("characteristicName", characteristic.getUnisSalesCName());
                     selectedValue.put("characteristicValueCode", characteristicValue.getCharacteristicValueCode());
-                    selectedValue.put("characteristicValueName", characteristicValue.getCharacteristicValueName());
+                    selectedValue.put("characteristicValueName", characteristicValue.getUnisSalesVName());
                     selectedValue.put("qualifyDate", characteristicValue.getQualifyDate());
                     selectedValue.put("characteristicType", characteristic.getCharacteristicType());
                     selectedValueList.add(selectedValue);

src/main/resources/mapper/CharacteristicValueMapper.xml

@@ -302,9 +302,9 @@
             resultType="cn.com.uitech.authorization.pojo.entity.CharacteristicValue">
         select * from super_characteristic_value_info a
 	        left join super_characteristic_info b on a.characteristic_code = b.characteristic_code
-	        where characteristic_value_name = #{characteristicValueName}
+	        where unis_sales_v_name = #{characteristicValueName}
 	        and a.super_bom_code = #{superBomCode}
-	        and b.characteristic_name= #{characteristicName}
+	        and b.unis_sales_c_name= #{characteristicName}
     </select>
 
     <select id="getCharacteristicValueInfoByCode"

src/main/resources/mapper/SuperTableInfoMapper.xml

@@ -65,9 +65,9 @@
         select distinct group_number groupnumber from super_table_item_info where table_number = #{tablenumber}
     </select>
     <select id="findCName" resultType="map">
-        select distinct c.characteristic_code characteristiccode,c.characteristic_name characteristicname from super_table_item_info b left join super_characteristic_info c on b.characteristic_code = c.characteristic_code where b.table_number  =#{tablenumber} and b.group_number = #{groupNumber}
+        select distinct c.characteristic_code characteristiccode,c.unis_sales_c_name characteristicname from super_table_item_info b left join super_characteristic_info c on b.characteristic_code = c.characteristic_code where b.table_number  =#{tablenumber} and b.group_number = #{groupNumber}
     </select>
     <select id="findVName" resultType="java.lang.String">
-        select distinct COALESCE(d.characteristic_value_name,'None') from super_table_item_info b left join super_characteristic_value_info d on b.characteristic_value_code = d.characteristic_value_code where b.table_number  =#{tablenumber} and b.group_number = #{groupNumber} and b.characteristic_code = #{characteristiccode}
+        select distinct COALESCE(d.unis_sales_v_name,'None') from super_table_item_info b left join super_characteristic_value_info d on b.characteristic_value_code = d.characteristic_value_code where b.table_number  =#{tablenumber} and b.group_number = #{groupNumber} and b.characteristic_code = #{characteristiccode}
     </select>
 </mapper>