修改维保记录查询BUG

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/CheckController.java

@@ -504,6 +504,13 @@ public class CheckController extends AbstractBaseController {
         String loginOrgCode = getOrgCode(reginParams);
         Map<String, Object> authMap = Bean.BeantoMap(reginParams.getPersonIdentity());
         params.putAll(authMap);
+        params.put("person", person);
+        if (StringUtil.isNotEmpty(person)) {
+            ResponseModel<String> idByAmosOrgId = jcsFeignClient.getIdByAmosOrgId(person);
+            if (StringUtil.isNotEmpty(idByAmosOrgId.getResult())) {
+                params.put("person", idByAmosOrgId.getResult());
+            }
+        }
         params.put("userId", userId);
         if (StringUtil.isNotEmpty(userId)) {
             ResponseModel<String> idByAmosOrgId = jcsFeignClient.getIdByAmosOrgId(userId);
@@ -518,7 +525,6 @@ public class CheckController extends AbstractBaseController {
         }
         params.put("beginTime", beginTime);
         params.put("endTime", endTime);
-        params.put("person", person);
         params.put("companyId", companyId);
         params.put("equipId", equipId);
         params.put("orgCode", loginOrgCode);

amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -1916,6 +1916,10 @@
                 pc.org_code AS orgCode
             FROM p_check pc
             LEFT JOIN p_point pp ON pp.id = pc.point_id
+        <if test="person != null and person != ''">
+            LEFT JOIN p_plan_task_detail ptd on ptd.id = pc.plan_task_detail_id
+            where ptd.executor_id = #{person}
+        </if>
         ) a
         <include refid="mobile-check-record-where" />
         <if test="orderRule == null or orderRule == ''"> order by checkDate </if>
@@ -2021,6 +2025,10 @@
         pc.org_code AS orgCode
         FROM p_check pc
         LEFT JOIN p_point pp ON pp.id = pc.point_id
+        <if test="person != null and person != ''">
+            LEFT JOIN p_plan_task_detail ptd on ptd.id = pc.plan_task_detail_id
+            where ptd.executor_id = #{person}
+        </if>
         ) a
         <include refid="mobile-check-record-where" />
     </select>