保洁记录

share-front/src/main/java/share/web/controller/system/SCleanRecordsController.java

@@ -90,7 +90,8 @@ public class SCleanRecordsController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(sCleanRecordsService.selectSCleanRecordsById(id));
+        SCleanRecords sCleanRecords = sCleanRecordsService.selectSCleanRecordsById(id);
+        return success(sCleanRecords);
     }
 
     /**

share-system/src/main/java/share/system/service/WechatPayInfoService.java

@@ -14,4 +14,7 @@ public interface WechatPayInfoService extends IService<WechatPayInfo> {
      * @return WechatPayInfo
      */
     WechatPayInfo getByNo(String outTradeNo);
+
+
+
 }
\ No newline at end of file

share-system/src/main/java/share/system/service/impl/SCleanRecordsServiceImpl.java

@@ -50,7 +50,14 @@ public class SCleanRecordsServiceImpl implements ISCleanRecordsService
     @Override
     public SCleanRecords selectSCleanRecordsById(Long id)
     {
-        return sCleanRecordsMapper.selectSCleanRecordsById(id);
+        SCleanRecords sCleanRecords = sCleanRecordsMapper.selectSCleanRecordsById(id);
+        if (sCleanRecords != null) {
+            SStore store = sStoreMapper.selectSStoreById(sCleanRecords.getStoreId());
+            SRoom room = sRoomMapper.selectSRoomById(sCleanRecords.getRoomId());
+            sCleanRecords.setsStore(store);
+            sCleanRecords.setsRoom(room);
+        }
+        return sCleanRecords;
     }
 
     /**

share-system/src/main/resources/mapper/system/SCleanRecordsMapper.xml

@@ -68,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where t1.status = 0 and
               t1.store_id in (select store_id from s_store_consumer where consumer_id = #{consumerId})
         <if test="storeName != null  and storeName != ''"> and t2.name = #{storeName}</if>
+        order by update_time, create_time desc
     </select>
 
     <select id="myCleanList" parameterType="SCleanRecords" resultMap="SCleanRecordsResult">
@@ -83,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where t1.consumer_id = #{consumerId}
         <if test="status != null "> and t1.status = #{status}</if>
         <if test="storeName != null  and storeName != ''"> and t2.name = #{storeName}</if>
+        order by update_time, create_time desc
     </select>
 
     <insert id="insertSCleanRecords" parameterType="SCleanRecords" useGeneratedKeys="true" keyProperty="id">