打卡记录问题

account/account-service/src/main/java/com/hungraim/ltc/account/controller/AccountController.java

@@ -244,6 +244,7 @@ public class AccountController {
     public Result<Page<ChDisabDetailAccountsResp>>   queryDelayAccountList(@RequestHeader("Authorization") String token,Integer pageNum, Integer pageSize,SrvOrganListReq srvOrganListReq) {
         List<String> list = Arrays.asList("1", "2");
         srvOrganListReq.setAccountsStatusList(list);
+        srvOrganListReq.setAccountsStatus(srvOrganListReq.getStatus());
         long srvOrganId = TokenParsingUtil.TokenParsing(token, "srvOrganId");
         if(srvOrganId != 0) {
             srvOrganListReq.setSrvOrganId(srvOrganId);

account/account-service/src/main/resources/mapper/ChDisabAccountsDetailMapper.xml

@@ -42,6 +42,10 @@
             <if test="req.realName != null and req.realName != ''">
                 AND info.real_name LIKE CONCAT('%',CONCAT(#{req.realName},'%'))
             </if>
+            <if test="req.certiCode != null and req.certiCode != ''">
+                AND info.CERTI_CODE  =  #{req.certiCode}
+            </if>
+
             <if test="req.srvOrganId != null and req.srvOrganId != '' and req.srvOrganId!=0">
                 and d.SRV_ORGAN_ID = #{req.srvOrganId}
             </if>

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/SrvOrganListReq.java

@@ -43,8 +43,13 @@ public class SrvOrganListReq extends BaseReq {
 
     private String realName;
 
+    private String certiCode;
+
+
     private List<String> accountsStatusList;
     // 是否展示异地  1 不展示
     private String flag;
+    // 检索条件
+    private String status;
 
 }

governance/src/main/resources/com/hungraim/ltc/governance/mapper/BuildBedMapper.xml

@@ -85,8 +85,8 @@
 
     <select id="getServiceTypeDetailed" parameterType="Long" resultType="com.hungraim.ltc.pojo.entity.account.ChServiceTypeDetailedVO">
         SELECT
-        case when mode1.MODE_NAME='上门'  then to_char(detail.SRV_START_TIME, 'dd' )
-        else to_char(item.FCD, 'dd' )  end executionTime,
+        case when mode1.MODE_NAME='上门'  then to_char(detail.SRV_DATE, 'dd' )
+        else to_char(detail.SRV_DATE, 'dd' )  end executionTime,
         service.SERVICE_TYPE_DETAILED_NAME itemName,
         service.SERVICE_TYPE_DETAILED_ID serviceTypeDetailedId
         FROM
@@ -106,12 +106,20 @@
                   <if test="sevStarTime != null and sevStarTime != ''">
                       AND detail.SRV_START_TIME &gt;= TO_DATE (substr(#{sevStarTime},1,10), 'yyyy-mm-dd')
                   </if>
+
                   <if test="sevEndTime != null and sevEndTime != ''">
                       AND detail.SRV_END_TIME &lt;= TO_DATE (substr(#{sevEndTime},1,10), 'yyyy-mm-dd')
                   </if>
               </when>
               <otherwise>
-                    AND item.FCD >= TO_DATE (substr(#{sevStarTime},1,10), 'yyyy-mm-dd')
+
+                  <if test="sevStarTime != null and sevStarTime != ''">
+                      AND detail.SRV_DATE &gt;= TO_DATE (substr(#{sevStarTime},1,10), 'yyyy-mm-dd')
+                  </if>
+
+                  <if test="sevEndTime != null and sevEndTime != ''">
+                      AND detail.SRV_DATE &lt;= TO_DATE (substr(#{sevEndTime},1,10), 'yyyy-mm-dd')
+                  </if>
               </otherwise>
           </choose>
     </select>