Merge remote-tracking branch 'origin/master'

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/controller/my/AppEvaluateController.java

@@ -13,6 +13,7 @@ import org.jeecg.modules.app.dto.PageDTO;
 import org.jeecg.modules.app.dto.evaluate.AddEvaluateDTO;
 import org.jeecg.modules.app.dto.evaluate.FindEvaluateDTO;
 import org.jeecg.modules.app.dto.evaluate.FindEvaluatePage;
+import org.jeecg.modules.system.app.dto.evaluate.FindEvaluateRequestDTO;
 import org.jeecg.modules.system.app.dto.evaluate.FindEvaluateResponseDTO;
 import org.jeecg.modules.system.app.entity.AppOrder;
 import org.jeecg.modules.system.app.entity.Evaluate;
@@ -49,6 +50,8 @@ public class AppEvaluateController {
     @GetMapping("/findByPage")
     @Operation(summary = "app评价分页查询")
     public Result<IPage<FindEvaluateResponseDTO>> findByList(PageDTO pageDTO) {
+        FindEvaluateRequestDTO findEvaluateRequestDTO = new FindEvaluateRequestDTO();
+        findEvaluateRequestDTO.setCheckStatus(1);
         return Result.ok(evaluateService.findPage(pageDTO.getPageNo(), pageDTO.getPageSize(), null));
     }
 

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/EvaluateMapper.xml

@@ -9,7 +9,7 @@
         left join  sys_depart sd on  ne.dept_id = sd.id
         LEFT JOIN nm_site ns on  ne.site_id =ns.id
         LEFT JOIN sys_user su on  ne.user_id =su.id
-        where 1=1  AND ne.check_status = 1
+        where 1=1
         <if test="findEvaluateRequestDTO!=null and findEvaluateRequestDTO!=''">
             <if test="findEvaluateRequestDTO.orgCode!=null and findEvaluateRequestDTO.orgCode!=''">
                 and ne.org_code like CONCAT('',#{findEvaluateRequestDTO.orgCode},'%')
@@ -20,6 +20,9 @@
         <if test="findEvaluateRequestDTO.score!=null">
             AND ne.score = #{findEvaluateRequestDTO.score}
         </if>
+        <if test="findEvaluateRequestDTO.checkStatus!=null">
+             AND ne.check_status = #{findEvaluateRequestDTO.checkStatus}
+        </if>
         <if test="findEvaluateRequestDTO.replyStatus!=null">
             AND ne.reply_status = #{findEvaluateRequestDTO.replyStatus}
         </if>