Compare commits

..

No commits in common. "323a05bcfe88fa47d3a12f21490ab57830167ef5" and "33d8b1de2280919f792fbb9c0a7131dd1533df04" have entirely different histories.

5 changed files with 3 additions and 12 deletions

View File

@ -167,7 +167,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageNum(query.getCurrent());
domainQuery.setPageSize(query.getSize()); domainQuery.setPageSize(query.getSize());
domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId());
domainQuery.setId(query.getId()); domainQuery.setFilingNo(query.getFilingNo());
domainQuery.setFilingUnitName(query.getFilingUnitName()); domainQuery.setFilingUnitName(query.getFilingUnitName());
domainQuery.setFilingTerritoryCode(query.getFilingTerritoryCode()); domainQuery.setFilingTerritoryCode(query.getFilingTerritoryCode());
domainQuery.setFilingStatusCode(query.getFilingStatusCode()); domainQuery.setFilingStatusCode(query.getFilingStatusCode());
@ -183,7 +183,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageNum(query.getCurrent());
domainQuery.setPageSize(query.getSize()); domainQuery.setPageSize(query.getSize());
domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId());
domainQuery.setId(query.getId()); domainQuery.setFilingNo(query.getFilingNo());
domainQuery.setFilingUnitName(query.getFilingUnitName()); domainQuery.setFilingUnitName(query.getFilingUnitName());
domainQuery.setFilingTerritoryCode(query.getFilingTerritoryCode()); domainQuery.setFilingTerritoryCode(query.getFilingTerritoryCode());
domainQuery.setFilingStatusCode(query.getFilingStatusCode()); domainQuery.setFilingStatusCode(query.getFilingStatusCode());

View File

@ -17,8 +17,7 @@ public class QualFilingChangePageQuery extends BasePageQuery {
private Long orgId; private Long orgId;
@ApiModelProperty(value = "备案编号") @ApiModelProperty(value = "备案编号")
// private String filingNo; private String filingNo;
private Long id;
@ApiModelProperty(value = "备案单位") @ApiModelProperty(value = "备案单位")
private String filingUnitName; private String filingUnitName;

View File

@ -28,8 +28,6 @@ public class QualFilingChangeQuery {
/** 备案编号 */ /** 备案编号 */
private String filingNo; private String filingNo;
private Long id;
/** 备案单位 */ /** 备案单位 */
private String filingUnitName; private String filingUnitName;

View File

@ -122,9 +122,6 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway {
if (StringUtils.hasText(query.getFilingNo())) { if (StringUtils.hasText(query.getFilingNo())) {
wrapper.like(QualFilingChangeDO::getFilingNo, query.getFilingNo()); wrapper.like(QualFilingChangeDO::getFilingNo, query.getFilingNo());
} }
if (query.getId() != null) {
wrapper.eq(QualFilingChangeDO::getId, query.getId());
}
if (StringUtils.hasText(query.getFilingUnitName())) { if (StringUtils.hasText(query.getFilingUnitName())) {
wrapper.like(QualFilingChangeDO::getFilingUnitName, query.getFilingUnitName()); wrapper.like(QualFilingChangeDO::getFilingUnitName, query.getFilingUnitName());
} }

View File

@ -100,9 +100,6 @@
<if test="query.filingNo != null and query.filingNo != ''"> <if test="query.filingNo != null and query.filingNo != ''">
AND qfc.filing_no LIKE CONCAT('%', #{query.filingNo}, '%') AND qfc.filing_no LIKE CONCAT('%', #{query.filingNo}, '%')
</if> </if>
<if test="query.id != null ">
AND qfc.id = #{query.id}
</if>
<if test="query.filingUnitName != null and query.filingUnitName != ''"> <if test="query.filingUnitName != null and query.filingUnitName != ''">
AND qfc.filing_unit_name LIKE CONCAT('%', #{query.filingUnitName}, '%') AND qfc.filing_unit_name LIKE CONCAT('%', #{query.filingUnitName}, '%')
</if> </if>