优化经销商开发删除农户接口

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

@@ -42,4 +42,6 @@ public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
     void deletePauByUserId(String userId);
     void deleteAliByUserId(String userId);
     void deleteHhcByUserId(String userId);
+
+    Integer selectSurveyOrNot(String sequenceNbr);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IPeasantHouseholdService.java

@@ -17,5 +17,5 @@ public interface IPeasantHouseholdService {
 
     List<PeasantHousehold> getInfoByIds(String ids);
 
-    Boolean deleteByUserId(String userId);
+    Boolean deleteUser(String sequenceNbr, String userId);
 }

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

@@ -77,6 +77,11 @@ and hygf_document_station.station_id is not null
             `user`.MOBILE = #{telephone}
     </select>
 
+    <select id="selectSurveyOrNot" resultType="Integer">
+        select survey_or_not from hygf_peasant_household where sequence_nbr = #{sequenceNbr}
+    </select>
+
+
 
     <select id="selectIsAllRevoke" resultType="Integer">
         SELECT

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

@@ -280,15 +280,15 @@ public class PeasantHouseholdController extends BaseController {
 
 
 	/**
-	 * 根据userId删除用户信息
-	 *
+	 * 根据sequenceNbr和userId删除用户信息
+	 * sequenceNbr 唯一标识
 	 * @param userId 用户id
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@DeleteMapping(value = "/userId/{userId}")
+	@DeleteMapping(value = "/{sequenceNbr}/{userId}")
 	@ApiOperation(httpMethod = "DELETE",value = "根据userId删除用户信息和合同",  notes = "根据userId删除用户信息和合同")
-	public ResponseModel<Boolean> deleteByUserId(@PathVariable String userId) {
-		return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.deleteByUserId(userId));
+	public ResponseModel<Boolean> deleteUser(@PathVariable String sequenceNbr, @PathVariable String userId) {
+		return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.deleteUser(sequenceNbr, userId));
 	}
 }

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

@@ -796,8 +796,23 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
     }
 
     @Override
-    public Boolean deleteByUserId(String userId) {
+    public Boolean deleteUser(String sequenceNbr, String userId) {
         try {
+//            根据sequenceNbr获取农户勘察状态
+            Integer surveyOrNot = peasantHouseholdMapper.selectSurveyOrNot(sequenceNbr);
+
+            if(surveyOrNot != 0) {
+                throw new BadRequest("该用户已勘察, 不允许删除！");
+            }
+
+            //            查询该条数据能否被删除, 0不能删除, 1可以删除
+            Integer isAllRevok = peasantHouseholdMapper.selectIsAllRevoke(userId);
+
+            if(isAllRevok != 1) {
+                throw new BadRequest("该用户有未完成的任务, 不允许删除！");
+            }
+
+
             // 删除hygf_peasant_household表中数据
             peasantHouseholdMapper.deleteHphByUserId(userId);
             // 删除privilege_agency_user表中数据
@@ -808,7 +823,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
             peasantHouseholdMapper.deleteHhcByUserId(userId);
 
 
-            return null;
+            return true;
         } catch (Exception e) {
             throw new BadRequest("删除失败！");
         }