cxd hai 6 meses
pai
achega
72b3713126

+ 3 - 0
gqy-system/src/main/java/com/gqy/document/mapper/DcProductMapper.java

@@ -10,6 +10,9 @@ import java.util.Map;
  */
 public interface DcProductMapper {
 
+
+
+
     /**
      * 新增产品对象 dc_product
      *

+ 10 - 0
gqy-system/src/main/java/com/gqy/document/mapper/DcSystemProductMapper.java

@@ -4,9 +4,19 @@ import com.gqy.document.domain.DcSystemProduct;
 import com.gqy.document.domain.DcTemplate;
 
 import java.util.List;
+import java.util.Map;
 
 public interface DcSystemProductMapper {
 
+    /**
+     * 根据产品ID查询工程系统关联信息
+     *
+     * @param dcpId 产品ID
+     * @return 工程系统关联信息
+     */
+    List<Map> selectWorkSystemByProductId(Long dcpId);
+
+
     /**
      *  插入
      * @return

+ 19 - 3
gqy-system/src/main/java/com/gqy/document/service/impl/DcProductServiceImpl.java

@@ -8,6 +8,7 @@ import com.gqy.document.mapper.DcSystemProductMapper;
 import com.gqy.document.mapper.DcWorkSystemMapper;
 import com.gqy.document.service.IDcProductService;
 import com.gqy.system.mapper.DcPsParamMapper;
+import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -15,6 +16,7 @@ import org.springframework.util.CollectionUtils;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  *  产品信息
@@ -39,14 +41,29 @@ public class DcProductServiceImpl implements IDcProductService {
     private DcPsParamMapper dcPsParamMapper;
 
 
+
+
+
+
+
+    /**
+     * 根据id查询产品
+     * @param dcpId
+     * @return
+     */
     public Map selectDcProductByIdMap(Long dcpId){
         Map result = new HashMap();
         DcProduct dcProduct = dcProductMapper.selectDcProductById(dcpId);
         DcSpec dcSpecQuery = new DcSpec();
         Map content = BeanUtils.beanToMap(dcProduct);
+
+        List<Map>  listMaps = dcSystemProductMapper.selectWorkSystemByProductId(dcpId);
+        content.putAll(listMaps.get(0));
         result.put("content",content);
+
         dcSpecQuery.setPs_p_id(dcProduct.getDcp_id());
         List<DcSpec> list = dcSpecMapper.selectDcSpecList(dcSpecQuery);
+        List<Map> listDcSpec = Lists.newArrayList();
         for (DcSpec dcSpec :list){
             Map contentDcSpec = BeanUtils.beanToMap(dcSpec);
 
@@ -59,10 +76,9 @@ public class DcProductServiceImpl implements IDcProductService {
                 Map contentDcPsParam = BeanUtils.beanToMap(dcPsParam);
                 contentDcSpec.putAll(contentDcPsParam);
             }
-
-            result.put("specs",contentDcSpec);
-
+            listDcSpec.add(contentDcSpec);
         }
+        result.put("specs",listDcSpec);
 
         return result;
     }

+ 15 - 0
gqy-system/src/main/resources/mapper/document/DcSystemProductMapper.xml

@@ -15,6 +15,21 @@
 
 
 
+    <!-- 根据产品ID查询工程系统关联信息 -->
+    <select id="selectWorkSystemByProductId" parameterType="Long" resultType="java.util.Map">
+        SELECT
+            dws.wr_id,
+            dsp.sys_no
+        FROM
+            dc_work_system dws,
+            dc_system_product dsp
+        WHERE
+            dws.sys_id = dsp.sys_no
+            AND dsp.dcp_id = #{dcpId}
+    </select>
+
+
+
 
     <insert id="insertDcSystemProduct" parameterType="DcSystemProduct">
         insert into dc_system_product