新增的几项列表数据增加日期筛选条件

slibra-common/src/main/java/com/slibra/common/core/domain/TXinyiDaily.java

@@ -397,4 +397,10 @@ public class TXinyiDaily extends BaseEntity
     @JSONField(name = "DWCB")
     private BigDecimal DWCB;
 
+    //2024年09月10日10:47:07 新增的请求参数
+    /**  开始时间 */
+    private String timeBegin;
+
+    /** 截止时间 */
+    private String timeEnd;
 }

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

@@ -738,4 +738,10 @@ public class TXinyiBigTableDay extends BaseEntity
     @Excel(name = "乐观锁")
     private Long revision;
 
+    //2024年09月10日10:47:07 新增的请求参数
+    /**  开始时间 */
+    private String timeBegin;
+
+    /** 截止时间 */
+    private String timeEnd;
 }

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

@@ -744,4 +744,11 @@ public class TXinyiBigTableHour extends BaseEntity
     @Excel(name = "乐观锁")
     private Long revision;
 
+    //2024年09月10日10:47:07 新增的请求参数
+    /**  开始时间 */
+    private String timeBegin;
+
+    /** 截止时间 */
+    private String timeEnd;
+
 }

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

@@ -738,5 +738,12 @@ public class TXinyiBigTableMonth extends BaseEntity
     /** 乐观锁 */
     @Excel(name = "乐观锁")
     private Long revision;
+
+    //2024年09月10日10:47:07 新增的请求参数
+    /**  开始时间 */
+    private String timeBegin;
+
+    /** 截止时间 */
+    private String timeEnd;
     
 }

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

@@ -158,4 +158,11 @@ public class TXinyiCalculate extends BaseEntity
     /** 乐观锁 */
     @Excel(name = "乐观锁")
     private Long revision;
+
+    //2024年09月10日10:47:07 新增的请求参数
+    /**  开始时间 */
+    private String timeBegin;
+
+    /** 截止时间 */
+    private String timeEnd;
 }

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

@@ -248,7 +248,12 @@ public class TXinyiIndustry
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createdTime;
 
+    //2024年09月10日10:47:07 新增的请求参数
+    /**  开始时间 */
+    private String timeBegin;
 
+    /** 截止时间 */
+    private String timeEnd;
 
 }
 

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

@@ -169,4 +169,11 @@ public class TXinyiRobot
     @Excel(name = "好氧池正磷酸盐", readConverterExp = "多=个池子")
     private String hyzlsyAll;
 
+    //2024年09月10日10:47:07 新增的请求参数
+    /**  开始时间 */
+    private String timeBegin;
+
+    /** 截止时间 */
+    private String timeEnd;
+
 }

slibra-system/src/main/java/com/slibra/system/mapper/SysUserMapper.java

@@ -103,11 +103,12 @@ public interface SysUserMapper
 
     /**
      * 校验用户名称是否唯一
-     * 
+     *
      * @param userName 用户名称
+     * @param type
      * @return 结果
      */
-    public SysUser checkUserNameUnique(String userName);
+    public SysUser checkUserNameUnique(@Param("userName") String userName, @Param("type") Integer type);
 
     /**
      * 校验手机号码是否唯一
@@ -115,15 +116,16 @@ public interface SysUserMapper
      * @param phonenumber 手机号码
      * @return 结果
      */
-    public SysUser checkPhoneUnique(String phonenumber);
+    public SysUser checkPhoneUnique(@Param("phonenumber") String phonenumber, @Param("type") Integer type);
 
     /**
      * 校验email是否唯一
      *
      * @param email 用户邮箱
+     * @param type
      * @return 结果
      */
-    public SysUser checkEmailUnique(String email);
+    public SysUser checkEmailUnique(String email, Integer type);
 
     SysUser selectUserByPhonenumber(String phoneNumber);
 }

slibra-system/src/main/java/com/slibra/system/service/impl/SysUserServiceImpl.java

@@ -170,7 +170,8 @@ public class SysUserServiceImpl implements ISysUserService
     public boolean checkUserNameUnique(SysUser user)
     {
         Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
-        SysUser info = userMapper.checkUserNameUnique(user.getUserName());
+//        SysUser info = userMapper.checkUserNameUnique(user.getUserName());
+        SysUser info = userMapper.checkUserNameUnique(user.getUserName(), user.getType());
         if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
         {
             return UserConstants.NOT_UNIQUE;
@@ -188,7 +189,8 @@ public class SysUserServiceImpl implements ISysUserService
     public boolean checkPhoneUnique(SysUser user)
     {
         Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
-        SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
+//        SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
+        SysUser info = userMapper.checkEmailUnique(user.getEmail(), user.getType());
         if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
         {
             return UserConstants.NOT_UNIQUE;
@@ -206,7 +208,7 @@ public class SysUserServiceImpl implements ISysUserService
     public boolean checkEmailUnique(SysUser user)
     {
         Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
-        SysUser info = userMapper.checkEmailUnique(user.getEmail());
+        SysUser info = userMapper.checkEmailUnique(user.getEmail(), user.getType());
         if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
         {
             return UserConstants.NOT_UNIQUE;

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

@@ -50,46 +50,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, TEST_DATE, TEST_HOUR, TEST_TIME, JS_TDB, JS_TLB, JS_BOD_B_COD, YYQ_HRT, QYQ_HRT, HYQ_HRT, HFXWNNDZB, F_M, GSLS, GSLS_ONE, GSLS_TWO, XGS_GSLS, XLCSC_BMFH, XLCSC_HRT, CCCDC_BMFH, CCCDC_HRT, ECC_BMFH, ECC_HRT, ECC_GTFH, CLSN_JCSJ, XGCDC_QSQ_SSLS, WHLB, WHL_R_N, NHLB, WDSCNL, QSB, FCXSL, FCXSLBL, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_xinyi_calculate
     </sql>
 
-    <select id="selectTXinyiCalculateList" parameterType="TXinyiCalculate" resultMap="TXinyiCalculateResult">
-        <include refid="selectTXinyiCalculateVo"/>
-        <where>
-            1 = 1
-            <if test="testDate != null  and testDate != ''"> and TEST_DATE = #{testDate}</if>
-            <if test="testHour != null  and testHour != ''"> and TEST_HOUR = #{testHour}</if>
-            <if test="testTime != null  and testTime != ''"> and TEST_TIME = #{testTime}</if>
-            <if test="jsTdb != null "> and JS_TDB = #{jsTdb}</if>
-            <if test="jsTlb != null "> and JS_TLB = #{jsTlb}</if>
-            <if test="jsBodBCod != null "> and JS_BOD_B_COD = #{jsBodBCod}</if>
-            <if test="yyqHrt != null "> and YYQ_HRT = #{yyqHrt}</if>
-            <if test="qyqHrt != null "> and QYQ_HRT = #{qyqHrt}</if>
-            <if test="hyqHrt != null "> and HYQ_HRT = #{hyqHrt}</if>
-            <if test="HFXWNNDZB != null "> and HFXWNNDZB = #{HFXWNNDZB}</if>
-            <if test="fM != null "> and F_M = #{fM}</if>
-            <if test="GSLS != null "> and GSLS = #{GSLS}</if>
-            <if test="gslsOne != null "> and GSLS_ONE = #{gslsOne}</if>
-            <if test="gslsTwo != null "> and GSLS_TWO = #{gslsTwo}</if>
-            <if test="xgsGsls != null "> and XGS_GSLS = #{xgsGsls}</if>
-            <if test="xlcscBmfh != null "> and XLCSC_BMFH = #{xlcscBmfh}</if>
-            <if test="xlcscHrt != null "> and XLCSC_HRT = #{xlcscHrt}</if>
-            <if test="cccdcBmfh != null "> and CCCDC_BMFH = #{cccdcBmfh}</if>
-            <if test="cccdcHrt != null "> and CCCDC_HRT = #{cccdcHrt}</if>
-            <if test="eccBmfh != null "> and ECC_BMFH = #{eccBmfh}</if>
-            <if test="eccHrt != null "> and ECC_HRT = #{eccHrt}</if>
-            <if test="eccGtfh != null "> and ECC_GTFH = #{eccGtfh}</if>
-            <if test="clsnJcsj != null "> and CLSN_JCSJ = #{clsnJcsj}</if>
-            <if test="xgcdcQsqSsls != null "> and XGCDC_QSQ_SSLS = #{xgcdcQsqSsls}</if>
-            <if test="WHLB != null "> and WHLB = #{WHLB}</if>
-            <if test="whlRN != null "> and WHL_R_N = #{whlRN}</if>
-            <if test="NHLB != null "> and NHLB = #{NHLB}</if>
-            <if test="WDSCNL != null "> and WDSCNL = #{WDSCNL}</if>
-            <if test="QSB != null "> and QSB = #{QSB}</if>
-            <if test="FCXSL != null "> and FCXSL = #{FCXSL}</if>
-            <if test="FCXSLBL != null "> and FCXSLBL = #{FCXSLBL}</if>
-            <if test="revision != null "> and revision = #{revision}</if>
-        </where>
-        and del_flag = 0 order by id desc
-    </select>
-    
     <select id="selectTXinyiCalculateById" parameterType="Long" resultMap="TXinyiCalculateResult">
         <include refid="selectTXinyiCalculateVo"/>
         where id = #{id} and del_flag = 0
@@ -236,4 +196,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
+    <select id="selectTXinyiCalculateList" parameterType="TXinyiCalculate" resultMap="TXinyiCalculateResult">
+        <include refid="selectTXinyiCalculateVo"/>
+        <where>
+            1 = 1
+            <if test="testDate != null  and testDate != ''"> and TEST_DATE = #{testDate}</if>
+            <if test="testHour != null  and testHour != ''"> and TEST_HOUR = #{testHour}</if>
+            <if test="testTime != null  and testTime != ''"> and TEST_TIME = #{testTime}</if>
+            <if test="jsTdb != null "> and JS_TDB = #{jsTdb}</if>
+            <if test="jsTlb != null "> and JS_TLB = #{jsTlb}</if>
+            <if test="jsBodBCod != null "> and JS_BOD_B_COD = #{jsBodBCod}</if>
+            <if test="yyqHrt != null "> and YYQ_HRT = #{yyqHrt}</if>
+            <if test="qyqHrt != null "> and QYQ_HRT = #{qyqHrt}</if>
+            <if test="hyqHrt != null "> and HYQ_HRT = #{hyqHrt}</if>
+            <if test="HFXWNNDZB != null "> and HFXWNNDZB = #{HFXWNNDZB}</if>
+            <if test="fM != null "> and F_M = #{fM}</if>
+            <if test="GSLS != null "> and GSLS = #{GSLS}</if>
+            <if test="gslsOne != null "> and GSLS_ONE = #{gslsOne}</if>
+            <if test="gslsTwo != null "> and GSLS_TWO = #{gslsTwo}</if>
+            <if test="xgsGsls != null "> and XGS_GSLS = #{xgsGsls}</if>
+            <if test="xlcscBmfh != null "> and XLCSC_BMFH = #{xlcscBmfh}</if>
+            <if test="xlcscHrt != null "> and XLCSC_HRT = #{xlcscHrt}</if>
+            <if test="cccdcBmfh != null "> and CCCDC_BMFH = #{cccdcBmfh}</if>
+            <if test="cccdcHrt != null "> and CCCDC_HRT = #{cccdcHrt}</if>
+            <if test="eccBmfh != null "> and ECC_BMFH = #{eccBmfh}</if>
+            <if test="eccHrt != null "> and ECC_HRT = #{eccHrt}</if>
+            <if test="eccGtfh != null "> and ECC_GTFH = #{eccGtfh}</if>
+            <if test="clsnJcsj != null "> and CLSN_JCSJ = #{clsnJcsj}</if>
+            <if test="xgcdcQsqSsls != null "> and XGCDC_QSQ_SSLS = #{xgcdcQsqSsls}</if>
+            <if test="WHLB != null "> and WHLB = #{WHLB}</if>
+            <if test="whlRN != null "> and WHL_R_N = #{whlRN}</if>
+            <if test="NHLB != null "> and NHLB = #{NHLB}</if>
+            <if test="WDSCNL != null "> and WDSCNL = #{WDSCNL}</if>
+            <if test="QSB != null "> and QSB = #{QSB}</if>
+            <if test="FCXSL != null "> and FCXSL = #{FCXSL}</if>
+            <if test="FCXSLBL != null "> and FCXSLBL = #{FCXSLBL}</if>
+            <if test="revision != null "> and revision = #{revision}</if>
+            <!-- 下面是新增的SQL检索条件 -->
+            <if test="timeBegin != null  and timeBegin != ''"> and TEST_DATE &gt;= #{timeBegin}</if>
+            <if test="timeEnd != null  and timeEnd != ''"> and TEST_DATE &lt;= #{timeEnd}</if>
+        </where>
+        and del_flag = 0 order by id desc
+    </select>
 </mapper>

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

@@ -85,86 +85,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select ID, TEST_DATE, TEST_HOUR, TEST_TIME, SORT, JS_COD, JS_PH, JS_BOD5, JS_SS, JS_NH3, JS_TN, JS_TP, JS_DCGJ, CS_COD, CS_PH, CS_BOD5, CS_SS, CS_NH3, CS_TN, CS_TP, CS_DCGJ, JS_SW, CS_SW, SHC_ONE_PH, SHC_TWO_PH, SHC_HY_ONE_SV, SHC_HY_TWO_SV, SHC_HY_ONE_SVI, SHC_HY_TWO_SVI, SHC_HY_ONE_MLSS, SHC_HY_TWO_MLSS, SHC_HY_ONE_MLVSS, SHC_HY_TWO_MLVSS, SHC_YY_ONE_DO, SHC_YY_TWO_DO, SHC_QY_ONE_DO, SHC_QY_TWO_DO, SHC_HY_ONE_DO, SHC_HY_TWO_DO, JSL, CSL, SDCLCXSL, QSB, F_M, YY_HRT, HY_HRT, QY_HRT, NHL_R, WHL_R, SRT, CNL, TYQ_BOD5_TN, TYH_BOD5_TN, HYC_RJY_ALL, HYC_WNND_ALL, YYC_RJY_ALL, QYC_RJY_ALL, WNCJB_ALL, WNTJZS_ALL, HFXWNND_ALL, CREATED_TIME, CHUNILIANG, CNHSL, GWNL, DF, XNJF, CLF, TYF, XDJF, QTYJF, CNF, ZLSF, ZJCB, DWCB from t_xinyi_daily
     </sql>
 
-    <select id="selectTXinyiDailyList" parameterType="TXinyiDaily" resultMap="TXinyiDailyResult">
-        <include refid="selectTXinyiDailyVo"/>
-        <where>
-            <if test="testDate != null  and testDate != ''"> and TEST_DATE = #{testDate}</if>
-            <if test="testHour != null  and testHour != ''"> and TEST_HOUR = #{testHour}</if>
-            <if test="testTime != null  and testTime != ''"> and TEST_TIME = #{testTime}</if>
-            <if test="SORT != null "> and SORT = #{SORT}</if>
-            <if test="jsCod != null "> and JS_COD = #{jsCod}</if>
-            <if test="jsPh != null "> and JS_PH = #{jsPh}</if>
-            <if test="jsBod5 != null "> and JS_BOD5 = #{jsBod5}</if>
-            <if test="jsSs != null "> and JS_SS = #{jsSs}</if>
-            <if test="jsNh3 != null "> and JS_NH3 = #{jsNh3}</if>
-            <if test="jsTn != null "> and JS_TN = #{jsTn}</if>
-            <if test="jsTp != null "> and JS_TP = #{jsTp}</if>
-            <if test="jsDcgj != null "> and JS_DCGJ = #{jsDcgj}</if>
-            <if test="csCod != null "> and CS_COD = #{csCod}</if>
-            <if test="csPh != null "> and CS_PH = #{csPh}</if>
-            <if test="csBod5 != null "> and CS_BOD5 = #{csBod5}</if>
-            <if test="csSs != null "> and CS_SS = #{csSs}</if>
-            <if test="csNh3 != null "> and CS_NH3 = #{csNh3}</if>
-            <if test="csTn != null "> and CS_TN = #{csTn}</if>
-            <if test="csTp != null "> and CS_TP = #{csTp}</if>
-            <if test="csDcgj != null "> and CS_DCGJ = #{csDcgj}</if>
-            <if test="jsSw != null "> and JS_SW = #{jsSw}</if>
-            <if test="csSw != null "> and CS_SW = #{csSw}</if>
-            <if test="shcOnePh != null "> and SHC_ONE_PH = #{shcOnePh}</if>
-            <if test="shcTwoPh != null "> and SHC_TWO_PH = #{shcTwoPh}</if>
-            <if test="shcHyOneSv != null "> and SHC_HY_ONE_SV = #{shcHyOneSv}</if>
-            <if test="shcHyTwoSv != null "> and SHC_HY_TWO_SV = #{shcHyTwoSv}</if>
-            <if test="shcHyOneSvi != null "> and SHC_HY_ONE_SVI = #{shcHyOneSvi}</if>
-            <if test="shcHyTwoSvi != null "> and SHC_HY_TWO_SVI = #{shcHyTwoSvi}</if>
-            <if test="shcHyOneMlss != null "> and SHC_HY_ONE_MLSS = #{shcHyOneMlss}</if>
-            <if test="shcHyTwoMlss != null "> and SHC_HY_TWO_MLSS = #{shcHyTwoMlss}</if>
-            <if test="shcHyOneMlvss != null "> and SHC_HY_ONE_MLVSS = #{shcHyOneMlvss}</if>
-            <if test="shcHyTwoMlvss != null "> and SHC_HY_TWO_MLVSS = #{shcHyTwoMlvss}</if>
-            <if test="shcYyOneDo != null "> and SHC_YY_ONE_DO = #{shcYyOneDo}</if>
-            <if test="shcYyTwoDo != null "> and SHC_YY_TWO_DO = #{shcYyTwoDo}</if>
-            <if test="shcQyOneDo != null "> and SHC_QY_ONE_DO = #{shcQyOneDo}</if>
-            <if test="shcQyTwoDo != null "> and SHC_QY_TWO_DO = #{shcQyTwoDo}</if>
-            <if test="shcHyOneDo != null "> and SHC_HY_ONE_DO = #{shcHyOneDo}</if>
-            <if test="shcHyTwoDo != null "> and SHC_HY_TWO_DO = #{shcHyTwoDo}</if>
-            <if test="JSL != null "> and JSL = #{JSL}</if>
-            <if test="CSL != null "> and CSL = #{CSL}</if>
-            <if test="SDCLCXSL != null "> and SDCLCXSL = #{SDCLCXSL}</if>
-            <if test="QSB != null "> and QSB = #{QSB}</if>
-            <if test="fM != null "> and F_M = #{fM}</if>
-            <if test="yyHrt != null "> and YY_HRT = #{yyHrt}</if>
-            <if test="hyHrt != null "> and HY_HRT = #{hyHrt}</if>
-            <if test="qyHrt != null "> and QY_HRT = #{qyHrt}</if>
-            <if test="nhlR != null "> and NHL_R = #{nhlR}</if>
-            <if test="whlR != null "> and WHL_R = #{whlR}</if>
-            <if test="SRT != null "> and SRT = #{SRT}</if>
-            <if test="CNL != null "> and CNL = #{CNL}</if>
-            <if test="tyqBod5Tn != null "> and TYQ_BOD5_TN = #{tyqBod5Tn}</if>
-            <if test="tyhBod5Tn != null "> and TYH_BOD5_TN = #{tyhBod5Tn}</if>
-            <if test="hycRjyAll != null  and hycRjyAll != ''"> and HYC_RJY_ALL = #{hycRjyAll}</if>
-            <if test="hycWnndAll != null  and hycWnndAll != ''"> and HYC_WNND_ALL = #{hycWnndAll}</if>
-            <if test="yycRjyAll != null  and yycRjyAll != ''"> and YYC_RJY_ALL = #{yycRjyAll}</if>
-            <if test="qycRjyAll != null  and qycRjyAll != ''"> and QYC_RJY_ALL = #{qycRjyAll}</if>
-            <if test="wncjbAll != null  and wncjbAll != ''"> and WNCJB_ALL = #{wncjbAll}</if>
-            <if test="wntjzsAll != null  and wntjzsAll != ''"> and WNTJZS_ALL = #{wntjzsAll}</if>
-            <if test="hfxwnndAll != null  and hfxwnndAll != ''"> and HFXWNND_ALL = #{hfxwnndAll}</if>
-            <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>
-            <if test="CHUNILIANG != null "> and CHUNILIANG = #{CHUNILIANG}</if>
-            <if test="CNHSL != null "> and CNHSL = #{CNHSL}</if>
-            <if test="GWNL != null "> and GWNL = #{GWNL}</if>
-            <if test="DF != null "> and DF = #{DF}</if>
-            <if test="XNJF != null "> and XNJF = #{XNJF}</if>
-            <if test="CLF != null "> and CLF = #{CLF}</if>
-            <if test="TYF != null "> and TYF = #{TYF}</if>
-            <if test="XDJF != null "> and XDJF = #{XDJF}</if>
-            <if test="QTYJF != null "> and QTYJF = #{QTYJF}</if>
-            <if test="CNF != null "> and CNF = #{CNF}</if>
-            <if test="ZLSF != null "> and ZLSF = #{ZLSF}</if>
-            <if test="ZJCB != null "> and ZJCB = #{ZJCB}</if>
-            <if test="DWCB != null "> and DWCB = #{DWCB}</if>
-        </where>
-        order by TEST_DATE desc
-    </select>
-
     <select id="selectTXinyiDailyByID" parameterType="Long" resultMap="TXinyiDailyResult">
         <include refid="selectTXinyiDailyVo"/>
         where ID = #{ID}
@@ -439,4 +359,87 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getDetailByDay" resultMap="TXinyiDailyResult">
         <include refid="selectTXinyiDailyVo"/> where TEST_DATE = #{testDate} limit 1
     </select>
+
+    <select id="selectTXinyiDailyList" parameterType="TXinyiDaily" resultMap="TXinyiDailyResult">
+        <include refid="selectTXinyiDailyVo"/>
+        <where>
+            <if test="testDate != null  and testDate != ''"> and TEST_DATE = #{testDate}</if>
+            <if test="testHour != null  and testHour != ''"> and TEST_HOUR = #{testHour}</if>
+            <if test="testTime != null  and testTime != ''"> and TEST_TIME = #{testTime}</if>
+            <if test="SORT != null "> and SORT = #{SORT}</if>
+            <if test="jsCod != null "> and JS_COD = #{jsCod}</if>
+            <if test="jsPh != null "> and JS_PH = #{jsPh}</if>
+            <if test="jsBod5 != null "> and JS_BOD5 = #{jsBod5}</if>
+            <if test="jsSs != null "> and JS_SS = #{jsSs}</if>
+            <if test="jsNh3 != null "> and JS_NH3 = #{jsNh3}</if>
+            <if test="jsTn != null "> and JS_TN = #{jsTn}</if>
+            <if test="jsTp != null "> and JS_TP = #{jsTp}</if>
+            <if test="jsDcgj != null "> and JS_DCGJ = #{jsDcgj}</if>
+            <if test="csCod != null "> and CS_COD = #{csCod}</if>
+            <if test="csPh != null "> and CS_PH = #{csPh}</if>
+            <if test="csBod5 != null "> and CS_BOD5 = #{csBod5}</if>
+            <if test="csSs != null "> and CS_SS = #{csSs}</if>
+            <if test="csNh3 != null "> and CS_NH3 = #{csNh3}</if>
+            <if test="csTn != null "> and CS_TN = #{csTn}</if>
+            <if test="csTp != null "> and CS_TP = #{csTp}</if>
+            <if test="csDcgj != null "> and CS_DCGJ = #{csDcgj}</if>
+            <if test="jsSw != null "> and JS_SW = #{jsSw}</if>
+            <if test="csSw != null "> and CS_SW = #{csSw}</if>
+            <if test="shcOnePh != null "> and SHC_ONE_PH = #{shcOnePh}</if>
+            <if test="shcTwoPh != null "> and SHC_TWO_PH = #{shcTwoPh}</if>
+            <if test="shcHyOneSv != null "> and SHC_HY_ONE_SV = #{shcHyOneSv}</if>
+            <if test="shcHyTwoSv != null "> and SHC_HY_TWO_SV = #{shcHyTwoSv}</if>
+            <if test="shcHyOneSvi != null "> and SHC_HY_ONE_SVI = #{shcHyOneSvi}</if>
+            <if test="shcHyTwoSvi != null "> and SHC_HY_TWO_SVI = #{shcHyTwoSvi}</if>
+            <if test="shcHyOneMlss != null "> and SHC_HY_ONE_MLSS = #{shcHyOneMlss}</if>
+            <if test="shcHyTwoMlss != null "> and SHC_HY_TWO_MLSS = #{shcHyTwoMlss}</if>
+            <if test="shcHyOneMlvss != null "> and SHC_HY_ONE_MLVSS = #{shcHyOneMlvss}</if>
+            <if test="shcHyTwoMlvss != null "> and SHC_HY_TWO_MLVSS = #{shcHyTwoMlvss}</if>
+            <if test="shcYyOneDo != null "> and SHC_YY_ONE_DO = #{shcYyOneDo}</if>
+            <if test="shcYyTwoDo != null "> and SHC_YY_TWO_DO = #{shcYyTwoDo}</if>
+            <if test="shcQyOneDo != null "> and SHC_QY_ONE_DO = #{shcQyOneDo}</if>
+            <if test="shcQyTwoDo != null "> and SHC_QY_TWO_DO = #{shcQyTwoDo}</if>
+            <if test="shcHyOneDo != null "> and SHC_HY_ONE_DO = #{shcHyOneDo}</if>
+            <if test="shcHyTwoDo != null "> and SHC_HY_TWO_DO = #{shcHyTwoDo}</if>
+            <if test="JSL != null "> and JSL = #{JSL}</if>
+            <if test="CSL != null "> and CSL = #{CSL}</if>
+            <if test="SDCLCXSL != null "> and SDCLCXSL = #{SDCLCXSL}</if>
+            <if test="QSB != null "> and QSB = #{QSB}</if>
+            <if test="fM != null "> and F_M = #{fM}</if>
+            <if test="yyHrt != null "> and YY_HRT = #{yyHrt}</if>
+            <if test="hyHrt != null "> and HY_HRT = #{hyHrt}</if>
+            <if test="qyHrt != null "> and QY_HRT = #{qyHrt}</if>
+            <if test="nhlR != null "> and NHL_R = #{nhlR}</if>
+            <if test="whlR != null "> and WHL_R = #{whlR}</if>
+            <if test="SRT != null "> and SRT = #{SRT}</if>
+            <if test="CNL != null "> and CNL = #{CNL}</if>
+            <if test="tyqBod5Tn != null "> and TYQ_BOD5_TN = #{tyqBod5Tn}</if>
+            <if test="tyhBod5Tn != null "> and TYH_BOD5_TN = #{tyhBod5Tn}</if>
+            <if test="hycRjyAll != null  and hycRjyAll != ''"> and HYC_RJY_ALL = #{hycRjyAll}</if>
+            <if test="hycWnndAll != null  and hycWnndAll != ''"> and HYC_WNND_ALL = #{hycWnndAll}</if>
+            <if test="yycRjyAll != null  and yycRjyAll != ''"> and YYC_RJY_ALL = #{yycRjyAll}</if>
+            <if test="qycRjyAll != null  and qycRjyAll != ''"> and QYC_RJY_ALL = #{qycRjyAll}</if>
+            <if test="wncjbAll != null  and wncjbAll != ''"> and WNCJB_ALL = #{wncjbAll}</if>
+            <if test="wntjzsAll != null  and wntjzsAll != ''"> and WNTJZS_ALL = #{wntjzsAll}</if>
+            <if test="hfxwnndAll != null  and hfxwnndAll != ''"> and HFXWNND_ALL = #{hfxwnndAll}</if>
+            <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>
+            <if test="CHUNILIANG != null "> and CHUNILIANG = #{CHUNILIANG}</if>
+            <if test="CNHSL != null "> and CNHSL = #{CNHSL}</if>
+            <if test="GWNL != null "> and GWNL = #{GWNL}</if>
+            <if test="DF != null "> and DF = #{DF}</if>
+            <if test="XNJF != null "> and XNJF = #{XNJF}</if>
+            <if test="CLF != null "> and CLF = #{CLF}</if>
+            <if test="TYF != null "> and TYF = #{TYF}</if>
+            <if test="XDJF != null "> and XDJF = #{XDJF}</if>
+            <if test="QTYJF != null "> and QTYJF = #{QTYJF}</if>
+            <if test="CNF != null "> and CNF = #{CNF}</if>
+            <if test="ZLSF != null "> and ZLSF = #{ZLSF}</if>
+            <if test="ZJCB != null "> and ZJCB = #{ZJCB}</if>
+            <if test="DWCB != null "> and DWCB = #{DWCB}</if>
+            <!-- 下面是新增的SQL检索条件 -->
+            <if test="timeBegin != null  and timeBegin != ''"> and TEST_DATE &gt;= #{timeBegin}</if>
+            <if test="timeEnd != null  and timeEnd != ''"> and TEST_DATE &lt;= #{timeEnd}</if>
+        </where>
+        order by TEST_DATE desc
+    </select>
 </mapper>

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

@@ -68,71 +68,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select ID, TEST_DATE, TEST_HOUR, TEST_TIME, JS_COD, JS_PH, JS_SS, JS_TP, JS_TN, JS_NH3, JS_SW_PH, JS_BFYW, CS_SLQC, CS_COD, CS_PH, CS_SS, CS_TN, CS_TP, CS_NH3, ONE_HYZD_DO, ONE_HYMD_DO, TWO_HYZD_DO, TWO_HYMD_DO, ONE_MLSS, TWO_MLSS, JS_TDS, JS_SLQ, N_HLB_ONE_GP, N_HLB_TWO_GP, N_HLB_THREE_GP, N_HLB_FOUR_GP, NHL_B_FIVE_GP, N_HLB_SIX_GP, W_HLB_ONE_GP, W_HLB_TWO_GP, W_HLB_THREE_GP, W_HLB_FOUR_GP, W_HLB_FIVE_GP, FJ_ONE, FJ_TWO, FJ_THREE, FJ_FOUR, FJ_FIVE, FJ_SIX, KQLL_ONE, KQLL_TWO, KQLL_THREE, KQLL_FOUR, KQLL_FIVE, KQLL_SIX, SJTYJLY, CLJYSSLL, HYC_RJY_ALL, HYC_RJY_ZD_ALL, HYC_WNND_ALL, CL_P04_YCZ, CREATED_TIME from t_xinyi_industry
     </sql>
 
-
-
-    <select id="selectTXinyiIndustryList" parameterType="TXinyiIndustry" resultMap="TXinyiIndustryResult">
-        <include refid="selectTXinyiIndustryVo"/>
-        <where>
-            <if test="testDate != null  and testDate != ''"> and TEST_DATE = #{testDate}</if>
-            <if test="testHour != null  and testHour != ''"> and TEST_HOUR = #{testHour}</if>
-            <if test="testTime != null  and testTime != ''"> and TEST_TIME = #{testTime}</if>
-            <if test="jsCod != null "> and JS_COD = #{jsCod}</if>
-            <if test="jsPh != null "> and JS_PH = #{jsPh}</if>
-            <if test="jsSs != null "> and JS_SS = #{jsSs}</if>
-            <if test="jsTp != null "> and JS_TP = #{jsTp}</if>
-            <if test="jsTn != null "> and JS_TN = #{jsTn}</if>
-            <if test="jsNh3 != null "> and JS_NH3 = #{jsNh3}</if>
-            <if test="jsSwPh != null "> and JS_SW_PH = #{jsSwPh}</if>
-            <if test="jsBfyw != null "> and JS_BFYW = #{jsBfyw}</if>
-            <if test="csSlqc != null "> and CS_SLQC = #{csSlqc}</if>
-            <if test="csCod != null "> and CS_COD = #{csCod}</if>
-            <if test="csPh != null "> and CS_PH = #{csPh}</if>
-            <if test="csSs != null "> and CS_SS = #{csSs}</if>
-            <if test="csTn != null "> and CS_TN = #{csTn}</if>
-            <if test="csTp != null "> and CS_TP = #{csTp}</if>
-            <if test="csNh3 != null "> and CS_NH3 = #{csNh3}</if>
-            <if test="oneHyzdDo != null "> and ONE_HYZD_DO = #{oneHyzdDo}</if>
-            <if test="oneHymdDo != null "> and ONE_HYMD_DO = #{oneHymdDo}</if>
-            <if test="twoHyzdDo != null "> and TWO_HYZD_DO = #{twoHyzdDo}</if>
-            <if test="twoHymdDo != null "> and TWO_HYMD_DO = #{twoHymdDo}</if>
-            <if test="oneMlss != null "> and ONE_MLSS = #{oneMlss}</if>
-            <if test="twoMlss != null "> and TWO_MLSS = #{twoMlss}</if>
-            <if test="jsTds != null "> and JS_TDS = #{jsTds}</if>
-            <if test="jsSlq != null "> and JS_SLQ = #{jsSlq}</if>
-            <if test="nHlbOneGp != null "> and N_HLB_ONE_GP = #{nHlbOneGp}</if>
-            <if test="nHlbTwoGp != null "> and N_HLB_TWO_GP = #{nHlbTwoGp}</if>
-            <if test="nHlbThreeGp != null "> and N_HLB_THREE_GP = #{nHlbThreeGp}</if>
-            <if test="nHlbFourGp != null "> and N_HLB_FOUR_GP = #{nHlbFourGp}</if>
-            <if test="nhlBFiveGp != null "> and NHL_B_FIVE_GP = #{nhlBFiveGp}</if>
-            <if test="nHlbSixGp != null "> and N_HLB_SIX_GP = #{nHlbSixGp}</if>
-            <if test="wHlbOneGp != null "> and W_HLB_ONE_GP = #{wHlbOneGp}</if>
-            <if test="wHlbTwoGp != null "> and W_HLB_TWO_GP = #{wHlbTwoGp}</if>
-            <if test="wHlbThreeGp != null "> and W_HLB_THREE_GP = #{wHlbThreeGp}</if>
-            <if test="wHlbFourGp != null "> and W_HLB_FOUR_GP = #{wHlbFourGp}</if>
-            <if test="wHlbFiveGp != null "> and W_HLB_FIVE_GP = #{wHlbFiveGp}</if>
-            <if test="fjOne != null "> and FJ_ONE = #{fjOne}</if>
-            <if test="fjTwo != null "> and FJ_TWO = #{fjTwo}</if>
-            <if test="fjThree != null "> and FJ_THREE = #{fjThree}</if>
-            <if test="fjFour != null "> and FJ_FOUR = #{fjFour}</if>
-            <if test="fjFive != null "> and FJ_FIVE = #{fjFive}</if>
-            <if test="fjSix != null "> and FJ_SIX = #{fjSix}</if>
-            <if test="kqllOne != null "> and KQLL_ONE = #{kqllOne}</if>
-            <if test="kqllTwo != null "> and KQLL_TWO = #{kqllTwo}</if>
-            <if test="kqllThree != null "> and KQLL_THREE = #{kqllThree}</if>
-            <if test="kqllFour != null "> and KQLL_FOUR = #{kqllFour}</if>
-            <if test="kqllFive != null "> and KQLL_FIVE = #{kqllFive}</if>
-            <if test="kqllSix != null "> and KQLL_SIX = #{kqllSix}</if>
-            <if test="SJTYJLY != null "> and SJTYJLY = #{SJTYJLY}</if>
-            <if test="CLJYSSLL != null "> and CLJYSSLL = #{CLJYSSLL}</if>
-            <if test="hycRjyAll != null  and hycRjyAll != ''"> and HYC_RJY_ALL = #{hycRjyAll}</if>
-            <if test="hycRjyZdAll != null  and hycRjyZdAll != ''"> and HYC_RJY_ZD_ALL = #{hycRjyZdAll}</if>
-            <if test="hycWnndAll != null  and hycWnndAll != ''"> and HYC_WNND_ALL = #{hycWnndAll}</if>
-            <if test="CLP04YCZ != null "> and CL_P04_YCZ = #{CLP04YCZ}</if>
-            <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>
-        </where>
-        order by id desc
-    </select>
-
     <select id="selectTXinyiIndustryByID" parameterType="Long" resultMap="TXinyiIndustryResult">
         <include refid="selectTXinyiIndustryVo"/>
         where ID = #{ID}
@@ -590,4 +525,71 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY
             ID ASC
     </select>
+
+
+    <select id="selectTXinyiIndustryList" parameterType="TXinyiIndustry" resultMap="TXinyiIndustryResult">
+        <include refid="selectTXinyiIndustryVo"/>
+        <where>
+            <if test="testDate != null  and testDate != ''"> and TEST_DATE = #{testDate}</if>
+            <if test="testHour != null  and testHour != ''"> and TEST_HOUR = #{testHour}</if>
+            <if test="testTime != null  and testTime != ''"> and TEST_TIME = #{testTime}</if>
+            <if test="jsCod != null "> and JS_COD = #{jsCod}</if>
+            <if test="jsPh != null "> and JS_PH = #{jsPh}</if>
+            <if test="jsSs != null "> and JS_SS = #{jsSs}</if>
+            <if test="jsTp != null "> and JS_TP = #{jsTp}</if>
+            <if test="jsTn != null "> and JS_TN = #{jsTn}</if>
+            <if test="jsNh3 != null "> and JS_NH3 = #{jsNh3}</if>
+            <if test="jsSwPh != null "> and JS_SW_PH = #{jsSwPh}</if>
+            <if test="jsBfyw != null "> and JS_BFYW = #{jsBfyw}</if>
+            <if test="csSlqc != null "> and CS_SLQC = #{csSlqc}</if>
+            <if test="csCod != null "> and CS_COD = #{csCod}</if>
+            <if test="csPh != null "> and CS_PH = #{csPh}</if>
+            <if test="csSs != null "> and CS_SS = #{csSs}</if>
+            <if test="csTn != null "> and CS_TN = #{csTn}</if>
+            <if test="csTp != null "> and CS_TP = #{csTp}</if>
+            <if test="csNh3 != null "> and CS_NH3 = #{csNh3}</if>
+            <if test="oneHyzdDo != null "> and ONE_HYZD_DO = #{oneHyzdDo}</if>
+            <if test="oneHymdDo != null "> and ONE_HYMD_DO = #{oneHymdDo}</if>
+            <if test="twoHyzdDo != null "> and TWO_HYZD_DO = #{twoHyzdDo}</if>
+            <if test="twoHymdDo != null "> and TWO_HYMD_DO = #{twoHymdDo}</if>
+            <if test="oneMlss != null "> and ONE_MLSS = #{oneMlss}</if>
+            <if test="twoMlss != null "> and TWO_MLSS = #{twoMlss}</if>
+            <if test="jsTds != null "> and JS_TDS = #{jsTds}</if>
+            <if test="jsSlq != null "> and JS_SLQ = #{jsSlq}</if>
+            <if test="nHlbOneGp != null "> and N_HLB_ONE_GP = #{nHlbOneGp}</if>
+            <if test="nHlbTwoGp != null "> and N_HLB_TWO_GP = #{nHlbTwoGp}</if>
+            <if test="nHlbThreeGp != null "> and N_HLB_THREE_GP = #{nHlbThreeGp}</if>
+            <if test="nHlbFourGp != null "> and N_HLB_FOUR_GP = #{nHlbFourGp}</if>
+            <if test="nhlBFiveGp != null "> and NHL_B_FIVE_GP = #{nhlBFiveGp}</if>
+            <if test="nHlbSixGp != null "> and N_HLB_SIX_GP = #{nHlbSixGp}</if>
+            <if test="wHlbOneGp != null "> and W_HLB_ONE_GP = #{wHlbOneGp}</if>
+            <if test="wHlbTwoGp != null "> and W_HLB_TWO_GP = #{wHlbTwoGp}</if>
+            <if test="wHlbThreeGp != null "> and W_HLB_THREE_GP = #{wHlbThreeGp}</if>
+            <if test="wHlbFourGp != null "> and W_HLB_FOUR_GP = #{wHlbFourGp}</if>
+            <if test="wHlbFiveGp != null "> and W_HLB_FIVE_GP = #{wHlbFiveGp}</if>
+            <if test="fjOne != null "> and FJ_ONE = #{fjOne}</if>
+            <if test="fjTwo != null "> and FJ_TWO = #{fjTwo}</if>
+            <if test="fjThree != null "> and FJ_THREE = #{fjThree}</if>
+            <if test="fjFour != null "> and FJ_FOUR = #{fjFour}</if>
+            <if test="fjFive != null "> and FJ_FIVE = #{fjFive}</if>
+            <if test="fjSix != null "> and FJ_SIX = #{fjSix}</if>
+            <if test="kqllOne != null "> and KQLL_ONE = #{kqllOne}</if>
+            <if test="kqllTwo != null "> and KQLL_TWO = #{kqllTwo}</if>
+            <if test="kqllThree != null "> and KQLL_THREE = #{kqllThree}</if>
+            <if test="kqllFour != null "> and KQLL_FOUR = #{kqllFour}</if>
+            <if test="kqllFive != null "> and KQLL_FIVE = #{kqllFive}</if>
+            <if test="kqllSix != null "> and KQLL_SIX = #{kqllSix}</if>
+            <if test="SJTYJLY != null "> and SJTYJLY = #{SJTYJLY}</if>
+            <if test="CLJYSSLL != null "> and CLJYSSLL = #{CLJYSSLL}</if>
+            <if test="hycRjyAll != null  and hycRjyAll != ''"> and HYC_RJY_ALL = #{hycRjyAll}</if>
+            <if test="hycRjyZdAll != null  and hycRjyZdAll != ''"> and HYC_RJY_ZD_ALL = #{hycRjyZdAll}</if>
+            <if test="hycWnndAll != null  and hycWnndAll != ''"> and HYC_WNND_ALL = #{hycWnndAll}</if>
+            <if test="CLP04YCZ != null "> and CL_P04_YCZ = #{CLP04YCZ}</if>
+            <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>
+            <!-- 下面是新增的SQL检索条件 -->
+            <if test="timeBegin != null  and timeBegin != ''"> and TEST_DATE &gt;= #{timeBegin}</if>
+            <if test="timeEnd != null  and timeEnd != ''"> and TEST_DATE &lt;= #{timeEnd}</if>
+        </where>
+        order by id desc
+    </select>
 </mapper>

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

@@ -50,48 +50,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select ID, V_DATE, V_TIME, V_DATE_TIME, TEST_DATE, TEST_HOUR, TEST_TIME, COD_YB, COD_JQR, COD_YZ, TP_HL1_JQR, TP_HL2_JQR, TP_RCC_JQR, TP_1_YZ, TP_2_YZ, TP_RCC_YZ, NH3_1_JQR, NH3_2_JQR, NH3_1_YZ, NO3_HLC1_YZ, NH3_2_YZ, NO3_HLC2_YZ, NO3_HLJ1_JQR, NO3_HLJ2_JQR, TYLL, NO3_QYC_1_JQR, NO3_QYC_2_JQR, NO3_QYC_1_YZ, NO3_QYC_2_YZ, JSLL, CREATED_TIME, HYCXSY_ALL, QYAN_ALL, QYCKXSY_ALL, HYZLSY_ALL from t_xinyi_robot
     </sql>
 
-    <select id="selectTXinyiRobotList" parameterType="TXinyiRobot" resultMap="TXinyiRobotResult">
-        <include refid="selectTXinyiRobotVo"/>
-        <where>
-            1 = 1
-            <if test="vDate != null  and vDate != ''"> and V_DATE = #{vDate}</if>
-            <if test="vTime != null  and vTime != ''"> and V_TIME = #{vTime}</if>
-            <if test="vDateTime != null  and vDateTime != ''"> and V_DATE_TIME = #{vDateTime}</if>
-            <if test="testDate != null  and testDate != ''"> and TEST_DATE = #{testDate}</if>
-            <if test="testHour != null  and testHour != ''"> and TEST_HOUR = #{testHour}</if>
-            <if test="testTime != null  and testTime != ''"> and TEST_TIME = #{testTime}</if>
-            <if test="codYb != null "> and COD_YB = #{codYb}</if>
-            <if test="codJqr != null "> and COD_JQR = #{codJqr}</if>
-            <if test="codYz != null "> and COD_YZ = #{codYz}</if>
-            <if test="tpHl1Jqr != null "> and TP_HL1_JQR = #{tpHl1Jqr}</if>
-            <if test="tpHl2Jqr != null "> and TP_HL2_JQR = #{tpHl2Jqr}</if>
-            <if test="tpRccJqr != null "> and TP_RCC_JQR = #{tpRccJqr}</if>
-            <if test="tp1Yz != null "> and TP_1_YZ = #{tp1Yz}</if>
-            <if test="tp2Yz != null "> and TP_2_YZ = #{tp2Yz}</if>
-            <if test="tpRccYz != null "> and TP_RCC_YZ = #{tpRccYz}</if>
-            <if test="nh31Jqr != null "> and NH3_1_JQR = #{nh31Jqr}</if>
-            <if test="nh32Jqr != null "> and NH3_2_JQR = #{nh32Jqr}</if>
-            <if test="nh31Yz != null "> and NH3_1_YZ = #{nh31Yz}</if>
-            <if test="no3Hlc1Yz != null "> and NO3_HLC1_YZ = #{no3Hlc1Yz}</if>
-            <if test="nh32Yz != null "> and NH3_2_YZ = #{nh32Yz}</if>
-            <if test="no3Hlc2Yz != null "> and NO3_HLC2_YZ = #{no3Hlc2Yz}</if>
-            <if test="no3Hlj1Jqr != null "> and NO3_HLJ1_JQR = #{no3Hlj1Jqr}</if>
-            <if test="no3Hlj2Jqr != null "> and NO3_HLJ2_JQR = #{no3Hlj2Jqr}</if>
-            <if test="TYLL != null "> and TYLL = #{TYLL}</if>
-            <if test="no3Qyc1Jqr != null "> and NO3_QYC_1_JQR = #{no3Qyc1Jqr}</if>
-            <if test="no3Qyc2Jqr != null "> and NO3_QYC_2_JQR = #{no3Qyc2Jqr}</if>
-            <if test="no3Qyc1Yz != null "> and NO3_QYC_1_YZ = #{no3Qyc1Yz}</if>
-            <if test="no3Qyc2Yz != null "> and NO3_QYC_2_YZ = #{no3Qyc2Yz}</if>
-            <if test="JSLL != null "> and JSLL = #{JSLL}</if>
-            <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>
-            <if test="hycxsyAll != null  and hycxsyAll != ''"> and HYCXSY_ALL = #{hycxsyAll}</if>
-            <if test="qyanAll != null  and qyanAll != ''"> and QYAN_ALL = #{qyanAll}</if>
-            <if test="qyckxsyAll != null  and qyckxsyAll != ''"> and QYCKXSY_ALL = #{qyckxsyAll}</if>
-            <if test="hyzlsyAll != null  and hyzlsyAll != ''"> and HYZLSY_ALL = #{hyzlsyAll}</if>
-        </where>
-        order by id desc
-    </select>
-
     <select id="selectTXinyiRobotByID" parameterType="Long" resultMap="TXinyiRobotResult">
         <include refid="selectTXinyiRobotVo"/>
         where ID = #{ID}
@@ -366,4 +324,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY
             ID ASC
     </select>
+
+    <select id="selectTXinyiRobotList" parameterType="TXinyiRobot" resultMap="TXinyiRobotResult">
+        <include refid="selectTXinyiRobotVo"/>
+        <where>
+            1 = 1
+            <if test="vDate != null  and vDate != ''"> and V_DATE = #{vDate}</if>
+            <if test="vTime != null  and vTime != ''"> and V_TIME = #{vTime}</if>
+            <if test="vDateTime != null  and vDateTime != ''"> and V_DATE_TIME = #{vDateTime}</if>
+            <if test="testDate != null  and testDate != ''"> and TEST_DATE = #{testDate}</if>
+            <if test="testHour != null  and testHour != ''"> and TEST_HOUR = #{testHour}</if>
+            <if test="testTime != null  and testTime != ''"> and TEST_TIME = #{testTime}</if>
+            <if test="codYb != null "> and COD_YB = #{codYb}</if>
+            <if test="codJqr != null "> and COD_JQR = #{codJqr}</if>
+            <if test="codYz != null "> and COD_YZ = #{codYz}</if>
+            <if test="tpHl1Jqr != null "> and TP_HL1_JQR = #{tpHl1Jqr}</if>
+            <if test="tpHl2Jqr != null "> and TP_HL2_JQR = #{tpHl2Jqr}</if>
+            <if test="tpRccJqr != null "> and TP_RCC_JQR = #{tpRccJqr}</if>
+            <if test="tp1Yz != null "> and TP_1_YZ = #{tp1Yz}</if>
+            <if test="tp2Yz != null "> and TP_2_YZ = #{tp2Yz}</if>
+            <if test="tpRccYz != null "> and TP_RCC_YZ = #{tpRccYz}</if>
+            <if test="nh31Jqr != null "> and NH3_1_JQR = #{nh31Jqr}</if>
+            <if test="nh32Jqr != null "> and NH3_2_JQR = #{nh32Jqr}</if>
+            <if test="nh31Yz != null "> and NH3_1_YZ = #{nh31Yz}</if>
+            <if test="no3Hlc1Yz != null "> and NO3_HLC1_YZ = #{no3Hlc1Yz}</if>
+            <if test="nh32Yz != null "> and NH3_2_YZ = #{nh32Yz}</if>
+            <if test="no3Hlc2Yz != null "> and NO3_HLC2_YZ = #{no3Hlc2Yz}</if>
+            <if test="no3Hlj1Jqr != null "> and NO3_HLJ1_JQR = #{no3Hlj1Jqr}</if>
+            <if test="no3Hlj2Jqr != null "> and NO3_HLJ2_JQR = #{no3Hlj2Jqr}</if>
+            <if test="TYLL != null "> and TYLL = #{TYLL}</if>
+            <if test="no3Qyc1Jqr != null "> and NO3_QYC_1_JQR = #{no3Qyc1Jqr}</if>
+            <if test="no3Qyc2Jqr != null "> and NO3_QYC_2_JQR = #{no3Qyc2Jqr}</if>
+            <if test="no3Qyc1Yz != null "> and NO3_QYC_1_YZ = #{no3Qyc1Yz}</if>
+            <if test="no3Qyc2Yz != null "> and NO3_QYC_2_YZ = #{no3Qyc2Yz}</if>
+            <if test="JSLL != null "> and JSLL = #{JSLL}</if>
+            <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>
+            <if test="hycxsyAll != null  and hycxsyAll != ''"> and HYCXSY_ALL = #{hycxsyAll}</if>
+            <if test="qyanAll != null  and qyanAll != ''"> and QYAN_ALL = #{qyanAll}</if>
+            <if test="qyckxsyAll != null  and qyckxsyAll != ''"> and QYCKXSY_ALL = #{qyckxsyAll}</if>
+            <if test="hyzlsyAll != null  and hyzlsyAll != ''"> and HYZLSY_ALL = #{hyzlsyAll}</if>
+            <!-- 下面是新增的SQL检索条件 -->
+            <if test="timeBegin != null  and timeBegin != ''"> and TEST_DATE &gt;= #{timeBegin}</if>
+            <if test="timeEnd != null  and timeEnd != ''"> and TEST_DATE &lt;= #{timeEnd}</if>
+        </where>
+        order by id desc
+    </select>
 </mapper>

slibra-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -143,13 +143,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectUserVo"/>
 		where u.user_id = #{userId}
 	</select>
-	
-	<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1
+
+	<select id="checkUserNameUnique" resultMap="SysUserResult">
+		select user_id, user_name from sys_user where user_name = #{userName} and type = #{type} and del_flag = '0' limit 1
 	</select>
-	
-	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
+
+	<select id="checkPhoneUnique" resultMap="SysUserResult">
+		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and type = #{type} and del_flag = '0' limit 1
 	</select>
 	
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">