工程阶段时间轴

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/mapper/ZhjcGhjhMapper.java

@@ -74,5 +74,11 @@ public interface ZhjcGhjhMapper extends BaseMapper<ZhjcGhjh> {
      * @return
      */
     List<ZhjcGhjhTjfxDzxAndXgj> getGhjhFourData(@Param("code") int code, @Param("xmlxdm") String xmlxdm, @Param("year") String year);
-    List<Map<String,Object>> queryLxGhjh(@Param("gcxmId") String gcxmId);
+
+    /**
+     * 根据工程ID查询项目编号
+     * @param: gcxmId
+     * @return
+     */
+    Map<String,Object> queryLxGhjh(@Param("gcxmId") String gcxmId);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/service/ZhjcGhjhService.java

@@ -56,5 +56,10 @@ public interface ZhjcGhjhService extends IService<ZhjcGhjh> {
      * 删除规划计划
      */
     Boolean deleteZhjcGhjh(ZhjcGhjh zhjcGhjh);
-    List<Map<String,Object>> queryLxGhjh(String gcxmId);
+    /**
+     * 根据工程ID查询项目编码并获取项目信息
+     * @param: gcxmId
+     * @return
+     */
+    ZhjcGhjhTimeline queryLxGhjh(String gcxmId);
 }
\ No newline at end of file

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/service/impl/ZhjcGhjhServiceImpl.java

@@ -325,7 +325,11 @@ public class ZhjcGhjhServiceImpl extends ServiceImpl<ZhjcGhjhMapper, ZhjcGhjh> i
     }
 
     @Override
-    public List<Map<String, Object>> queryLxGhjh(String gcxmId) {
-        return zhjcGhjhMapper.queryLxGhjh(gcxmId);
+    public ZhjcGhjhTimeline queryLxGhjh(String gcxmId) {
+        Map<String,Object> xmbm = zhjcGhjhMapper.queryLxGhjh(gcxmId);
+        if(!xmbm.isEmpty()){
+            return this.getZhjcGhjhByXmbm(xmbm.get("xmbm").toString());
+        }
+            return null;
     }
 }

src/main/resources/mapper/zhjc/ZhjcGhjhMapper.xml

@@ -26,17 +26,9 @@
         <result property="sfzxzt" column="sfzxzt"/>
         <result property="createtime" column="createtime"/>
   </resultMap>
-<!--      <resultMap id="lxghjhMap" type="HashMap">-->
-<!--            <result property="xmmc" column="xmmc"/>-->
-<!--            <collection property="jieduan" column="xmid"  javaType="ArrayList" ofType="HashMap">-->
-<!--                  <result property="xmlx" column="xmlx"/>-->
-<!--                  <result property="xmjdhy" column="xmjdhy"/>-->
-<!--                  <result property="jsxz" column="jsxz"/>-->
-<!--                  <result property="createtime" column="createtime"/>-->
-<!--                  <result property="jhnf" column="jhnf"/>-->
-<!--            </collection>-->
-<!--      </resultMap>-->
-
+    <select id="queryLxGhjh" resultType="HashMap">
+        SELECT xmbm FROM `t_szgl_ghjh_gcxm` where gcxm_id = #{gcxmId} limit 0,1
+      </select>
       <select id="getFourDataWctzMonth" resultType="java.lang.Double">
             select sum(WCTZMonth) from t_zhjc_ghjh_tzzh where xmid=#{xmid}
       </select>
@@ -45,10 +37,6 @@
             select * from t_zhjc_ghjh_tzzh where xmid=#{xmid} ORDER BY tbsj desc
       </select>
 
-      <select id="queryLxGhjh" resultType="HashMap">
-        select * from t_zhjc_ghjh where xmbm in (SELECT xmbm FROM `t_szgl_ghjh_gcxm` where gcxm_id = #{gcxmId})
-      </select>
-
       <select id="getTableBnZJData"  resultType="java.lang.Double">
             select sum(YXDTZ) from t_zhjc_ghjh_tzzh where xmid in (select xmid from t_zhjc_ghjh where xmbm in (select xmbm from t_zhjc_ghjh
             where xmid=#{xmid}))