新增 查询24节气列表，编辑24节气列表功能接口

src/main/java/com/yunfeiyun/agmp/fms/mapper/FmsSolarMapper.java

@@ -83,7 +83,7 @@ public interface FmsSolarMapper
      * @param date 日期(yyyy-MM-dd)
      * @return 节气
      * */
-    public FmsSolar getFmsSolarByDate(@Param("date") String date,@Param("tid") String tid);
+    public FmsSolar getFmsSolarByDate(FmsSolar fmsSolar);
 
 
 }

src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsSolarServiceImpl.java

@@ -205,9 +205,15 @@ public class FmsSolarServiceImpl implements IFmsSolarService
 
     @Override
     public FmsSolar getNowSolar(String date, String tid) {
-        FmsSolar fmsSolar = fmsSolarMapper.getFmsSolarByDate(date,tid);
+        FmsSolar selectFmsSolar = new FmsSolar();
+        selectFmsSolar.setTid(tid);
+        selectFmsSolar.setYear(String.valueOf(LocalDate.now().getYear()));
+        selectFmsSolar.setSolarStartdate(date);
+
+        FmsSolar fmsSolar = fmsSolarMapper.getFmsSolarByDate(selectFmsSolar);
         if(null == fmsSolar){
-            return fmsSolarMapper.getFmsSolarByDate(null,tid);
+            selectFmsSolar.setTid("");
+            return fmsSolarMapper.getFmsSolarByDate(selectFmsSolar);
         }
         return fmsSolar;
     }

src/main/resources/mapper/FmsSolarMapper.xml

@@ -31,11 +31,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where solarName = #{solarName} and year = #{year} and tid = #{tid}
     </select>
 
-    <select id="getFmsSolarByDate" parameterType="String" resultType="FmsSolar">
+    <select id="getFmsSolarByDate" parameterType="FmsSolar" resultType="FmsSolar">
         <include refid="selectFmsSolarVo"/>
         <where>
-            tid = #{tid}
-            <if test="date != null and date != ''">and solarStartdate &lt;= #{date}</if>
+            tid = #{tid} and year = #{year}
+            <if test="solarStartdate != null and solarStartdate != ''">and solarStartdate &lt;= #{solarStartdate}</if>
         </where>
         order by solarStartdate desc limit 1
     </select>