气瓶bug修改

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/BottleStorageErrorServiceImpl.java

@@ -43,11 +43,11 @@ public class BottleStorageErrorServiceImpl extends ServiceImpl<BottleStorageErro
         LambdaQueryWrapper<BottleStorageError> queryWrapper = Wrappers.lambdaQuery(BottleStorageError.class);
         String startTime = bottleStorageError.getStartTime();
         if (StringUtils.hasLength(startTime)) {
-            queryWrapper.apply("DATE_FORMAT(op_time,'%Y-%m-%d') >=" + startTime);
+            queryWrapper.apply(StringUtils.hasLength(startTime), "DATE_FORMAT(create_time,'%Y-%m-%d') >=date_format('" + startTime + "','%Y-%m-%d')");
         }
         String endTime = bottleStorageError.getEndTime();
         if (StringUtils.hasLength(endTime)) {
-            queryWrapper.apply("DATE_FORMAT(op_time,'%Y-%m-%d') <=" + endTime);
+            queryWrapper.apply(StringUtils.hasLength(endTime), "DATE_FORMAT(create_time,'%Y-%m-%d') <=date_format('" + endTime + "','%Y-%m-%d')");
         }
         String searchValue = bottleStorageError.getSearchValue();
         if (StringUtils.hasLength(searchValue)) {
@@ -60,6 +60,7 @@ public class BottleStorageErrorServiceImpl extends ServiceImpl<BottleStorageErro
         if (ids!=null && !ids.isEmpty()){
             queryWrapper.in(BottleStorageError::getId,ids);
         }
+        queryWrapper.orderByDesc(true,BottleStorageError::getCreateTime);
         return list(queryWrapper);
     }
 

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/UseRecordServiceImpl.java

@@ -97,6 +97,7 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
         if (ids != null && !ids.isEmpty()) {
             queryWrapper.in(UseRecord::getId, ids);
         }
+        queryWrapper.orderByDesc(true,UseRecord::getUseTime);
         queryWrapper.setEntity(useRecord);
         return list(queryWrapper);
     }

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/UsegasApplyMapper.xml

@@ -29,7 +29,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,
+        id
+        ,
         create_time,
         location, subject_id, apply_user, user_id, dept_id, dept_name, phone, start_time, end_time, gas_use, apply_certificate, safety_precautions, use_gas_id, use_gas_name, lead_audit_staus, lead_audit_userid, lead_audit_username, lead_audit_time, lead_audit_cause
     </sql>
@@ -39,7 +40,8 @@
             resultType="com.zd.bottle.vo.UsegasApplyVo">
         select ua.id,ua.apply_user applyUserName,ua.phone applyUserPhone,ua.use_gas_name useGasName,ua.create_time
         applyTime,
-        ua.start_time startTime,ua.end_time endTime,ua.gas_use gasUse,ua.safety_precautions safetyPrecautions,
+        ua.start_time startTime,ua.end_time endTime,ua.gas_use gasUse,ua.apply_certificate applyCertificate,
+        ua.safety_precautions safetyPrecautions,
         ua.use_gas_file useGasFile
         from ab_usegas_apply ua
         <where>