权限修改 合同修改

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/HouseholdContractMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
+import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractPageDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
 import org.apache.ibatis.annotations.Param;
 
@@ -16,6 +17,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface HouseholdContractMapper extends BaseMapper<HouseholdContract> {
 
-    @UserEmpower(field ={"regional_companies_code"} ,dealerField={"developer_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"in","in","in"} ,relationship="and")
-    IPage<HouseholdContract> selectPage(IPage<HouseholdContract> page, @Param(Constants.WRAPPER) Wrapper<HouseholdContract> queryWrapper);
+    @UserEmpower(field ={"regional_companies_code"} ,dealerField={"dealer_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"in","in","in"} ,relationship="and")
+    IPage<HouseholdContract> selectPage(@Param("dto") HouseholdContractPageDto dto);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/HouseholdContractMapper.xml

@@ -2,4 +2,47 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper">
 
+    <select id="selectPage" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract">
+
+    select
+           *
+    from hygf_household_contract
+        LEFT JOIN
+        (select developer_user_id,developer_code FROM  hygf_peasant_household ) php  ON php.developer_code= hygf_household_contract.dealer_code
+    <where>
+    <if test="dto.name != null ">
+        and hygf_household_contract.name like concat('%',#{dto.name},'%')
+    </if>
+    <if test="dto.contractNumber != null ">
+        and hygf_household_contract.contractNumber like concat('%',#{dto.contractNumber},'%')
+    </if>
+    <if test="dto.initiateStatus != null ">
+        and hygf_household_contract.initiateStatus = #{dto.initiateStatus}
+    </if>
+    <if test="dto.peasantHouseholdId != null ">
+        and hygf_household_contract.peasantHouseholdId = #{dto.peasantHouseholdId}
+    </if>
+    <if test="dto.dealerId != null ">
+        and hygf_household_contract.dealerId = #{dto.dealerId}
+    </if>
+    <if test="dto.surveyStatus != null ">
+        and hygf_household_contract.surveyStatus = #{dto.surveyStatus}
+    </if>
+    <if test="dto.signStatus != null ">
+        and hygf_household_contract.signStatus = #{dto.signStatus}
+    </if>
+    <if test="dto.userId != null ">
+        and hygf_household_contract.userId = #{dto.userId}
+    </if>
+    <if test="dto.partyA != null ">
+        and hygf_household_contract.partyA like concat('%',#{dto.partyA},'%')
+    </if>
+    </where>
+        <if test="dto.orderBy  == null ">
+            ORDER BY hygf_household_contract.rec_date DESC
+        </if>
+        <if test="dto.orderBy != null ">
+            ORDER BY hygf_household_contract.${orderBy} ${dto.isAsc}
+        </if>
+    </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HouseholdContractServiceImpl.java

@@ -70,26 +70,26 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
      */
     public IPage<HouseholdContract> queryForPreparationMoneyPage(HouseholdContractPageDto dto)   {
 
-        //列表数据组装
-        QueryWrapper<HouseholdContract> qw = new QueryWrapper<>();
-        qw.like(StringUtils.isNotEmpty(dto.getName()), "name", dto.getName());
-        qw.like(StringUtils.isNotEmpty(dto.getContractNumber()), "contract_number", dto.getContractNumber());
-        qw.eq(StringUtils.isNotEmpty(dto.getInitiateStatus()), "initiate_status",dto.getInitiateStatus() );
-
-        qw.eq(dto.getPeasantHouseholdId()!=null, "peasant_household_id",dto.getPeasantHouseholdId() );
-        qw.eq(dto.getDealerId()!=null, "dealer_id",dto.getDealerId() );
-        qw.eq(StringUtils.isNotEmpty(dto.getSurveyStatus()), "survey_status",dto.getSurveyStatus() );
-        qw.eq(StringUtils.isNotEmpty(dto.getSignStatus()), "sign_status",dto.getSignStatus() );
-        qw.eq(StringUtils.isNotEmpty(dto.getUserId()), "project_user_id",dto.getUserId() );
-        qw.like(StringUtils.isNotEmpty(dto.getPartyA()), "party_a",dto.getPartyA() );
-
-
-        if (StringUtils.isNotEmpty(dto.getOrderBy())) {
-            qw.orderBy(Boolean.TRUE, dto.getIsASC(), dto.getOrderBy());
-        }else{
-            qw.orderBy(Boolean.TRUE, Boolean.FALSE, "rec_date");
-        }
-        IPage<HouseholdContract> warningQuestionInfoIPage = householdContractMapper.selectPage(dto, qw);
+//        //列表数据组装
+//        QueryWrapper<HouseholdContract> qw = new QueryWrapper<>();
+//        qw.like(StringUtils.isNotEmpty(dto.getName()), "name", dto.getName());
+//        qw.like(StringUtils.isNotEmpty(dto.getContractNumber()), "contract_number", dto.getContractNumber());
+//        qw.eq(StringUtils.isNotEmpty(dto.getInitiateStatus()), "initiate_status",dto.getInitiateStatus() );
+//
+//        qw.eq(dto.getPeasantHouseholdId()!=null, "peasant_household_id",dto.getPeasantHouseholdId() );
+//        qw.eq(dto.getDealerId()!=null, "dealer_id",dto.getDealerId() );
+//        qw.eq(StringUtils.isNotEmpty(dto.getSurveyStatus()), "survey_status",dto.getSurveyStatus() );
+//        qw.eq(StringUtils.isNotEmpty(dto.getSignStatus()), "sign_status",dto.getSignStatus() );
+//        qw.eq(StringUtils.isNotEmpty(dto.getUserId()), "project_user_id",dto.getUserId() );
+//        qw.like(StringUtils.isNotEmpty(dto.getPartyA()), "party_a",dto.getPartyA() );
+//
+//
+//        if (StringUtils.isNotEmpty(dto.getOrderBy())) {
+//            qw.orderBy(Boolean.TRUE, dto.getIsASC(), dto.getOrderBy());
+//        }else{
+//            qw.orderBy(Boolean.TRUE, Boolean.FALSE, "rec_date");
+//        }
+        IPage<HouseholdContract> warningQuestionInfoIPage = householdContractMapper.selectPage(dto);
 
         return warningQuestionInfoIPage;
     }