springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageElderAuthRecordsDTO.java
@@ -35,8 +35,8 @@ @ApiModelProperty(value = "认证结束时间") private String authDateEnd; @ApiModelProperty(value = "认证状态(1.已认证 0.未认证)") private String authStatus; @ApiModelProperty(value = "认证状态(1.已认证 2.未认证)") private Integer authStatus; @ApiModelProperty(value = "审核状态(1.待审核 2.驳回 3.通过)") private Integer approvalStatus; springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPensionAuthRecordDAO.java
@@ -2,8 +2,7 @@ import java.util.List; import com.panzhihua.common.model.vos.community.ComPensionAuthRecordExcleVO; import com.panzhihua.common.model.vos.community.ComPensionAuthRecordStatisticExcleVO; import com.panzhihua.common.model.vos.community.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -12,8 +11,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.community.PageElderAuthRecordsDTO; import com.panzhihua.common.model.dtos.community.PageIdentityAuthRecordDTO; import com.panzhihua.common.model.vos.community.ComPensionAuthRecordVO; import com.panzhihua.common.model.vos.community.IdentityAuthRecordDetailVO; import com.panzhihua.service_community.model.dos.ComPensionAuthRecordDO; /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java
@@ -15,6 +15,7 @@ import javax.annotation.Resource; import com.panzhihua.common.model.vos.community.*; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -33,12 +34,6 @@ import com.panzhihua.common.model.dtos.community.PageIdentityAuthRecordDTO; import com.panzhihua.common.model.helper.AESUtil; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComPensionAuthRecordExcleVO; import com.panzhihua.common.model.vos.community.ComPensionAuthRecordImportExcelVO; import com.panzhihua.common.model.vos.community.ComPensionAuthRecordImportMistakeExcelVO; import com.panzhihua.common.model.vos.community.ComPensionAuthRecordStatisticExcleVO; import com.panzhihua.common.model.vos.community.ComPensionAuthRecordVO; import com.panzhihua.common.model.vos.community.SysConfVO; import com.panzhihua.common.utlis.AgeUtils; import com.panzhihua.common.utlis.DateUtils; import com.panzhihua.common.utlis.StringUtils; springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPensionAuthRecordMapper.xml
@@ -296,7 +296,7 @@ and cpahr.auth_period = #{pageElderAuthRecordsDTO.authPeriod} </if> <if test="pageElderAuthRecordsDTO.authStatus != null"> and cpahr.auth_status = #{pageElderAuthRecordsDTO.authStatus} and cpahr.ia_auth = #{pageElderAuthRecordsDTO.authStatus} </if> <if test="pageElderAuthRecordsDTO.personnelCategory != null and pageElderAuthRecordsDTO.personnelCategory != 0"> and cpap.personnel_category = #{pageElderAuthRecordsDTO.personnelCategory}