返回销售查看的名称

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

@@ -151,6 +151,17 @@ public class IntegrateController {
         if (!ObjectUtils.isEmpty(data)) {
             Map<String, Object> map = (Map<String, Object>) data;
             Object selectedValues = map.get("selectedValues");
+            List<Map<String,Object>> resultCharacteristicList = (List<Map<String, Object>>) map.get("characteristicList");
+            // 根据英文名称查询中文名称
+            resultCharacteristicList.forEach(resultCharacteristic->{
+                resultCharacteristic.put("unisCName",superTableInfoMapper.findCNameByName((String) resultCharacteristic.get("name")));
+                List<Map<String,Object>> vList= (List<Map<String, Object>>) resultCharacteristic.get("values");
+                vList.forEach(v->{
+                    v.put("unisVName",superTableInfoMapper.findVNameByName((String) v.get("name")));
+                });
+            });
+
+
             List<Map<String, Object>> selectedValueList = new ArrayList<>();
             if (!ObjectUtils.isEmpty(selectedValues)) {
                 List<Map<String, Object>> list = (List<Map<String, Object>>) selectedValues;
@@ -246,15 +257,16 @@ public class IntegrateController {
 
     @PostMapping("/conflictAnalysis")
     @ApiOperation(value = "conflictAnalysis", notes = "conflictAnalysis", httpMethod = "POST")
-    public Object conflictAnalysis(@RequestBody ConflictAnalysisInputDTO conflictAnalysisInputDTO,
+    public CrmResponseEntity<?> conflictAnalysis(@RequestBody ConflictAnalysisInputDTO conflictAnalysisInputDTO,
                                    Errors errors) {
         RestTemplate restTemplate = new RestTemplate();
         HttpHeaders headers = getHttpHeader();
         conflictAnalysisInputDTO.setProductGroupCode(conflictAnalysisInputDTO.getProductClassCode());
+        conflictAnalysisInputDTO.setMaterialCode(conflictAnalysisInputDTO.getSuperBomCode());
         HttpEntity<String> requestEntity = new HttpEntity<String>(JSON.toJSONString(conflictAnalysisInputDTO), headers);
         ResponseEntity<String> responseEntity = restTemplate.exchange("http://127.0.0.1:8080/api/v1/selector/conflictAnalysis", HttpMethod.POST, requestEntity, String.class);
         JSONObject object = JSONObject.parseObject(responseEntity.getBody());
-        return object.get("data");
+        return ResultGenerator.genSuccessResult(object.get("data"));
     }
 
     @PostMapping("/getConfigurations")

src/main/java/cn/com/uitech/authorization/mapper/SuperTableInfoMapper.java

@@ -29,4 +29,8 @@ public interface SuperTableInfoMapper extends IBaseMapper<SuperTableInfo>{
     List<Map<String,String>> findCName(@Param("tablenumber") String tablenumber, @Param("groupNumber") String groupNumber);
 
     List<String> findVName(@Param("tablenumber") String tablenumber, @Param("characteristiccode") String characteristiccode, @Param("groupNumber") String groupNumber);
+
+    String findCNameByName(@Param("name") String name);
+
+    String findVNameByName(@Param("name") String name);
 }

src/main/java/cn/com/uitech/authorization/pojo/dto/ConflictAnalysisInputDTO.java

@@ -30,6 +30,7 @@ public class ConflictAnalysisInputDTO implements Serializable {
     private String productClassCode;
     @NotNull
     private String materialCode;
+    private String superBomCode;
     @NotNull
     private String operator;
     @NotNull

src/main/resources/mapper/SuperTableInfoMapper.xml

@@ -70,4 +70,10 @@
     <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>
+    <select id="findCNameByName" resultType="java.lang.String">
+        select unis_sales_c_name from super_characteristic_info where characteristic_name = #{name}
+    </select>
+    <select id="findVNameByName" resultType="java.lang.String">
+        select unis_sales_v_name from super_characteristic_value_info where characteristic_value_name = #{name} limit 1
+    </select>
 </mapper>