工单详情返回参数增加支付时间；耗材管理、耗材记录查询增加校区筛选；评价查询增加星级筛选；

src/main/java/com/repair/api/RepairConsumablesControllerAPI.java

@@ -34,7 +34,7 @@ public interface RepairConsumablesControllerAPI {
 
     @GetMapping(value = "/queryRepairConsumablePageList")
     @ApiOperation(value = "耗材记录数据", notes = "耗材记录数据", httpMethod = "GET")
-    CommonResult queryRepairConsumablePageList(@RequestParam int currentPage, @RequestParam int pageCount, String keyWord,String startTime,String endTime);
+    CommonResult queryRepairConsumablePageList(@RequestParam int currentPage, @RequestParam int pageCount,String schoolId, String keyWord,String startTime,String endTime);
 
     @GetMapping(value = "/downloadRepairConsumableExcel")
     @ApiOperation(value = "导出耗材记录数据", notes = "导出耗材记录数据", httpMethod = "GET")

src/main/java/com/repair/api/RepairConsumeControllerAPI.java

@@ -33,7 +33,7 @@ public interface RepairConsumeControllerAPI {
 
     @GetMapping(value = "/queryPageRepairConsume")
     @ApiOperation(value = "耗材管理分页数据", notes = "耗材管理分页数据", httpMethod = "GET")
-    CommonResult queryPageRepairConsumes(@RequestParam int currentPage, @RequestParam int pageCount, String name, String startTime, String endTime);
+    CommonResult queryPageRepairConsumes(@RequestParam int currentPage, @RequestParam int pageCount,String schoolId, String name, String startTime, String endTime);
 
     @GetMapping(value = "/deleteRepairConsumeById")
     @ApiOperation(value = "根据ID删除指定耗材管理", notes = "根据ID删除指定耗材管理", httpMethod = "GET")

src/main/java/com/repair/api/RepairEvaluateControllerAPI.java

@@ -20,7 +20,7 @@ public interface RepairEvaluateControllerAPI {
 
     @GetMapping(value = "/queryPageRepairEvaluate")
     @ApiOperation(value = "评价分页数据", notes = "评价分页数据", httpMethod = "GET")
-    CommonResult queryPageRepairEvaluates(@RequestParam int currentPage, @RequestParam int pageCount, String keyWord, String startTime, String endTime);
+    CommonResult queryPageRepairEvaluates(@RequestParam int currentPage, @RequestParam int pageCount,String star, String keyWord, String startTime, String endTime);
 
     @GetMapping(value = "/deleteRepairEvaluateById")
     @ApiOperation(value = "根据ID删除指定评价", notes = "根据ID删除指定评价", httpMethod = "GET")

src/main/java/com/repair/controller/RepairConsumablesController.java

@@ -142,7 +142,7 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
      * @return
      */
     @Override
-    public CommonResult queryRepairConsumablePageList(int currentPage, int pageCount, String keyWord, String startTime, String endTime) {
+    public CommonResult queryRepairConsumablePageList(int currentPage, int pageCount,String schoolId, String keyWord, String startTime, String endTime) {
 
         if (startTime != null && endTime != null) {
             try {
@@ -152,7 +152,7 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
             }
         }
 
-        PageUtils<ConsumablePageVo> result = repairConsumablesService.queryConsumablePageList(currentPage, pageCount, keyWord, startTime, endTime);
+        PageUtils<ConsumablePageVo> result = repairConsumablesService.queryConsumablePageList(currentPage, pageCount,schoolId, keyWord, startTime, endTime);
 
         for (ConsumablePageVo data : result.getList()) {
             //校区名称
@@ -169,7 +169,14 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
         }
         if (StringUtils.hasText(keyWord)) {
             String str ="record_id  in (select id from   repair_record rr where  rr.deleted = 0 and rr.record_no like '%" + keyWord + "%')";
-            ew.and(w -> w.like("consume_name", keyWord).or().apply(str));
+            if(StringUtils.hasText(schoolId)&&StringUtils.hasText(schoolId)){
+                str="record_id  in (select id from   repair_record rr where  rr.deleted = 0 and rr.school_id = "+schoolId+" and rr.record_no like '%" + keyWord + "%')";
+            }
+            String finalStr = str;
+            ew.and(w -> w.like("consume_name", keyWord).or().apply(finalStr));
+        }else if(StringUtils.hasText(schoolId)&&StringUtils.hasText(schoolId)){
+            String str2="record_id  in (select id from   repair_record rr where  rr.deleted = 0  and rr.school_id = "+schoolId+")";
+            ew.apply(str2);
         }
         ew.select("IFNULL(sum(number),0) tcont,IFNULL(sum(total_price),0) tprice");
         Map<String,Object> map=repairConsumablesService.getMap(ew);

src/main/java/com/repair/controller/RepairConsumeController.java

@@ -158,7 +158,7 @@ public class RepairConsumeController implements RepairConsumeControllerAPI {
      * @return
      */
     @Override
-    public CommonResult queryPageRepairConsumes(int currentPage, int pageCount, String name, String startTime, String endTime) {
+    public CommonResult queryPageRepairConsumes(int currentPage, int pageCount, String schoolId,String name, String startTime, String endTime) {
 
         if (startTime != null && endTime != null) {
             try {
@@ -168,7 +168,7 @@ public class RepairConsumeController implements RepairConsumeControllerAPI {
             }
         }
 
-        PageUtils<RepairConsumeVo> result = repairConsumeService.queryPageRepairConsumes(currentPage, pageCount, name, startTime, endTime);
+        PageUtils<RepairConsumeVo> result = repairConsumeService.queryPageRepairConsumes(currentPage, pageCount,schoolId, name, startTime, endTime);
 
         for (RepairConsumeVo r : result.getList()) {
             if (r.getArticleId() != null) {

src/main/java/com/repair/controller/RepairEvaluateController.java

@@ -145,8 +145,8 @@ public class RepairEvaluateController implements RepairEvaluateControllerAPI {
      * @return
      */
     @Override
-    public CommonResult queryPageRepairEvaluates(@RequestParam int currentPage, @RequestParam int pageCount, String keyWord, String startTime, String endTime) {
-        PageUtils<RepairEvaluate> result = repairEvaluateService.queryPageList(currentPage, pageCount, keyWord, startTime, endTime);
+    public CommonResult queryPageRepairEvaluates(@RequestParam int currentPage, @RequestParam int pageCount,String star, String keyWord, String startTime, String endTime) {
+        PageUtils<RepairEvaluate> result = repairEvaluateService.queryPageList(currentPage, pageCount,star, keyWord, startTime, endTime);
 
         return CommonResult.ok(result);
     }

src/main/java/com/repair/controller/RepairRecordController.java

@@ -2398,11 +2398,13 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
         List<TrackDetailsVo> tracks = repairTrackRecordService.queryDetailData(recordId);
         List<RepairConsumables> rcs = repairConsumablesService.getRepairsByRecordId(recordId);
+        RepairPayRecord repairPayRecord=repairPayRecordService.getRepairPayByRecordId(recordId);
         if (tracks.size() > 0) {
             rr.setTracks(tracks);
         }
         if (rcs.size() > 0) {
             rr.setConsumables(rcs);
+            rr.setPayTime(repairPayRecord.getCreateTime());
         }
 
         return CommonResult.ok(rr);

src/main/java/com/repair/mapper/RepairConsumablesMapper.java

@@ -21,7 +21,7 @@ import java.util.List;
  */
 @Repository
 public interface RepairConsumablesMapper extends BaseMapper<RepairConsumables> {
-    IPage<ConsumablePageVo> queryConsumablePageList(IPage<ConsumablePageVo> page, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime);
+    IPage<ConsumablePageVo> queryConsumablePageList(IPage<ConsumablePageVo> page, @Param("keyWord") String keyWord,@Param("schoolId") String schoolId, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
     List<ConsumableExcelVo> queryConsumableExcelList(@Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime);
 

src/main/java/com/repair/mapper/RepairConsumeMapper.java

@@ -23,7 +23,7 @@ import java.util.List;
 public interface RepairConsumeMapper extends BaseMapper<RepairConsume> {
     List<ConsumeVo> queryConsumeList(@Param("name") String name, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-    IPage<RepairConsumeVo> queryConsumePageList(IPage<RepairConsumeVo> page, @Param("name") String name, @Param("startTime") String startTime, @Param("endTime") String endTime);
+    IPage<RepairConsumeVo> queryConsumePageList(IPage<RepairConsumeVo> page, @Param("schoolId") String schoolId, @Param("name") String name, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
     List<RepairArticleConsumeVo> queryArticleConsumes(@Param("schoolId") Integer schoolId, @Param("keyWork") String keyWork, @Param("findInSet") String findInSet);
 

src/main/java/com/repair/mapper/RepairEvaluateMapper.java

@@ -22,7 +22,7 @@ import java.util.List;
 public interface RepairEvaluateMapper extends BaseMapper<RepairEvaluate> {
     List<EvaluateVo> queryEvaluatePageList(@Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-    IPage<EvaluateVo> queryEvaluatePageList(IPage<EvaluateVo> page, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime);
+    IPage<EvaluateVo> queryEvaluatePageList(IPage<EvaluateVo> page, @Param("star") String star, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
     List<RecordEvaluateVo> queryEvaluateList(@Param("dateStr") String dateStr);
 }

src/main/java/com/repair/model/vo/DetailsVo.java

@@ -143,4 +143,9 @@ public class DetailsVo {
      * 耗材详情集合
      */
     private List<RepairConsumables> consumables;
+
+    /**
+     * 支付时间
+     */
+    private Date payTime;
 }

src/main/java/com/repair/services/RepairConsumablesService.java

@@ -34,7 +34,7 @@ public interface RepairConsumablesService extends IService<RepairConsumables> {
 
     List<RepairConsumables> getRepairsByRecordId(Integer recordIds);
 
-    PageUtils<ConsumablePageVo> queryConsumablePageList(int currentPage, int pageCount, String keyWord, String startTime, String endTime);
+    PageUtils<ConsumablePageVo> queryConsumablePageList(int currentPage, int pageCount,String schoolId, String keyWord, String startTime, String endTime);
 
     List<ConsumableExcelVo> queryConsumablePageList(String keyWord, String startTime, String endTime);
 

src/main/java/com/repair/services/RepairConsumeService.java

@@ -22,7 +22,7 @@ public interface RepairConsumeService extends IService<RepairConsume> {
 
     int updateRepairConsume(RepairConsume rns);
 
-    PageUtils<RepairConsumeVo> queryPageRepairConsumes(int currentPage, int pageCount, String name, String startTime, String endTime);
+    PageUtils<RepairConsumeVo> queryPageRepairConsumes(int currentPage, int pageCount, String schoolId, String name, String startTime, String endTime);
 
     int deleteRepairConsumeById(int id);
 

src/main/java/com/repair/services/RepairEvaluateService.java

@@ -21,7 +21,7 @@ public interface RepairEvaluateService extends IService<RepairEvaluate> {
 
     int deleteRepairEvaluateById(int id);
 
-    PageUtils<RepairEvaluate> queryPageList(int currentPage, int pageCount, String keyWord, String startTime, String endTime);
+    PageUtils<RepairEvaluate> queryPageList(int currentPage, int pageCount, String star,String keyWord, String startTime, String endTime);
 
     RepairEvaluate getRepairById(int id);
 

src/main/java/com/repair/services/impl/RepairConsumablesServiceImpl.java

@@ -86,11 +86,11 @@ public class RepairConsumablesServiceImpl extends ServiceImpl<RepairConsumablesM
     }
 
     @Override
-    public PageUtils<ConsumablePageVo> queryConsumablePageList(int currentPage, int pageCount, String keyWord, String startTime, String endTime) {
+    public PageUtils<ConsumablePageVo> queryConsumablePageList(int currentPage, int pageCount,String schoolId, String keyWord, String startTime, String endTime) {
         Page<ConsumablePageVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<ConsumablePageVo> datas = repairConsumablesMapper.queryConsumablePageList(page, keyWord, startTime, endTime);
+        IPage<ConsumablePageVo> datas = repairConsumablesMapper.queryConsumablePageList(page, keyWord,schoolId, startTime, endTime);
         return new PageUtils(datas);
     }
 

src/main/java/com/repair/services/impl/RepairConsumeServiceImpl.java

@@ -43,11 +43,11 @@ public class RepairConsumeServiceImpl extends ServiceImpl<RepairConsumeMapper, R
     }
 
     @Override
-    public PageUtils<RepairConsumeVo> queryPageRepairConsumes(int currentPage, int pageCount, String name, String startTime, String endTime) {
+    public PageUtils<RepairConsumeVo> queryPageRepairConsumes(int currentPage, int pageCount, String schoolId, String name, String startTime, String endTime) {
         Page<RepairConsumeVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<RepairConsumeVo> datas = repairConsumeMapper.queryConsumePageList(page, name, startTime, endTime);
+        IPage<RepairConsumeVo> datas = repairConsumeMapper.queryConsumePageList(page,schoolId, name, startTime, endTime);
         return new PageUtils(datas);
     }
 

src/main/java/com/repair/services/impl/RepairEvaluateServiceImpl.java

@@ -43,7 +43,7 @@ public class RepairEvaluateServiceImpl extends ServiceImpl<RepairEvaluateMapper,
     }
 
     @Override
-    public PageUtils<RepairEvaluate> queryPageList(int currentPage, int pageCount, String keyWord, String startTime, String endTime) {
+    public PageUtils<RepairEvaluate> queryPageList(int currentPage, int pageCount,String star, String keyWord, String startTime, String endTime) {
         Page<EvaluateVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
@@ -53,7 +53,7 @@ public class RepairEvaluateServiceImpl extends ServiceImpl<RepairEvaluateMapper,
         }catch (Exception e){
 
         }
-        IPage<EvaluateVo> result = repairEvaluateMapper.queryEvaluatePageList(page, keyWord, startTime, endTime);
+        IPage<EvaluateVo> result = repairEvaluateMapper.queryEvaluatePageList(page,star, keyWord, startTime, endTime);
         return new PageUtils(result);
     }
 

src/main/resources/mapper/repair/RepairConsumablesMapper.xml

@@ -27,6 +27,9 @@
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 and rcs.update_time BETWEEN #{startTime} and #{endTime}
             </if>
+            <if test="schoolId != null and schoolId != ''">
+                and rr.school_id =#{schoolId}
+            </if>
         </where>
         order by rr.report_time desc,rcs.update_time desc
     </select>

src/main/resources/mapper/repair/RepairConsumeMapper.xml

@@ -47,6 +47,9 @@
             <if test="name != null and name != ''">
                 and rc.name like '%' #{name} '%'
             </if>
+            <if test="schoolId != null and schoolId != ''">
+                and rc.school_id = #{schoolId}
+            </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 and rc.update_time BETWEEN #{startTime} and #{endTime}
             </if>

src/main/resources/mapper/repair/RepairEvaluateMapper.xml

@@ -29,6 +29,9 @@
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 and re.create_time BETWEEN #{startTime} and #{endTime}
             </if>
+            <if test="star != null and star != ''">
+                and re.star = #{star}
+            </if>
         </where>
         order by re.create_time desc
     </select>