Skip to content

A
amos-boot-zx-biz
Commit 08069cda authored by 朱晨阳's avatar 朱晨阳
Browse files
Options

合同作废后，重新发起成功后，隐藏掉重新发起按钮

parent 5be59850
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 32 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/HouseholdContract.java
View file @ 08069cda
......@@ -253,4 +253,8 @@ public class HouseholdContract extends BaseEntity {
//合同填充字段值
@TableField(exist = false)
List<ContractFillData> contractFillData;
//查询一个农户拥有的合同是否全是已废弃
@TableField(exist = false)
private Boolean isAllDisuse;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/HouseholdContractMapper.xml
View file @ 08069cda
......@@ -4,38 +4,45 @@
<select id="selectPage" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract">
select
*
from hygf_household_contract
LEFT JOIN hygf_peasant_household php ON php.sequence_nbr = hygf_household_contract.peasant_household_id <where>
<if test="dto.name != null and dto.name !='' ">
and hygf_household_contract.name like concat('%',#{dto.name},'%')
</if>
<if test="dto.contractNumber != null and dto.contractNumber !=''">
and hygf_household_contract.contract_number like concat('%',#{dto.contractNumber},'%')
</if>
<if test="dto.initiateStatus != null and dto.initiateStatus !='' ">
and hygf_household_contract.initiate_status = #{dto.initiateStatus}
</if>
<if test="dto.peasantHouseholdId != null and dto.peasantHouseholdId !=''">
and hygf_household_contract.peasant_household_id = #{dto.peasantHouseholdId}
</if>
<if test="dto.dealerId != null and dto.dealerId !=''">
and hygf_household_contract.dealer_id = #{dto.dealerId}
</if>
<if test="dto.surveyStatus != null and dto.surveyStatus !=''">
and hygf_household_contract.survey_status = #{dto.surveyStatus}
</if>
<if test="dto.signStatus != null and dto.signStatus !=''">
and hygf_household_contract.sign_status = #{dto.signStatus}
</if>
<if test="dto.userId != null and dto.userId !=''">
and hygf_household_contract.project_user_id = #{dto.userId}
</if>
<if test="dto.partyA != null and dto.partyA !=''">
and hygf_household_contract.party_a like concat('%',#{dto.partyA},'%')
</if>
</where>
select
*,
(SELECT CASE WHEN SUM( CASE WHEN hhc.`status` = '已作废' THEN 1 ELSE 0 END ) = COUNT(*) THEN 'true' ELSE 'false'
END FROM hygf_household_contract AS hhc
WHERE
hhc.peasant_household_id = hygf_household_contract.peasant_household_id
) AS isAllDisuse
from hygf_household_contract
LEFT JOIN hygf_peasant_household php ON php.sequence_nbr = hygf_household_contract.peasant_household_id
<where>
<if test="dto.name != null and dto.name !='' ">
and hygf_household_contract.name like concat('%',#{dto.name},'%')
</if>
<if test="dto.contractNumber != null and dto.contractNumber !=''">
and hygf_household_contract.contract_number like concat('%',#{dto.contractNumber},'%')
</if>
<if test="dto.initiateStatus != null and dto.initiateStatus !='' ">
and hygf_household_contract.initiate_status = #{dto.initiateStatus}
</if>
<if test="dto.peasantHouseholdId != null and dto.peasantHouseholdId !=''">
and hygf_household_contract.peasant_household_id = #{dto.peasantHouseholdId}
</if>
<if test="dto.dealerId != null and dto.dealerId !=''">
and hygf_household_contract.dealer_id = #{dto.dealerId}
</if>
<if test="dto.surveyStatus != null and dto.surveyStatus !=''">
and hygf_household_contract.survey_status = #{dto.surveyStatus}
</if>
<if test="dto.signStatus != null and dto.signStatus !=''">
and hygf_household_contract.sign_status = #{dto.signStatus}
</if>
<if test="dto.userId != null and dto.userId !=''">
and hygf_household_contract.project_user_id = #{dto.userId}
</if>
<if test="dto.partyA != null and dto.partyA !=''">
and hygf_household_contract.party_a like concat('%',#{dto.partyA},'%')
</if>
</where>
<if test="dto.orderBy == null ">
ORDER BY hygf_household_contract.rec_date DESC
</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment