人大金仓适配

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

@@ -36,6 +36,7 @@ public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
     List<Map<String,Object>> selectUserIsHouse(String telephone);
 
     Integer selectIsAllRevoke(String peasantHouseholdNo);
+    Integer selectIsAllRevokePassCount(String peasantHouseholdNo);
 
     void deleteHphByUserId(String userId);
     void deletePauByUserId(String userId);

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

@@ -93,14 +93,18 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
 
 
     <select id="selectIsAllRevoke" resultType="Integer">
-        SELECT
-            count(*) = ( SELECT count(*) FROM hygf_household_contract WHERE peasant_household_number = #{peasantHouseholdNo} and initiate_status = '已发起' AND STATUS = '已作废' )
-        FROM
-            hygf_household_contract
-        WHERE
-            peasant_household_number = #{peasantHouseholdNo} and initiate_status = '已发起'
+<!--        SELECT-->
+<!--            count(*) = ( SELECT count(*) FROM hygf_household_contract WHERE peasant_household_number = #{peasantHouseholdNo} and initiate_status = '已发起' AND STATUS = '已作废' )-->
+<!--        FROM-->
+<!--            hygf_household_contract-->
+<!--        WHERE-->
+<!--            peasant_household_number = #{peasantHouseholdNo} and initiate_status = '已发起'-->
+        SELECT count(1) FROM hygf_household_contract WHERE peasant_household_number = #{peasantHouseholdNo} and initiate_status = '已发起' AND STATUS = '已作废'
     </select>
 
+    <select id="selectIsAllRevokePassCount" resultType="java.lang.Integer">
+        SELECT count(1) FROM hygf_household_contract WHERE peasant_household_number = #{peasantHouseholdNo} and initiate_status = '已发起'
+    </select>
     <select id="deleteHphByUserId">
         DELETE FROM hygf_peasant_household WHERE amos_user_id=#{userId}
     </select>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UnitInfoController.java

@@ -550,8 +550,7 @@ public class UnitInfoController extends BaseController {
     @ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
     public ResponseModel<IPage<CompanyDto>> getCompanyModelList(CompanyDto dto) {
 
-//        String  userid= getUserInfo().getUserId();
-        String  userid= "9840153";
+        String  userid= getUserInfo().getUserId();
         LambdaQueryWrapper<PublicAgencyUser> qud=new LambdaQueryWrapper<>();
         qud.eq(PublicAgencyUser::getAmosUserId,userid);
         PublicAgencyUser publicAgencyUse=  publicAgencyUserMapper.selectOne(qud);

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -239,7 +240,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
 
         List<PeasantHousehold> newRecords = records.stream().map(item -> {
 //            查询该条数据能否被删除, 0不能删除, 1可以删除
-            item.setIsAllRevoke(peasantHouseholdMapper.selectIsAllRevoke(item.getPeasantHouseholdNo()));
+            item.setIsAllRevoke(BooleanUtil.toInteger(peasantHouseholdMapper.selectIsAllRevokePassCount(item.getPeasantHouseholdNo()) == peasantHouseholdMapper.selectIsAllRevoke(item.getPeasantHouseholdNo())));
 
 
             if(item.getSurveyOrNot() != null){
@@ -805,9 +806,9 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
             }
 
             // 查询该条数据能否被删除, 0不能删除, 1可以删除
-            Integer isAllRevok = peasantHouseholdMapper.selectIsAllRevoke(peasantHouseholdNo);
-
-            if(isAllRevok != 1) {
+//            Integer isAllRevok = peasantHouseholdMapper.selectIsAllRevoke(peasantHouseholdNo);
+        Integer isAllRevok = BooleanUtil.toInteger(peasantHouseholdMapper.selectIsAllRevokePassCount(peasantHouseholdNo) == peasantHouseholdMapper.selectIsAllRevoke(peasantHouseholdNo));
+        if(isAllRevok != 1) {
                 throw new BadRequest("该用户有未完成的任务, 无法删除！");
             }