碳源投机相关接口处理

slibra-admin/src/main/java/com/slibra/web/controller/business/TXinyiMedicineParamController.java

@@ -61,6 +61,30 @@ public class TXinyiMedicineParamController extends BaseController
 
 
 
+    /**
+     * 获取智能投药参数设置详细信息的历史记录-统计使用
+     */
+    @GetMapping(value = "/getList")
+    public AjaxResult getList(TXinyiMedicineParam tXinyiMedicineParam)
+    {
+        return success(tXinyiMedicineParamService.selectTXinyiMedicineParamList(tXinyiMedicineParam));
+    }
+
+
+
+    /**
+     * 新增智能投药参数设置
+     */
+//    @PreAuthorize("@ss.hasPermi('business:param:add')")
+//    @Log(title = "智能投药参数设置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TXinyiMedicineParam tXinyiMedicineParam)
+    {
+        tXinyiMedicineParam.setCreateBy(getUsername());
+        return toAjax(tXinyiMedicineParamService.insertTXinyiMedicineParam(tXinyiMedicineParam));
+    }
+
+
     //下面的前端暂时用不到
 
 
@@ -100,17 +124,6 @@ public class TXinyiMedicineParamController extends BaseController
         return success(tXinyiMedicineParamService.selectTXinyiMedicineParamById(id));
     }
 
-    /**
-     * 新增智能投药参数设置
-     */
-//    @PreAuthorize("@ss.hasPermi('business:param:add')")
-//    @Log(title = "智能投药参数设置", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody TXinyiMedicineParam tXinyiMedicineParam)
-    {
-        tXinyiMedicineParam.setCreateBy(getUsername());
-        return toAjax(tXinyiMedicineParamService.insertTXinyiMedicineParam(tXinyiMedicineParam));
-    }
 
 
     /**

slibra-system/src/main/java/com/slibra/business/domain/TXinyiMedicineParam.java

@@ -166,4 +166,12 @@ public class TXinyiMedicineParam extends BaseEntity
     //额外查询的字段
     //碳源投加瞬时流量
     private BigDecimal tytjTransientLL;
+
+    //请求参数
+
+    /**  开始时间 */
+    private String timeBegin;
+
+    /** 截止时间 */
+    private String timeEnd;
 }

slibra-system/src/main/resources/mapper/business/TXinyiMedicineParamMapper.xml

@@ -51,46 +51,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, number_beng, type, js_ll_type, js_ll_one, js_ll_two, js_cod_type, js_cod_one, js_cod_two, hyc_xsy_type, hyc_xsy_one, hyc_xsy_two, qyc_yxy_type, qyc_yxy_one, qyc_yxy_two, qyc_ad_type, qyc_ad_one, qyc_ad_two, js_tn_type, js_tn_one, js_tn_two, htfksd, jzxs, xzxs, kzxs, slfpxs, tydl, zhxs, sxps, yymd, zxqdll, tdb, medicine_amount, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_xinyi_medicine_param
     </sql>
 
-    <select id="selectTXinyiMedicineParamList" parameterType="TXinyiMedicineParam" resultMap="TXinyiMedicineParamResult">
-        <include refid="selectTXinyiMedicineParamVo"/>
-        <where>
-            1 = 1
-            <if test="numberBeng != null "> and number_beng = #{numberBeng}</if>
-            <if test="type != null "> and type = #{type}</if>
-            <if test="jsLlType != null "> and js_ll_type = #{jsLlType}</if>
-            <if test="jsLlOne != null "> and js_ll_one = #{jsLlOne}</if>
-            <if test="jsLlTwo != null "> and js_ll_two = #{jsLlTwo}</if>
-            <if test="jsCodType != null "> and js_cod_type = #{jsCodType}</if>
-            <if test="jsCodOne != null "> and js_cod_one = #{jsCodOne}</if>
-            <if test="jsCodTwo != null "> and js_cod_two = #{jsCodTwo}</if>
-            <if test="hycXsyType != null "> and hyc_xsy_type = #{hycXsyType}</if>
-            <if test="hycXsyOne != null "> and hyc_xsy_one = #{hycXsyOne}</if>
-            <if test="hycXsyTwo != null "> and hyc_xsy_two = #{hycXsyTwo}</if>
-            <if test="qycYxyType != null "> and qyc_yxy_type = #{qycYxyType}</if>
-            <if test="qycYxyOne != null "> and qyc_yxy_one = #{qycYxyOne}</if>
-            <if test="qycYxyTwo != null "> and qyc_yxy_two = #{qycYxyTwo}</if>
-            <if test="qycAdType != null "> and qyc_ad_type = #{qycAdType}</if>
-            <if test="qycAdOne != null "> and qyc_ad_one = #{qycAdOne}</if>
-            <if test="qycAdTwo != null "> and qyc_ad_two = #{qycAdTwo}</if>
-            <if test="jsTnType != null "> and js_tn_type = #{jsTnType}</if>
-            <if test="jsTnOne != null "> and js_tn_one = #{jsTnOne}</if>
-            <if test="jsTnTwo != null "> and js_tn_two = #{jsTnTwo}</if>
-            <if test="htfksd != null "> and htfksd = #{htfksd}</if>
-            <if test="jzxs != null "> and jzxs = #{jzxs}</if>
-            <if test="xzxs != null "> and xzxs = #{xzxs}</if>
-            <if test="kzxs != null "> and kzxs = #{kzxs}</if>
-            <if test="slfpxs != null "> and slfpxs = #{slfpxs}</if>
-            <if test="tydl != null "> and tydl = #{tydl}</if>
-            <if test="zhxs != null "> and zhxs = #{zhxs}</if>
-            <if test="sxps != null "> and sxps = #{sxps}</if>
-            <if test="yymd != null "> and yymd = #{yymd}</if>
-            <if test="zxqdll != null "> and zxqdll = #{zxqdll}</if>
-            <if test="tdb != null "> and tdb = #{tdb}</if>
-            <if test="medicineAmount != null "> and medicine_amount = #{medicineAmount}</if>
-            <if test="revision != null "> and revision = #{revision}</if>
-        </where>
-        and del_flag = 0 order by id desc
-    </select>
     
     <select id="selectTXinyiMedicineParamById" parameterType="Long" resultMap="TXinyiMedicineParamResult">
         <include refid="selectTXinyiMedicineParamVo"/>
@@ -248,4 +208,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTXinyiMedicineParamVo"/>
         where del_flag = 0 order by id desc limit 1
     </select>
+
+
+    <select id="selectTXinyiMedicineParamList" parameterType="TXinyiMedicineParam" resultMap="TXinyiMedicineParamResult">
+        <include refid="selectTXinyiMedicineParamVo"/>
+        <where>
+            1 = 1
+            <if test="numberBeng != null "> and number_beng = #{numberBeng}</if>
+            <if test="type != null "> and type = #{type}</if>
+            <if test="jsLlType != null "> and js_ll_type = #{jsLlType}</if>
+            <if test="jsLlOne != null "> and js_ll_one = #{jsLlOne}</if>
+            <if test="jsLlTwo != null "> and js_ll_two = #{jsLlTwo}</if>
+            <if test="jsCodType != null "> and js_cod_type = #{jsCodType}</if>
+            <if test="jsCodOne != null "> and js_cod_one = #{jsCodOne}</if>
+            <if test="jsCodTwo != null "> and js_cod_two = #{jsCodTwo}</if>
+            <if test="hycXsyType != null "> and hyc_xsy_type = #{hycXsyType}</if>
+            <if test="hycXsyOne != null "> and hyc_xsy_one = #{hycXsyOne}</if>
+            <if test="hycXsyTwo != null "> and hyc_xsy_two = #{hycXsyTwo}</if>
+            <if test="qycYxyType != null "> and qyc_yxy_type = #{qycYxyType}</if>
+            <if test="qycYxyOne != null "> and qyc_yxy_one = #{qycYxyOne}</if>
+            <if test="qycYxyTwo != null "> and qyc_yxy_two = #{qycYxyTwo}</if>
+            <if test="qycAdType != null "> and qyc_ad_type = #{qycAdType}</if>
+            <if test="qycAdOne != null "> and qyc_ad_one = #{qycAdOne}</if>
+            <if test="qycAdTwo != null "> and qyc_ad_two = #{qycAdTwo}</if>
+            <if test="jsTnType != null "> and js_tn_type = #{jsTnType}</if>
+            <if test="jsTnOne != null "> and js_tn_one = #{jsTnOne}</if>
+            <if test="jsTnTwo != null "> and js_tn_two = #{jsTnTwo}</if>
+            <if test="htfksd != null "> and htfksd = #{htfksd}</if>
+            <if test="jzxs != null "> and jzxs = #{jzxs}</if>
+            <if test="xzxs != null "> and xzxs = #{xzxs}</if>
+            <if test="kzxs != null "> and kzxs = #{kzxs}</if>
+            <if test="slfpxs != null "> and slfpxs = #{slfpxs}</if>
+            <if test="tydl != null "> and tydl = #{tydl}</if>
+            <if test="zhxs != null "> and zhxs = #{zhxs}</if>
+            <if test="sxps != null "> and sxps = #{sxps}</if>
+            <if test="yymd != null "> and yymd = #{yymd}</if>
+            <if test="zxqdll != null "> and zxqdll = #{zxqdll}</if>
+            <if test="tdb != null "> and tdb = #{tdb}</if>
+            <if test="medicineAmount != null "> and medicine_amount = #{medicineAmount}</if>
+            <if test="revision != null "> and revision = #{revision}</if>
+            <!-- 下面是新增的SQL检索条件  MySQL写法-->
+            <if test="timeBegin != null  and timeBegin != ''"> and DATE_FORMAT(create_time, '%Y-%m-%d') &gt;= #{timeBegin}</if>
+            <if test="timeEnd != null  and timeEnd != ''"> DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= #{timeEnd}</if>
+        </where>
+        and del_flag = 0 order by id desc
+    </select>
 </mapper>