dengyj 3 سال پیش
والد
کامیت
606f742ef1

+ 10 - 10
src/main/java/com/steerinfo/baseinfo/meterbasetermtaredata/service/impl/MeterBaseTermTareDataServiceImpl.java

@@ -451,16 +451,16 @@ public class MeterBaseTermTareDataServiceImpl extends BaseServiceImpl<MeterBaseT
                 userName = "system";
             }
 
-            HashMap<String, Object> gaugerMap = new HashMap<>();
-            gaugerMap.put("pBaseCode", "001059");
-            gaugerMap.put("memo", userId);
-            List<String> gaugerModels = comBaseInfoMapper.matterNoByBaseCode(gaugerMap);
-
-            if(gaugerModels.size() < 1) {
-                rm.setMessage("该用户<" + userName + ">没有留存期限皮权限!!");
-                rm.setCode("1");
-                return rm;
-            }
+//            HashMap<String, Object> gaugerMap = new HashMap<>();
+//            gaugerMap.put("pBaseCode", "001059");
+//            gaugerMap.put("memo", userId);
+//            List<String> gaugerModels = comBaseInfoMapper.matterNoByBaseCode(gaugerMap);
+//
+//            if(gaugerModels.size() < 1) {
+//                rm.setMessage("该用户<" + userName + ">没有留存期限皮权限!!");
+//                rm.setCode("1");
+//                return rm;
+//            }
             //从一次计量表里取出:车号、计量点编号、计量点名称、计量时间、计量重量
             String actualFirstNo = id;
             MeterWorkCarActualFirst modelTemp = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualFirstNo);

+ 4 - 0
src/main/java/com/steerinfo/baseinfo/meterbaseuserspotconfig/mapper/MeterBaseUserSpotConfigMapper.xml

@@ -315,6 +315,10 @@
   <select id="noPage" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select" />
     where 1 = 1
+      <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+        and  create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
+        and create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
       <if test="userId != null and userId != ''">
         and USER_ID LIKE '%${userId}%'
       </if>