调整 基地存在地块时不能被删除

main
masong 2 years ago
parent e8e825d974
commit 8c64576973
  1. 8
      cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/base/TraceabilityBaseController.java
  2. 5
      cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/block/BlockMapper.java
  3. 7
      cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/base/TraceabilityBaseService.java
  4. 9
      cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/base/TraceabilityBaseServiceImpl.java

@ -61,8 +61,12 @@ public class TraceabilityBaseController {
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('traceability:base:delete')")
public CommonResult<Boolean> deleteBase(@RequestParam("id") Integer id) {
baseService.deleteBase(id);
return success(true);
if (baseService.selectIsBindBlock(id)) {
return success(false);
}else{
baseService.deleteBase(id);
return success(true);
}
}
@GetMapping("/get")

@ -53,4 +53,9 @@ public interface BlockMapper extends BaseMapperX<BlockDO> {
.eq(CropperDO :: getId, cropperId)
);
}
default Long selectIsBindBlock(Integer baseId){
return selectJoinCount(new MPJLambdaWrapper<BlockDO>()
.eq(BlockDO :: getBaseId,baseId)
);
}
}

@ -66,4 +66,11 @@ public interface TraceabilityBaseService {
void updateBaseStatus(Integer id, Integer status);
Map<String,Object> getAllBaseInfo(Integer id);
/**
* 查询基地是否绑定地块
* @param id
* @return
*/
boolean selectIsBindBlock(Integer id);
}

@ -10,6 +10,7 @@ import com.cjy.traceability.module.traceability.controller.admin.base.vo.Traceab
import com.cjy.traceability.module.traceability.controller.admin.base.vo.TraceabilityBaseSaveReqVO;
import com.cjy.traceability.module.traceability.dal.dataobject.base.TraceabilityBaseDO;
import com.cjy.traceability.module.traceability.dal.mysql.base.TraceabilityBaseMapper;
import com.cjy.traceability.module.traceability.dal.mysql.block.BlockMapper;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@ -32,7 +33,8 @@ public class TraceabilityBaseServiceImpl implements TraceabilityBaseService {
@Resource
private TraceabilityBaseMapper baseMapper;
@Resource
private BlockMapper blockMapper;
@Override
public Integer createBase(TraceabilityBaseSaveReqVO createReqVO) {
// 插入
@ -124,4 +126,9 @@ public class TraceabilityBaseServiceImpl implements TraceabilityBaseService {
returnMap.put("currentPlantingArea", baseMapper.getCurrentPlantingArea(ids));
return returnMap;
}
@Override
public boolean selectIsBindBlock(Integer id) {
return blockMapper.selectIsBindBlock(id)>0;
}
}
Loading…
Cancel
Save